[🤖Automation] Update README with sponsors information

Currently translated at 100.0% (733 of 733 strings)

Translation: NetAlertX/core
Translate-URL: https://hosted.weblate.org/projects/pialert/core/it/

.github/ISSUE_TEMPLATE/i-have-an-issue.yml

@@ -9,6 +9,16 @@ body:
     options:
     - label: I have searched the existing open and closed issues and I checked the docs https://github.com/jokob-sk/NetAlertX/tree/main/docs
       required: true
+- type: checkboxes
+  attributes:
+    label: The issue occurs in the following browsers. Select at least 2.
+    description: This step helps me understand if this is a cache or browser-specific issue. 
+    options:
+    - label: "Firefox"
+    - label: "Chrome"
+    - label: "Edge"
+    - label: "Safari (unsupported) - PRs welcome"
+    - label: "N/A - This is an issue with the backend"
 - type: textarea
   attributes:
     label: Current Behavior
@@ -64,7 +74,7 @@ body:
       ***Generally speaking, all bug reports should have logs provided.***
       Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
       Additionally, any additional info? Screenshots? References? Anything that will give us more context about the issue you are encountering!
-      You can use `tail -100 /app/front/log/app.log` in the container if you have trouble getting to the log files. 
+      You can use `tail -100 /app/log/app.log` in the container if you have trouble getting to the log files. 
   validations:
     required: false
 - type: checkboxes

.gitignore

@@ -7,7 +7,9 @@ db/*
 db/pialert.db
 db/app.db
 front/log/*
+/log/*
 front/api/*
+/api/*
 **/plugins/**/*.log
 **/%40eaDir/
 **/@eaDir/

Dockerfile

@@ -5,9 +5,8 @@ ARG INSTALL_DIR=/app
 ENV PYTHONUNBUFFERED=1
 
 # Install build dependencies
-RUN apk add --no-cache bash python3 python3-dev gcc musl-dev libffi-dev openssl-dev \
+RUN apk add --no-cache bash python3 python3-dev gcc musl-dev libffi-dev openssl-dev git\
     && python -m venv /opt/venv
-    
 
 # Enable venv
 ENV PATH="/opt/venv/bin:$PATH"
@@ -15,11 +14,27 @@ 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 librouteros  \
+RUN pip install graphene flask netifaces tplink-omada-client pycryptodome requests paho-mqtt scapy cron-converter pytz json2table dhcp-leases pyunifi speedtest-cli chardet python-nmap dnspython librouteros git+https://github.com/foreign-sub/aiofreepybox.git \
     && 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 {} \;"
 
+# Append Iliadbox certificate to aiofreepybox
+RUN printf "\n-----BEGIN CERTIFICATE-----\n\
+MIICOjCCAcCgAwIBAgIUI0Tu7zsrBJACQIZgLMJobtbdNn4wCgYIKoZIzj0EAwIw\n\
+TDELMAkGA1UEBhMCSVQxDjAMBgNVBAgMBUl0YWx5MQ4wDAYDVQQKDAVJbGlhZDEd\n\
+MBsGA1UEAwwUSWxpYWRib3ggRUNDIFJvb3QgQ0EwHhcNMjAxMTI3MDkzODEzWhcN\n\
+NDAxMTIyMDkzODEzWjBMMQswCQYDVQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDjAM\n\
+BgNVBAoMBUlsaWFkMR0wGwYDVQQDDBRJbGlhZGJveCBFQ0MgUm9vdCBDQTB2MBAG\n\
+ByqGSM49AgEGBSuBBAAiA2IABMryJyb2loHNAioY8IztN5MI3UgbVHVP/vZwcnre\n\
+ZvJOyDvE4HJgIti5qmfswlnMzpNbwf/MkT+7HAU8jJoTorRm1wtAnQ9cWD3Ebv79\n\
+RPwtjjy3Bza3SgdVxmd6fWPUKaNjMGEwHQYDVR0OBBYEFDUij/4lpoJ+kOXRyrcM\n\
+jf2RPzOqMB8GA1UdIwQYMBaAFDUij/4lpoJ+kOXRyrcMjf2RPzOqMA8GA1UdEwEB\n\
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2gAMGUCMQC6eUV1\n\
+pFh4UpJOTc1JToztN4ttnQR6rIzxMZ6mNCe+nhjkohWp24pr7BpUYSbEizYCMAQ6\n\
+LCiBKV2j7QQGy7N1aBmdur17ZepYzR1YV0eI+Kd978aZggsmhjXENQYVTmm/XA==\n\
+-----END CERTIFICATE-----\n" >> /opt/venv/lib/python3.12/site-packages/aiofreepybox/freebox_certificates.pem
+
 # second stage
 FROM alpine:3.20 AS runner
 
@@ -40,7 +55,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0
 
 RUN apk update --no-cache \
     && apk add --no-cache bash zip lsblk gettext-envsubst sudo mtr tzdata s6-overlay \
-    && apk add --no-cache curl arp-scan iproute2 iproute2-ss nmap nmap-scripts traceroute nbtscan net-tools net-snmp-tools bind-tools awake ca-certificates  \
+    && apk add --no-cache curl arp-scan iproute2 iproute2-ss nmap nmap-scripts traceroute nbtscan avahi avahi-tools openrc dbus net-tools net-snmp-tools bind-tools awake ca-certificates  \
     && apk add --no-cache sqlite php83 php83-fpm php83-cgi php83-curl php83-sqlite3 php83-session \
     && apk add --no-cache python3 nginx \
     && apk add --no-cache dcron \
@@ -57,6 +72,6 @@ COPY install/crontab /etc/crontabs/root
 RUN ${INSTALL_DIR}/dockerfiles/pre-setup.sh
 
 HEALTHCHECK --interval=30s --timeout=5s --start-period=15s --retries=2 \
-  CMD curl -sf -o /dev/null ${LISTEN_ADDR}:${PORT}/api/app_state.json
+    CMD curl -sf -o /dev/null ${LISTEN_ADDR}:${PORT}/php/server/query_json.php?file=app_state.json
 
 ENTRYPOINT ["/init"]

Dockerfile.debian

@@ -33,7 +33,7 @@ COPY --chmod=775 --chown=${USER_ID}:${USER_GID} . ${INSTALL_DIR}/
 RUN apt-get install -y \
     tini snmp ca-certificates curl libwww-perl arp-scan perl apt-utils cron sudo \
     nginx-light php php-cgi php-fpm php-sqlite3 php-curl sqlite3 dnsutils net-tools php-openssl \
-    python3 python3-dev iproute2 nmap python3-pip zip systemctl usbutils traceroute nbtscan
+    python3 python3-dev iproute2 nmap python3-pip zip systemctl usbutils traceroute nbtscan avahi avahi-tools openrc dbus
 
 # Alternate dependencies
 RUN apt-get install nginx nginx-core mtr php-fpm php8.2-fpm php-cli php8.2 php8.2-sqlite3 -y
@@ -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 librouteros "
+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,8 +1,8 @@
-[![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)
+[![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)
+[![Discord](https://img.shields.io/discord/1274490466481602755?color=0aa8d2&logoColor=fff&logo=Discord&style=for-the-badge)](https://discord.gg/NczTUTWyRr)
 
 # 🖧🔍 Network scanner & notification framework
 
@@ -62,6 +62,8 @@ Head to [https://netalertx.com/](https://netalertx.com/) for more gifs and scree
 ## Installation & Documentation
 <!--- --------------------------------------------------------------------- --->
 
+Supported browsers: Chrome, Firefox
+
 | Docs        | Link    | 
 |-------------|-------------|
 | 📥🐳  | [Docker instructions](https://github.com/jokob-sk/NetAlertX/blob/main/dockerfiles/README.md) 

back/app.conf

@@ -19,7 +19,7 @@
 
 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']
+LOADED_PLUGINS = ['ARPSCAN','CSVBCKP','DBCLNP', 'INTRNT','MAINT','NEWDEV','NSLOOKUP','NTFPRCS', 'AVAHISCAN', 'SETPWD','SMTP', 'SYNC', 'VNDRPDT', 'WORKFLOWS']
 
 DAYS_TO_KEEP_EVENTS=90
 # Used for generating links in emails. Make sure not to add a trailing slash!
@@ -28,7 +28,6 @@ REPORT_DASHBOARD_URL='http://netalertx'
 # Make sure at least these scanners are enabled for new installs, other defaults are taken from the config.json
 INTRNT_RUN='schedule'
 ARPSCAN_RUN='schedule'
-PHOLUS_RUN='on_new_device'
 NSLOOKUP_RUN='before_name_updates'
 
 # Email 

back/cron_script.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 export INSTALL_DIR=/app
 
-LOG_FILE="${INSTALL_DIR}/front/log/execution_queue.log"
+LOG_FILE="${INSTALL_DIR}/log/execution_queue.log"
 
 # Check if there are any entries with cron_restart_backend
 if grep -q "cron_restart_backend" "$LOG_FILE"; then

back/update_vendors.sh

@@ -30,13 +30,12 @@ IEEE_OUI_URL="http://standards-oui.ieee.org/oui/oui.txt"
 # Download the file using wget
 wget "$IEEE_OUI_URL" -O ieee-oui_dl.txt
 
-# Filter lines containing "(base 16)" and remove the "(base 16)" string
-grep "(base 16)" ieee-oui_dl.txt | sed 's/ *(base 16)//' > ieee-oui_new.txt
-
-# Combine ieee-oui_new.txt and ieee-oui.txt, and extract unique MAC start values along with vendor names
+# Filter lines containing "(base 16)" and format them with a tab between MAC and vendor
+grep "(base 16)" ieee-oui_dl.txt | sed -E 's/ *\(base 16\)//' | awk -F' ' '{printf "%s\t%s\n", $1, substr($0, index($0, $2))}' > ieee-oui_new.txt
 
+# Combine, sort, and remove duplicates, ensuring tab-separated output
 cat ieee-oui.txt ieee-oui_new.txt >> ieee-oui_all.txt
-sort ieee-oui_all.txt > ieee-oui_all_sort.txt
-awk '{$1=$1; print}' ieee-oui_all_sort.txt | sort -u > ieee-oui_all_filtered.txt
+sort ieee-oui_all.txt | awk '{$1=$1; print}' | sort -u | awk -F' ' '{printf "%s\t%s\n", $1, substr($0, index($0, $2))}' > ieee-oui_all_filtered.txt
+
 
 

docker-compose.yml

@@ -16,7 +16,7 @@ services:
       # - ${APP_DATA_LOCATION}/netalertx_dev/db:/app/db      
       - ${APP_DATA_LOCATION}/netalertx/db:/app/db           
       # (optional) useful for debugging if you have issues setting up the container
-      # - ${LOGS_LOCATION}:/app/front/log      
+      # - ${LOGS_LOCATION}:/app/log      
       # ---------------------------------------------------------------------------
       # DELETE START anyone trying to use this file: comment out / delete BELOW lines, they are only for development purposes
       - ${APP_DATA_LOCATION}/netalertx/dhcp_samples/dhcp1.leases:/mnt/dhcp1.leases
@@ -25,6 +25,7 @@ services:
       - ${APP_DATA_LOCATION}/netalertx/dhcp_samples/pihole_dhcp_2.leases:/etc/pihole/dhcp2.leases      
       - ${APP_DATA_LOCATION}/pihole/etc-pihole/pihole-FTL.db:/etc/pihole/pihole-FTL.db    
       - ${DEV_LOCATION}/server:/app/server            
+      - ${DEV_LOCATION}/test:/app/test            
       - ${DEV_LOCATION}/dockerfiles:/app/dockerfiles
       # - ${APP_DATA_LOCATION}/netalertx/php.ini:/etc/php/8.2/fpm/php.ini      
       - ${DEV_LOCATION}/install:/app/install
@@ -38,9 +39,10 @@ services:
       - ${DEV_LOCATION}/install/user-mapping.debian.sh:/app/install/user-mapping.debian.sh
       - ${DEV_LOCATION}/install/install.debian.sh:/app/install/install.debian.sh      
       - ${DEV_LOCATION}/install/install_dependencies.debian.sh:/app/install/install_dependencies.debian.sh      
-      - ${DEV_LOCATION}/front/api:/app/front/api
+      - ${DEV_LOCATION}/api:/app/api
       - ${DEV_LOCATION}/front/php:/app/front/php      
       - ${DEV_LOCATION}/front/deviceDetails.php:/app/front/deviceDetails.php
+      - ${DEV_LOCATION}/front/deviceDetailsEdit.php:/app/front/deviceDetailsEdit.php
       - ${DEV_LOCATION}/front/userNotifications.php:/app/front/userNotifications.php
       - ${DEV_LOCATION}/front/deviceDetailsTools.php:/app/front/deviceDetailsTools.php
       - ${DEV_LOCATION}/front/devices.php:/app/front/devices.php
@@ -64,7 +66,7 @@ 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"}
+      # - APP_CONF_OVERRIDE={"SCAN_SUBNETS":"['192.168.1.0/24 --interface=eth1']","UI_theme":"Dark"}
       - TZ=${TZ}
       - PORT=${PORT}      
       # ❗ DANGER ZONE BELOW - Setting ALWAYS_FRESH_INSTALL=true will delete the content of the /db & /config folders

dockerfiles/README.md

@@ -2,7 +2,7 @@
 [![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)
+[![Discord](https://img.shields.io/discord/1274490466481602755?color=0aa8d2&logoColor=fff&logo=Discord&style=for-the-badge)](https://discord.gg/NczTUTWyRr)
 
 
 # NetAlertX 🖧🔍 Network scanner & notification framework
@@ -41,7 +41,10 @@ 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_theme":"Dark"}` (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` |
+
+> You can override the default GraphQL port setting `GRAPHQL_PORT` (set to `20212`) by using the `APP_CONF_OVERRIDE` env variable. 
 
 ### Docker paths
 
@@ -52,10 +55,10 @@ docker run -d --rm --network=host \
 | :------------- | :------------- | :-------------| 
 | ✅ | `:/app/config` | Folder which will contain the `app.conf` & `devices.csv` ([read about devices.csv](https://github.com/jokob-sk/NetAlertX/blob/main/docs/DEVICES_BULK_EDITING.md)) files (see below for details).  | 
 | ✅ | `:/app/db` | Folder which will contain the `app.db` file  | 
-| | `:/app/front/log` |  Logs folder useful for debugging if you have issues setting up the container  | 
+| | `:/app/log` |  Logs folder useful for debugging if you have issues setting up the container  | 
 | | `:/etc/pihole/pihole-FTL.db` |  PiHole's `pihole-FTL.db` database file. Required if you want to use PiHole DB mapping.  | 
 | | `:/etc/pihole/dhcp.leases` |  PiHole's `dhcp.leases` file. Required if you want to use PiHole `dhcp.leases` file. This has to be matched with a corresponding `DHCPLSS_paths_to_check` setting entry (the path in the container must contain `pihole`)| 
-| | `:/app/front/api` |  A simple [API endpoint](https://github.com/jokob-sk/NetAlertX/blob/main/docs/API.md) containing static (but regularly updated) json and other files.   | 
+| | `:/app/api` |  A simple [API endpoint](https://github.com/jokob-sk/NetAlertX/blob/main/docs/API.md) containing static (but regularly updated) json and other files.   | 
 | | `:/app/front/plugins/<plugin>/ignore_plugin` | Map a file `ignore_plugin` to ignore a plugin. Plugins can be soft-disabled via settings. More in the [Plugin docs](https://github.com/jokob-sk/NetAlertX/blob/main/front/plugins/README.md).  | 
 | | `:/etc/resolv.conf` | Use a custom `resolv.conf` file for [better name resolution](https://github.com/jokob-sk/NetAlertX/blob/main/docs/REVERSE_DNS.md).  | 
 
@@ -126,7 +129,7 @@ services:
       - local/path/config:/app/config
       - local/path/db:/app/db      
       # (optional) useful for debugging if you have issues setting up the container
-      - local/path/logs:/app/front/log
+      - local/path/logs:/app/log
     environment:
       - TZ=Europe/Berlin      
       - PORT=20211
@@ -175,7 +178,7 @@ services:
       - ${APP_DATA_LOCATION}/netalertx/config:/app/config
       - ${APP_DATA_LOCATION}/netalertx/db/:/app/db/      
       # (optional) useful for debugging if you have issues setting up the container
-      - ${LOGS_LOCATION}:/app/front/log
+      - ${LOGS_LOCATION}:/app/log
     environment:
       - TZ=${TZ}      
       - PORT=${PORT}
@@ -236,4 +239,4 @@ Big thanks to <a href="https://github.com/Macleykun">@Macleykun</a> & for help a
 - Bitcoin: `1N8tupjeCK12qRVU2XrV17WvKK7LCawyZM`
 - Ethereum: `0x6e2749Cb42F4411bc98501406BdcD82244e3f9C7`
 
-> 📧 Email me at [jokob@duck.com](mailto:jokob@duck.com?subject=NetAlertX) if you want to get in touch or if I should add other sponsorship platforms.
+> 📧 Email me at [jokob@duck.com](mailto:jokob@duck.com?subject=NetAlertX) if you want to get in touch or if I should add other sponsorship platforms.

dockerfiles/setup.sh

@@ -43,6 +43,10 @@ fi
 
 # OVERRIDE settings: Handling APP_CONF_OVERRIDE
 # Check if APP_CONF_OVERRIDE is set
+
+# remove old
+rm "${INSTALL_DIR}/config/app_conf_override.json"
+
 if [ -z "$APP_CONF_OVERRIDE" ]; then
   echo "APP_CONF_OVERRIDE is not set. Skipping config file creation."
 else
@@ -102,15 +106,15 @@ fi
 
 # Create an empty log files
 # Create the execution_queue.log and app_front.log files if they don't exist
-touch "${INSTALL_DIR}"/front/log/{app.log,execution_queue.log,app_front.log,app.php_errors.log,stderr.log,stdout.log,db_is_locked.log}
-touch "${INSTALL_DIR}"/front/api/user_notifications.json
+touch "${INSTALL_DIR}"/log/{app.log,execution_queue.log,app_front.log,app.php_errors.log,stderr.log,stdout.log,db_is_locked.log}
+touch "${INSTALL_DIR}"/api/user_notifications.json
 
 echo "[INSTALL] Fixing permissions after copied starter config & DB"
-chown -R nginx:www-data "${INSTALL_DIR}"/{config,front/log,db,front/api}
-chown -R nginx:www-data "${INSTALL_DIR}"/front/api/user_notifications.json
+chown -R nginx:www-data "${INSTALL_DIR}"/{config,log,db,api}
+chown -R nginx:www-data "${INSTALL_DIR}"/api/user_notifications.json
 
-chmod 750 "${INSTALL_DIR}"/{config,front/log,db}
-find "${INSTALL_DIR}"/{config,front/log,db} -type f -exec chmod 640 {} \;
+chmod 750 "${INSTALL_DIR}"/{config,log,db}
+find "${INSTALL_DIR}"/{config,log,db} -type f -exec chmod 640 {} \;
 
 # Check if buildtimestamp.txt doesn't exist
 if [ ! -f "${INSTALL_DIR}/front/buildtimestamp.txt" ]; then

docs/API.md

@@ -9,7 +9,7 @@ The endpoints are updated when objects in the API endpoints are changed.
 
 ### Location of the endpoints
 
-In the container, these files are located under the `/app/front/api/` folder and thus on the `<netalertx_url>/api/<File name>` url.
+In the container, these files are located under the `/app/api/` folder. You can acces sthem via the `/php/server/query_json.php?file=user_notifications.json` endpoint.
 
 ### Available endpoints
 
@@ -21,7 +21,6 @@ You can access the following files:
   | `notification_text.html` | The full HTML of the last email notification. |
   | `notification_json_final.json` | The json version of the last notification (e.g. used for webhooks - [sample JSON](https://github.com/jokob-sk/NetAlertX/blob/main/front/report_templates/webhook_json_sample.json)). |
   | `table_devices.json` | The current (at the time of the last update as mentioned above on this page) state of all of the available Devices detected by the app. |  
-  | `table_pholus_scan.json` | The latest state of the [pholus](https://github.com/jokob-sk/NetAlertX/tree/main/pholus) (A multicast DNS and DNS Service Discovery Security Assessment Tool) scan results. |
   | `table_plugins_events.json` | The list of the unprocessed (pending) notification events (plugins_events DB table). |
   | `table_plugins_history.json` | The list of notification events history. |  
   | `table_plugins_objects.json` | The content of the plugins_objects table. Find more info on the [Plugin system here](https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins)|
@@ -58,38 +57,38 @@ Example JSON of the `table_devices.json` endpoint with two Devices (database row
 {
   "data": [
         {
-          "dev_MAC": "Internet",
-          "dev_Name": "Net - Huawei",
-          "dev_DeviceType": "Router",
-          "dev_Vendor": null,
-          "dev_Group": "Always on",
-          "dev_FirstConnection": "2021-01-01 00:00:00",
-          "dev_LastConnection": "2021-01-28 22:22:11",
-          "dev_LastIP": "192.168.1.24",
-          "dev_StaticIP": 0,
-          "dev_PresentLastScan": 1,
-          "dev_LastNotification": "2023-01-28 22:22:28.998715",
-          "dev_NewDevice": 0,
-          "dev_Network_Node_MAC_ADDR": "",
-          "dev_Network_Node_port": "",
-          "dev_Icon": "globe"
+          "devMac": "Internet",
+          "devName": "Net - Huawei",
+          "devType": "Router",
+          "devVendor": null,
+          "devGroup": "Always on",
+          "devFirstConnection": "2021-01-01 00:00:00",
+          "devLastConnection": "2021-01-28 22:22:11",
+          "devLastIP": "192.168.1.24",
+          "devStaticIP": 0,
+          "devPresentLastScan": 1,
+          "devLastNotification": "2023-01-28 22:22:28.998715",
+          "devIsNew": 0,
+          "devParentMAC": "",
+          "devParentPort": "",
+          "devIcon": "globe"
         }, 
         {
-          "dev_MAC": "a4:8f:ff:aa:ba:1f",
-          "dev_Name": "Net - USG",
-          "dev_DeviceType": "Firewall",
-          "dev_Vendor": "Ubiquiti Inc",
-          "dev_Group": "",
-          "dev_FirstConnection": "2021-02-12 22:05:00",
-          "dev_LastConnection": "2021-07-17 15:40:00",
-          "dev_LastIP": "192.168.1.1",
-          "dev_StaticIP": 1,
-          "dev_PresentLastScan": 1,
-          "dev_LastNotification": "2021-07-17 15:40:10.667717",
-          "dev_NewDevice": 0,
-          "dev_Network_Node_MAC_ADDR": "Internet",
-          "dev_Network_Node_port": 1,
-          "dev_Icon": "shield-halved"
+          "devMac": "a4:8f:ff:aa:ba:1f",
+          "devName": "Net - USG",
+          "devType": "Firewall",
+          "devVendor": "Ubiquiti Inc",
+          "devGroup": "",
+          "devFirstConnection": "2021-02-12 22:05:00",
+          "devLastConnection": "2021-07-17 15:40:00",
+          "devLastIP": "192.168.1.1",
+          "devStaticIP": 1,
+          "devPresentLastScan": 1,
+          "devLastNotification": "2021-07-17 15:40:10.667717",
+          "devIsNew": 0,
+          "devParentMAC": "Internet",
+          "devParentPort": 1,
+          "devIcon": "shield-halved"
       }
     ]
 }

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,7 +8,7 @@ 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 backup storage
@@ -73,7 +73,7 @@ End-result: Partial restore (historical data & configurations from the Maintenan
 
 #### Recovery:
 
-Even with a corrupted database you can recover what I would argue is 99% of the configuration (except of a couple of settings under Maintenance). 
+Even with a corrupted database you can recover what I would argue is 99% of the configuration. 
 
 - map the `/config/app.conf` file as described in the [Setup documentation](https://github.com/jokob-sk/NetAlertX/blob/main/dockerfiles/README.md#docker-paths).
 - rename the `devices_<timestamp>.csv` to `devices.csv` and place it in the `/config` folder

docs/DATABASE.md

@@ -14,7 +14,6 @@
   | Events | Used to collect connection/disconnection events. | ![Screen4][screen4]  |   
   | Online_History   | Used to display the `Device presence` chart  | ![Screen6][screen6]  | 
   | Parameters       | Used to pass values between the frontend and backend. | ![Screen7][screen7]  | 
-  | 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 collected from the plugin `config.json` files used for string resolution in the frontend. | ![Screen12][screen12]  | 
@@ -29,7 +28,6 @@
   [screen4]: /docs/img/DATABASE/Events.png  
   [screen6]: /docs/img/DATABASE/Online_History.png
   [screen7]: /docs/img/DATABASE/Parameters.png
-  [screen8]: /docs/img/DATABASE/Pholus_Scan.png  
   [screen10]: /docs/img/DATABASE/Plugins_Events.png
   [screen11]: /docs/img/DATABASE/Plugins_History.png
   [screen12]: /docs/img/DATABASE/Plugins_Language_Strings.png

docs/DEBUG_PLUGINS.md

@@ -55,7 +55,7 @@ Input data from the plugin might cause mapping issues in specific edge cases. Lo
 17:31:05 [Plugins] SQL sqlParams for mapping: [('01:01:01:01:01:01', '172.30.0.1', 0, 'aaaa', 'vvvvvvvvv', 'PIHOLE'), ('02:42:ac:1e:00:02', '172.30.0.2', 0, 'dddd', 'vvvvv2222', 'PIHOLE')]
 🔺
 17:31:05 [API] Update API starting
-17:31:06 [API] Updating table_plugins_history.json file in /front/api
+17:31:06 [API] Updating table_plugins_history.json file in /api
 ```
 
 > The debug output between the 🔻red arrows🔺 is important for debugging (arrows added only to highlight the section on this page, they are not available in the actual debug log)
@@ -76,3 +76,16 @@ In the above output notice the section logging how many events are produced by t
 These values, if formatted correctly, will also show up in the UI:
 
 ![Plugins table](/docs/img/DEBUG_PLUGINS/plugin_objects_pihole.png)
+
+
+### Sharing application state
+
+Sometimes specific log sections are needed to debug issues. The Devices and CurrentScan table data is sometimes needed to figure out what's wrong. 
+
+1. Please set `LOG_LEVEL` to `trace` (Disable it once you have the info as this produces big log files).
+2. Wait for the issue to occur.
+3. Search for `================ DEVICES table content  ================` in your logs.
+4. Search for `================ CurrentScan table content  ================` in your logs.
+5. Open a new issue and post (redacted) output into the issue description (or send to the netalertx@gmail.com email if sensitive data present).
+6. Please set `LOG_LEVEL` to `debug` or lower.
+

docs/DEBUG_TIPS.md

@@ -49,11 +49,22 @@ services:
     # Other service configurations...
 ```
 
+## 5. Sharing application state
+
+Sometimes specific log sections are needed to debug issues. The Devices and CurrentScan table data is sometimes needed to figure out what's wrong. 
+
+1. Please set `LOG_LEVEL` to `trace` (Disable it once you have the info as this produces big log files).
+2. Wait for the issue to occur.
+3. Search for `================ DEVICES table content  ================` in your logs.
+4. Search for `================ CurrentScan table content  ================` in your logs.
+5. Open a new issue and post (redacted) output into the issue description (or send to the netalertx@gmail.com email if sensitive data present).
+6. Please set `LOG_LEVEL` to `debug` or lower.
+
 ## 📃Common issues
 
 ### Permissions
 
-* If facing issues (AJAX errors, can't write to DB, empty screen, etc,) make sure permissions are set correctly, and check the logs under `/app/front/log`. 
+* If facing issues (AJAX errors, can't write to DB, empty screen, etc,) make sure permissions are set correctly, and check the logs under `/app/log`. 
 * To solve permission issues you can try setting the owner and group of the `app.db` by executing the following on the host system: `docker exec netalertx chown -R www-data:www-data /app/db/app.db`. 
 * If still facing issues, try to map the app.db file (⚠ not folder) to `:/app/db/app.db` (see [docker-compose Examples](https://github.com/jokob-sk/NetAlertX/blob/main/dockerfiles/README.md#-docker-composeyml-examples) for details)
 
@@ -81,3 +92,7 @@ sudo dpkg -i libseccomp2_2.5.3-2_armhf.deb
 ```
 
 The link above will probably break in time too. Go to https://packages.debian.org/sid/armhf/libseccomp2/download to find the new version number and put that in the url.
+
+### Only Router and own device show up
+
+Make sure that the subnet and interface in SCAN_SUBNETS are the correct ones. If your device/NAS has multiple ethernet ports, you probably need to change eth0 to something else!

docs/DEVICE_DISPLAY_SETTINGS.md

@@ -0,0 +1,6 @@
+# Device Display Settings
+
+This set of settings allows you to group Devices under different views. The Archived toggle allows you to exclude a Device from most listings and notifications. 
+
+
+![Display settings](/docs/img/DEVICE_MANAGEMENT/DeviceDetails_DisplaySettings.png)

docs/DEVICE_MANAGEMENT.md

@@ -1,107 +1,52 @@
 # NetAlertX - Device Management
-<!--- --------------------------------------------------------------------- --->
-To edit device information:
-  - Select "Devices" in the menu on the left of the screen
-  - Find the device you want to edit in the central table
-  - Go to the device page by clicking on the device name or status
-  - Press "Details" tab of the device
-  - Edit the device data
-  - Press the "Save" button
+
+The Main Info section is where most of the device identifyiable information is stored and edited. Some of the information is autodetected via various plugins. Initial values for most of the fields can be specified in the `NEWDEV` plugin.
 
 
 > [!NOTE] 
 >
-> [Bulk-edit devices](https://github.com/jokob-sk/NetAlertX/blob/main/docs/DEVICES_BULK_EDITING.md) by using the _CSV Export_ functionality in the _Maintenance_ section.
+> You can multi-edit devices by selecting them in the main Devices view, from the Mainetence section, or via the CSV Export functionality under Maintenance. More info can be found in the [Devices Bulk-editing docs](https://github.com/jokob-sk/NetAlertX/blob/main/docs/DEVICES_BULK_EDITING.md).
 
 
-![Device Details][screen1]
+ ![Main Info](/docs/img/DEVICE_MANAGEMENT/DeviceManagement_MainInfo.png)
 
 
 ## Main Info
-  - **MAC**: MAC addres of the device. Not editable.
-  - **Name**: Friendly device name
-  - **Owner**: Device owner (The list is self-populated with existing owners)
-  - **Type**: Select a device type from the dropdown list (Smartphone, Table,
-      Laptop, TV, router, ....) or type a new device type
-  - **Vendor**: Automatically updated by NetAlertX when empty or unknown
-  - **Favorite**: Mark the device as favorite and then it will appears at the
-      begining of the device list
-  - **Group**: Select a grouper ('Always on', 'Personal', Friends') or type
-      your own Group name
-  - **Comments**: Type any comments for the device
 
-## Session Info
-  - **Status**: Show device status : On-line / Off-Line
-  - **First Session**: Date and time of the first connection
-  - **Last Offline**: Date and time of the last last time the device was offline
-  - **Last IP**: Last known IP used during the last connection
-  - **Static IP**: Check this box to identify devices that always use the
-      same IP
+  - **MAC**: MAC addres of the device. Not editable, unless creating a new dummy device.
+  - **Last IP**: IP addres of the device. Not editable, unless creating a new dummy device.
+  - **Name**: Friendly device name. Autodetected via various 🆎 Name discovery [plugins](https://github.com/jokob-sk/NetAlertX/blob/main/front/plugins/README.md).
+  - **Icon**: Partially autodetected. Select an existing or [add a custom icon](https://github.com/jokob-sk/NetAlertX/blob/main/docs/ICONS.md). You can also auto-apply the same icon on all devices of the same type. 
+  - **Owner**: Device owner (The list is self-populated with existing owners and you can add custom values).
+  - **Type**: Select a device type from the dropdown list (`Smartphone`, `Tablet`,
+      `Laptop`, `TV`, `router`, etc.) or add a new device type. If you want the device to act as a **Network device** (and be able to be a network node in the Network view), select a type under Network Devices or add a new Network Device type in Settings. More information can be found in the [Network Setup docs](https://github.com/jokob-sk/NetAlertX/blob/main/docs/NETWORK_TREE.md). 
+  - **Vendor**: The manufacturing vendor. Automatically updated by NetAlertX when empty or unknown, can be edited.
+  - **Group**: Select a group (`Always on`, `Personal`, `Friends`, etc.) or type
+      your own Group name.
+  - **Location**: Select the location, usually a room, where the device is located (`Kitchen`, `Attic`, `Living room`, etc.) or add a custom Location.  
+  - **Comments**: Add any comments for the device, such as a serial number, or maintenance information.
 
-## Events & Alerts config
-  - **Scan Cycle**: Select the scan cycle: 0, 1', 15'
-    - Some devices do not respond to all ARP packets, for this cases is better
-      to use a 15' cycle.
-    - **For Apple devices I recommend using 15' cycle**
-  - **Alert All Events**: Send a notification in each event (connection,
-      disconnection, IP Changed, ...)
-  - **Alert Down**: Send a notification when the device is down
-    - *(Userful with "always connected" devices: Camera, Alexa,...)*
-  - **Skip repeated notifications during**: Do not send more than one
-      notification to this device for X hours
-    - *(Useful to avoid notification saturation on devices that frequently
-      connects and disconnects)*
+> [!NOTE] 
+>
+> Please note the above usage of the fields are only suggestions. You can use most of these fields for other purposes, such as storing the network interface, company owning a device, or similar. 
 
-# Privacy & Random MAC's
-<!--- --------------------------------------------------------------------- --->
+## Dummy devices
 
-The latest versions of some operating systems (IOS and Android) incorporate a
-new & interesting functionality to improve privacy: **Random MACs**.
+You can create dummy devices from the Devices listing screen. 
 
-This functionality allows you to **hide the true MAC** of the device and
-**assign a random MAC** when we connect to WIFI networks.
+![Create Dummy Device](/docs/img/DEVICE_MANAGEMENT/Devices_CreateDummyDevice.png)
 
-This behavior is especially useful when connecting to WIFI's that we do not
-know, but it **is totally useless when connecting to our own WIFI's** or known
-networks.
+The **MAC** field and the **Last IP** field will then become editable.
 
-**I recommend disabling this operation when connecting our devices to our own
-WIFI's**, in this way, NetAlertX will be able to identify the device, and it
-will not identify it as a new device every so often (every time IOS or Android
-decides to change the MAC).
-
-### IOS
-![ios][ios]
-
-  - [Use private Wi-Fi addresses in iOS 14](https://support.apple.com/en-us/HT211227)
-
-### Android
-![Android][Android]
-
-  - [How to Disable MAC Randomization in Android 10](https://support.boingo.com/s/article/How-to-Disable-MAC-Randomization-in-Android-10-Android-Q)
-  - [How do I disable random Wi-Fi MAC address on Android 10](https://support.plume.com/hc/en-gb/articles/360052070714-How-do-I-disable-random-Wi-Fi-MAC-address-on-Android-10-)
-  
-### License
-  GPL 3.0
-  [Read more here](../LICENSE.txt)
-
-### Contact 
-
-  Always use the Issue tracker for the correct fork, for example: 
-  
-  [jokob-sk/NetAlertX](https://github.com/jokob-sk/NetAlertX/issues). Please also follow the guidelines on:
-
-  - ➕ [Pull Request guidelines](https://github.com/jokob-sk/NetAlertX/tree/main/docs#-pull-requests-prs) 
-  - 🙏 [Feature request guidelines](https://github.com/jokob-sk/NetAlertX/tree/main/docs#-feature-requests) 
-  - 🐛 [Issue guidelines](https://github.com/jokob-sk/NetAlertX/tree/main/docs#-submitting-an-issue-or-bug)
-
-    
-  ***Suggestions and comments are welcome***
+![Save Dummy Device](/docs/img/DEVICE_MANAGEMENT/DeviceEdit_SaveDummyDevice.png)
 
 
-<!--- --------------------------------------------------------------------- --->
-[main]:    ./img/1_devices.jpg           "Main screen"
-[screen1]: ./img/2_1_device_details.jpg  "Screen 1"
-[ios]:     https://9to5mac.com/wp-content/uploads/sites/6/2020/08/how-to-use-private-wifi-mac-address-iphone-ipad.png?resize=2048,1009 "ios"
-[Android]: ./img/android_random_mac.jpg  "Android"
+> [!NOTE] 
+>
+> You can couple this with the `ICMP` plugin which can be used to monitor the status of these devices, if they are actual devices reachable with the `ping` command. If not, you can use a loopback IP address so they appear online, such as `0.0.0.0` or `127.0.0.1`.
+
+## Copying data from an existing device. 
+
+To speed up device population you can also copy data from an existing device. This can be done from the **Tools** tab on the Device details. 
+
 

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/FRONTEND_DEVELOPMENT.md

@@ -38,7 +38,7 @@ Some examples how to apply the above:
 
 Some useful frontend JavaScript functions:
 
-- `getDeviceDataByMac(macAddress, devicesColumn)` - method to retrieve any device data (database column) based on MAC address in the frontend 
+- `getDevDataByMac(macAddress, devicesColumn)` - method to retrieve any device data (database column) based on MAC address in the frontend 
 - `getString(string stringKey)` - method to retrieve translated strings in the frontend 
 - `getSetting(string stringKey)` - method to retrieve settings in the frontend 
 

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/HW_INSTALL.md

@@ -5,6 +5,8 @@ To download and install NetAlertX on the hardware/server directly use the `curl`
 > [!NOTE]
 > This is an Experimental feature 🧪 and it relies on community support.
 >
+> Looking for maintainers for this installation method 🙂
+>
 > There is no guarantee that the install script or any other script will gracefully handle other installed software.
 > Data loss is a possibility, **it is recommended to install NetAlertX using the supplied Docker image**.
 

docs/ICONS.md

@@ -45,7 +45,7 @@ Copying the HTML code from [Font Awesome](https://fontawesome.com/search?o=r&m=f
 If you own the premium package of Font Awesome icons you can mount it in your Docker container the following way:
 
 ```yaml
-/font-awesome:/app/front/lib/AdminLTE/bower_components/font-awesome:ro
+/font-awesome:/app/front/lib/font-awesome:ro
 ```
 
 You can use the full range of Font Awesome icons afterwards. 

docs/MIGRATION.md

@@ -85,7 +85,7 @@ services:
       - local/path/config:/app/config         # ⚠  This has changed (🔺required) 
       - local/path/db:/app/db                 # ⚠  This has changed (🔺required) 
       # (optional) useful for debugging if you have issues setting up the container
-      - local/path/logs:/app/front/log        # ⚠  This has changed (🟡optional) 
+      - local/path/logs:/app/log        # ⚠  This has changed (🟡optional) 
     environment:
       - TZ=Europe/Berlin      
       - PORT=20211
@@ -135,7 +135,7 @@ services:
       - local/path/config/app.conf:/app/config/app.conf # ⚠  This has changed (🔺required) 
       - local/path/db/app.db:/app/db/app.db             # ⚠  This has changed (🔺required) 
       # (optional) useful for debugging if you have issues setting up the container
-      - local/path/logs:/app/front/log                  # ⚠  This has changed (🟡optional) 
+      - local/path/logs:/app/log                  # ⚠  This has changed (🟡optional) 
     environment:
       - TZ=Europe/Berlin      
       - PORT=20211

docs/NETWORK_TREE.md

@@ -2,7 +2,7 @@
 
 Make sure you have a root device with the MAC `Internet` (No other MAC addresses are currently supported as the root node) set to a network device type (e.g.: **Type**:`Router`).
 
-> 💡 Tip: You can add dummy devices via the [Undiscoverables plugin](https://github.com/jokob-sk/NetAlertX/blob/main/front/plugins/undiscoverables/README.md)
+> 💡 Tip: You can add dummy devices via the [Create dummy device](https://github.com/jokob-sk/NetAlertX/blob/main/docs/DEVICE_MANAGEMENT.md#dummy-devices) button in the Devices listing page.
 
 > 💡 Tip: Export your configuration of the Network and Devices once in a while via the Export CSV feature under **Maintenance** -> **Backup/Restore** -> **CSV Export**.   
 

docs/NOTIFICATIONS.md

@@ -11,17 +11,15 @@ There are 4 ways how to influence notifications:
 > It's recommended to use the same schedule interval for all plugins responsible for scanning devices, otherwise false positives might be reported if different devices are discovered by different plugins. Check the **Settings** > **Enabled settings** section for a warning:
 > ![Schedules out-of-sync](/docs/img/NOTIFICATIONS/Schedules_out-of-sync.png)
 
-
 ## Device settings 💻
 
 ![Device notification settings](/docs/img/NOTIFICATIONS/Device-notification-settings.png)
 
 There are 4 settings on the device for influencing notifications. You can:
 
-1. Completely disable the scanning of the device
-2. **Alert all events**, connections, disconnections, IP changes (noisy, usually not recommended)
-3. **Alert down** - alerts when a device goes down. This setting overrides disabled Alert All Events, so you will get a notification of a device going down even if you don't have Alert All Events ticked.
-4. **Skip repeated notifications**, if for example you know there is a temporary issue and want to pause the same notification for this device for a given time.
+1. **Alert Events** - Enables alerts of connections, disconnections, IP changes.
+2. **Alert Down** - Alerts when a device goes down. This setting overrides a disabled **Alert Events** setting, so you will get a notification of a device going down even if you don't have **Alert Events** ticked.
+3. **Skip repeated notifications**, if for example you know there is a temporary issue and want to pause the same notification for this device for a given time.
 
 ## Plugin settings 🔌
 
@@ -40,7 +38,7 @@ Click the **Read more in the docs.** Link at the top of each plugin to get more
 
 In Notification Processing settings, you can specify blanket rules. These allow you to specify exceptions to the Plugin and Device settings and will override those.
 
-1. Notify on (`NTFPRCS_INCLUDED_SECTIONS`) allows you to specify which events trigger notifications. Usual setups will have `new_devices`, `down_devices`, and possibly `events` set. Setting `plugin` might be too noisy for most setups. More info in the [NTFPRCS plugin](/front/plugins/notification_processing/README.md)
+1. Notify on (`NTFPRCS_INCLUDED_SECTIONS`) allows you to specify which events trigger notifications. Usual setups will have `new_devices`, `down_devices`, and possibly `down_reconnected` set. Including `plugin` (dependenton the Plugin `<plugin>_WATCH` and `<plugin>_REPORT_ON` settings) and `events` (dependent on the on-device **Alert Events** setting) might be too noisy for most setups. More info in the [NTFPRCS plugin](/front/plugins/notification_processing/README.md)
 2. Alert down after (`NTFPRCS_alert_down_time`) is useful if you want to wait for some time before the system sends out a down notification for a device. This is related to the on-device **Alert down** setting and only devices with this checked will trigger a down notification.
 3. A filter to allow you to set device-specific exceptions to New devices being added to the app.
 4. A filter to allow you to set device-specific exceptions to generated Events.

docs/PERFORMANCE.md

@@ -0,0 +1,31 @@
+# Performance tips
+
+The application runs regular maintenance and DB cleanup tasks. If these tasks fail, you might encounter performance issues. 
+
+Most performance issues are caused by a big database or large log files. Enabling unnecessary plugins will also lead to performance degradation. 
+
+You can always check the size of your database and database tables under the Maintenance page. 
+
+![Db size check](/docs/img/PERFORMANCE/db_size_check.png)
+
+> [!NOTE]
+> For around 100 devices the database should be approximately `50MB` and none of the entries (rows) should exceed the value of `10 000` on a healthy system. These numbers will depend on your network activity and settings. 
+
+## Maintenance plugins
+
+There are 2 plugins responsible for maintaining the overal health of the application. One is responsible for the database cleanup and one for other tasks, such as log cleanup. 
+
+### DB Cleanup (DBCLNP)
+
+The database cleanup plugin. Check details and related setting in the [DB Cleanup plugin docs](/front/plugins/db_cleanup/README.md). Make sure the plugin is not failing by checking the logs. Try changing the schedule `DBCLNP_RUN_SCHD` and the timeout `DBCLNP_RUN_TIMEOUT` (increase) if the plugin is failing to execute.
+
+### Maintenance (MAINT)
+
+The maintenance plugin. Check details and related setting in the [Maintenance plugin docs](/front/plugins/maintenance/README.md). Make sure the plugin is not failing by checking the logs. Try changing the schedule `MAINT_RUN_SCHD` and the timeout `MAINT_RUN_TIMEOUT` (increase) if the plugin is failing to execute.
+
+## Scan frequency and coverage
+
+The more often you scan the networks the more resources, traffic and DB read/write cycles are executed. Especially on busy networks and lower end hardware, consider increasing scan intervals (`<PLUGIN>_RUN_SCHD`)  and timeouts (`<PLUGIN>_RUN_TIMEOUT`).
+
+Also consider decreasing the scanned subnet, e.g. from `/16` to `/24` if need be.   
+

docs/PLUGINS_DEV.md

@@ -83,7 +83,7 @@ The `config.json` file is the manifest of the plugin. It contains mainly setting
 
 ## Execution order
 
-The execution order is used to specify wwhen a plugin is executed. This is useful if a plugin has access and surfaces more information than others. If a device is detected by 2 plugins and inserted into the `CurrentScan` table, the plugin with the higher priority (e.g.: `Level_0` is a higher priority than `Level_1`) will insert it's values first. These values (devices) will be then prioritized over any values inserted later.
+The execution order is used to specify when a plugin is executed. This is useful if a plugin has access and surfaces more information than others. If a device is detected by 2 plugins and inserted into the `CurrentScan` table, the plugin with the higher priority (e.g.: `Level_0` is a higher priority than `Level_1`) will insert it's values first. These values (devices) will be then prioritized over any values inserted later.
 
 ```json
 {
@@ -170,20 +170,20 @@ This SQL query is executed on the `app.db` SQLite database file.
 > SQL query example:
 > 
 > ```SQL
-> SELECT  dv.dev_Name as Object_PrimaryID, 
->     cast(dv.dev_LastIP as VARCHAR(100)) || ':' || cast( SUBSTR(ns.Port ,0, INSTR(ns.Port , '/')) as VARCHAR(100)) as Object_SecondaryID,  
+> SELECT  dv.devName as Object_PrimaryID, 
+>     cast(dv.devLastIP as VARCHAR(100)) || ':' || cast( SUBSTR(ns.Port ,0, INSTR(ns.Port , '/')) as VARCHAR(100)) as Object_SecondaryID,  
 >     datetime() as DateTime,  
 >     ns.Service as Watched_Value1,        
 >     ns.State as Watched_Value2,
 >     'null' as Watched_Value3,
 >     'null' as Watched_Value4,
 >     ns.Extra as Extra,
->     dv.dev_MAC as ForeignKey 
+>     dv.devMac as ForeignKey 
 > FROM 
 >     (SELECT * FROM Nmap_Scan) ns 
 > LEFT JOIN 
->     (SELECT dev_Name, dev_MAC, dev_LastIP FROM Devices) dv 
-> ON ns.MAC = dv.dev_MAC
+>     (SELECT devName, devMac, devLastIP FROM Devices) dv 
+> ON ns.MAC = dv.devMac
 > ```
 > 
 > Required `CMD` setting example with above query (you can set `"type": "label"` if you want it to make uneditable in the UI):
@@ -192,7 +192,7 @@ This SQL query is executed on the `app.db` SQLite database file.
 > {
 >             "function": "CMD",
 >            "type": {"dataType":"string", "elements": [{"elementType" : "input", "elementOptions" : [] ,"transformers": []}]},
->            "default_value":"SELECT  dv.dev_Name as Object_PrimaryID, cast(dv.dev_LastIP as VARCHAR(100)) || ':' || cast( SUBSTR(ns.Port ,0, INSTR(ns.Port , '/')) as VARCHAR(100)) as Object_SecondaryID,  datetime() as DateTime,  ns.Service as Watched_Value1,        ns.State as Watched_Value2,        'null' as Watched_Value3,        'null' as Watched_Value4,        ns.Extra as Extra        FROM (SELECT * FROM Nmap_Scan) ns LEFT JOIN (SELECT dev_Name, dev_MAC, dev_LastIP FROM Devices) dv   ON ns.MAC = dv.dev_MAC",
+>            "default_value":"SELECT  dv.devName as Object_PrimaryID, cast(dv.devLastIP as VARCHAR(100)) || ':' || cast( SUBSTR(ns.Port ,0, INSTR(ns.Port , '/')) as VARCHAR(100)) as Object_SecondaryID,  datetime() as DateTime,  ns.Service as Watched_Value1,        ns.State as Watched_Value2,        'null' as Watched_Value3,        'null' as Watched_Value4,        ns.Extra as Extra        FROM (SELECT * FROM Nmap_Scan) ns LEFT JOIN (SELECT devName, devMac, devLastIP FROM Devices) dv   ON ns.MAC = dv.devMac",
 >            "options": [],
 >            "localized": ["name", "description"],
 >            "name" : [{
@@ -361,7 +361,7 @@ Plugin results are always inserted into the standard `Plugin_Objects` database t
 >3.  That's it. The app takes care of the rest. It loops thru the objects discovered by the plugin, takes the results line-by-line, and inserts them into the database table specified in `"mapped_to_table"`. The columns are translated from the generic plugin columns to the target table columns via the `"mapped_to_column"` property in the column definitions.
 
 > [!NOTE] 
-> You can create a column mapping with a default value via the `mapped_to_column_data` property. This means that the value of the given column will always be this value. That also menas that the `"column": "NameDoesntMatter"` is not important as there is no database source column. 
+> You can create a column mapping with a default value via the `mapped_to_column_data` property. This means that the value of the given column will always be this value. That also means that the `"column": "NameDoesntMatter"` is not important as there is no database source column. 
 
 
 >🔍 Example:
@@ -460,7 +460,7 @@ Below are some general additional notes, when defining `params`:
 
 - `"name":"name_value"` - is used as a wildcard replacement in the `CMD` setting value by using curly brackets `{name_value}`. The wildcard is replaced by the result of the `"value" : "param_value"` and `"type":"type_value"` combo configuration below.
 - `"type":"<sql|setting>"` - is used to specify the type of the params, currently only 2 supported (`sql`,`setting`).
-  - `"type":"sql"` - will execute the SQL query specified in the `value` property. The sql query needs to return only one column. The column is flattened and separated by commas (`,`), e.g: `SELECT dev_MAC from DEVICES` -> `Internet,74:ac:74:ac:74:ac,44:44:74:ac:74:ac`. This is then used to replace the wildcards in the `CMD` setting.  
+  - `"type":"sql"` - will execute the SQL query specified in the `value` property. The sql query needs to return only one column. The column is flattened and separated by commas (`,`), e.g: `SELECT devMac from DEVICES` -> `Internet,74:ac:74:ac:74:ac,44:44:74:ac:74:ac`. This is then used to replace the wildcards in the `CMD` setting.  
   - `"type":"setting"` - The setting code name. A combination of the value from `unique_prefix` + `_` + `function` value, or otherwise the code name you can find in the Settings page under the Setting display name, e.g. `PIHOLE_RUN`. 
 - `"value": "param_value"` - Needs to contain a setting code name or SQL query without wildcards.
 - `"timeoutMultiplier" : true` - used to indicate if the value should multiply the max timeout for the whole script run by the number of values in the given parameter.
@@ -474,13 +474,13 @@ Below are some general additional notes, when defining `params`:
 >     "params" : [{
 >            "name"              : "ips",
 >            "type"              : "sql",
->            "value"             : "SELECT dev_LastIP from DEVICES",
+>            "value"             : "SELECT devLastIP from DEVICES",
 >            "timeoutMultiplier" : true
 >        },
 >        {
 >            "name"              : "macs",
 >            "type"              : "sql",
->            "value"             : "SELECT dev_MAC from DEVICES"            
+>            "value"             : "SELECT devMac from DEVICES"            
 >        },
 >        {
 >            "name"              : "timeout",
@@ -518,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": "devIcon",
+      "type": {
+        "dataType": "string",
+        "elements": [
+          {
+            "elementType": "span",
+            "elementOptions": [
+              { "cssClasses": "input-group-addon iconPreview" },
+              { "getStringKey": "Gen_SelectToPreview" },
+              { "customId": "NEWDEV_devIcon_preview" }
+            ],
+            "transformers": []
+          },
+          {
+            "elementType": "select",
+            "elementHasInputValue": 1,
+            "elementOptions": [
+              { "cssClasses": "col-xs-12" },
+              {
+                "onChange": "updateIconPreview(this)"
+              },
+              { "customParams": "NEWDEV_devIcon,NEWDEV_devIcon_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
 
@@ -595,7 +649,7 @@ The UI will adjust how columns are displayed in the UI based on the resolvers de
 | See below for information on `threshold`, `replace`. | |
 |  |  |
 | `options` Property | Used in conjunction with types like `threshold`, `replace`, `regex`. |
-| `options_params` Property | Used in conjunction with a `"options": "[{value}]"` template and `text.select`/`list.select`. Can specify SQL query (needs to return 2 columns `SELECT dev_Name as name, dev_Mac as id`) or Setting (not tested) to populate the dropdown. Check example below or have a look at the `NEWDEV` plugin `config.json` file. |
+| `options_params` Property | Used in conjunction with a `"options": "[{value}]"` template and `text.select`/`list.select`. Can specify SQL query (needs to return 2 columns `SELECT devName as name, devMac as id`) or Setting (not tested) to populate the dropdown. Check example below or have a look at the `NEWDEV` plugin `config.json` file. |
 | `threshold` | The `options` array contains objects ordered from the lowest `maximum` to the highest. The corresponding `hexColor` is used for the value background color if it's less than the specified `maximum` but more than the previous one in the `options` array. |
 | `replace` | The `options` array contains objects with an `equals` property, which is compared to the "value." If the values are the same, the string in `replacement` is displayed in the UI instead of the actual "value". |
 | `regex` | Applies a regex to the value.  The `options` array contains objects with an `type` (must be set to `regex`) and `param` (must contain the regex itself) property. |
@@ -615,7 +669,7 @@ The UI will adjust how columns are displayed in the UI based on the resolvers de
 
 
 ```json
-        "function": "dev_DeviceType",
+        "function": "devType",
         "type": {"dataType":"string", "elements": [{"elementType" : "select", "elementOptions" : [] ,"transformers": []}]},
         "maxLength": 30,
         "default_value": "",
@@ -624,7 +678,7 @@ The UI will adjust how columns are displayed in the UI based on the resolvers de
             {
                 "name"  : "value",
                 "type"  : "sql",
-                "value" : "SELECT '' as id, '' as name UNION SELECT dev_DeviceType as id, dev_DeviceType as name FROM (SELECT dev_DeviceType FROM Devices UNION SELECT 'Smartphone' UNION SELECT 'Tablet' UNION SELECT 'Laptop' UNION SELECT 'PC' UNION SELECT 'Printer' UNION SELECT 'Server' UNION SELECT 'NAS' UNION SELECT 'Domotic' UNION SELECT 'Game Console' UNION SELECT 'SmartTV' UNION SELECT 'Clock' UNION SELECT 'House Appliance' UNION SELECT 'Phone' UNION SELECT 'AP' UNION SELECT 'Gateway' UNION SELECT 'Firewall' UNION SELECT 'Switch' UNION SELECT 'WLAN' UNION SELECT 'Router' UNION SELECT 'Other') AS all_devices ORDER BY id;"
+                "value" : "SELECT '' as id, '' as name UNION SELECT devType as id, devType as name FROM (SELECT devType FROM Devices UNION SELECT 'Smartphone' UNION SELECT 'Tablet' UNION SELECT 'Laptop' UNION SELECT 'PC' UNION SELECT 'Printer' UNION SELECT 'Server' UNION SELECT 'NAS' UNION SELECT 'Domotic' UNION SELECT 'Game Console' UNION SELECT 'SmartTV' UNION SELECT 'Clock' UNION SELECT 'House Appliance' UNION SELECT 'Phone' UNION SELECT 'AP' UNION SELECT 'Gateway' UNION SELECT 'Firewall' UNION SELECT 'Switch' UNION SELECT 'WLAN' UNION SELECT 'Router' UNION SELECT 'Other') AS all_devices ORDER BY id;"
             },
             {
                 "name"  : "uilang",

docs/README.md

@@ -27,6 +27,7 @@ There is also an in-app Help / FAQ section that should be answering frequently a
 
 #### 📥 Initial Setup
 
+- [Synology Guide](/docs/SYNOLOGY_GUIDE.md)
 - [Subnets and VLANs configuration for arp-scan](/docs/SUBNETS.md)
 - [SMTP server config](/docs/SMTP.md)
 - [Custom Icon configuration and support](/docs/ICONS.md)
@@ -43,6 +44,7 @@ There is also an in-app Help / FAQ section that should be answering frequently a
 - [Invalid JSON errors debug help](/docs/DEBUG_INVALID_JSON.md)
 - [Troubleshooting Plugins](/docs/DEBUG_PLUGINS.md)
 - [File Permissions](/docs/FILE_PERMISSIONS.md)
+- [Performance tips](/docs/PERFORMANCE.md)
 
 #### 🔝 Popular/Suggested
 
@@ -63,6 +65,8 @@ 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)
+- [Installing Updates](/docs/UPDATES.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/log
+    environment:
+      - TZ=Europe/Berlin
+      - PORT=20211
+    network_mode: host
+    dns:           # specifying the DNS servers used for the container
+      - 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. 
@@ -43,7 +66,7 @@ services:
     volumes:
       - ./config/app.conf:/app/config/app.conf
       - ./db:/app/db
-      - ./log:/app/front/log
+      - ./log:/app/log
       - ./config/resolv.conf:/etc/resolv.conf                          # Mapping the /resolv.conf file for better name resolution
     environment:
       - TZ=Europe/Berlin

docs/SESSION_INFO.md

@@ -0,0 +1,62 @@
+# Sessions Section in Device View
+
+The **Sessions Section** provides details about a device's connection history. This data is automatically detected and cannot be edited by the user.
+
+ ![Session info](/docs/img/SESSION_INFO/DeviceDetails_SessionInfo.png)
+
+---
+
+## Key Fields
+
+1. **Date and Time of First Connection**
+   - **Description:** Displays the first detected connection time for the device.
+   - **Editability:** Uneditable (auto-detected).
+   - **Source:** Automatically captured when the device is first added to the system.
+
+2. **Date and Time of Last Connection**
+   - **Description:** Shows the most recent time the device was online.
+   - **Editability:** Uneditable (auto-detected).
+   - **Source:** Updated with every new connection event.
+
+3. **Offline Devices with Missing or Conflicting Data**
+   - **Description:** Handles cases where a device is offline but has incomplete or conflicting session data (e.g., missing start times).
+   - **Handling:** The system flags these cases for review and attempts to infer missing details.
+
+---
+
+## How Sessions are Discovered and Calculated
+
+### 1. Detecting New Devices
+When a device is first detected in the network, the system logs it in the events table:
+
+`INSERT INTO Events (eve_MAC, eve_IP, eve_DateTime, eve_EventType, eve_AdditionalInfo, eve_PendingAlertEmail) SELECT cur_MAC, cur_IP, '{startTime}', 'New Device', cur_Vendor, 1 FROM CurrentScan WHERE NOT EXISTS (SELECT 1 FROM Devices WHERE devMac = cur_MAC)`
+
+- Devices scanned in the current cycle (**CurrentScan**) are checked against the **Devices** table.
+- If a device is new:
+  - A **New Device** event is logged.
+  - The device’s MAC, IP, vendor, and detection time are recorded.
+
+### 2. Logging Connection Sessions
+When a new connection is detected, the system creates a session record:
+
+`INSERT INTO Sessions (ses_MAC, ses_IP, ses_EventTypeConnection, ses_DateTimeConnection, ses_EventTypeDisconnection, ses_DateTimeDisconnection, ses_StillConnected, ses_AdditionalInfo) SELECT cur_MAC, cur_IP, 'Connected', '{startTime}', NULL, NULL, 1, cur_Vendor FROM CurrentScan WHERE NOT EXISTS (SELECT 1 FROM Sessions WHERE ses_MAC = cur_MAC)`
+
+- A new session is logged in the **Sessions** table if no prior session exists.
+- Fields like `MAC`, `IP`, `Connection Type`, and `Connection Time` are populated.
+- The `Still Connected` flag is set to `1` (active connection).
+
+### 3. Handling Missing or Conflicting Data
+- Devices with incomplete or conflicting session data (e.g., missing start times) are detected.
+- The system flags these records and attempts corrections by inferring details from available data.
+
+### 4. Updating Sessions
+- When a device reconnects, its session is updated with a new connection timestamp.
+- When a device disconnects:
+  - The **Disconnection Time** is recorded.
+  - The `Still Connected` flag is set to `0`.
+
+The session information is then used to display the device presence under **Monitoring** -> **Presence**.
+
+![Monitoring Device Presence](/docs/img/SESSION_INFO/Monitoring_Presence.png)
+
+

docs/SUBNETS.md

@@ -1,108 +1,130 @@
-# 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 a `/16` to `/24`) or increase the `TIMEOUT` setting (e.g.: `ARPSCAN_RUN_TIMEOUT` to `300` (a timeout of 5min)) for the plugin and the interval between scans (e.g.: `ARPSCAN_RUN_SCHD` to `*/10 * * * *` (scans every 10 min)). 
+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.
 
+
+### Wi-Fi Extenders
+
+A Wi-Fi extender typically works by creating a separate network or subnet, which can cause certain network scanning tools, like `arp-scan`, to be unable to detect devices behind the extender.
+
+This happens because `arp-scan` uses ARP (Address Resolution Protocol) to map IP addresses to MAC addresses on the local network. Since ARP is a Layer 2 (data link layer) protocol, it usually only works within a single broadcast domain, which is typically limited to a single router or network segment.
+
+When you introduce a Wi-Fi extender, it may isolate devices on different segments of the network, meaning ARP packets cannot easily traverse from one segment (your main network) to another (the network behind the extender).
+
+To scan devices behind the extender, you can try:
+
+- Scanning the specific subnet that the extender uses, if it is separate from the main network.
+- Using [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.
+
+Check the [plugins list](https://github.com/jokob-sk/NetAlertX/blob/main/front/plugins/README.md) to find a plugin supported by your router and  your network setup. 
+
+

docs/SYNOLOGY_GUIDE.md

@@ -0,0 +1,74 @@
+# Installation on a Synology NAS
+
+There are different ways to install NetAlertX on a Synology, including SSH-ing into the machine and using the command line. For this guide, we will use the Project option in Container manager. 
+
+## Create the folder structure
+
+The folders you are creating below will contain the configuration and the database. Back them up regularly. 
+
+1. Create a parent folder named `netalertx`
+2. Create a `db` sub-folder
+
+![Folder structure](/docs/img/SYNOLOGY/01_Create_folder_structure.png)
+![Folder structure](/docs/img/SYNOLOGY/02_Create_folder_structure_db.png)
+![Folder structure](/docs/img/SYNOLOGY/03_Create_folder_structure_db.png)
+
+3. Create a `config` sub-folder
+
+![Folder structure](/docs/img/SYNOLOGY/04_Create_folder_structure_config.png)
+
+4. Note down the folders Locations:
+
+![Getting the location](/docs/img/SYNOLOGY/05_Access_folder_properties.png)
+![Getting the location](/docs/img/SYNOLOGY/06_Note_location.png)
+
+5. Open **Container manager** -> **Project** and click **Create**.
+6. Fill in the details:
+
+- Project name: `netalertx`
+- Path: `/app_storage/netalertx` (will differ from yours)
+- Paste in the following template:
+
+```yaml
+version: "3"
+services:
+  netalertx:
+    container_name: netalertx
+    # use the below line if you want to test the latest dev image
+    # image: "jokobsk/netalertx-dev:latest" 
+    image: "jokobsk/netalertx:latest"      
+    network_mode: "host"        
+    restart: unless-stopped
+    volumes:
+      - local/path/config:/app/config
+      - local/path/db:/app/db      
+      # (optional) useful for debugging if you have issues setting up the container
+      - local/path/logs:/app/log
+    environment:
+      - TZ=Europe/Berlin      
+      - PORT=20211
+```
+
+![Project settings](/docs/img/SYNOLOGY/07_Create_project.png)
+
+7. Replace the paths to your volume and/or comment out unnecessary line(s):
+
+- This is only an example, your paths will differ.
+
+```yaml
+ volumes:
+      - /volume1/app_storage/netalertx/config:/app/config
+      - /volume1/app_storage/netalertx/db:/app/db      
+      # (optional) useful for debugging if you have issues setting up the container
+      # - local/path/logs:/app/log <- commented out with # ⚠
+```
+
+![Adjusting docker-compose](/docs/img/SYNOLOGY/08_Adjust_docker_compose_volumes.png)
+
+8. (optional) Change the port number from `20211` to an unused port if this port is already used.
+9. Build the project:
+
+![Build](/docs/img/SYNOLOGY/09_Run_and_build.png)
+
+10. Navigate to `<Synology URL>:20211` (or your custom port).
+11. Read the [Subnets](/docs/SUBNETS.md) and [Plugins](/front/plugins/README.md) docs to complete your setup. 

docs/UPDATES.md

@@ -0,0 +1,110 @@
+# Docker Update Strategies for NetAlertX
+
+This guide outlines several approaches for updating Docker containers, specifically using NetAlertX. Each method offers different benefits depending on the situation. Here are the methods:
+
+- Manual: Direct commands to stop, remove, and rebuild containers.
+- Dockcheck: Semi-automated with more control, suited for bulk updates.
+- Watchtower: Fully automated, runs continuously to check and update containers.
+
+You can choose any approach that fits your workflow.
+
+> In the examples I assume that the container name is `netalertx` and the image name is `netalertx` as well.
+
+## 1. Manual Updates
+
+Use this method when you need precise control over a single container or when dealing with a broken container that needs immediate attention.
+Example Commands
+
+To manually update the `netalertx` container, stop it, delete it, remove the old image, and start a fresh one with `docker-compose`.
+
+```bash
+# Stop the container
+sudo docker container stop netalertx
+
+# Remove the container
+sudo docker container rm netalertx
+
+# Remove the old image
+sudo docker image rm netalertx
+
+# Pull and start a new container
+sudo docker-compose up -d
+```
+
+### Alternative: Force Pull with Docker Compose
+
+You can also use `--pull always` to ensure Docker pulls the latest image before starting the container:
+
+```bash
+sudo docker-compose up --pull always -d
+```
+
+## 2. Dockcheck for Bulk Container Updates
+
+Always check the [Dockcheck](https://github.com/mag37/dockcheck) docs if encountering issues with the guide below. 
+
+Dockcheck is a useful tool if you have multiple containers to update and some flexibility for handling potential issues that might arise during mass updates. Dockcheck allows you to inspect each container and decide when to update.
+
+### Example Workflow with Dockcheck
+
+You might use Dockcheck to:
+
+- Inspect container versions.
+- Pull the latest images in bulk.
+- Apply updates selectively.
+
+Dockcheck can help streamline bulk updates, especially if you’re managing multiple containers.
+
+Below is a script I use to run an update of the Dockcheck script and start a check for new containers:
+
+```bash
+cd /path/to/Docker &&
+rm dockcheck.sh &&
+wget https://raw.githubusercontent.com/mag37/dockcheck/main/dockcheck.sh &&
+sudo chmod +x dockcheck.sh &&
+sudo ./dockcheck.sh
+```
+
+## 3. Automated Updates with Watchtower
+
+Always check the [watchtower](https://github.com/containrrr/watchtower) docs if encountering issues with the guide below. 
+
+Watchtower monitors your Docker containers and automatically updates them when new images are available. This is ideal for ongoing updates without manual intervention.
+
+### Setting Up Watchtower
+
+#### 1. Pull the Watchtower Image:
+
+```bash
+docker pull containrrr/watchtower
+```
+
+#### 2. Run Watchtower to update all images:
+
+```bash
+docker run -d \
+  --name watchtower \
+  -v /var/run/docker.sock:/var/run/docker.sock \
+  containrrr/watchtower \
+  --interval 300 # Check for updates every 5 minutes
+```
+
+#### 3. Run Watchtower to update only NetAlertX: 
+
+You can specify which containers to monitor by listing them. For example, to monitor netalertx only:
+
+```bash
+docker run -d \
+  --name watchtower \
+  -v /var/run/docker.sock:/var/run/docker.sock \
+  containrrr/watchtower netalertx
+
+```
+
+## Summary
+
+- Manual: Ideal for individual or critical updates.
+- Dockcheck: Suitable for controlled, mass updates.
+- Watchtower: Fully automated, best for continuous deployment setups.
+
+These approaches allow you to maintain flexibility in how you update Docker containers, depending on the urgency and scale of the update.

docs/WEB_UI_PORT_DEBUG.md

@@ -41,7 +41,7 @@ In the container execute:
 
 `cat /var/log/nginx/error.log`
 
-`cat /app/front/log/app.php_errors.log`
+`cat /app/log/app.php_errors.log`
 
 ## 8. Make sure permissions are correct
 

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)
 
@@ -90,6 +90,6 @@ function processData(data) {
 </script>
 
 <!-- Datatable -->
-<link rel="stylesheet" href="lib/AdminLTE/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css"/>
-<script src="lib/AdminLTE/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
-<script src="lib/AdminLTE/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+<link rel="stylesheet" href="lib/datatables.net-bs/css/dataTables.bootstrap.min.css"/>
+<script src="lib/datatables.net/js/jquery.dataTables.min.js"></script>
+<script src="lib/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>

front/css/app.css

@@ -12,11 +12,36 @@
 ----------------------------------------------------------------------------- */
 :root {
     --color-aqua: #00c0ef;
+    --color-blue: #0060df;
     --color-green: #00a65a;
     --color-yellow: #f39c12;
     --color-red: #dd4b39;
 }
 
+.input-group .checkbox
+{
+    margin-left: 5px;
+}
+
+h5
+{
+    font-size: medium;
+}
+
+/* -----------------------------------------------------------------------------
+   Helper Classes
+----------------------------------------------------------------------------- */
+
+.pointer
+{
+    cursor: pointer;
+}
+
+.question
+{
+    cursor: help;
+}
+
 /* -----------------------------------------------------------------------------
    Text Classes
 ----------------------------------------------------------------------------- */
@@ -124,6 +149,21 @@
     border: none;
 }
 
+@media (min-width: 768px) {
+
+    .hideOnBigScreen{
+        display: none;
+    }
+}
+
+@media (max-width: 767px) { /* on mobile */
+
+    .hideOnMobile{
+        display: none;
+    }
+}
+
+
 /* -----------------------------------------------------------------------------
    Main Sections
 ----------------------------------------------------------------------------- */
@@ -197,6 +237,12 @@
 {
     line-height: 30px;
 }
+
+body
+{
+    background-image: url('../img/background.png');
+}
+
 /* -----------------------------------------------------------------------------
    Customized Main Menu
 ----------------------------------------------------------------------------- */
@@ -261,7 +307,7 @@
     .main-sidebar {
         padding-top: 50px;
     }
-    .content-header {
+    .content-header #pageTitle{
         display: none;
     }
 }
@@ -757,6 +803,35 @@ height: 50px;
     display: inline-grid;
 }
 
+/* --------------------------------------------------------- */
+/*                         Presence                          */
+/* --------------------------------------------------------- */
+.presencenceKey
+{
+    float: right;
+}
+
+.presenceOnlineNow{
+    background-color: var(--color-green);
+}
+
+.presenceOnlinePast{
+    background-color: var(--color-blue);
+}
+
+.presenceOnlinePastMiss{
+    background-color: var(--color-yellow);
+}
+
+.presenceKeyBoxes
+{
+    width: 10px;
+    height: 10px;
+    display: inline-block;
+    /* background: #fff; */
+    opacity: .75; 
+}
+
 /* --------------------------------------------------------- */
 /*                         report                            */
 /* --------------------------------------------------------- */
@@ -781,20 +856,20 @@ height: 50px;
 /*                          settings                         */
 /* --------------------------------------------------------- */
 
-@media (max-width: 767px) {
+@media (max-width: 767px) { /* on mobile */
     /* hide on mobile */
     .setting_description {
       /* color: red; */
       display: none;
     }
-    .setting_input{
+    /* .setting_input{
         width:70%;
-        /* background-color: red; */
+        
     }
     .setting_name
     {
         width:30%;         
-    }
+    } */
   }
 
 @media (min-width: 768px) {
@@ -802,14 +877,14 @@ height: 50px;
     /* color: green; */
     display: block;
 }
-.setting_input{
+/* .setting_input{
     width:40%;        
-    /* background-color: green; */
+
 }
 .setting_name
 {
     width:19%;         
-}
+} */
 }
 
 .settingswrap
@@ -874,10 +949,10 @@ height: 50px;
 }
 
 
-.table_row {    
+#settingsPage .table_row {    
     padding: 3px;    
-    width:100%;
-    display: flex;
+    /* width:100%; */
+    /* display: flex; */
     border-bottom-width: 1px;
     border-bottom-style: solid;
     border-color: #606060;
@@ -897,10 +972,6 @@ height: 50px;
     font-weight: 300;    
 }
 
-.setting_description
-{
-    width:40%;
-}
 
 .myhidden
 {
@@ -1041,7 +1112,11 @@ input[readonly] {
 
 .settingsSearchWrap
 {
-    padding:10px;
+    /* padding:10px; */
+    /* display: flex; */
+    justify-content: center; /* Centers horizontally */
+    align-items: center;     /* Centers vertically */
+    /* height: 60px;             */
 }
 
 .settings-sticky-bottom-section {
@@ -1051,11 +1126,12 @@ input[readonly] {
     /* opacity: 0.8; */
     bottom: 30px;
     border-radius: 5px;
-    margin:1px;
+    /* margin:1px; */
     border-width: 1px;
     border-style: solid;
     border-color: inherit;
     /* width: 87%; */
+    padding: 10px;
   }
 
   .settings-sticky-bottom-section:hover {
@@ -1074,7 +1150,7 @@ input[readonly] {
     width: 14px;
     position: absolute;
     right: -6px;
-    top: 6px;
+    top: 13px;
 
 }
 
@@ -1086,9 +1162,9 @@ input[readonly] {
 .saveSettingsWrapper button
 {
     width:70%;
-    margin-top:20px;
+    /* margin-top:20px; */
     margin-left:15%;
-    margin-bottom:20px;
+    /* margin-bottom:20px; */
 }
 
 #settingsPage .select2-selection 
@@ -1097,6 +1173,11 @@ input[readonly] {
     display: inline-block;
 }
 
+#settingsPage  .form-control
+{
+    min-height: 42px;
+}
+
 #settingsPage  .select2-selection
 {
     background-color: rgb(96, 96, 96);
@@ -1112,15 +1193,110 @@ input[readonly] {
     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;
+    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 {
+.modal-header .close
+{
+    display: flex;
+}
+
+.modal-title
+{
+    display: inline;
+}
+
+#iconList
+{
+    padding: 10px;
+    padding-bottom:30px;
+}
+
+.iconPreviewSelector:hover
+{
+    backdrop-filter: brightness(50%);
+}
+
+.iconPreviewSelector 
+{
+    text-align: center;
+    padding: 15px;
+    height: 80px;
+    margin-bottom: 15px;
+}
+
+.iconList
+{
+    display: flex;
+}
+
+.iconColumn
+{
+    max-height: 25px;
+}
+
+.iconPreviewSelector svg
+{
+    width:40px;
+    height: 40px;
+}
+
+.iconPreviewSelector i
+{
+    font-size: 30px;
+    height: 40px;
+}
+
+.iconPreview {
     min-width: 40px;
 }
 
 
+#tableDevices .fab
+{
+    font-size: 1.5em;
+}
+
+#tableDevices .fa
+{
+    font-size: 1.0em;
+}
+
+#tableDevices tbody tr
+{
+    height: 1.5em;
+}
+
 .info-icon-nav
 {   
     top: -6px;
@@ -1130,11 +1306,6 @@ input[readonly] {
     font-size: large;
 }
 
-.pointer
-{
-    cursor: pointer;
-}
-
 .drag
 {
     cursor: move; /* fallback if grab cursor is unsupported */
@@ -1157,10 +1328,11 @@ input[readonly] {
     background-color:#606060 !important;
 }
 
-.networkPageHelp{
+.helpIconSmallTopRight{
     position: absolute;
     font-size: x-small;
     margin-bottom: 6px;
+    margin-left: 3px;
 }
 
 .pageHelp{
@@ -1188,6 +1360,10 @@ input[readonly] {
     height: 1em !important;
 }
 
+#panDetails .control-label{
+    text-align: left;
+}
+
 /* ----------------------------------------------------------------- */
 /* MODAL popups */
 /* ----------------------------------------------------------------- */
@@ -1274,7 +1450,8 @@ input[readonly] {
     border: solid;
     border-color:cyan;
 }
-#networkTree .netStatus-Off-line i
+#networkTree .netStatus-Off-line i,
+#networkTree .netStatus-Off-line svg
 {
     color: #dd4b39;
 }
@@ -1355,7 +1532,17 @@ input[readonly] {
 .plugin-content #tabs-content-location
 {    
     margin: 0px;
+    /* padding-top: 0; */
+}
 
+.integrations-plugins .content
+{
+    display: table;
+}
+
+.plugin-content .tab-content
+{    
+    padding-top: 10px;
 }
 
 .plugins-description
@@ -1410,6 +1597,33 @@ input[readonly] {
 }
   
 
+.textOverflow
+{
+    white-space: nowrap;        /* Prevent text from wrapping to a new line */
+    overflow: hidden;           /* Hide the overflowed text */
+    text-overflow: ellipsis;    /* Show ellipsis (...) */
+}
+
+.table-stretched
+{
+    min-width: -moz-available;
+    min-width: -webkit-fill-available;
+}
+
+.pluginBadge
+{
+    float: right;
+}
+
+.pluginBadgeWrap
+{
+    float: right;
+    display: ruby;
+    z-index: 1;
+    position: sticky;
+    margin-top: 1px;
+}
+
 /* -----------------------------------------------------------------------------
    Spin
 ----------------------------------------------------------------------------- */

front/css/dark-patch.css

@@ -17,6 +17,10 @@ html {
   background-color: #353c42;
 }
 
+body {
+  background-image: url('../img/boxed-bg-dark.png') !important;
+}
+
 body, .bg-yellow, .callout.callout-warning, .alert-warning, .label-warning, .modal-warning .modal-body {
 
   background-color: #353c42 !important;

front/css/system-dark-patch-cal.css

@@ -0,0 +1,21 @@
+@media (prefers-color-scheme: dark) {
+
+  .fc-sat {  
+  background-color: #444D56; }
+  .fc-sun {  
+  background-color: #444D56; }
+  .fc-today {
+    background-color: #8D9AAC !important;
+    border: none !important;
+  } 
+  .fc-cell-content {
+	  background-color: #272c30;
+  }
+  .fc-widget-header {
+	  background-color: #353c42;
+  }
+  .fc-unthemed .fc-content, .fc-unthemed .fc-divider, .fc-unthemed .fc-list-heading td, .fc-unthemed .fc-list-view, .fc-unthemed .fc-popover, .fc-unthemed .fc-row, .fc-unthemed tbody, .fc-unthemed td, .fc-unthemed th, .fc-unthemed thead{
+	  border-color: #353c42 !important;
+  }
+
+}

front/css/system-dark-patch.css

@@ -0,0 +1,737 @@
+/* Pi-hole: A black hole for Internet advertisements
+*  (c) 2020 Pi-hole, LLC (https://pi-hole.net)
+*  Network-wide ad blocking via your own hardware.
+*
+*  This file is copyright under the latest version of the EUPL.
+*  Please see LICENSE file for your rights under this license.
+*
+*  The colors used in this theme has been inspired by
+*  https://github.com/anvyst/adminlte-skin-midnight
+*
+* Additional fixes For Pi.Alert UI by leiweibau */
+
+@media (prefers-color-scheme: dark) {
+    
+  :root {
+    --datatable-bgcolor: rgba(64, 76, 88, 0.8);
+  }
+  html {
+    background-color: #353c42;
+  }
+
+  body {
+    background-image: url('../img/boxed-bg-dark.png') !important;
+  }
+
+  body, .bg-yellow, .callout.callout-warning, .alert-warning, .label-warning, .modal-warning .modal-body {
+
+    background-color: #353c42 !important;
+    color: #bec5cb !important;
+  }
+  h4 {
+    color: #44def1;
+  }
+  .content-header > .breadcrumb > li > a {
+    color: #bec5cb;
+  }
+  .table > thead > tr > th,
+  .table > tbody > tr > th,
+  .table > tfoot > tr > th,
+  .table > thead > tr > td,
+  .table > tbody > tr > td,
+  .table > tfoot > tr > td {
+    border-top: 0;
+  }
+  .table > thead > tr.odd,
+  .table > tbody > tr.odd,
+  .table > tfoot > tr.odd {
+    background-color: #2a2f34;
+  }
+  .table > thead > tr.odd:hover,
+  .table > tbody > tr.odd:hover,
+  .table > tfoot > tr.odd:hover,
+  .table > thead > tr.even:hover,
+  .table > tbody > tr.even:hover,
+  .table > tfoot > tr.even:hover {
+    background-color: #1e2226;
+  }
+  .table-bordered,
+  .table-bordered > thead > tr > th,
+  .table-bordered > tbody > tr > th,
+  .table-bordered > tfoot > tr > th,
+  .table-bordered > thead > tr > td,
+  .table-bordered > tbody > tr > td,
+  .table-bordered > tfoot > tr > td {
+    border: 1px solid #353c42;
+  }
+  .dataTables_wrapper input[type="search"] {
+    border-radius: 4px;
+    background-color: #353c42;
+    border: 0;
+    color: #bec5cb;
+  }
+  .dataTables_paginate .pagination li > a {
+    background-color: #353c42;
+    border-color: #353c42;
+  }
+  .pagination > .disabled > a,
+  .pagination > .disabled > a:focus,
+  .pagination > .disabled > a:hover,
+  .pagination > .disabled > span,
+  .pagination > .disabled > span:focus,
+  .pagination > .disabled > span:hover {
+    cursor: not-allowed;
+    color: #bec5cb;
+    background-color: #353c42;
+    border-color: #353c42;
+  }
+  .pagination > li > a:focus,
+  .pagination > li > a:hover,
+  .pagination > li > span:focus,
+  .pagination > li > span:hover {
+    z-index: 2;
+    color: #bec5cb;
+    background-color: #54606b;
+    border-color: #54606b;
+  }
+  .wrapper,
+  .main-sidebar,
+  .left-side {
+    background-color: #272c30;
+  }
+  .user-panel > .info,
+  .user-panel > .info > a {
+    color: #fff;
+  }
+  .sidebar-menu > li.header {
+    color: #556068;
+    background-color: #1e2225;
+  }
+  .sidebar-menu > li > a {
+    border-left: 3px solid transparent;
+  }
+  .sidebar-menu > li:hover > a,
+  .sidebar-menu > li > a:focus,
+  .sidebar-menu > li.active > a {
+    color: #fff;
+    background-color: #22272a;
+    border-color: #3c8dbc;
+  }
+  .sidebar-menu > li > .treeview-menu {
+    margin: 0 1px;
+    background-color: #32393e;
+  }
+  .sidebar a {
+    color: #bec5cb;
+  }
+  .sidebar a:hover {
+    text-decoration: none;
+  }
+  .treeview-menu > li > a {
+    color: #949fa8;
+  }
+  .treeview-menu > li.active > a,
+  .treeview-menu > li > a:hover,
+  .treeview-menu > li > a:focus {
+    color: #fff;
+  }
+  .sidebar-form {
+    border-radius: 3px;
+    border: 1px solid #3e464c;
+    margin: 10px;
+  }
+  .sidebar-form input[type="text"],
+  .sidebar-form .btn {
+    box-shadow: none;
+    background-color: #3e464c;
+    border: 1px solid transparent;
+    height: 35px;
+  }
+  .sidebar-form input[type="text"] {
+    color: #666;
+    border-top-left-radius: 2px;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 2px;
+  }
+  .sidebar-form input[type="text"]:focus,
+  .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+    background-color: #fff;
+    color: #666;
+  }
+  .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
+    border-left-color: #fff;
+  }
+  .sidebar-form .btn {
+    color: #999;
+    border-top-left-radius: 0;
+    border-top-right-radius: 2px;
+    border-bottom-right-radius: 2px;
+    border-bottom-left-radius: 0;
+  }
+  .box,
+  .box-footer,
+  .info-box,
+  .box-comment,
+  .comment-text,
+  .comment-text .username {
+    color: #bec5cb;
+    background-color: #272c30;
+  }
+  .box-comments .box-comment {
+    border-bottom-color: #353c42;
+  }
+  .box-footer {
+    border-top: 1px solid #353c42;
+  }
+  .box-header.with-border {
+    border-bottom: 1px solid #353c42;
+  }
+  .box-solid,
+  .box {
+    border: 1px solid #272c30;
+  }
+  .box-solid > .box-header,
+  .box > .box-header {
+    color: #bec5cb;
+  }
+  .box-solid > .box-header .btn,
+  .box > .box-header .btn {
+    color: #bec5cb;
+  }
+  .box.box-info,
+  .box.box-primary,
+  .box.box-success,
+  .box.box-warning,
+  .box.box-danger {
+    border-top-width: 3px;
+  }
+  .main-header .navbar {
+    background-color: #272c30;
+  }
+  .main-header .navbar .nav > li > a,
+  .main-header .navbar .nav > li > .navbar-text {
+    color: #bec5cb;
+    max-height: 50px;
+  }
+  .main-header .navbar .nav > li > a:hover,
+  .main-header .navbar .nav > li > a:active,
+  .main-header .navbar .nav > li > a:focus,
+  .main-header .navbar .nav .open > a,
+  .main-header .navbar .nav .open > a:hover,
+  .main-header .navbar .nav .open > a:focus,
+  .main-header .navbar .nav > .active > a {
+    background-color: rgba(0, 0, 0, 0.1);
+    color: #f6f6f6;
+  }
+  .main-header .navbar .sidebar-toggle {
+    color: #bec5cb;
+  }
+  .main-header .navbar .sidebar-toggle:hover {
+    color: #f6f6f6;
+    background-color: rgba(0, 0, 0, 0.1);
+  }
+  .timeline li .timeline-item {
+    color: #bec5cb;
+    background-color: #272c30;
+    border-color: #353c42;
+  }
+  .timeline li .timeline-header {
+    border-bottom-color: #353c42;
+  }
+  .nav-stacked > li > a {
+    color: #bec5cb;
+  }
+  .nav-stacked > li > a:hover {
+    color: white;
+    background-color: #1e2226;
+  }
+  .content-wrapper,
+  .right-side {
+    background-color: #353c42;
+  }
+  .main-footer,
+  .nav-tabs-custom {
+    background-color: #272c30;
+    border-top-color: #353c42;
+    color: #bec5cb;
+  }
+  .main-footer .nav-tabs,
+  .nav-tabs-custom .nav-tabs {
+    background-color: #30383f;
+    border-bottom-color: #2f363b;
+  }
+  .main-footer .tab-content,
+  .nav-tabs-custom .tab-content {
+    background-color: #30383f;
+  }
+  .nav-tabs-custom > .nav-tabs {
+    background: rgba(64, 72, 80, 0.666);
+  }
+  .nav-tabs-custom > .nav-tabs > li {
+    margin-right: 1px;
+    color: #bec5cb;
+  }
+  .nav-tabs-custom > .nav-tabs > li.active > a,
+  .nav-tabs-custom > .nav-tabs > li.active:hover > a {
+    border-left-color: #30383f;
+    border-right-color: #30383f;
+    background-color: #30383f;
+    color: #bec5cb;
+  }
+  .nav-tabs-custom > .nav-tabs > li:not(.active):hover {
+    border-top-color: #d2d6de;
+    background-color: transparent;
+  }
+  .nav-tabs-custom > .nav-tabs > li > a {
+    color: #8e959b;
+  }
+  .nav-tabs-custom > .nav-tabs > li > a:focus {
+    color: #3c8dbc;
+  }
+  .nav-tabs-custom > .nav-tabs > li:hover > a,
+  .nav-tabs-custom > .nav-tabs > li.active:hover > a {
+    background-color: #353c42;
+    color: #bec5cb;
+  }
+
+  .list-group {
+    color: #bec5cb;
+    background-color: #272c30;
+  }
+  .list-group .list-group-item {
+    border-color: #353c42;
+    background-color: #272c30;
+  }
+  .input-group .input-group-addon {
+    border-right: 1px solid #272c30;
+  }
+  .select2 .select2-selection {
+    background-color: #353c42;
+    color: #bec5cb;
+    border: 1px solid #353c42;
+  }
+  .select2 .select2-selection .select2-container--default,
+  .select2 .select2-selection .select2-selection--single,
+  .select2 .select2-selection .select2-selection--multiple,
+  .select2 .select2-selection .select2-selection__rendered {
+    color: #bec5cb;
+  }
+  .select2-dropdown {
+    background-color: #353c42;
+    color: #bec5cb;
+    border: 1px solid #353c42;
+  }
+  .select2-dropdown .select2-search__field {
+    background-color: #272c30;
+    color: #bec5cb;
+    border: 1px solid #353c42;
+  }
+  .select2-container--default.select2-container--open {
+    background-color: #272c30;
+  }
+
+  .layout-boxed {
+    background: url("../../img/boxed-bg-dark.png") repeat fixed;
+  }
+  .not-used {
+    background-color: #eee;
+  }
+  .not-used:hover {
+    background-color: #c5c5c5;
+  }
+  .used {
+    background-color: #fff;
+  }
+  .used:hover {
+    background-color: #ddd;
+  }
+
+  .graphs-grid {
+    background-color: rgba(255, 255, 255, 0.2);
+  }
+  .graphs-ticks {
+    color: #b8c7ce;
+  }
+  .queries-permitted {
+    background-color: #00a65a;
+  }
+  .queries-blocked {
+    background-color: #999;
+  }
+  .progress {
+    background-color: #333;
+  }
+
+  .bg-green {
+    background-color: #005c32 !important;
+  }
+  .bg-aqua {
+    background-color: #007997 !important;
+  }
+  .bg-yellow {
+    background-color: #b1720c !important;
+  }
+  .bg-red {
+    background-color: #913225 !important;
+  }
+
+  code,
+  pre {
+    padding: 2px 4px;
+    font-size: 90%;
+    color: #bec5cb;
+    background-color: #353c42;
+    border-radius: 4px;
+  }
+
+  /* Used in the Query Log table */
+  .text-green-light {
+    color: #5ca314 !important;
+  }
+  .text-green {
+    color: #00aa60 !important;
+  }
+  .text-orange {
+    color: #b1720c !important;
+  }
+  .text-red {
+    color: #bd2c19 !important;
+  }
+  .text-vivid-blue {
+    color: #007997 !important;
+  }
+  td.highlight {
+    background-color: rgba(255, 204, 0, 0.333);
+  }
+  .btn-default {
+    box-shadow: none;
+    background-color: #3e464c;
+    color: #bec5cb;
+    border: 1px solid #353c42;
+  }
+
+  /* Used in debug log page */
+  .log-red {
+    color: #ff4038;
+  }
+  .log-green {
+    color: #4c4;
+  }
+  .log-yellow {
+    color: #fb0;
+  }
+  .log-blue {
+    color: #48f;
+  }
+  .log-purple {
+    color: #b8e;
+  }
+  .log-cyan {
+    color: #0df;
+  }
+  .log-gray {
+    color: #999;
+  }
+
+  #output {
+    border-color: #505458;
+    background: #272c30;
+  }
+
+  /* Used by the long-term pages */
+  .daterangepicker {
+    background-color: #3e464c;
+    border-radius: 4px;
+    border: 1px solid #353c42;
+  }
+  .daterangepicker .ranges li:hover {
+    background-color: #353c42;
+  }
+  .daterangepicker .ranges li.active {
+    background-color: #1e2226; /* Color also used in table pagination */
+  }
+  .daterangepicker .calendar-table {
+    background-color: #3e464c;
+    border-radius: 4px;
+    border: 1px solid #353c42;
+  }
+  .daterangepicker td.off,
+  .daterangepicker td.off.in-range,
+  .daterangepicker td.off.start-date,
+  .daterangepicker td.off.end-date {
+    background-color: #485158;
+  }
+  .daterangepicker td.available:hover,
+  .daterangepicker th.available:hover {
+    background-color: #1e2226;
+  }
+  .daterangepicker td.active,
+  .daterangepicker td.active:hover,
+  .daterangepicker td.in-range:hover {
+    background-color: #225e92;
+  }
+  .daterangepicker td.in-range {
+    background-color: #1e2226;
+    color: #bec5cb;
+  }
+  input,
+  select,
+  select.form-control,
+  .form-group .input-group-addon,
+  .input-group .input-group-addon,
+  .form-group input,
+  .input-group input,
+  .form-group textarea,
+  .input-group textarea,
+  .daterangepicker select.hourselect,
+  .daterangepicker select.minuteselect,
+  .daterangepicker select.secondselect,
+  .daterangepicker select.ampmselect,
+  .form-control,
+  div.dataTables_wrapper div.dataTables_length select {
+    background-color: #353c42;
+    color: #bec5cb;
+    border: 1px solid #3d444b;
+  }
+  .form-control[disabled],
+  .form-control[readonly],
+  fieldset[disabled] .form-control {
+    background-color: #353c42;
+    opacity: 1;
+  }
+  .navbar-custom-menu > .navbar-nav > li > .dropdown-menu {
+    background-color: #4c5761;
+    color: #bec5cb;
+    border: 1px solid #171c20;
+  }
+  .table-striped > tbody > tr:nth-of-type(2n + 1) {
+    background-color: #2d343a;
+  }
+  .panel,
+  .panel-body,
+  .panel-default > .panel-heading {
+    background-color: #3e464c;
+    border-radius: 4px;
+    border: 1px solid #353c42;
+    color: #bec5cb;
+  }
+  .box.box-solid.box-info,
+  .box.box-solid.box-info > .box-header {
+    color: #bec5cb;
+    background-color: #367fa9 !important;
+    border: 1px solid #367fa9;
+  }
+  input[type="password"]::-webkit-credentials-auto-fill-button {
+    background: #bfc5ca;
+  }
+  input[type="password"]::-webkit-caps-lock-indicator {
+    filter: invert(100%);
+  }
+
+  .network-never {
+    background-color: #661b02;
+  }
+  .network-recent {
+    background-color: #114100;
+  }
+  .network-old {
+    background-color: #525200;
+  }
+  .network-older {
+    background-color: #502b00;
+  }
+  .network-gradient {
+    background-image: linear-gradient(to right, #114100 0%, #525200 100%);
+  }
+
+  .icheckbox_polaris,
+  .icheckbox_futurico,
+  .icheckbox_minimal-blue {
+    margin-right: 10px;
+  }
+  .iradio_polaris,
+  .iradio_futurico,
+  .iradio_minimal-blue {
+    margin-right: 8px;
+  }
+
+  /* Overlay box with spinners as shown during data collection for graphs */
+  .box .overlay,
+  .overlay-wrapper .overlay {
+    z-index: 50;
+    background-color: rgba(53, 60, 66, 0.733);
+    border-radius: 3px;
+  }
+  .box .overlay > .fa,
+  .overlay-wrapper .overlay > .fa,
+  .navbar-nav > .user-menu > .dropdown-menu > .user-body a {
+    color: #bec5cb !important;
+  }
+
+  .navbar-nav > .user-menu > .dropdown-menu > .user-footer {
+    background-color: #353c42bb;
+    padding: 10px;
+  }
+
+  .modal-content {
+    background: #272c30;
+  }
+  .modal-header {
+    border-bottom-color: #353c42;
+  }
+  .modal-footer {
+    border-top-color: #353c42;
+  }
+  .close {
+    color: #383838;
+  }
+
+  /*** Fix login input visual misalignment ***/
+  #loginform,
+  #loginform input {
+    color: rgb(120, 127, 133);
+  }
+
+  .login-options input,
+  .login-options [class*="icheck-"] > input:first-child + input[type="hidden"] + label::before,
+  .login-options [class*="icheck-"] > input:first-child + label::before {
+    background: none;
+    border-color: rgb(120, 127, 133);
+  }
+
+  /*** Additional fixes For Pi.Alert UI ***/
+  .small-box {
+      border-radius: 10px;
+      border-top: 0px;
+  }
+  .pa-small-box-aqua .inner {
+    background-color: rgb(45,108,133);
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
+  }
+  .pa-small-box-green .inner {
+    background-color: rgb(31,76,46);
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
+  }
+  .pa-small-box-yellow .inner {
+    background-color: rgb(151,104,37);
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
+  }
+  .pa-small-box-red .inner {
+    background-color: rgb(120,50,38);
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
+  }
+  .pa-small-box-gray .inner {
+    background-color: #777;
+    /* color: rgba(20,20,20,30%); */
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
+  }
+  .pa-small-box-gray .inner h3 {
+    color:  #bbb;
+  }
+  .text-gray-20 {
+    color: rgba(220,220,220,30%);
+  }
+  .bg-gray {
+    background-color: #888888 !important;
+  }
+  .badge.bg-green {
+      background-color: #00A000 !important;
+  }
+  .badge.bg-gray {
+      background-color: #888 !important;
+  }
+  #txtRecord {
+    background-color: #353c42;
+    border-color: #888888;
+  }
+  .table-hover tbody tr:hover td, .table-hover tbody tr:hover th {
+    background-color: rgb(189,192,198);
+    color: #444;
+  }
+
+  .db_info_table_cell:nth-child(1) {background: #272c30}
+  .db_info_table_cell:nth-child(2) {background: #272c30}
+  .db_tools_table_cell_a:nth-child(1) {background: #272c30}
+  .db_tools_table_cell_a:nth-child(2) {background: #272c30}
+  .db_tools_table_cell_b:nth-child(1) {background: #272c30}
+  .db_tools_table_cell_b:nth-child(2) {background: #272c30}
+
+  .db_info_table { 
+     display: table;
+     border-spacing: 0em;
+     font-weight: 400;
+     font-size: 15px;
+     width: 100%;
+     margin: auto;
+  }
+
+  .nav-tabs-custom > .nav-tabs > li:hover > a, .nav-tabs-custom > .nav-tabs > li.active:hover > a {
+    background-color: #272c30;
+    color: #bec5cb;
+  }
+
+  .nav-tabs-custom > .nav-tabs > li.active > a, .nav-tabs-custom > .nav-tabs > li.active:hover > a {
+    border-left-color: #30383f;
+    border-right-color: #30383f;
+    background-color: #272c30;
+    color: #bec5cb;
+  }
+  .nav-tabs-custom > .nav-tabs {
+    background-color: #353c42;
+  }
+  .nav-tabs-custom .tab-content {
+    background-color: #272c30;
+  }
+  .top_small_box_gray_text {
+    color: white !important;
+  }
+
+  /* remove white border that appears on mobile screen sizes */
+  .box-body {
+      border: 0px;
+  }
+  /* remove white border that appears on mobile screen sizes */
+  .table-responsive {
+    border: 0px;
+  }
+
+  .login-page {
+    background-color: transparent;
+  }
+
+  .login-logo a {
+    color: white;
+  }
+
+  .login-box-body {
+    color: #bec5cb;
+    background-color: #272c30;
+  }
+  /* Add border radius to bottom of the status boxes*/
+  .pa-small-box-footer {
+    border-bottom-left-radius: 10px;
+    border-bottom-right-radius: 10px;
+  }
+
+  .small-box > .inner h3, .small-box > .inner p {
+    margin-bottom: 0px;
+    margin-left: 0px;
+  }
+  .small-box:hover .icon {
+    font-size: 3.74em;
+  }
+  .small-box .icon { 
+    top: 0.01em;
+    font-size: 3.25em;
+  }
+  .pa_semitransparent-panel{
+    background-color: #000 !important;
+  }
+
+}

front/deviceDetailsEdit.php

@@ -0,0 +1,467 @@
+<?php
+  //------------------------------------------------------------------------------
+  // check if authenticated
+  require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+?>
+
+
+<div class="row">
+  <div class="box-body form-horizontal">
+    <form id="edit-form">
+    <!-- Form fields will be appended here -->
+    </form>
+  </div>
+  <!-- Buttons -->
+  <div class="col-xs-12">
+    <div class="pull-right">
+        <button type="button" 
+                class="btn btn-default pa-btn pa-btn-delete"  
+                style="margin-left:0px;" 
+                id="btnDeleteEvents"   
+                onclick="askDeleteDeviceEvents()">   
+                <?= lang('DevDetail_button_DeleteEvents');?> 
+        </button>
+        <button type="button" 
+                class="btn btn-default pa-btn pa-btn-delete"  
+                style="margin-left:0px;"  
+                id="btnDelete"   
+                onclick="askDeleteDevice()">   
+                <?= lang('DevDetail_button_Delete');?> 
+        </button>
+        <button type="button" 
+                class="btn btn-primary pa-btn" 
+                style="margin-left:6px; "  
+                id="btnSave"     
+                onclick="setDeviceData()" >     
+                <?= lang('DevDetail_button_Save');?> 
+        </button>
+    </div>
+    </div>
+</div>
+
+
+<script defer>
+  
+  // -------------------------------------------------------------------  
+  // Get plugin and settings data from API endpoints
+  function getDeviceData(readAllData){
+
+    mac = getMac()
+
+    console.log(mac);
+
+    // get data from server 
+    $.get('php/server/devices.php?action=getServerDeviceData&mac='+ mac + '&period='+ period, function(data) {      
+
+      // show loading dialog
+      showSpinner()
+
+      var deviceData = JSON.parse(data);
+
+      // Deactivate next previous buttons
+      if (readAllData) {
+        $('#btnPrevious').attr    ('disabled','');
+        $('#btnPrevious').addClass  ('text-gray50');
+        $('#btnNext').attr      ('disabled','');
+        $('#btnNext').addClass    ('text-gray50');
+      }
+
+      // some race condition, need to implement delay
+      setTimeout(() => {
+        $.get('/php/server/query_json.php', { file: 'table_settings.json', nocache: Date.now() }, function(res) {  
+        
+        settingsData = res["data"];
+
+        // columns to hide
+        hiddenFields = ["NEWDEV_devScan", "NEWDEV_devPresentLastScan" ]
+        // columns to disable - conditional depending if a new dummy device is created
+        disabledFields =  mac == "new" ? ["NEWDEV_devLastNotification", "NEWDEV_devFirstConnection", "NEWDEV_devLastConnection"] : ["NEWDEV_devLastNotification", "NEWDEV_devFirstConnection", "NEWDEV_devLastConnection", "NEWDEV_devMac", "NEWDEV_devLastIP" ];
+        
+        // Grouping of fields into categories with associated documentation links
+        const fieldGroups = {
+            // Group for device main information
+            DevDetail_MainInfo_Title: {
+                data: ["devMac", "devLastIP", "devName", "devOwner", "devType", "devVendor", "devGroup", "devIcon", "devLocation", "devComments"], 
+                docs: "https://github.com/jokob-sk/NetAlertX/blob/main/docs/DEVICE_MANAGEMENT.md",
+                iconClass: "fa fa-pencil"
+            },
+            // Group for session information
+            DevDetail_SessionInfo_Title: {
+                data: ["devStatus", "devLastConnection", "devFirstConnection"],
+                docs: "https://github.com/jokob-sk/NetAlertX/blob/main/docs/SESSION_INFO.md",
+                iconClass: "fa fa-calendar"
+            },
+             // Group for event and alert settings
+             DevDetail_EveandAl_Title: {
+                data: ["devAlertEvents", "devAlertDown", "devSkipRepeated"],
+                docs: "https://github.com/jokob-sk/NetAlertX/blob/main/docs/NOTIFICATIONS.md",
+                iconClass: "fa fa-bell"
+            },
+            // Group for network details
+            DevDetail_MainInfo_Network_Title: {
+                data: ["devParentMAC", "devParentPort", "devSSID", "devSite"],
+                docs: "https://github.com/jokob-sk/NetAlertX/blob/main/docs/NETWORK_TREE.md",
+                iconClass: "fa fa-network-wired"
+            },
+            // Group for other fields like static IP, archived status, etc.
+            DevDetail_DisplayFields_Title: {
+                data: ["devStaticIP", "devIsNew", "devFavorite", "devIsArchived"],
+                docs: "https://github.com/jokob-sk/NetAlertX/blob/main/docs/DEVICE_DISPLAY_SETTINGS.md",
+                iconClass: "fa fa-list-check"
+
+            }
+        };
+
+        // Filter settings data to get relevant settings
+        const relevantSettings = settingsData.filter(set =>
+            set.setGroup === "NEWDEV" &&               // Filter for settings in the "NEWDEV" group
+            set.setKey.includes("_dev") &&             // Include settings with '_dev' in the key
+            !hiddenFields.includes(set.setKey) &&     // Exclude settings listed in hiddenFields
+            !set.setKey.includes("__metadata")        // Exclude metadata fields
+        );
+
+        // Function to generate the form
+        const generateSimpleForm = settings => {
+            const form = $('#edit-form');  // Get the form element to append generated fields
+
+            // Loop over each field group to generate sections for each category
+            Object.entries(fieldGroups).forEach(([groupName, obj]) => {
+                const groupDiv = $('<div>').addClass('field-group col-lg-4 col-sm-6 col-xs-12'); // Create a div for each group with responsive Bootstrap classes
+                
+                // Add group title and documentation link
+                groupDiv.append(`<h5><i class="${obj.iconClass}"></i>  ${getString(groupName)} 
+                                    <span class="helpIconSmallTopRight">
+                                        <a target="_blank" href="${obj.docs}">
+                                            <i class="fa fa-circle-question"></i>
+                                        </a>
+                                    </span> 
+                                  </h5>
+                                  <hr>
+                                  `);
+
+                // Filter relevant settings for the current group
+                const groupSettings = settings.filter(set => obj.data.includes(set.setKey.replace('NEWDEV_', '')));
+
+                // Loop over each setting in the group to generate form fields
+                groupSettings.forEach(setting => {
+                    const column = $('<div>');  // Create a column for each setting (Bootstrap column)
+
+                    // Get the field data (replace 'NEWDEV_' prefix from the key)
+                    fieldData = deviceData[setting.setKey.replace('NEWDEV_', '')]
+                    fieldData = fieldData == null ? "" : fieldData;
+
+                    // console.log(setting.setKey);                    
+                    // console.log(fieldData);                    
+
+                    // Additional form elements like the random MAC address button for devMac
+                    let inlineControl = "";
+                    // handle rendom mac
+                    if (setting.setKey == "NEWDEV_devMac" && deviceData["devIsRandomMAC"] == true) {
+                      inlineControl += `<span class="input-group-addon pointer"
+                                              title="${getString("RandomMAC_hover")}">
+                                              <a href="https://github.com/jokob-sk/NetAlertX/blob/main/docs/RANDOM_MAC.md" target="_blank">     
+                                                  <i class="fa-solid fa-shuffle"></i>
+                                              </a>
+                                          </span>`;
+                    }
+                    // handle generate MAC for new device
+                    if (setting.setKey == "NEWDEV_devMac" && deviceData["devMac"] == "") {
+                      inlineControl += `<span class="input-group-addon pointer"
+                                              onclick="generate_NEWDEV_devMac()"
+                                              title="${getString("Gen_Generate")}">
+                                              <i class="fa-solid fa-dice" ></i>
+                                          </span>`;
+                    }
+                    // handle generate IP for new device
+                    if (setting.setKey == "NEWDEV_devLastIP" && deviceData["devLastIP"] == "") {
+                      inlineControl += `<span class="input-group-addon pointer"
+                                              onclick="generate_NEWDEV_devLastIP()"
+                                              title="${getString("Gen_Generate")}">
+                                              <i class="fa-solid fa-dice" ></i>
+                                          </span>`;
+                    }
+
+                    // handle generate IP for new device
+                    if (setting.setKey == "NEWDEV_devIcon") {
+                      inlineControl += `<span class="input-group-addon pointer"
+                                              onclick="showIconSelection()"
+                                              title="${getString("Gen_Select")}">
+                                              <i class="fa-solid fa-chevron-down" ></i>
+                                          </span>`;
+                    }
+                    
+
+                    // Generate the input field HTML
+                    const inputFormHtml = `<div class="form-group col-xs-12">
+                                              <label class="col-sm-4 col-xs-12 control-label"> ${setting.setName}    
+                                                  <i my-set-key="${setting.setKey}"
+                                                      title="${getString("Settings_Show_Description")}" 
+                                                      class="fa fa-circle-info pointer helpIconSmallTopRight" 
+                                                      onclick="showDescriptionPopup(this)">
+                                                  </i>
+                                              </label>
+                                              <div class="col-sm-8 col-xs-12 input-group">
+                                                  ${generateFormHtml(setting, fieldData.toString())}
+                                                  ${inlineControl}
+                                              </div>
+                                          </div>`;
+
+                    column.append(inputFormHtml);  // Append the input field to the column
+                    groupDiv.append(column);       // Append the column to the group div
+                });
+
+                form.append(groupDiv);  // Append the group div (containing columns) to the form
+            });
+
+
+            // wait until everything is initialized to update icon
+            updateIconPreview();
+
+            // update readonly fields
+            handleReadOnly(settingsData, disabledFields);
+
+            // Page title - Name
+            if (mac == "new") {
+                $('#pageTitle').html(`<i title="${getString("Gen_create_new_device")}" class="fa fa-square-plus"></i> ` +  getString("Gen_create_new_device"));
+            } else if (deviceData['devOwner'] == null || deviceData['devOwner'] == '' ||
+                (deviceData['devName'].toString()).indexOf(deviceData['devOwner']) != -1) {
+                $('#pageTitle').html(deviceData['devName']);
+            } else {
+                $('#pageTitle').html(deviceData['devName'] + ' (' + deviceData['devOwner'] + ')');
+            }
+        };
+
+        // console.log(relevantSettings)
+
+        generateSimpleForm(relevantSettings);
+
+        // <> chevrons
+        updateChevrons(deviceData)
+
+        toggleNetworkConfiguration(mac == 'Internet') 
+
+        hideSpinner();
+      
+      })
+    
+      }, 1);
+    });
+  
+  }
+  
+
+  // ----------------------------------------
+  // Handle previous/next arrows/chevrons
+  function updateChevrons(deviceData) {
+
+    devicesList = getDevicesList();    
+
+    // console.log(devicesList);
+
+    // Check if device is part of the devicesList      
+    pos = devicesList.findIndex(item => item.rowid == deviceData['rowid']);        
+    
+    // console.log(pos);    
+
+    if (pos == -1) {
+      devicesList.push({"rowid" : deviceData['rowid'], "mac" : deviceData['devMac'], "name": deviceData['devName'], "type": deviceData['devType']});
+      pos=0;
+    }
+
+    // Record number
+    $('#txtRecord').html (pos+1 +' / '+ devicesList.length);
+
+    // Deactivate previous button
+    if (pos <= 0) {
+      $('#btnPrevious').attr        ('disabled','');
+      $('#btnPrevious').addClass    ('text-gray50');
+    } else {
+      $('#btnPrevious').removeAttr  ('disabled');
+      $('#btnPrevious').removeClass ('text-gray50');
+    }
+
+    // Deactivate next button
+    if (pos >= (devicesList.length-1)) {
+      $('#btnNext').attr        ('disabled','');
+      $('#btnNext').addClass    ('text-gray50');
+    } else {
+      $('#btnNext').removeAttr  ('disabled');
+      $('#btnNext').removeClass ('text-gray50');
+    }
+  }
+
+  // ----------------------------------------
+  // Handle the read-only fields
+  function handleReadOnly(settingsData, disabledFields) {
+    settingsData.forEach(setting => {
+    const element = $(`#${setting.setKey}`);
+    if (disabledFields.includes(setting.setKey)) {
+      element.prop('readonly', true);
+    } else {
+      element.prop('readonly', false);
+    }
+  });
+  }
+
+
+  // ----------------------------------------
+  // Show the description of a setting
+  function showDescriptionPopup(e) {
+
+    console.log($(e).attr("my-set-key"));    
+
+    showModalOK("Info", getString($(e).attr("my-set-key") + '_description'))
+  }
+
+  // -----------------------------------------------------------------------------
+  function askDeleteDeviceEvents () {
+    // Check MAC
+    if (mac == '') {
+      return;
+    }
+
+    // Ask delete device Events 
+    showModalWarning ('<?= lang('DevDetail_button_DeleteEvents');?>', '<?= lang('DevDetail_button_DeleteEvents_Warning');?>',
+      '<?= lang('Gen_Cancel');?>', '<?= lang('Gen_Delete');?>', 'deleteDeviceEvents');
+  }
+
+  function deleteDeviceEvents () {
+    // Check MAC
+    if (mac == '') {
+      return;
+    }
+
+    // Delete device events
+    $.get('php/server/devices.php?action=deleteDeviceEvents&mac='+ mac, function(msg) {
+      showMessage (msg);
+    });
+
+    // Deactivate controls
+    $('#panDetails :input').attr('disabled', true);
+  }
+
+  // -----------------------------------------------------------------------------
+  function askDeleteDevice () {
+    // Check MAC
+    if (mac == '') {
+      return;
+    }
+
+    // Ask delete device
+    showModalWarning ('Delete Device', 'Are you sure you want to delete this device?<br>(maybe you prefer to archive it)',
+      '<?= lang('Gen_Cancel');?>', '<?= lang('Gen_Delete');?>', 'deleteDevice');
+  }
+
+
+  // -----------------------------------------------------------------------------
+  function deleteDevice () {
+    // Check MAC
+    if (mac == '') {
+      return;
+    }
+
+    // Delete device
+    $.get('php/server/devices.php?action=deleteDevice&mac='+ mac, function(msg) {
+      showMessage (msg);
+    });
+
+    // Deactivate controls
+    $('#panDetails :input').attr('disabled', true);
+
+    // refresh API
+    updateApi("devices,appevents")
+  }
+
+  // -----------------------------------------------------------------------------
+  function setDeviceData(direction = '', refreshCallback = '') {
+    // Check MAC
+    if (mac === '') {
+      return;
+    }
+
+    // Determine if a new device should be created
+    const createNew = mac === 'new' ? 1 : 0;
+
+    const devLastIP = $('#NEWDEV_devLastIP').val();
+
+    // Validate MAC and Last IP
+    if (mac === '' || !(isValidIPv4(devLastIP) || isValidIPv6(devLastIP))) {
+      showMessage(getString("DeviceEdit_ValidMacIp"), 5000, "modal_red");
+      return;
+    }
+
+    showSpinner();
+
+     // update data to server
+     $.get('php/server/devices.php?action=setDeviceData&mac='+ $('#NEWDEV_devMac').val()
+      + '&name='           + encodeURIComponent($('#NEWDEV_devName').val().replace(/'/g, ""))
+      + '&owner='          + encodeURIComponent($('#NEWDEV_devOwner').val().replace(/'/g, ""))
+      + '&type='           + $('#NEWDEV_devType').val()
+      + '&vendor='         + encodeURIComponent($('#NEWDEV_devVendor').val().replace(/'/g, ""))
+      + '&icon='           + encodeURIComponent($('#NEWDEV_devIcon').val())
+      + '&favorite='       + ($('#NEWDEV_devFavorite')[0].checked * 1)
+      + '&group='          + encodeURIComponent($('#NEWDEV_devGroup').val())
+      + '&location='       + encodeURIComponent($('#NEWDEV_devLocation').val())
+      + '&comments='       + encodeURIComponent(encodeSpecialChars($('#NEWDEV_devComments').val()))
+      + '&networknode='    + $('#NEWDEV_devParentMAC').val()
+      + '&networknodeport=' + $('#NEWDEV_devParentPort').val()
+      + '&ssid='            + $('#NEWDEV_devSSID').val()
+      + '&networksite='     + $('#NEWDEV_devSite').val()
+      + '&staticIP='       + ($('#NEWDEV_devStaticIP')[0].checked * 1)
+      + '&scancycle='      + "1"
+      + '&alertevents='    + ($('#NEWDEV_devAlertEvents')[0].checked * 1)
+      + '&alertdown='      + ($('#NEWDEV_devAlertDown')[0].checked * 1)
+      + '&skiprepeated='   + $('#NEWDEV_devSkipRepeated').val().split(' ')[0]
+      + '&newdevice='      + ($('#NEWDEV_devIsNew')[0].checked * 1)
+      + '&archived='       + ($('#NEWDEV_devIsArchived')[0].checked * 1)
+      + '&devFirstConnection='       + ($('#NEWDEV_devFirstConnection').val())
+      + '&devLastConnection='       + ($('#NEWDEV_devLastConnection').val())
+      + '&ip='             + ($('#NEWDEV_devLastIP').val())
+      + '&createNew='          + createNew
+      , function(msg) {
+      
+        showMessage (msg);
+
+        // Remove navigation prompt "Are you sure you want to leave..."
+        window.onbeforeunload = null;
+        somethingChanged      = false;
+
+        // refresh API
+        updateApi("devices,appevents")
+
+        // Callback fuction
+        if (typeof refreshCallback == 'function') {
+          refreshCallback(direction);
+        }
+
+      // everything loaded 
+      hideSpinner();
+    });
+  }
+
+  //-----------------------------------------------------------------------------------
+  // Disables or enables network configuration for the root node
+  function toggleNetworkConfiguration(disable) {
+    if (disable) {  
+      // Completely disable the NEWDEV_devParentMAC <select> and NEWDEV_devParentPort
+      $('#NEWDEV_devParentMAC').prop('disabled', true).val("").prop('selectedIndex', 0); 
+      $('#NEWDEV_devParentMAC').empty() // Remove all options
+      .append('<option value="">Root Node</option>')
+      $('#NEWDEV_devParentPort').prop('disabled', true);
+      $('#NEWDEV_devParentPort').prop('readonly', true );
+      $('#NEWDEV_devParentMAC').prop('readonly', true );
+    } else {
+      // Enable the NEWDEV_devParentMAC <select> and NEWDEV_devParentPort
+      $('#NEWDEV_devParentMAC').prop('disabled', false);
+      $('#NEWDEV_devParentPort').prop('disabled', false);
+      $('#NEWDEV_devParentPort').prop('readonly', false );
+      $('#NEWDEV_devParentMAC').prop('readonly', false );
+    }
+  }
+
+
+  // -------------------- INIT ------------------------
+  getDeviceData(true);
+
+
+</script>

front/deviceDetailsTools.php

@@ -1,74 +1,125 @@
+<?php
+  //------------------------------------------------------------------------------
+  // check if authenticated
+  require_once  $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+?>
 
-
+<!-- INTERNET INFO -->
 <?php if ($_REQUEST["mac"] == "Internet") { ?>
     
-<h4 class=""><i class="fa-solid fa-globe"></i>
-    <?= lang("DevDetail_Tab_Tools_Internet_Info_Title") ?>
-</h4>
-<h5 class="">
-    <?= lang("DevDetail_Tab_Tools_Internet_Info_Description") ?>
-</h5>
-<br>
-<div style="width:100%; text-align: center; margin-bottom: 50px;">
-    <button type="button" id="internetinfo" class="btn btn-primary pa-btn" style="margin: auto;" onclick="internetinfo()">
-        <?= lang("DevDetail_Tab_Tools_Internet_Info_Start") ?></button>
+    <h4 class=""><i class="fa-solid fa-globe"></i>
+        <?= lang("DevDetail_Tab_Tools_Internet_Info_Title") ?>
+    </h4>
+    <h5 class="">
+        <?= lang("DevDetail_Tab_Tools_Internet_Info_Description") ?>
+    </h5>
     <br>
-    <div id="internetinfooutput" style="margin-top: 10px;"></div>
-</div>
+    <div style="width:100%; text-align: center; margin-bottom: 50px;">
+        <button type="button" id="internetinfo" class="btn btn-primary pa-btn" style="margin: auto;" onclick="internetinfo()">
+            <?= lang("DevDetail_Tab_Tools_Internet_Info_Start") ?></button>
+        <br>
+        <div id="internetinfooutput" style="margin-top: 10px;"></div>
+    </div>
 
 <?php } ?>
 
+<!-- COPY FROM DEVICE -->
+<?php if ($_REQUEST["mac"] != "Internet") { ?>
+    
+    <h4 class=""><i class="fa-solid fa-copy"></i>
+        <?= lang("DevDetail_Copy_Device_Title") ?>
+    </h4>
+    <h5 class="">
+        <?= lang("DevDetail_Copy_Device_Tooltip") ?>
+    </h5>
+    <br>
+    <div style="width:100%; text-align: center; margin-bottom: 50px;">
+        <select class="form-control" 
+                title="<?= lang('DevDetail_Copy_Device_Tooltip');?>" 
+                id="txtCopyFromDevice" >
+                <option value="lemp_loading" id="lemp_loading">Loading</option>
+        </select>
+        <button type="button" id="internetinfo" class="btn btn-primary pa-btn" style="margin: auto;" onclick="()">
+            <?= lang("BackDevDetail_Copy_Title") ?></button>
+        <br>
+    </div>
+
+<?php } ?>
+
+<!-- WAKE ON LAN - WOL -->
+<?php if ($_REQUEST["mac"] != "Internet") { ?>
+    
+    <h4 class=""><i class="fa-solid fa-bell"></i>
+        <?= lang("DevDetail_Tools_WOL_noti") ?>
+    </h4>
+    <h5 class="">
+        <?= lang("DevDetail_Tools_WOL_noti_text") ?>
+    </h5>
+    <br>
+    <div style="width:100%; text-align: center; margin-bottom: 50px;">
+        <button type="button" id="internetinfo" class="btn btn-primary pa-btn" style="margin: auto;" onclick="wakeonlan()">
+            <?= lang("DevDetail_Tools_WOL_noti") ?></button>
+        <br>
+        <div id="wol_output" style="margin-top: 10px;"></div>
+    </div>
+
+<?php } ?>
+
+<!-- SPEEDTEST -->
 <?php if ($_REQUEST["mac"] == "Internet") { ?>
-<h4 class=""><i class="fa-solid fa-gauge-high"></i>
-    <?= lang("DevDetail_Tab_Tools_Speedtest_Title") ?>
-</h4>
-<h5 class="">
-    <?= lang("DevDetail_Tab_Tools_Speedtest_Description") ?>
-</h5>
-<br>
-<div style="width:100%; text-align: center; margin-bottom: 50px;">
-    <button type="button" id="speedtestcli" class="btn btn-primary pa-btn" style="margin: auto;" onclick="speedtestcli()">
-        <?= lang("DevDetail_Tab_Tools_Speedtest_Start") ?></button>
+    <h4 class=""><i class="fa-solid fa-gauge-high"></i>
+        <?= lang("DevDetail_Tab_Tools_Speedtest_Title") ?>
+    </h4>
+    <h5 class="">
+        <?= lang("DevDetail_Tab_Tools_Speedtest_Description") ?>
+    </h5>
     <br>
-    <div id="speedtestoutput" style="margin-top: 10px;"></div>
-</div>
+    <div style="width:100%; text-align: center; margin-bottom: 50px;">
+        <button type="button" id="speedtestcli" class="btn btn-primary pa-btn" style="margin: auto;" onclick="speedtestcli()">
+            <?= lang("DevDetail_Tab_Tools_Speedtest_Start") ?></button>
+        <br>
+        <div id="speedtestoutput" style="margin-top: 10px;"></div>
+    </div>
 
 <?php } ?>
 
+<!-- TRACEROUTE -->
 <?php if ($_REQUEST["mac"] != "Internet") { ?>
-<h4 class=""><i class="fa-solid fa-route"></i>
-    <?= lang("DevDetail_Tab_Tools_Traceroute_Title") ?>
-</h4>
-<h5 class="">
-    <?= lang("DevDetail_Tab_Tools_Traceroute_Description") ?>
-</h5>
-<div style="width:100%; text-align: center; margin-bottom: 50px;">
-    <button type="button" id="traceroute" class="btn btn-primary pa-btn" style="margin: auto;" onclick="traceroute()">
-        <?= lang("DevDetail_Tab_Tools_Traceroute_Start") ?>
-    </button>
-    <br>
-    <div id="tracerouteoutput" style="margin-top: 10px;"></div>
-</div>
+    <h4 class=""><i class="fa-solid fa-route"></i>
+        <?= lang("DevDetail_Tab_Tools_Traceroute_Title") ?>
+    </h4>
+    <h5 class="">
+        <?= lang("DevDetail_Tab_Tools_Traceroute_Description") ?>
+    </h5>
+    <div style="width:100%; text-align: center; margin-bottom: 50px;">
+        <button type="button" id="traceroute" class="btn btn-primary pa-btn" style="margin: auto;" onclick="traceroute()">
+            <?= lang("DevDetail_Tab_Tools_Traceroute_Start") ?>
+        </button>
+        <br>
+        <div id="tracerouteoutput" style="margin-top: 10px;"></div>
+    </div>
 
 <?php } ?>
 
+<!-- NSLOOKUP -->
 <?php if ($_REQUEST["mac"] != "Internet") { ?>
-<h4 class=""><i class="fa-solid fa-magnifying-glass"></i>
-    <?= lang("DevDetail_Tab_Tools_Nslookup_Title") ?>
-</h4>
-<h5 class="">
-    <?= lang("DevDetail_Tab_Tools_Nslookup_Description") ?>
-</h5>
-<div style="width:100%; text-align: center; margin-bottom: 50px;">
-    <button type="button" id="nslookup" class="btn btn-primary pa-btn" style="margin: auto;" onclick="nslookup()">
-        <?= lang("DevDetail_Tab_Tools_Nslookup_Start") ?>
-    </button>
-    <br>
-    <div id="nslookupoutput" style="margin-top: 10px;"></div>
-</div>
+    <h4 class=""><i class="fa-solid fa-magnifying-glass"></i>
+        <?= lang("DevDetail_Tab_Tools_Nslookup_Title") ?>
+    </h4>
+    <h5 class="">
+        <?= lang("DevDetail_Tab_Tools_Nslookup_Description") ?>
+    </h5>
+    <div style="width:100%; text-align: center; margin-bottom: 50px;">
+        <button type="button" id="nslookup" class="btn btn-primary pa-btn" style="margin: auto;" onclick="nslookup()">
+            <?= lang("DevDetail_Tab_Tools_Nslookup_Start") ?>
+        </button>
+        <br>
+        <div id="nslookupoutput" style="margin-top: 10px;"></div>
+    </div>
 
 <?php } ?>                                             
 
+<!-- NMAP SCANS -->
 <h4 class=""><i class="fa-solid fa-ethernet"></i>
     <?= lang("DevDetail_Nmap_Scans") ?>    
 </h4>
@@ -77,16 +128,16 @@
         <?= lang("DevDetail_Nmap_Scans_desc") ?>
     </div>
 
-    <button type="button" id="piamanualnmap_fast" class="btn btn-primary pa-btn" style="margin-bottom: 20px; margin-left: 10px; margin-right: 10px;" onclick="manualnmapscan(getDeviceDataByMac(getMac(), 'dev_LastIP'), 'fast')">
+    <button type="button" id="piamanualnmap_fast" class="btn btn-primary pa-btn" style="margin-bottom: 20px; margin-left: 10px; margin-right: 10px;" onclick="manualnmapscan(getDevDataByMac(getMac(), 'devLastIP'), 'fast')">
         <?= lang("DevDetail_Loading") ?>
     </button>
-    <button type="button" id="piamanualnmap_normal" class="btn btn-primary pa-btn" style="margin-bottom: 20px; margin-left: 10px; margin-right: 10px;" onclick="manualnmapscan(getDeviceDataByMac(getMac(), 'dev_LastIP'), 'normal')">
+    <button type="button" id="piamanualnmap_normal" class="btn btn-primary pa-btn" style="margin-bottom: 20px; margin-left: 10px; margin-right: 10px;" onclick="manualnmapscan(getDevDataByMac(getMac(), 'devLastIP'), 'normal')">
         <?= lang("DevDetail_Loading") ?>
     </button>
-    <button type="button" id="piamanualnmap_detail" class="btn btn-primary pa-btn" style="margin-bottom: 20px; margin-left: 10px; margin-right: 10px;" onclick="manualnmapscan(getDeviceDataByMac(getMac(), 'dev_LastIP'), 'detail')">
+    <button type="button" id="piamanualnmap_detail" class="btn btn-primary pa-btn" style="margin-bottom: 20px; margin-left: 10px; margin-right: 10px;" onclick="manualnmapscan(getDevDataByMac(getMac(), 'devLastIP'), 'detail')">
         <?= lang("DevDetail_Loading") ?>
     </button>
-    <button type="button" id="piamanualnmap_skipdiscovery" class="btn btn-primary pa-btn" style="margin-bottom: 20px; margin-left: 10px; margin-right: 10px;" onclick="manualnmapscan(getDeviceDataByMac(getMac(), 'dev_LastIP'), 'skipdiscovery')">
+    <button type="button" id="piamanualnmap_skipdiscovery" class="btn btn-primary pa-btn" style="margin-bottom: 20px; margin-left: 10px; margin-right: 10px;" onclick="manualnmapscan(getDevDataByMac(getMac(), 'devLastIP'), 'skipdiscovery')">
         <?= lang("DevDetail_Loading") ?>
     </button>
 
@@ -155,7 +206,7 @@
             $( "#tracerouteoutput" ).empty();
                 $.ajax({
                     method: "GET",
-                    url: "./php/server/traceroute.php?action=get&ip=" + getDeviceDataByMac(getMac(), 'dev_LastIP') + "",
+                    url: "./php/server/traceroute.php?action=get&ip=" + getDevDataByMac(getMac(), 'devLastIP') + "",
                     beforeSend: function() { $('#tracerouteoutput').addClass("ajax_scripts_loading"); },
                     complete: function() { $('#tracerouteoutput').removeClass("ajax_scripts_loading"); },
                     success: function(data, textStatus) {
@@ -170,7 +221,7 @@
             $( "#nslookupoutput" ).empty();
                 $.ajax({
                     method: "GET",
-                    url: "./php/server/nslookup.php?action=get&ip=" + getDeviceDataByMac(getMac(), 'dev_LastIP') + "",
+                    url: "./php/server/nslookup.php?action=get&ip=" + getDevDataByMac(getMac(), 'devLastIP') + "",
                     beforeSend: function() { $('#nslookupoutput').addClass("ajax_scripts_loading"); },
                     complete: function() { $('#nslookupoutput').removeClass("ajax_scripts_loading"); },
                     success: function(data, textStatus) {
@@ -181,23 +232,110 @@
 
         // ----------------------------------------------------------------
         function initNmapButtons() {
-                        setTimeout(function(){
-                                    document.getElementById('piamanualnmap_fast').innerHTML=getString(
-                                        "DevDetail_Nmap_buttonFast"
-                                    ) ;
-                                    document.getElementById('piamanualnmap_normal').innerHTML=getString(
-                                        "DevDetail_Nmap_buttonDefault"
-                                    ) ;
-                                    document.getElementById('piamanualnmap_detail').innerHTML=getString(
-                                        "DevDetail_Nmap_buttonDetail"
-                                    ) ;
-                                    document.getElementById('piamanualnmap_skipdiscovery').innerHTML=getString(
-                                        "DevDetail_Nmap_buttonSkipDiscovery"
-                                    ) ;
-                                    }, 500);
-                }
+                setTimeout(function(){
+                            document.getElementById('piamanualnmap_fast').innerHTML=getString(
+                                "DevDetail_Nmap_buttonFast"
+                            ) ;
+                            document.getElementById('piamanualnmap_normal').innerHTML=getString(
+                                "DevDetail_Nmap_buttonDefault"
+                            ) ;
+                            document.getElementById('piamanualnmap_detail').innerHTML=getString(
+                                "DevDetail_Nmap_buttonDetail"
+                            ) ;
+                            document.getElementById('piamanualnmap_skipdiscovery').innerHTML=getString(
+                                "DevDetail_Nmap_buttonSkipDiscovery"
+                            ) ;
+                            }, 500);
+        }
 
 
+        // ----------------------------------------------------------------
+        function initCopyFromDevice() {
+
+            const devices = getVisibleDevicesList()
+            console.log(devices);
+
+            const $select = $('#txtCopyFromDevice');
+            $select.empty(); // Clear existing options
+
+            devices.forEach(device => {
+                const option = $('<option></option>')
+                    .val(device.devMac)
+                    .text(device.devName);
+                $select.append(option);
+            });
+            
+            
+        }
+
+        // ----------------------------------------------------------------
+        function wakeonlan() {
+
+            macAddress = getMac();
+
+            // Execute
+            $.get('php/server/devices.php?action=wakeonlan&'
+                + '&mac='         + macAddress
+                + '&ip='          + getDevDataByMac(macAddress, "devLastIP")
+                , function(msg) {
+                showMessage (msg);
+            });
+        }
+
+        // ------------------------------------------------------------
+        function copyFromDevice() {
+
+            macAddress = getMac();
+
+            // Execute
+            $.get('php/server/devices.php?action=copyFromDevice&'
+                + '&macTo='         + macAddress
+                + '&macFrom='          + $('#txtCopyFromDevice').val()
+                , function(msg) {
+                    showMessage (msg);
+
+                    setTimeout(function() {
+                        window.location.reload();
+                    }, 2000);
+            });
+
+        }
+
+        // ------------------------------------------------------------
+        function getVisibleDevicesList()
+        {
+            // Read cache (skip cookie expiry check)
+            devicesList = getCache('devicesListAll_JSON', true);
+            
+            if (devicesList != '') {
+                devicesList = JSON.parse (devicesList);
+            } else {
+                devicesList = [];
+            }
+
+            // only loop thru the filtered down list
+            visibleDevices = getCache("ntx_visible_macs")
+
+            if(visibleDevices != "") {
+            visibleDevicesMACs = visibleDevices.split(',');
+
+            devicesList_tmp = [];
+
+            // Iterate through the data and filter only visible devices
+            $.each(devicesList, function(index, item) {
+                // Check if the current item's MAC exists in visibleDevicesMACs
+                if (visibleDevicesMACs.includes(item.devMac)) {
+                devicesList_tmp.push(item);
+                }
+            });
+
+            // Update devicesList with the filtered items
+            devicesList = devicesList_tmp;
+            }
+
+            return devicesList;
+        }
+
         // ----------------------------------------------------------------
         function internetinfo() {
                 $( "#internetinfooutput" ).empty();
@@ -210,8 +348,9 @@
                         $("#internetinfooutput").html(data);    
                     }
                 })
-                }
+        }
 
         // init first time
         initNmapButtons();
+        initCopyFromDevice();
 </script>

front/events.php

@@ -176,50 +176,38 @@
 
 <!-- ----------------------------------------------------------------------- -->
 <!-- Datatable -->
-  <link rel="stylesheet" href="lib/AdminLTE/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
-  <script src="lib/AdminLTE/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
-  <script src="lib/AdminLTE/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+  <link rel="stylesheet" href="lib/datatables.net-bs/css/dataTables.bootstrap.min.css">
+  <script src="lib/datatables.net/js/jquery.dataTables.min.js"></script>
+  <script src="lib/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
 
 
 <!-- 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/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,33 +80,42 @@ 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 -->
-  <link rel="stylesheet" href="lib/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css">
-  <!-- Font Awesome -->
-  <link rel="stylesheet" href="lib/AdminLTE/bower_components/font-awesome/css/fontawesome.min.css">
+  <link rel="stylesheet" href="lib/bootstrap/bootstrap.min.css">
   <!-- Ionicons -->
-  <link rel="stylesheet" href="lib/AdminLTE/bower_components/Ionicons/css/ionicons.min.css">
+  <link rel="stylesheet" href="lib/Ionicons/ionicons.min.css">
   <!-- Theme style -->
   <link rel="stylesheet" href="lib/AdminLTE/dist/css/AdminLTE.min.css">
   <!-- iCheck -->
-  <link rel="stylesheet" href="lib/AdminLTE/plugins/iCheck/square/blue.css">
+  <link rel="stylesheet" href="lib/iCheck/square/blue.css">
+  <!-- Font Awesome -->
+  <link rel="stylesheet" href="lib/font-awesome/fontawesome.min.css">
+  <link rel="stylesheet" href="lib/font-awesome/solid.css">
+  <link rel="stylesheet" href="lib/font-awesome/brands.css">
+  <link rel="stylesheet" href="lib/font-awesome/v5-font-face.css">
+  <!-- Favicon -->
+  <link id="favicon" rel="icon" type="image/x-icon" href="img/NetAlertX_logo.png">
 
   <!-- 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\');"';}
+switch ($UI_THEME) {
+  case "Dark":
+    echo '<link rel="stylesheet" href="css/dark-patch.css">';
+    break;
+  case "System":
+    echo '<link rel="stylesheet" href="css/system-dark-patch.css">';
+    break;
+}
 ?>
   <link rel="stylesheet" href="/css/offline-font.css">
 </head>
 <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 +151,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>
@@ -156,11 +165,11 @@ if ($ENABLED_DARKMODE === True) {
 
 
 <!-- jQuery 3 -->
-<script src="lib/AdminLTE/bower_components/jquery/dist/jquery.min.js"></script>
+<script src="lib/jquery/jquery.min.js"></script>
 <!-- Bootstrap 3.3.7 -->
-<script src="lib/AdminLTE/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+<script src="lib/bootstrap/bootstrap.min.js"></script>
 <!-- iCheck -->
-<script src="lib/AdminLTE/plugins/iCheck/icheck.min.js"></script>
+<script src="lib/iCheck/icheck.min.js"></script>
 <script>
   $(function () {
     $('input').iCheck({

front/js/common.js

@@ -12,7 +12,7 @@ var timerRefreshData = ''
 
 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
+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", "ar_ar", "ca_ca"]; // needs to be same as in lang.php
 var   settingsJSON  = {}
 
 
@@ -115,28 +115,28 @@ function cacheSettings()
   return new Promise((resolve, reject) => {
     if(!getCache('completedCalls').includes('cacheSettings'))
     {  
-      $.get('api/table_settings.json?nocache=' + Date.now(), function(resSet) { 
-
-        $.get('api/plugins.json?nocache=' + Date.now(), function(resPlug) {        
+      $.get('/php/server/query_json.php', { file: 'table_settings.json', nocache: Date.now() }, function(resSet) { 
 
+        $.get('/php/server/query_json.php', { file: 'plugins.json', nocache: Date.now() }, function(resPlug) {
+       
           pluginsData = resPlug["data"]; 
           settingsData = resSet["data"];  
 
           settingsData.forEach((set) => {  
 
-            resolvedOptions = createArray(set.Options)
+            resolvedOptions = createArray(set.setOptions)
             resolvedOptionsOld = resolvedOptions
             setPlugObj     = {};
             options_params = [];
             resolved = ""
           
             // proceed only if first option item contains something to resolve
-            if( !set.Code_Name.includes("__metadata") && 
+            if( !set.setKey.includes("__metadata") && 
                 resolvedOptions.length != 0 && 
                 resolvedOptions[0].includes("{value}"))
             {
               // get setting definition from the plugin config if available
-              setPlugObj = getPluginSettingObject(pluginsData, set.Code_Name)
+              setPlugObj = getPluginSettingObject(pluginsData, set.setKey)
 
               // check if options contains parameters and resolve 
               if(setPlugObj != {} && setPlugObj["options_params"])
@@ -161,8 +161,8 @@ function cacheSettings()
               }    
             }
 
-            setCache(`pia_set_${set.Code_Name}`, set.Value)             
-            setCache(`pia_set_opt_${set.Code_Name}`, resolvedOptions) 
+            setCache(`nax_set_${set.setKey}`, set.setValue)             
+            setCache(`nax_set_opt_${set.setKey}`, resolvedOptions) 
           });
         }).then(() => handleSuccess('cacheSettings', resolve())).catch(() => handleFailure('cacheSettings', reject("cacheSettings already completed")));    // handle AJAX synchronization
       })
@@ -177,7 +177,7 @@ function getSettingOptions (key) {
   // handle initial load to make sure everything is set-up and cached
   // handleFirstLoad()
  
-  result = getCache(`pia_set_opt_${key}`, true);
+  result = getCache(`nax_set_opt_${key}`, true);
 
   if (result == "")
   {
@@ -195,7 +195,7 @@ function getSetting (key) {
   // handle initial load to make sure everything is set-up and cached
   // handleFirstLoad()
  
-  result = getCache(`pia_set_${key}`, true);
+  result = getCache(`nax_set_${key}`, true);
 
   if (result == "")
   {
@@ -225,7 +225,7 @@ function cacheStrings() {
               });
 
               // Fetch strings and translations from plugins
-              $.get(`api/table_plugins_language_strings.json?nocache=${Date.now()}`)
+              $.get('/php/server/query_json.php', { file: 'table_plugins_language_strings.json', nocache: Date.now() })
                 .done((pluginRes) => {
                   const data = pluginRes["data"];
                   
@@ -289,6 +289,7 @@ function getString(key) {
 
 // -----------------------------------------------------------------------------
 // Get current language ISO code
+// below has to match exactly teh values in /front/php/templates/language/lang.php & /front/js/common.js
 function getLangCode() {
 
     UI_LANG = getSetting("UI_LANG");
@@ -332,6 +333,12 @@ function getLangCode() {
       case 'Czech (cs_cz)':
         lang_code = 'cs_cz';
         break;
+      case 'Arabic (ar_ar)':
+        lang_code = 'ar_ar';
+        break;
+      case 'Catalan (ca_ca)':
+        lang_code = 'ca_ca';
+        break;
     }
 
     return lang_code;
@@ -342,6 +349,8 @@ function getLangCode() {
 // -----------------------------------------------------------------------------
 // String utilities
 // -----------------------------------------------------------------------------
+
+// ----------------------------------------------------
 function jsonSyntaxHighlight(json) {
   if (typeof json != 'string') {
        json = JSON.stringify(json, undefined, 2);
@@ -364,6 +373,7 @@ function jsonSyntaxHighlight(json) {
   });
 }
 
+// ----------------------------------------------------
 function isValidBase64(str) {
   // Base64 characters set
   var base64CharacterSet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -373,7 +383,7 @@ function isValidBase64(str) {
   return invalidCharacters === '';
 }
 
-
+// ----------------------------------------------------
 function isValidJSON(jsonString) {
   try {
       JSON.parse(jsonString);
@@ -383,6 +393,37 @@ function isValidJSON(jsonString) {
   }
 }
 
+// ----------------------------------------------------
+// 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
 // -----------------------------------------------------------------------------
@@ -423,29 +464,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({
@@ -630,17 +648,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;
 }
@@ -677,11 +689,20 @@ function openUrl(urls) {
   }
 }
 
+// -----------------------------------------------------------------------------
+// force load URL in current window with specific anchor
+function forceLoadUrl(relativeUrl) {
+
+  window.location.replace(relativeUrl);
+  window.location.reload()  
+  
+}
+
 
 // -----------------------------------------------------------------------------
 function navigateToDeviceWithIp (ip) {
 
-  $.get('api/table_devices.json?nocache=' + Date.now(), function(res) {    
+  $.get('/php/server/query_json.php', { file: 'table_devices.json', nocache: Date.now() }, function(res) {    
         
     devices = res["data"];
 
@@ -689,9 +710,9 @@ function navigateToDeviceWithIp (ip) {
     
     $.each(devices, function(index, obj) {
       
-      if(obj.dev_LastIP.trim() == ip.trim())
+      if(obj.devLastIP.trim() == ip.trim())
       {
-        mac = obj.dev_MAC;
+        mac = obj.devMac;
 
         window.open(window.location.origin +'/deviceDetails.php?mac=' + mac , "_blank");
       }
@@ -702,7 +723,7 @@ function navigateToDeviceWithIp (ip) {
 
 // -----------------------------------------------------------------------------
 function getNameByMacAddress(macAddress) {
-  return getDeviceDataByMac(macAddress, "dev_Name")
+  return getDevDataByMac(macAddress, "devName")
 }
 
 // -----------------------------------------------------------------------------
@@ -739,6 +760,12 @@ function isValidIPv6(ipAddress) {
   return ipv6Regex.test(ipAddress);
 }
 
+function isValidIPv4(ip) {
+  const ipv4Regex = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
+  return ipv4Regex.test(ip);
+}
+
+
 function formatIPlong(ipAddress) {
   if (ipAddress.includes(':') && isValidIPv6(ipAddress)) {
     const parts = ipAddress.split(':');
@@ -803,7 +830,11 @@ function isRandomMAC(mac)
     // Empty array
     if (input === '[]' || input === '') {
       return [];
-    } 
+    }
+    // handle integer 
+    if (typeof input === 'number') {
+      input = input.toString();
+    }
   
     // Regex pattern for brackets
     const patternBrackets = /(^\s*\[)|(\]\s*$)/g;
@@ -855,7 +886,7 @@ function isRandomMAC(mac)
 // -----------------------------------------------------------------------------
 // A function to get a device property using the mac address as key and DB column nakme as parameter
 //  for the value to be returned
-function getDeviceDataByMac(macAddress, dbColumn) {
+function getDevDataByMac(macAddress, dbColumn) {
 
   const sessionDataKey = 'devicesListAll_JSON';  
   const devicesCache = getCache(sessionDataKey);
@@ -868,7 +899,7 @@ function getDeviceDataByMac(macAddress, dbColumn) {
   const devices = JSON.parse(devicesCache);
 
   for (const device of devices) {
-      if (device["dev_MAC"].toLowerCase() === macAddress.toLowerCase()) {
+      if (device["devMac"].toLowerCase() === macAddress.toLowerCase()) {
 
         if(dbColumn)
         {
@@ -893,7 +924,7 @@ function cacheDevices()
 
     // if(!getCache('completedCalls').includes('cacheDevices'))
     // {
-      $.get('api/table_devices.json?nocache=' + Date.now(), function(data) {    
+    $.get('/php/server/query_json.php', { file: 'table_devices.json', nocache: Date.now() }, function(data) {    
         
         // console.log(data)
 
@@ -958,6 +989,19 @@ function getGuid() {
 // -----------------------------------------------------------------------------
 //  Loading Spinner overlay
 // -----------------------------------------------------------------------------
+spinnerHtml = `
+    <!-- spinner -->
+    <div id="loadingSpinner" style="display: block">
+      <div class="pa_semitransparent-panel"></div>
+      <div class="panel panel-default pa_spinner">
+        <table>
+          <td width="130px" align="middle">_text_</td>
+          <td><i class="ion ion-ios-loop-strong fa-spin fa-2x fa-fw"></td>
+        </table>
+      </div>
+    </div>
+    `
+
 function showSpinner(stringKey='Loading')
 {
 
@@ -976,20 +1020,7 @@ function showSpinner(stringKey='Loading')
     $("#loadingSpinner").show();
   }
   else{    
-    html =  `
-    <!-- spinner -->
-    <div id="loadingSpinner" style="display: block">
-      <div class="pa_semitransparent-panel"></div>
-      <div class="panel panel-default pa_spinner">
-        <table>
-          <td width="130px" align="middle">${text}</td>
-          <td><i class="ion ion-ios-loop-strong fa-spin fa-2x fa-fw"></td>
-        </table>
-      </div>
-    </div>
-    `
-
-    $(".wrapper").append(html)
+    $(".wrapper").append(spinnerHtml.replace('_text_',text))
   }
 }
 // -----------------------------------------------------------------------------
@@ -1001,11 +1032,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({
@@ -1148,9 +1179,9 @@ function arraysContainSameValues(arr1, arr2) {
 
 // -----------------------------------------------------------------------------
 // Hide elements on the page based on the supplied setting
-function hideUIelements(settingKey) {
+function hideUIelements(setKey) {
 
-  hiddenSectionsSetting = getSetting(settingKey)
+  hiddenSectionsSetting = getSetting(setKey)
   
   if(hiddenSectionsSetting != "") // handle if settings not yet initialized
   {
@@ -1174,23 +1205,61 @@ function hideUIelements(settingKey) {
 
 }
 
+// ------------------------------------------------------------
+function getDevicesList()
+{
+  // Read cache (skip cookie expiry check)
+  devicesList = getCache('devicesListAll_JSON', true);
+  
+  if (devicesList != '') {
+      devicesList = JSON.parse (devicesList);
+  } else {
+      devicesList = [];
+  }
+
+  // only loop thru the filtered down list
+  visibleDevices = getCache("ntx_visible_macs")
+
+  if(visibleDevices != "") {
+    visibleDevicesMACs = visibleDevices.split(',');
+
+    devicesList_tmp = [];
+
+    // Iterate through the data and filter only visible devices
+    $.each(devicesList, function(index, item) {
+      // Check if the current item's MAC exists in visibleDevicesMACs
+      if (visibleDevicesMACs.includes(item.devMac)) {
+        devicesList_tmp.push(item);
+      }
+    });
+
+    // Update devicesList with the filtered items
+    devicesList = devicesList_tmp;
+  }
+
+  return devicesList;
+}
 
 
 // -----------------------------------------------------------------------------
-// apply dark mode
+// apply theme
 
 $(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\');');
+  let theme = getSetting("UI_theme");
+  if (theme) {
+    theme = theme.replace("['","").replace("']","");
+    // Add the theme stylesheet
+    setCookie("UI_theme", theme);
+    switch(theme) {
+      case "Dark":
+	$('head').append('<link rel="stylesheet" href="css/dark-patch.css">');
+	break;
+      case "System":
+	$('head').append('<link rel="stylesheet" href="css/system-dark-patch.css">');
+	break
+    }
   } else {
-    setCookie("UI_dark_mode", "False")
-    // Set the background image for light mode
-    $('body').attr('style', 'background-image: url(\'img/background.png\');');
+    setCookie("UI_theme", "Light");
   }
 });
 
@@ -1221,7 +1290,7 @@ function clearCache() {
 // -----------------------------------------------------------------------------
 // Function to check if cache needs to be refreshed because of setting changes
 function checkSettingChanges() {
-  $.get('api/app_state.json?nocache=' + Date.now(), function(appState) {   
+  $.get('/php/server/query_json.php', { file: 'app_state.json', nocache: Date.now() }, function(appState) {   
     const importedMilliseconds = parseInt(appState["settingsImported"] * 1000);
     const lastReloaded = parseInt(sessionStorage.getItem(sessionStorageKey + '_time'));
 
@@ -1244,39 +1313,75 @@ async function handleFirstLoad(callback) {
 }
 
 // -----------------------------------------------------------------------------
-// Execute callback once app initialized
-function callAfterAppInitialized(callback) {
-  if (!isAppInitialized()) {
+// Execute callback once the app is initialized and GraphQL server is running
+async function callAfterAppInitialized(callback) {
+  if (!isAppInitialized() || !(await isGraphQLServerRunning())) {
     setTimeout(() => {
-      callAfterAppInitialized(callback)
+      callAfterAppInitialized(callback);
     }, 500);
-  } else
-  {
+  } else {
     callback();
   }
 }
 
+// -----------------------------------------------------------------------------
+// Polling function to repeatedly check if the server is running
+async function waitForGraphQLServer() {
+  const pollInterval = 2000; // 2 seconds between each check
+  let serverRunning = false;
+
+  while (!serverRunning) {
+    serverRunning = await isGraphQLServerRunning();
+    if (!serverRunning) {
+      console.log("GraphQL server not running, retrying in 2 seconds...");
+      await new Promise(resolve => setTimeout(resolve, pollInterval));
+    }
+  }
+
+  console.log("GraphQL server is now running.");
+}
+
+// -----------------------------------------------------------------------------
+// Returns 1 if running, 0 otherwise
+async function isGraphQLServerRunning() {
+  try {
+    const response = await $.get('/php/server/query_json.php', { file: 'app_state.json', nocache: Date.now()});
+    console.log("graphQLServerStarted: " + response["graphQLServerStarted"]);
+    setCache("graphQLServerStarted", response["graphQLServerStarted"]);
+    return response["graphQLServerStarted"];
+  } catch (error) {
+    console.error("Failed to check GraphQL server status:", error);
+    return false;
+  }
+}
+
 // -----------------------------------------------------------------------------
 // Check if the code has been executed before by checking sessionStorage
 function isAppInitialized() {
-  //  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 ;
+  completedCalls = parseInt(getCache("completedCallsCount"));
+  shouldBeCompletedCalls = getLangCode() == 'en_us' ? 3 : 4;
 
-  return (parseInt(getCache("completedCallsCount")) >=  completedCallsCount_final);
+  return (
+    completedCalls >= shouldBeCompletedCalls
+  );
 }
 
-// Define a function that will execute the code only once
+// -----------------------------------------------------------------------------
+// Main execution logic
 async function executeOnce() {
   showSpinner();
 
   if (!isAppInitialized()) {
     try {
+      console.log("HERE");
+      
+      await waitForGraphQLServer(); // Wait for the server to start
+
       await cacheDevices();
       await cacheSettings();
-      await cacheStrings();     
-      
+      await cacheStrings();
+
       console.log("✅ All AJAX callbacks have completed");
       onAllCallsComplete();
     } catch (error) {
@@ -1285,6 +1390,7 @@ async function executeOnce() {
   }
 }
 
+
 // -----------------------------------------------------------------------------
 // Function to handle successful completion of an AJAX call
 const handleSuccess = (callName) => {

front/js/db_methods.js

@@ -85,7 +85,7 @@ function renderList(
 // Check if database is locked
 function checkDbLock() {
   $.ajax({
-    url: "log/db_is_locked.log", // Replace with the actual path to your PHP file
+    url: "/php/server/query_logs.php?file=db_is_locked.log", 
     type: "GET",
 
     success: function (response) {

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/handle_version.js

@@ -33,7 +33,7 @@ function versionUpdateUI(){
 // Checks if a new version is available via the global app_state.json
 function checkIfNewVersionAvailable()
 {
-  $.get('api/app_state.json?nocache=' + Date.now(), function(appState) {   
+  $.get('/php/server/query_json.php', { file: 'app_state.json', nocache: Date.now() }, function(appState) {   
     
     // console.log(appState["isNewVersionChecked"])
     // console.log(appState["isNewVersion"])

front/js/modal.js

@@ -87,7 +87,8 @@ function showModalInput(
     message,
     btnCancel = getString("Gen_Cancel"),
     btnOK = getString("Gen_Okay"),
-    callbackFunction = null
+    callbackFunction = null,
+    triggeredBy = null    
 ) {
     prefix = "modal-input";
 
@@ -101,6 +102,10 @@ function showModalInput(
         modalCallbackFunction = callbackFunction;
     }
 
+    if (triggeredBy != null) {
+        $('#'+prefix).attr("data-myparam-triggered-by", triggeredBy)
+    }
+
     // Show modal
     $(`#${prefix}`).modal("show");
 
@@ -117,7 +122,8 @@ function showModalFieldInput(
     btnCancel = getString("Gen_Cancel"),
     btnOK = getString("Gen_Okay"),
     curValue = "",
-    callbackFunction = null
+    callbackFunction = null,
+    triggeredBy = null
 ) {
     // set captions
     prefix = "modal-field-input";
@@ -128,9 +134,14 @@ function showModalFieldInput(
     $(`#${prefix}-OK`).html(btnOK);
 
     if (callbackFunction != null) {
+        
         modalCallbackFunction = callbackFunction;
     }
 
+    if (triggeredBy != null) {
+        $('#'+prefix).attr("data-myparam-triggered-by", triggeredBy)
+    }
+
     $(`#${prefix}-field`).val(curValue);
 
     setTimeout(function () {
@@ -148,7 +159,13 @@ function modalDefaultOK() {
 
     // timer to execute function
     window.setTimeout(function () {
-        window[modalCallbackFunction]();
+        if (typeof modalCallbackFunction === "function") {
+            modalCallbackFunction(); // Direct call
+        } else if (typeof modalCallbackFunction === "string" && typeof window[modalCallbackFunction] === "function") {
+            window[modalCallbackFunction](); // Call via window
+        } else {
+            console.error("Invalid callback function");
+        }
     }, 100);
 }
 
@@ -159,7 +176,13 @@ function modalDefaultInput() {
 
     // timer to execute function
     window.setTimeout(function () {
-        window[modalCallbackFunction]();
+        if (typeof modalCallbackFunction === "function") {
+            modalCallbackFunction(); // Direct call
+        } else if (typeof modalCallbackFunction === "string" && typeof window[modalCallbackFunction] === "function") {
+            window[modalCallbackFunction](); // Call via window
+        } else {
+            console.error("Invalid callback function");
+        }
     }, 100);
 }
 
@@ -170,7 +193,13 @@ function modalDefaultFieldInput() {
 
     // timer to execute function
     window.setTimeout(function () {
-        modalCallbackFunction();
+        if (typeof modalCallbackFunction === "function") {
+            modalCallbackFunction(); // Direct call
+        } else if (typeof modalCallbackFunction === "string" && typeof window[modalCallbackFunction] === "function") {
+            window[modalCallbackFunction](); // Call via window
+        } else {
+            console.error("Invalid callback function");
+        }
     }, 100);
 }
 
@@ -181,7 +210,13 @@ function modalWarningOK() {
 
     // timer to execute function
     window.setTimeout(function () {
-        window[modalCallbackFunction]();
+        if (typeof modalCallbackFunction === "function") {
+            modalCallbackFunction(); // Direct call
+        } else if (typeof modalCallbackFunction === "string" && typeof window[modalCallbackFunction] === "function") {
+            window[modalCallbackFunction](); // Call via window
+        } else {
+            console.error("Invalid callback function");
+        }
     }, 100);
 }
 
@@ -295,6 +330,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

@@ -215,14 +215,14 @@ function settingsCollectedCorrectly(settingsArray, settingsJSON_DB) {
     }
   });
 
-  const settingsCodeNames = settingsJSON_DB.map((setting) => setting.Code_Name);
+  const settingsCodeNames = settingsJSON_DB.map((setting) => setting.setKey);
   const detailedCodeNames = settingsArray.map((item) => item[1]);
 
   const missingCodeNamesOnPage = detailedCodeNames.filter(
-    (codeName) => !settingsCodeNames.includes(codeName)
+    (setKey) => !settingsCodeNames.includes(setKey)
   );
   const missingCodeNamesInDB = settingsCodeNames.filter(
-    (codeName) => !detailedCodeNames.includes(codeName)
+    (setKey) => !detailedCodeNames.includes(setKey)
   );
 
   // check if the number of settings on the page and in the DB are the same
@@ -453,11 +453,11 @@ function filterRows(inputText) {
         }
   
         var description = $row.find(".setting_description").text().toLowerCase();
-        var codeName = $row.find(".setting_name code").text().toLowerCase();
+        var setKey = $row.find(".setting_name code").text().toLowerCase();
   
         if (
           description.includes(inputText.toLowerCase()) ||
-          codeName.includes(inputText.toLowerCase())
+          setKey.includes(inputText.toLowerCase())
         ) {
           $row.show();
           anyVisible = true; // Set the flag to true if at least one row is visible
@@ -502,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
@@ -539,6 +512,17 @@ function toggleMetadata(element) {
   $(`#${id}`).toggle();
 }
 
+// -----------------------------------------------------------------------------
+// Show setting description in a modal on smaller screens
+// -----------------------------------------------------------------------------
+function showDescription(element) {
+  const id = $(element).attr("my-to-show");
+
+  description = $(`${id}`)[0].innerHTML
+  console.log(description);
+  showModalOK(getString("Gen_Description"), description);
+}
+
 // ---------------------------------------------------------
 // Helper methods
 // ---------------------------------------------------------
@@ -570,7 +554,7 @@ function overrideToggle(element) {
 
 // Generate options or set options based on the provided parameters
 function generateOptionsOrSetOptions(
-  codeName,
+  setKey,
   valuesArray, // Array of values to be pre-selected in the dropdown
   placeholder, // ID of the HTML element where dropdown should be rendered (will be replaced)
   processDataCallback, // Callback function to generate entries based on options
@@ -578,10 +562,10 @@ function generateOptionsOrSetOptions(
   transformers = [] // Transformers to be applied to the values
 ) {
 
-  // console.log(codeName);
+  // console.log(setKey);
 
   // NOTE {value} options to replace with a setting or SQL value are handled in the cacheSettings() function
-  options = arrayToObject(createArray(getSettingOptions(codeName)))
+  options = arrayToObject(createArray(getSettingOptions(setKey)))
 
   // Call to render lists
   renderList(
@@ -654,7 +638,7 @@ function reverseTransformers(val, transformers) {
 
 // ------------------------------------------------------------
 // Function to initialize relevant variables based on HTML element
-const handleElementOptions = (codeName, elementOptions, transformers, val) => {
+const handleElementOptions = (setKey, elementOptions, transformers, val) => {
   let inputType = "text";
   let readOnly = "";
   let isMultiSelect = false;
@@ -667,7 +651,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) {
@@ -699,7 +687,7 @@ const handleElementOptions = (codeName, elementOptions, transformers, val) => {
     }
     if (option.sourceSuffixes) {
       $.each(option.sourceSuffixes, function (index, suf) {
-        sourceIds.push(codeName + suf);
+        sourceIds.push(setKey + suf);
       });
     }
     if (option.separator) {
@@ -711,6 +699,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")) {
@@ -731,6 +728,9 @@ const handleElementOptions = (codeName, elementOptions, transformers, val) => {
     valRes,
     getStringKey,
     onClick,
+    onChange,
+    customParams,
+    customId
   };
 };
 
@@ -859,3 +859,164 @@ function genListWithInputSet(options, valuesArray, targetField, transformers, pl
   // Place the resulting HTML into the specified placeholder div
   $("#" + placeholder).replaceWith(listHtml);
 }
+
+
+// ------------------------------------------------------------------------------
+// Generate the form control for setting
+function generateFormHtml(set, overrideValue) {
+  let inputHtml = '';
+
+
+  isEmpty(overrideValue) ? inVal = set['setValue'] : inVal = overrideValue;  
+  const setKey = set['setKey'];
+  const setType = set['setType'];
+
+  // console.log(setType);
+  // console.log(setKey);
+  // console.log(overrideValue);
+  // console.log(inVal);
+  
+
+  // Parse the setType JSON string
+  const setTypeObject = JSON.parse(setType.replace(/'/g, '"'));
+  const dataType = setTypeObject.dataType;
+  const elements = setTypeObject.elements || [];
+
+  // Generate HTML for elements
+  elements.forEach(elementObj => {
+    const { elementType, elementOptions = [], transformers = [] } = elementObj;
+
+    // Handle element options
+    const {
+      inputType,
+      readOnly,
+      isMultiSelect,
+      isOrdeable,
+      cssClasses,
+      placeholder,
+      suffix,
+      sourceIds,
+      separator,
+      editable,
+      valRes,
+      getStringKey,
+      onClick,
+      onChange,
+      customParams,
+      customId
+    } = handleElementOptions(setKey, elementOptions, transformers, inVal);
+
+    // Override value
+    const val = valRes;
+
+    // console.log(val);
+    
+
+    // Generate HTML based on elementType
+    switch (elementType) {
+      case 'select':
+        const multi = isMultiSelect ? "multiple" : "";
+        const addCss = isOrdeable ? "select2 select2-hidden-accessible" : "";
+
+        inputHtml += `<select onChange="settingsChanged();${onChange}" 
+                              my-data-type="${dataType}" 
+                              my-editable="${editable}" 
+                              class="form-control ${addCss}" 
+                              name="${setKey}" 
+                              id="${setKey}" 
+                              my-customparams="${customParams}" 
+                              my-customid="${customId}" 
+                              ${multi}>
+                          <option value="" id="${setKey + "_temp_"}"></option>
+                        </select>`;
+
+        generateOptionsOrSetOptions(setKey, createArray(val), `${setKey}_temp_`, generateOptions, null, transformers);
+        break;
+
+      case 'input':
+        const checked = val === 'True' || val === '1' ? 'checked' : '';
+        const inputClass = inputType === 'checkbox' ? 'checkbox' : 'form-control';
+
+        inputHtml += `<input 
+                        class="${inputClass} ${cssClasses}" 
+                        onChange="settingsChanged();${onChange}" 
+                        my-data-type="${dataType}" 
+                        my-customparams="${customParams}" 
+                        my-customid="${customId}" 
+                        id="${setKey}${suffix}" 
+                        type="${inputType}" 
+                        value="${val}" 
+                        ${readOnly}
+                        ${checked}
+                        placeholder="${placeholder}" 
+                      />`;
+        break;
+
+      case 'button':
+        inputHtml += `<button 
+                        class="btn btn-primary ${cssClasses}" 
+                        my-customparams="${customParams}" 
+                        my-customid="${customId}" 
+                        my-input-from="${sourceIds}" 
+                        my-input-to="${setKey}" 
+                        onclick="${onClick}">
+                        ${getString(getStringKey)}
+                      </button>`;
+        break;
+
+      case 'textarea':
+        inputHtml += `<textarea 
+                        class="form-control input" 
+                        my-customparams="${customParams}" 
+                        my-customid="${customId}" 
+                        my-data-type="${dataType}" 
+                        id="${setKey}" 
+                        ${readOnly}>${val}</textarea>`;
+        break;
+
+      case 'span':
+        inputHtml += `<span 
+                        class="${cssClasses}" 
+                        my-data-type="${dataType}" 
+                        my-customparams="${customParams}" 
+                        my-customid="${customId}">
+                        ${getString(getStringKey)}
+                      </span>`;
+        break;
+
+      default:
+        console.warn(`🟥 Unknown element type: ${elementType}`);
+    }
+  });
+
+  // Generate event HTML if applicable
+  let eventsHtml = '';
+
+  // console.log(setTypeObject);
+  
+  // console.log(set);
+ 
+  const eventsList = createArray(set['setEvents']); 
+  // inline buttons events
+  
+
+  if (eventsList.length > 0) {
+    eventsList.forEach(event => {
+
+        eventsHtml += `<span class="input-group-addon pointer"
+                        id="${`${event}_${setKey}`}"
+                        data-myparam-setkey="${setKey}"
+                        data-myparam="${setKey}"
+                        data-myparam-plugin="${setTypeObject.prefix || ''}"
+                        data-myevent="${event}"  
+                        onclick="execute_settingEvent(this)">
+                        <i title="${getString(event + "_event_tooltip")}" class="fa ${getString(event + "_event_icon")}"></i>
+                      </span>`;
+    });
+  }
+
+  // Combine and return the final HTML
+  return inputHtml + eventsHtml;
+}
+
+

front/js/ui_components.js

@@ -23,7 +23,7 @@ function initDeviceSelectors(devicesListAll_JSON) {
       // Loop through the devices list
       devicesList.forEach(function(device) {         
 
-          selectorFieldsHTML += `<option value="${device.dev_MAC}">${device.dev_Name}</option>`;
+          selectorFieldsHTML += `<option value="${device.devMac}">${device.devName}</option>`;
       });
 
       selector = `<div class="db_info_table_row  col-sm-12" > 
@@ -67,21 +67,95 @@ function initDeviceSelectors(devicesListAll_JSON) {
     }, 10);
 }
 
+// -------------------------------------------------------------------
+// Utility function to generate a random API token in the format t_<random string of specified length>
+function generateApiToken(elem, length) {
+  // Retrieve and parse custom parameters from the element
+  let params = $(elem).attr("my-customparams")?.split(',').map(param => param.trim());
+  if (params && params.length >= 1) {
+    var targetElementID = params[0];  // Get the target element's ID
+  }
+
+  let targetElement = $('#' + targetElementID);
+
+  // Function to generate a random string of a specified length
+  function generateRandomString(len) {
+    let characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+    let result = '';
+    for (let i = 0; i < len; i++) {
+      result += characters.charAt(Math.floor(Math.random() * characters.length));
+    }
+    return result;
+  }
+
+  // Generate the token in the format t_<random string of length>
+  let randomToken = 't_' + generateRandomString(length);
+
+  // Set the generated token as the value of the target element
+  if (targetElement.length) {
+    targetElement.val(randomToken);
+  }
+}
+
+
+// ----------------------------------------------
+// Updates the icon preview  
+function updateIconPreview(elem) {
+  const targetElement = $('[my-customid="NEWDEV_devIcon_preview"]');
+  const iconInput = $("#NEWDEV_devIcon");
+
+  let attempts = 0;
+
+  function tryUpdateIcon() {
+    let value = iconInput.val();
+
+    if (value) {
+      targetElement.html(atob(value));
+      iconInput.off('change input').on('change input', function () {
+        let newValue = $(this).val();
+        targetElement.html(atob(newValue));
+      });
+      return; // Stop retrying if successful
+    } 
+
+    attempts++;
+    if (attempts < 10) {
+      setTimeout(tryUpdateIcon, 1000); // Retry after 1 second
+    } else {
+      console.error("Input value is empty after 10 attempts");
+    }
+  }
+
+  tryUpdateIcon();
+}
+
+
 
 // -----------------------------------------------------------------------------
-// Updates the icon preview  
-function updateIconPreview (inputId) {
-  // update icon
-  iconInput = $(inputId) 
+// Nice checkboxes with iCheck
+function initializeiCheck () {
+  // Blue
+  $('input[type="checkbox"].blue').iCheck({
+    checkboxClass: 'icheckbox_flat-blue',
+    radioClass:    'iradio_flat-blue',
+    increaseArea:  '20%'
+  });
 
-  value = iconInput.val()
+ // Orange
+ $('input[type="checkbox"].orange').iCheck({
+   checkboxClass: 'icheckbox_flat-orange',
+   radioClass:    'iradio_flat-orange',
+   increaseArea:  '20%'
+ });
 
-  iconInput.on('change input', function() {
-    $('#txtIconFA').html(atob(value))
-  });    
+ // Red
+ $('input[type="checkbox"].red').iCheck({
+   checkboxClass: 'icheckbox_flat-red',
+   radioClass:    'iradio_flat-red',
+   increaseArea:  '20%'
+ });
 
-  $('#txtIconFA').html(atob(value))
-  
+ 
 }
 
 
@@ -147,19 +221,24 @@ function getCellValue(row, index) {
   return $(row).children('td').eq(index).text();
 }
 
- // ----------------------------------------------------------------------------- 
-  // handling events on the backend initiated by the front end START
-  // ----------------------------------------------------------------------------- 
+// ----------------------------------------------------------------------------- 
+// handling events 
+// ----------------------------------------------------------------------------- 
 
-  modalEventStatusId = 'modal-message-front-event'
+modalEventStatusId = 'modal-message-front-event'
 
-  // --------------------------------------------------------
-  // Calls a backend function to add a front-end event (specified by the attributes 'data-myevent' and 'data-myparam-plugin' on the passed  element) to an execution queue
-  function addToExecutionQueue_settingEvent(element)
-  {
+function execute_settingEvent(element) {
 
+  feEvent     = $(element).attr('data-myevent');
+  fePlugin    = $(element).attr('data-myparam-plugin');
+  feSetKey    = $(element).attr('data-myparam-setkey');
+  feParam     = $(element).attr('data-myparam');
+  feSourceId  = $(element).attr('id');
+
+  if (["test", "run"].includes(feEvent)) {
+    // Calls a backend function to add a front-end event (specified by the attributes 'data-myevent' and 'data-myparam-plugin' on the passed  element) to an execution queue
     // value has to be in format event|param. e.g. run|ARPSCAN
-    action = `${getGuid()}|${$(element).attr('data-myevent')}|${$(element).attr('data-myparam-plugin')}`
+    action = `${getGuid()}|${feEvent}|${fePlugin}`
 
     $.ajax({
       method: "POST",
@@ -174,29 +253,221 @@ function getCellValue(row, index) {
           updateModalState()
       }
     })
-  }
+    
+  } else if (["add_option"].includes(feEvent)) {
+    showModalFieldInput (
+      '<i class="fa fa-square-plus pointer"></i> ' + getString('Gen_Add'),
+      getString('Gen_Add'),
+      getString('Gen_Cancel'), 
+      getString('Gen_Okay'), 
+      '', // curValue
+      'addOptionFromModalInput',
+      feSourceId // triggered by id
+    );
+  } else if (["add_icon"].includes(feEvent)) {
 
-  // --------------------------------------------------------
-  // Updating the execution queue in in modal pop-up
-  function updateModalState() {
-    setTimeout(function() {
-        // Fetch the content from the log file using an AJAX request
-        $.ajax({
-            url: '/log/execution_queue.log',
-            type: 'GET',
-            success: function(data) {
-                // Update the content of the HTML element (e.g., a div with id 'logContent')
-                $('#'+modalEventStatusId).html(data);
+      // Add new icon as base64 string 
+    showModalInput (
+      '<i class="fa fa-square-plus pointer"></i> ' + getString('DevDetail_button_AddIcon'),
+      getString('DevDetail_button_AddIcon_Help'),
+      getString('Gen_Cancel'), 
+      getString('Gen_Okay'), 
+      () => addIconAsBase64(element), // Wrap in an arrow function
+      feSourceId // triggered by id
+    );
+  } else if (["copy_icons"].includes(feEvent)) {
 
-                updateModalState();
-            },
-            error: function() {
-                // Handle error, such as the file not being found
-                $('#logContent').html('Error: Log file not found.');
-            }
-        });
-    }, 2000);
+
+    // Ask overwrite icon types 
+    showModalWarning (
+      getString('DevDetail_button_OverwriteIcons'), 
+      getString('DevDetail_button_OverwriteIcons_Warning'),
+      getString('Gen_Cancel'), 
+      getString('Gen_Okay'), 
+      'overwriteIconType'
+    );
+  } else if (["go_to_node"].includes(feEvent)) {
+
+    goToNetworkNode('NEWDEV_devParentMAC');
+
+  } else {
+    console.warn(`🔺Not implemented: ${feEvent}`)
   }
+  
+  
+}
+
+
+// -----------------------------------------------------------------------------
+// Go to the correct network node in the Network section
+function goToNetworkNode(dropdownId)
+{  
+  setCache('activeNetworkTab', $('#'+dropdownId).val().replaceAll(":","_")+'_id');
+  window.location.href = './network.php';
+  
+}
+  
+
+// --------------------------------------------------------
+// Updating the execution queue in in modal pop-up
+function updateModalState() {
+  setTimeout(function() {
+      // Fetch the content from the log file using an AJAX request
+      $.ajax({
+          url: '/php/server/query_logs.php?file=execution_queue.log',
+          type: 'GET',
+          success: function(data) {
+              // Update the content of the HTML element (e.g., a div with id 'logContent')
+              $('#'+modalEventStatusId).html(data);
+
+              updateModalState();
+          },
+          error: function() {
+              // Handle error, such as the file not being found
+              $('#logContent').html('Error: Log file not found.');
+          }
+      });
+  }, 2000);
+}
+
+// --------------------------------------------------------
+// A method to add option to select and make it selected
+function addOptionFromModalInput() {
+  var inputVal = $(`#modal-field-input-field`).val();
+  console.log($('#modal-field-input-field'));
+  
+  var triggeredBy = $('#modal-field-input').attr("data-myparam-triggered-by");
+  var targetId = $('#' + triggeredBy).attr("data-myparam-setkey");
+
+  // Add new option and set it as selected
+  $('#' + targetId).append(new Option(inputVal, inputVal)).val(inputVal);
+}
+
+
+// --------------------------------------------------------
+// Generate a random MAC address starting 00:1A
+function generate_NEWDEV_devMac() {
+  const randomHexPair = () => Math.floor(Math.random() * 256).toString(16).padStart(2, '0').toUpperCase();
+  $('#NEWDEV_devMac').val(`00:1A:${randomHexPair()}:${randomHexPair()}:${randomHexPair()}:${randomHexPair()}`.toLowerCase());
+}
+
+
+// --------------------------------------------------------
+// Generate a random IP address starting 192.
+function generate_NEWDEV_devLastIP() {
+  const randomByte = () => Math.floor(Math.random() * 256);
+  $('#NEWDEV_devLastIP').val(`192.${randomByte()}.${randomByte()}.${Math.floor(Math.random() * 254) + 1}`);
+}
+
+// -----------------------------------------------------------------------------
+// A method to add an Icon as an option to select and make it selected
+function addIconAsBase64 (el) {
+
+  var iconHtml = $('#modal-input-textarea').val();
+
+  console.log(iconHtml);
+
+  iconHtmlBase64 = btoa(iconHtml.replace(/"/g, "'"));
+
+  console.log(iconHtmlBase64);
+
+
+  console.log($('#modal-field-input-field'));
+  
+  var triggeredBy = $('#modal-input').attr("data-myparam-triggered-by");
+  var targetId = $('#' + triggeredBy).attr("data-myparam-setkey");
+
+  // $('#'+targetId).val(iconHtmlBase64); 
+
+  // Add new option and set it as selected
+  $('#' + targetId).append(new Option(iconHtmlBase64, iconHtmlBase64)).val(iconHtmlBase64);
+
+  updateIconPreview(el)  
+
+}
+
+
+
+function showIconSelection() {
+  const selectElement = document.getElementById('NEWDEV_devIcon');
+  const modalId = 'dynamicIconModal';
+
+  // Create modal HTML dynamically
+  const modalHTML = `
+    <div id="${modalId}" class="modal fade" tabindex="-1" role="dialog">
+      <div class="modal-dialog" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title">${getString("Gen_Select")}</h5>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+            </button>
+          </div>
+          <div class="modal-body">
+            <div id="iconList" class="row"></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  `;
+
+  // Append the modal to the body
+  document.body.insertAdjacentHTML('beforeend', modalHTML);
+
+  const iconList = document.getElementById('iconList');
+
+  // Populate the icon list
+  Array.from(selectElement.options).forEach(option => {
+    if (option.value != "") {
+        
+      
+      const value = option.value;
+
+      // Decode the base64 value
+      let decodedValue;
+      try {
+        decodedValue = atob(value);
+      } catch (e) {
+        console.warn(`Skipping invalid base64 value: ${value}`);
+        return;
+      }
+
+      // Create an icon container
+      const iconDiv = document.createElement('div');
+      iconDiv.classList.add('iconPreviewSelector','col-md-2' , 'col-sm-3', 'col-xs-4');
+      iconDiv.style.cursor = 'pointer';
+
+      // Render the SVG or HTML content
+      const iconContainer = document.createElement('div');
+      iconContainer.innerHTML = decodedValue;
+
+      // Append the icon to the div
+      iconDiv.appendChild(iconContainer);
+      iconList.appendChild(iconDiv);
+
+      // Add click event to select icon
+      iconDiv.addEventListener('click', () => {
+        selectElement.value = value; // Update the select element value
+        $(`#${modalId}`).modal('hide'); // Hide the modal
+        updateIconPreview();
+      });
+    }
+  });
+
+  // Show the modal using AJAX
+  $(`#${modalId}`).modal('show');
+
+  // Remove modal from DOM after it's hidden
+  $(`#${modalId}`).on('hidden.bs.modal', function () {
+    document.getElementById(modalId).remove();
+  });
+
+  //
+  
+}
+
+
+
 
 
 // -----------------------------------------------------------------------------
@@ -252,15 +523,14 @@ function initSelect2() {
   }  
 }
 
-// init select2 after dom laoded
+// init functions after dom loaded
 window.addEventListener("load", function() {
-  // try to initialize select2
+  // try to initialize 
   setTimeout(() => {
     initSelect2()
+    initializeiCheck();
   }, 1000);
 });
 
 
-
-
 console.log("init ui_components.js")

front/lib/AdminLTE/.npmignore

@@ -1,2 +0,0 @@
-documentation/
-composer.json

front/lib/AdminLTE/.travis.yml

@@ -1,24 +0,0 @@
-language: node_js
-
-node_js:
-  - 8
-  - 9
-  - 10
-  - 11
-  - 12
-
-env:
-  - INSTALL=bower
-  - INSTALL=yarn
-  - INSTALL=npm
-
-matrix:
-  fast_finish: true
-
-install:
-  - if [ "bower" == $INSTALL ]; then yarn global add bower && bower install; fi
-  - if [ "yarn" == $INSTALL ]; then yarn install; fi
-  - if [ "npm" == $INSTALL ]; then npm install; fi
-
-script:
-  - echo 'Tests must be configured'

front/lib/AdminLTE/Gruntfile.js

@@ -1,312 +0,0 @@
-// AdminLTE Gruntfile
-module.exports = function (grunt) { // jshint ignore:line
-  'use strict';
-
-  grunt.initConfig({
-    pkg   : grunt.file.readJSON('package.json'),
-    watch : {
-      less : {
-        // Compiles less files upon saving
-        files: ['build/less/*.less'],
-        tasks: ['less:development', 'less:production', 'replace', 'notify:less']
-      },
-      js   : {
-        // Compile js files upon saving
-        files: ['build/js/*.js'],
-        tasks: ['js', 'notify:js']
-      },
-      skins: {
-        // Compile any skin less files upon saving
-        files: ['build/less/skins/*.less'],
-        tasks: ['less:skins', 'less:minifiedSkins', 'notify:less']
-      }
-    },
-    // Notify end of tasks
-    notify: {
-      less: {
-        options: {
-          title  : 'AdminLTE',
-          message: 'LESS finished running'
-        }
-      },
-      js  : {
-        options: {
-          title  : 'AdminLTE',
-          message: 'JS bundler finished running'
-        }
-      }
-    },
-    // 'less'-task configuration
-    // This task will compile all less files upon saving to create both AdminLTE.css and AdminLTE.min.css
-    less  : {
-      // Development not compressed
-      development  : {
-        files: {
-          // compilation.css  :  source.less
-          'dist/css/AdminLTE.css'                     : 'build/less/AdminLTE.less',
-          // AdminLTE without plugins
-          'dist/css/alt/AdminLTE-without-plugins.css' : 'build/less/AdminLTE-without-plugins.less',
-          // Separate plugins
-          'dist/css/alt/AdminLTE-select2.css'         : 'build/less/select2.less',
-          'dist/css/alt/AdminLTE-fullcalendar.css'    : 'build/less/fullcalendar.less',
-          'dist/css/alt/AdminLTE-bootstrap-social.css': 'build/less/bootstrap-social.less'
-        }
-      },
-      // Production compressed version
-      production   : {
-        options: {
-          compress: true
-        },
-        files  : {
-          // compilation.css  :  source.less
-          'dist/css/AdminLTE.min.css'                     : 'build/less/AdminLTE.less',
-          // AdminLTE without plugins
-          'dist/css/alt/AdminLTE-without-plugins.min.css' : 'build/less/AdminLTE-without-plugins.less',
-          // Separate plugins
-          'dist/css/alt/AdminLTE-select2.min.css'         : 'build/less/select2.less',
-          'dist/css/alt/AdminLTE-fullcalendar.min.css'    : 'build/less/fullcalendar.less',
-          'dist/css/alt/AdminLTE-bootstrap-social.min.css': 'build/less/bootstrap-social.less'
-        }
-      },
-      // Non minified skin files
-      skins        : {
-        files: {
-          'dist/css/skins/skin-blue.css'        : 'build/less/skins/skin-blue.less',
-          'dist/css/skins/skin-black.css'       : 'build/less/skins/skin-black.less',
-          'dist/css/skins/skin-yellow.css'      : 'build/less/skins/skin-yellow.less',
-          'dist/css/skins/skin-green.css'       : 'build/less/skins/skin-green.less',
-          'dist/css/skins/skin-red.css'         : 'build/less/skins/skin-red.less',
-          'dist/css/skins/skin-purple.css'      : 'build/less/skins/skin-purple.less',
-          'dist/css/skins/skin-blue-light.css'  : 'build/less/skins/skin-blue-light.less',
-          'dist/css/skins/skin-black-light.css' : 'build/less/skins/skin-black-light.less',
-          'dist/css/skins/skin-yellow-light.css': 'build/less/skins/skin-yellow-light.less',
-          'dist/css/skins/skin-green-light.css' : 'build/less/skins/skin-green-light.less',
-          'dist/css/skins/skin-red-light.css'   : 'build/less/skins/skin-red-light.less',
-          'dist/css/skins/skin-purple-light.css': 'build/less/skins/skin-purple-light.less',
-          'dist/css/skins/_all-skins.css'       : 'build/less/skins/_all-skins.less'
-        }
-      },
-      // Skins minified
-      minifiedSkins: {
-        options: {
-          compress: true
-        },
-        files  : {
-          'dist/css/skins/skin-blue.min.css'        : 'build/less/skins/skin-blue.less',
-          'dist/css/skins/skin-black.min.css'       : 'build/less/skins/skin-black.less',
-          'dist/css/skins/skin-yellow.min.css'      : 'build/less/skins/skin-yellow.less',
-          'dist/css/skins/skin-green.min.css'       : 'build/less/skins/skin-green.less',
-          'dist/css/skins/skin-red.min.css'         : 'build/less/skins/skin-red.less',
-          'dist/css/skins/skin-purple.min.css'      : 'build/less/skins/skin-purple.less',
-          'dist/css/skins/skin-blue-light.min.css'  : 'build/less/skins/skin-blue-light.less',
-          'dist/css/skins/skin-black-light.min.css' : 'build/less/skins/skin-black-light.less',
-          'dist/css/skins/skin-yellow-light.min.css': 'build/less/skins/skin-yellow-light.less',
-          'dist/css/skins/skin-green-light.min.css' : 'build/less/skins/skin-green-light.less',
-          'dist/css/skins/skin-red-light.min.css'   : 'build/less/skins/skin-red-light.less',
-          'dist/css/skins/skin-purple-light.min.css': 'build/less/skins/skin-purple-light.less',
-          'dist/css/skins/_all-skins.min.css'       : 'build/less/skins/_all-skins.less'
-        }
-      }
-    },
-
-    // Uglify task info. Compress the js files.
-    uglify: {
-      options   : {
-        mangle : true,
-        output: {
-          comments: 'some'
-        },
-      },
-      production: {
-        files: {
-          'dist/js/adminlte.min.js': ['dist/js/adminlte.js']
-        }
-      }
-    },
-
-    // Concatenate JS Files
-    concat: {
-      options: {
-        separator: '\n\n',
-        banner   : '/*! AdminLTE app.js\n'
-        + '* ================\n'
-        + '* Main JS application file for AdminLTE v2. This file\n'
-        + '* should be included in all pages. It controls some layout\n'
-        + '* options and implements exclusive AdminLTE plugins.\n'
-        + '*\n'
-        + '* @author Colorlib\n'
-        + '* @support <https://github.com/ColorlibHQ/AdminLTE/issues>\n'
-        + '* @version <%= pkg.version %>\n'
-        + '* @repository <%= pkg.repository.url %>\n'
-        + '* @license MIT <http://opensource.org/licenses/MIT>\n'
-        + '*/\n\n'
-        + '// Make sure jQuery has been loaded\n'
-        + 'if (typeof jQuery === \'undefined\') {\n'
-        + 'throw new Error(\'AdminLTE requires jQuery\')\n'
-        + '}\n\n'
-      },
-      dist   : {
-        src : [
-          'build/js/BoxRefresh.js',
-          'build/js/BoxWidget.js',
-          'build/js/ControlSidebar.js',
-          'build/js/DirectChat.js',
-          'build/js/PushMenu.js',
-          'build/js/TodoList.js',
-          'build/js/Tree.js',
-          'build/js/Layout.js',
-        ],
-        dest: 'dist/js/adminlte.js'
-      }
-    },
-
-    // Replace image paths in AdminLTE without plugins
-    replace: {
-      withoutPlugins   : {
-        src         : ['dist/css/alt/AdminLTE-without-plugins.css'],
-        dest        : 'dist/css/alt/AdminLTE-without-plugins.css',
-        replacements: [
-          {
-            from: '../img',
-            to  : '../../img'
-          }
-        ]
-      },
-      withoutPluginsMin: {
-        src         : ['dist/css/alt/AdminLTE-without-plugins.min.css'],
-        dest        : 'dist/css/alt/AdminLTE-without-plugins.min.css',
-        replacements: [
-          {
-            from: '../img',
-            to  : '../../img'
-          }
-        ]
-      }
-    },
-
-    // Build the documentation files
-    includes: {
-      build: {
-        src    : ['*.html'], // Source files
-        dest   : 'documentation/', // Destination directory
-        flatten: true,
-        cwd    : 'documentation/build',
-        options: {
-          silent     : true,
-          includePath: 'documentation/build/include'
-        }
-      }
-    },
-
-    // Optimize images
-    image: {
-      dynamic: {
-        files: [
-          {
-            expand: true,
-            cwd   : 'build/img/',
-            src   : ['**/*.{png,jpg,gif,svg,jpeg}'],
-            dest  : 'dist/img/'
-          }
-        ]
-      }
-    },
-
-    // Validate JS code
-    jshint: {
-      options: {
-        jshintrc: 'build/js/.jshintrc'
-      },
-      grunt  : {
-        options: {
-          jshintrc: 'build/grunt/.jshintrc'
-        },
-        src    : 'Gruntfile.js'
-      },
-      core   : {
-        src: 'build/js/*.js'
-      },
-      demo   : {
-        src: 'dist/js/demo.js'
-      },
-      pages  : {
-        src: 'dist/js/pages/*.js'
-      }
-    },
-
-    jscs: {
-      options: {
-        config: 'build/js/.jscsrc'
-      },
-      core   : {
-        src: '<%= jshint.core.src %>'
-      },
-      pages  : {
-        src: '<%= jshint.pages.src %>'
-      }
-    },
-
-    // Validate CSS files
-    csslint: {
-      options: {
-        csslintrc: 'build/less/.csslintrc'
-      },
-      dist   : [
-        'dist/css/AdminLTE.css'
-      ]
-    },
-
-    // Validate Bootstrap HTML
-    bootlint: {
-      options: {
-        relaxerror: ['W005']
-      },
-      files  : ['pages/**/*.html', '*.html']
-    },
-
-    // Delete images in build directory
-    // After compressing the images in the build/img dir, there is no need
-    // for them
-    clean: {
-      build: ['build/img/*']
-    }
-  });
-
-  // Load all grunt tasks
-
-  // LESS Compiler
-  grunt.loadNpmTasks('grunt-contrib-less');
-  // Watch File Changes
-  grunt.loadNpmTasks('grunt-contrib-watch');
-  // Compress JS Files
-  grunt.loadNpmTasks('grunt-contrib-uglify');
-  // Include Files Within HTML
-  grunt.loadNpmTasks('grunt-includes');
-  // Optimize images
-  grunt.loadNpmTasks('grunt-image');
-  // Validate JS code
-  grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-jscs');
-  // Delete not needed files
-  grunt.loadNpmTasks('grunt-contrib-clean');
-  // Lint CSS
-  grunt.loadNpmTasks('grunt-contrib-csslint');
-  // Lint Bootstrap
-  grunt.loadNpmTasks('grunt-bootlint');
-  // Concatenate JS files
-  grunt.loadNpmTasks('grunt-contrib-concat');
-  // Notify
-  grunt.loadNpmTasks('grunt-notify');
-  // Replace
-  grunt.loadNpmTasks('grunt-text-replace');
-
-  // Linting task
-  grunt.registerTask('lint', ['jshint', 'csslint', 'bootlint']);
-  // JS task
-  grunt.registerTask('js', ['concat', 'uglify']);
-  // CSS Task
-  grunt.registerTask('css', ['less:development', 'less:production', 'replace']);
-
-  // The default task (running 'grunt' in console) is 'watch'
-  grunt.registerTask('default', ['watch']);
-};

front/lib/AdminLTE/bower.json

@@ -1,64 +0,0 @@
-{
-  "name": "admin-lte",
-  "homepage": "https://adminlte.io",
-  "authors": [
-    "Abdullah Almsaeed <abdullah@almsaeedstudio.com>"
-  ],
-  "description": "Admin dashboard and control panel template",
-  "main": [
-    "index2.html",
-    "dist/css/AdminLTE.css",
-    "dist/js/adminlte.js",
-    "build/less/AdminLTE.less"
-  ],
-  "keywords": [
-    "css",
-    "js",
-    "html",
-    "template",
-    "admin",
-    "bootstrap",
-    "theme",
-    "backend",
-    "responsive"
-  ],
-  "license": "MIT",
-  "ignore": [
-    "/.*",
-    "node_modules",
-    "bower_components",
-    "composer.json",
-    "documentation"
-  ],
-  "dependencies": {
-    "chart.js": "^1.0",
-    "ckeditor": "^4.7",
-    "bootstrap-colorpicker": "^2.5.1",
-    "bootstrap": "^3.4",
-    "jquery": "^3.4.1",
-    "datatables.net": "^1.10.15",
-    "datatables.net-bs": "^2.1.1",
-    "bootstrap-datepicker": "^1.7",
-    "bootstrap-daterangepicker": "^2.1.25",
-    "moment": "^2.18.1",
-    "fastclick": "^1.0.6",
-    "Flot": "flot#^0.8.3",
-    "fullcalendar": "^3.4",
-    "inputmask": "jquery.inputmask#^3.3.7",
-    "ion.rangeSlider": "ionrangeslider#^2.2",
-    "jvectormap": "^1.2.2",
-    "jquery-knob": "^1.2.13",
-    "morris.js": "^0.5.1",
-    "PACE": "pace#^1.0.2",
-    "select2": "^4.0.7",
-    "jquery-slimscroll": "slimscroll#^1.3.8",
-    "jquery-sparkline": "^2.1.3",
-    "font-awesome": "^4.7",
-    "Ionicons": "ionicons#^2.0.1",
-    "jquery-ui": "^1.12.1",
-    "seiyria-bootstrap-slider": "^10.6.2"
-  },
-  "resolutions": {
-    "jquery": "^3.4.1"
-  }
-}

front/lib/AdminLTE/bower_components/Flot/.bower.json

@@ -1,18 +0,0 @@
-{
-  "name": "Flot",
-  "version": "0.8.3",
-  "main": "jquery.flot.js",
-  "dependencies": {
-    "jquery": ">= 1.2.6"
-  },
-  "homepage": "https://github.com/flot/flot",
-  "_release": "0.8.3",
-  "_resolution": {
-    "type": "version",
-    "tag": "v0.8.3",
-    "commit": "453b017cc5acfd75e252b93e8635f57f4196d45d"
-  },
-  "_source": "https://github.com/flot/flot.git",
-  "_target": "^0.8.3",
-  "_originalSource": "flot"
-}

front/lib/AdminLTE/bower_components/Flot/.travis.yml

@@ -1,3 +0,0 @@
-language: node_js
-node_js:
-  - 0.8

front/lib/AdminLTE/bower_components/Flot/CONTRIBUTING.md

@@ -1,98 +0,0 @@
-## Contributing to Flot ##
-
-We welcome all contributions, but following these guidelines results in less
-work for us, and a faster and better response.
-
-### Issues ###
-
-Issues are not a way to ask general questions about Flot. If you see unexpected
-behavior but are not 100% certain that it is a bug, please try posting to the
-[forum](http://groups.google.com/group/flot-graphs) first, and confirm that
-what you see is really a Flot problem before creating a new issue for it.  When
-reporting a bug, please include a working demonstration of the problem, if
-possible, or at least a clear description of the options you're using and the
-environment (browser and version, jQuery version, other libraries) that you're
-running under.
-
-If you have suggestions for new features, or changes to existing ones, we'd
-love to hear them! Please submit each suggestion as a separate new issue.
-
-If you would like to work on an existing issue, please make sure it is not
-already assigned to someone else. If an issue is assigned to someone, that
-person has already started working on it. So, pick unassigned issues to prevent
-duplicated effort.
-
-### Pull Requests ###
-
-To make merging as easy as possible, please keep these rules in mind:
-
- 1. Submit new features or architectural changes to the *<version>-work*
-    branch for the next major release.  Submit bug fixes to the master branch.
-
- 2. Divide larger changes into a series of small, logical commits with
-    descriptive messages.
-
- 3. Rebase, if necessary, before submitting your pull request, to reduce the
-    work we need to do to merge it.
-
- 4. Format your code according to the style guidelines below.
-
-### Flot Style Guidelines ###
-
-Flot follows the [jQuery Core Style Guidelines](http://docs.jquery.com/JQuery_Core_Style_Guidelines),
-with the following updates and exceptions:
-
-#### Spacing ####
-
-Use four-space indents, no tabs.  Do not add horizontal space around parameter
-lists, loop definitions, or array/object indices. For example:
-
-```js
-    for ( var i = 0; i < data.length; i++ ) {  // This block is wrong!
-        if ( data[ i ] > 1 ) {
-            data[ i ] = 2;
-        }
-    }
-
-    for (var i = 0; i < data.length; i++) {  // This block is correct!
-        if (data[i] > 1) {
-            data[i] = 2;
-        }
-    }
-```
-
-#### Comments ####
-
-Use [jsDoc](http://usejsdoc.org) comments for all file and function headers.
-Use // for all inline and block comments, regardless of length.
-
-All // comment blocks should have an empty line above *and* below them. For
-example:
-
-```js
-    var a = 5;
-
-    // We're going to loop here
-    // TODO: Make this loop faster, better, stronger!
-
-    for (var x = 0; x < 10; x++) {}
-```
-
-#### Wrapping ####
-
-Block comments should be wrapped at 80 characters.
-
-Code should attempt to wrap at 80 characters, but may run longer if wrapping
-would hurt readability more than having to scroll horizontally.  This is a
-judgement call made on a situational basis.
-
-Statements containing complex logic should not be wrapped arbitrarily if they
-do not exceed 80 characters. For example:
-
-```js
-    if (a == 1 &&    // This block is wrong!
-        b == 2 &&
-        c == 3) {}
-
-    if (a == 1 && b == 2 && c == 3) {}  // This block is correct!
-```

front/lib/AdminLTE/bower_components/Flot/FAQ.md

@@ -1,75 +0,0 @@
-## Frequently asked questions ##
-
-#### How much data can Flot cope with? ####
-
-Flot will happily draw everything you send to it so the answer
-depends on the browser. The excanvas emulation used for IE (built with
-VML) makes IE by far the slowest browser so be sure to test with that
-if IE users are in your target group (for large plots in IE, you can
-also check out Flashcanvas which may be faster).
-
-1000 points is not a problem, but as soon as you start having more
-points than the pixel width, you should probably start thinking about
-downsampling/aggregation as this is near the resolution limit of the
-chart anyway. If you downsample server-side, you also save bandwidth.
-
-
-#### Flot isn't working when I'm using JSON data as source! ####
-
-Actually, Flot loves JSON data, you just got the format wrong.
-Double check that you're not inputting strings instead of numbers,
-like [["0", "-2.13"], ["5", "4.3"]]. This is most common mistake, and
-the error might not show up immediately because Javascript can do some
-conversion automatically.
-
-
-#### Can I export the graph? ####
-
-You can grab the image rendered by the canvas element used by Flot
-as a PNG or JPEG (remember to set a background). Note that it won't
-include anything not drawn in the canvas (such as the legend). And it
-doesn't work with excanvas which uses VML, but you could try
-Flashcanvas.
-
-
-#### The bars are all tiny in time mode? ####
-
-It's not really possible to determine the bar width automatically.
-So you have to set the width with the barWidth option which is NOT in
-pixels, but in the units of the x axis (or the y axis for horizontal
-bars). For time mode that's milliseconds so the default value of 1
-makes the bars 1 millisecond wide.
-
-
-#### Can I use Flot with libraries like Mootools or Prototype? ####
-
-Yes, Flot supports it out of the box and it's easy! Just use jQuery
-instead of $, e.g. call jQuery.plot instead of $.plot and use
-jQuery(something) instead of $(something). As a convenience, you can
-put in a DOM element for the graph placeholder where the examples and
-the API documentation are using jQuery objects.
-
-Depending on how you include jQuery, you may have to add one line of
-code to prevent jQuery from overwriting functions from the other
-libraries, see the documentation in jQuery ("Using jQuery with other
-libraries") for details.
-
-
-#### Flot doesn't work with [insert name of Javascript UI framework]! ####
-
-Flot is using standard HTML to make charts. If this is not working,
-it's probably because the framework you're using is doing something
-weird with the DOM or with the CSS that is interfering with Flot.
-
-A common problem is that there's display:none on a container until the
-user does something. Many tab widgets work this way, and there's
-nothing wrong with it - you just can't call Flot inside a display:none
-container as explained in the README so you need to hold off the Flot
-call until the container is actually displayed (or use
-visibility:hidden instead of display:none or move the container
-off-screen).
-
-If you find there's a specific thing we can do to Flot to help, feel
-free to submit a bug report. Otherwise, you're welcome to ask for help
-on the forum/mailing list, but please don't submit a bug report to
-Flot.

front/lib/AdminLTE/bower_components/Flot/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2007-2014 IOLA and Ole Laursen
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.

front/lib/AdminLTE/bower_components/Flot/Makefile

@@ -1,12 +0,0 @@
-# Makefile for generating minified files
-
-.PHONY: all
-
-# we cheat and process all .js files instead of an exhaustive list
-all: $(patsubst %.js,%.min.js,$(filter-out %.min.js,$(wildcard *.js)))
-
-%.min.js: %.js
-	yui-compressor $< -o $@
-
-test:
-	./node_modules/.bin/jshint *jquery.flot.js

front/lib/AdminLTE/bower_components/Flot/PLUGINS.md

@@ -1,143 +0,0 @@
-## Writing plugins ##
-
-All you need to do to make a new plugin is creating an init function
-and a set of options (if needed), stuffing it into an object and
-putting it in the $.plot.plugins array. For example:
-
-```js
-function myCoolPluginInit(plot) {
-    plot.coolstring = "Hello!";
-};
-
-$.plot.plugins.push({ init: myCoolPluginInit, options: { ... } });
-
-// if $.plot is called, it will return a plot object with the
-// attribute "coolstring"
-```
-
-Now, given that the plugin might run in many different places, it's
-a good idea to avoid leaking names. The usual trick here is wrap the
-above lines in an anonymous function which is called immediately, like
-this: (function () { inner code ... })(). To make it even more robust
-in case $ is not bound to jQuery but some other Javascript library, we
-can write it as
-
-```js
-(function ($) {
-    // plugin definition
-    // ...
-})(jQuery);
-```
-
-There's a complete example below, but you should also check out the
-plugins bundled with Flot.
-
-
-## Complete example ##
-  
-Here is a simple debug plugin which alerts each of the series in the
-plot. It has a single option that control whether it is enabled and
-how much info to output:
-
-```js
-(function ($) {
-    function init(plot) {
-        var debugLevel = 1;
-
-        function checkDebugEnabled(plot, options) {
-            if (options.debug) {
-                debugLevel = options.debug;
-                plot.hooks.processDatapoints.push(alertSeries);
-            }
-        }
-
-        function alertSeries(plot, series, datapoints) {
-            var msg = "series " + series.label;
-            if (debugLevel > 1) {
-                msg += " with " + series.data.length + " points";
-                alert(msg);
-            }
-        }
-
-        plot.hooks.processOptions.push(checkDebugEnabled);
-    }
-
-    var options = { debug: 0 };
-      
-    $.plot.plugins.push({
-        init: init,
-        options: options,
-        name: "simpledebug",
-        version: "0.1"
-    });
-})(jQuery);
-```
-
-We also define "name" and "version". It's not used by Flot, but might
-be helpful for other plugins in resolving dependencies.
-  
-Put the above in a file named "jquery.flot.debug.js", include it in an
-HTML page and then it can be used with:
-
-```js
-    $.plot($("#placeholder"), [...], { debug: 2 });
-```
-
-This simple plugin illustrates a couple of points:
-
- - It uses the anonymous function trick to avoid name pollution.
- - It can be enabled/disabled through an option.
- - Variables in the init function can be used to store plot-specific
-   state between the hooks.
-
-The two last points are important because there may be multiple plots
-on the same page, and you'd want to make sure they are not mixed up.
-
-
-## Shutting down a plugin ##
-
-Each plot object has a shutdown hook which is run when plot.shutdown()
-is called. This usually mostly happens in case another plot is made on
-top of an existing one.
-
-The purpose of the hook is to give you a chance to unbind any event
-handlers you've registered and remove any extra DOM things you've
-inserted.
-
-The problem with event handlers is that you can have registered a
-handler which is run in some point in the future, e.g. with
-setTimeout(). Meanwhile, the plot may have been shutdown and removed,
-but because your event handler is still referencing it, it can't be
-garbage collected yet, and worse, if your handler eventually runs, it
-may overwrite stuff on a completely different plot.
-
- 
-## Some hints on the options ##
-   
-Plugins should always support appropriate options to enable/disable
-them because the plugin user may have several plots on the same page
-where only one should use the plugin. In most cases it's probably a
-good idea if the plugin is turned off rather than on per default, just
-like most of the powerful features in Flot.
-
-If the plugin needs options that are specific to each series, like the
-points or lines options in core Flot, you can put them in "series" in
-the options object, e.g.
-
-```js
-var options = {
-    series: {
-        downsample: {
-            algorithm: null,
-            maxpoints: 1000
-        }
-    }
-}
-```
-
-Then they will be copied by Flot into each series, providing default
-values in case none are specified.
-
-Think hard and long about naming the options. These names are going to
-be public API, and code is going to depend on them if the plugin is
-successful.

front/lib/AdminLTE/bower_components/Flot/README.md

@@ -1,110 +0,0 @@
-# Flot [![Build status](https://travis-ci.org/flot/flot.png)](https://travis-ci.org/flot/flot)
-
-## About ##
-
-Flot is a Javascript plotting library for jQuery.  
-Read more at the website: <http://www.flotcharts.org/>
-
-Take a look at the the examples in examples/index.html; they should give a good
-impression of what Flot can do, and the source code of the examples is probably
-the fastest way to learn how to use Flot.
-
-
-## Installation ##
-
-Just include the Javascript file after you've included jQuery.
-
-Generally, all browsers that support the HTML5 canvas tag are
-supported.
-
-For support for Internet Explorer < 9, you can use [Excanvas]
-[excanvas], a canvas emulator; this is used in the examples bundled
-with Flot. You just include the excanvas script like this:
-
-```html
-<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="excanvas.min.js"></script><![endif]-->
-```
-
-If it's not working on your development IE 6.0, check that it has
-support for VML which Excanvas is relying on. It appears that some
-stripped down versions used for test environments on virtual machines
-lack the VML support.
-
-You can also try using [Flashcanvas][flashcanvas], which uses Flash to
-do the emulation. Although Flash can be a bit slower to load than VML,
-if you've got a lot of points, the Flash version can be much faster
-overall. Flot contains some wrapper code for activating Excanvas which
-Flashcanvas is compatible with.
-
-You need at least jQuery 1.2.6, but try at least 1.3.2 for interactive
-charts because of performance improvements in event handling.
-
-
-## Basic usage ##
-
-Create a placeholder div to put the graph in:
-
-```html
-<div id="placeholder"></div>
-```
-
-You need to set the width and height of this div, otherwise the plot
-library doesn't know how to scale the graph. You can do it inline like
-this:
-
-```html
-<div id="placeholder" style="width:600px;height:300px"></div>
-```
-
-You can also do it with an external stylesheet. Make sure that the
-placeholder isn't within something with a display:none CSS property -
-in that case, Flot has trouble measuring label dimensions which
-results in garbled looks and might have trouble measuring the
-placeholder dimensions which is fatal (it'll throw an exception).
-
-Then when the div is ready in the DOM, which is usually on document
-ready, run the plot function:
-
-```js
-$.plot($("#placeholder"), data, options);
-```
-
-Here, data is an array of data series and options is an object with
-settings if you want to customize the plot. Take a look at the
-examples for some ideas of what to put in or look at the 
-[API reference](API.md). Here's a quick example that'll draw a line 
-from (0, 0) to (1, 1):
-
-```js
-$.plot($("#placeholder"), [ [[0, 0], [1, 1]] ], { yaxis: { max: 1 } });
-```
-
-The plot function immediately draws the chart and then returns a plot
-object with a couple of methods.
-
-
-## What's with the name? ##
-
-First: it's pronounced with a short o, like "plot". Not like "flawed".
-
-So "Flot" rhymes with "plot".
-
-And if you look up "flot" in a Danish-to-English dictionary, some of
-the words that come up are "good-looking", "attractive", "stylish",
-"smart", "impressive", "extravagant". One of the main goals with Flot
-is pretty looks.
-
-
-## Notes about the examples ##
-
-In order to have a useful, functional example of time-series plots using time
-zones, date.js from [timezone-js][timezone-js] (released under the Apache 2.0
-license) and the [Olson][olson] time zone database (released to the public
-domain) have been included in the examples directory.  They are used in
-examples/axes-time-zones/index.html.
-
-
-[excanvas]: http://code.google.com/p/explorercanvas/
-[flashcanvas]: http://code.google.com/p/flashcanvas/
-[timezone-js]: https://github.com/mde/timezone-js
-[olson]: http://ftp.iana.org/time-zones

front/lib/AdminLTE/bower_components/Flot/component.json

@@ -1,8 +0,0 @@
-{
-	"name": "Flot",
-	"version": "0.8.3",
-	"main": "jquery.flot.js",
-	"dependencies": {
-		"jquery": ">= 1.2.6"
-	}
-}

front/lib/AdminLTE/bower_components/Flot/examples/ajax/data-eu-gdp-growth-1.json

@@ -1,4 +0,0 @@
-{
-    "label": "Europe (EU27)",
-    "data": [[1999, 3.0], [2000, 3.9]]
-}

front/lib/AdminLTE/bower_components/Flot/examples/ajax/data-eu-gdp-growth-2.json

@@ -1,4 +0,0 @@
-{
-    "label": "Europe (EU27)",
-    "data": [[1999, 3.0], [2000, 3.9], [2001, 2.0], [2002, 1.2]]
-}

front/lib/AdminLTE/bower_components/Flot/examples/ajax/data-eu-gdp-growth-3.json

@@ -1,4 +0,0 @@
-{
-    "label": "Europe (EU27)",
-    "data": [[1999, 3.0], [2000, 3.9], [2001, 2.0], [2002, 1.2], [2003, 1.3], [2004, 2.5]]
-}

front/lib/AdminLTE/bower_components/Flot/examples/ajax/data-eu-gdp-growth-4.json

@@ -1,4 +0,0 @@
-{
-    "label": "Europe (EU27)",
-    "data": [[1999, 3.0], [2000, 3.9], [2001, 2.0], [2002, 1.2], [2003, 1.3], [2004, 2.5], [2005, 2.0], [2006, 3.1]]
-}

front/lib/AdminLTE/bower_components/Flot/examples/ajax/data-eu-gdp-growth-5.json

@@ -1,4 +0,0 @@
-{
-    "label": "Europe (EU27)",
-    "data": [[1999, 3.0], [2000, 3.9], [2001, 2.0], [2002, 1.2], [2003, 1.3], [2004, 2.5], [2005, 2.0], [2006, 3.1], [2007, 2.9], [2008, 0.9]]
-}

front/lib/AdminLTE/bower_components/Flot/examples/ajax/data-eu-gdp-growth.json

@@ -1,4 +0,0 @@
-{
-    "label": "Europe (EU27)",
-    "data": [[1999, 3.0], [2000, 3.9], [2001, 2.0], [2002, 1.2], [2003, 1.3], [2004, 2.5], [2005, 2.0], [2006, 3.1], [2007, 2.9], [2008, 0.9]]
-}

front/lib/AdminLTE/bower_components/Flot/examples/ajax/data-japan-gdp-growth.json

@@ -1,4 +0,0 @@
-{
-    "label": "Japan",
-    "data": [[1999, -0.1], [2000, 2.9], [2001, 0.2], [2002, 0.3], [2003, 1.4], [2004, 2.7], [2005, 1.9], [2006, 2.0], [2007, 2.3], [2008, -0.7]]
-}

front/lib/AdminLTE/bower_components/Flot/examples/ajax/data-usa-gdp-growth.json

@@ -1,4 +0,0 @@
-{
-    "label": "USA",
-    "data": [[1999, 4.4], [2000, 3.7], [2001, 0.8], [2002, 1.6], [2003, 2.5], [2004, 3.6], [2005, 2.9], [2006, 2.8], [2007, 2.0], [2008, 1.1]]
-}

front/lib/AdminLTE/bower_components/Flot/examples/ajax/index.html

@@ -1,173 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>Flot Examples: AJAX</title>
-	<link href="../examples.css" rel="stylesheet" type="text/css">
-	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
-	<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script type="text/javascript">
-
-	$(function() {
-
-		var options = {
-			lines: {
-				show: true
-			},
-			points: {
-				show: true
-			},
-			xaxis: {
-				tickDecimals: 0,
-				tickSize: 1
-			}
-		};
-
-		var data = [];
-
-		$.plot("#placeholder", data, options);
-
-		// Fetch one series, adding to what we already have
-
-		var alreadyFetched = {};
-
-		$("button.fetchSeries").click(function () {
-
-			var button = $(this);
-
-			// Find the URL in the link right next to us, then fetch the data
-
-			var dataurl = button.siblings("a").attr("href");
-
-			function onDataReceived(series) {
-
-				// Extract the first coordinate pair; jQuery has parsed it, so
-				// the data is now just an ordinary JavaScript object
-
-				var firstcoordinate = "(" + series.data[0][0] + ", " + series.data[0][1] + ")";
-				button.siblings("span").text("Fetched " + series.label + ", first point: " + firstcoordinate);
-
-				// Push the new data onto our existing data array
-
-				if (!alreadyFetched[series.label]) {
-					alreadyFetched[series.label] = true;
-					data.push(series);
-				}
-
-				$.plot("#placeholder", data, options);
-			}
-
-			$.ajax({
-				url: dataurl,
-				type: "GET",
-				dataType: "json",
-				success: onDataReceived
-			});
-		});
-
-		// Initiate a recurring data update
-
-		$("button.dataUpdate").click(function () {
-
-			data = [];
-			alreadyFetched = {};
-
-			$.plot("#placeholder", data, options);
-
-			var iteration = 0;
-
-			function fetchData() {
-
-				++iteration;
-
-				function onDataReceived(series) {
-
-					// Load all the data in one pass; if we only got partial
-					// data we could merge it with what we already have.
-
-					data = [ series ];
-					$.plot("#placeholder", data, options);
-				}
-
-				// Normally we call the same URL - a script connected to a
-				// database - but in this case we only have static example
-				// files, so we need to modify the URL.
-
-				$.ajax({
-					url: "data-eu-gdp-growth-" + iteration + ".json",
-					type: "GET",
-					dataType: "json",
-					success: onDataReceived
-				});
-
-				if (iteration < 5) {
-					setTimeout(fetchData, 1000);
-				} else {
-					data = [];
-					alreadyFetched = {};
-				}
-			}
-
-			setTimeout(fetchData, 1000);
-		});
-
-		// Load the first series by default, so we don't have an empty plot
-
-		$("button.fetchSeries:first").click();
-
-		// Add the Flot version string to the footer
-
-		$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
-	});
-
-	</script>
-</head>
-<body>
-
-	<div id="header">
-		<h2>AJAX</h2>
-	</div>
-
-	<div id="content">
-
-		<div class="demo-container">
-			<div id="placeholder" class="demo-placeholder"></div>
-		</div>
-
-		<p>Example of loading data dynamically with AJAX. Percentage change in GDP (source: <a href="http://epp.eurostat.ec.europa.eu/tgm/table.do?tab=table&init=1&plugin=1&language=en&pcode=tsieb020">Eurostat</a>). Click the buttons below:</p>
-
-		<p>The data is fetched over HTTP, in this case directly from text files. Usually the URL would point to some web server handler (e.g. a PHP page or Java/.NET/Python/Ruby on Rails handler) that extracts it from a database and serializes it to JSON.</p>
-
-		<p>
-			<button class="fetchSeries">First dataset</button>
-			[ <a href="data-eu-gdp-growth.json">see data</a> ]
-			<span></span>
-		</p>
-
-		<p>
-			<button class="fetchSeries">Second dataset</button>
-			[ <a href="data-japan-gdp-growth.json">see data</a> ]
-			<span></span>
-		</p>
-
-		<p>
-			<button class="fetchSeries">Third dataset</button>
-			[ <a href="data-usa-gdp-growth.json">see data</a> ]
-			<span></span>
-		</p>
-
-		<p>If you combine AJAX with setTimeout, you can poll the server for new data.</p>
-
-		<p>
-			<button class="dataUpdate">Poll for data</button>
-		</p>
-
-	</div>
-
-	<div id="footer">
-		Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
-	</div>
-
-</body>
-</html>

front/lib/AdminLTE/bower_components/Flot/examples/annotating/index.html

@@ -1,87 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>Flot Examples: Adding Annotations</title>
-	<link href="../examples.css" rel="stylesheet" type="text/css">
-	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
-	<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script type="text/javascript">
-
-	$(function() {
-
-		var d1 = [];
-		for (var i = 0; i < 20; ++i) {
-			d1.push([i, Math.sin(i)]);
-		}
-
-		var data = [{ data: d1, label: "Pressure", color: "#333" }];
-
-		var markings = [
-			{ color: "#f6f6f6", yaxis: { from: 1 } },
-			{ color: "#f6f6f6", yaxis: { to: -1 } },
-			{ color: "#000", lineWidth: 1, xaxis: { from: 2, to: 2 } },
-			{ color: "#000", lineWidth: 1, xaxis: { from: 8, to: 8 } }
-		];
-
-		var placeholder = $("#placeholder");
-
-		var plot = $.plot(placeholder, data, {
-			bars: { show: true, barWidth: 0.5, fill: 0.9 },
-			xaxis: { ticks: [], autoscaleMargin: 0.02 },
-			yaxis: { min: -2, max: 2 },
-			grid: { markings: markings }
-		});
-
-		var o = plot.pointOffset({ x: 2, y: -1.2});
-
-		// Append it to the placeholder that Flot already uses for positioning
-
-		placeholder.append("<div style='position:absolute;left:" + (o.left + 4) + "px;top:" + o.top + "px;color:#666;font-size:smaller'>Warming up</div>");
-
-		o = plot.pointOffset({ x: 8, y: -1.2});
-		placeholder.append("<div style='position:absolute;left:" + (o.left + 4) + "px;top:" + o.top + "px;color:#666;font-size:smaller'>Actual measurements</div>");
-
-		// Draw a little arrow on top of the last label to demonstrate canvas
-		// drawing
-
-		var ctx = plot.getCanvas().getContext("2d");
-		ctx.beginPath();
-		o.left += 4;
-		ctx.moveTo(o.left, o.top);
-		ctx.lineTo(o.left, o.top - 10);
-		ctx.lineTo(o.left + 10, o.top - 5);
-		ctx.lineTo(o.left, o.top);
-		ctx.fillStyle = "#000";
-		ctx.fill();
-
-		// Add the Flot version string to the footer
-
-		$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
-	});
-
-	</script>
-</head>
-<body>
-
-	<div id="header">
-		<h2>Adding Annotations</h2>
-	</div>
-
-	<div id="content">
-
-		<div class="demo-container">
-			<div id="placeholder" class="demo-placeholder"></div>
-		</div>
-
-		<p>Flot has support for simple background decorations such as lines and rectangles. They can be useful for marking up certain areas. You can easily add any HTML you need with standard DOM manipulation, e.g. for labels. For drawing custom shapes there is also direct access to the canvas.</p>
-
-	</div>
-
-	<div id="footer">
-		Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
-	</div>
-
-</body>
-</html>

front/lib/AdminLTE/bower_components/Flot/examples/axes-interacting/index.html

@@ -1,97 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<title>Flot Examples: Interacting with axes</title>
-	<link href="../examples.css" rel="stylesheet" type="text/css">
-	<!--[if lte IE 8]><script language="javascript" type="text/javascript" src="../../excanvas.min.js"></script><![endif]-->
-	<script language="javascript" type="text/javascript" src="../../jquery.js"></script>
-	<script language="javascript" type="text/javascript" src="../../jquery.flot.js"></script>
-	<script type="text/javascript">
-
-	$(function() {
-
-		function generate(start, end, fn) {
-			var res = [];
-			for (var i = 0; i <= 100; ++i) {
-				var x = start + i / 100 * (end - start);
-				res.push([x, fn(x)]);
-			}
-			return res;
-		}
-
-		var data = [
-			{ data: generate(0, 10, function (x) { return Math.sqrt(x);}), xaxis: 1, yaxis:1 },
-			{ data: generate(0, 10, function (x) { return Math.sin(x);}), xaxis: 1, yaxis:2 },
-			{ data: generate(0, 10, function (x) { return Math.cos(x);}), xaxis: 1, yaxis:3 },
-			{ data: generate(2, 10, function (x) { return Math.tan(x);}), xaxis: 2, yaxis: 4 }
-		];
-
-		var plot = $.plot("#placeholder", data, {
-			xaxes: [
-				{ position: 'bottom' },
-				{ position: 'top'}
-			],
-			yaxes: [
-				{ position: 'left' },
-				{ position: 'left' },
-				{ position: 'right' },
-				{ position: 'left' }
-			]
-		});
-
-		// Create a div for each axis
-
-		$.each(plot.getAxes(), function (i, axis) {
-			if (!axis.show)
-				return;
-
-			var box = axis.box;
-
-			$("<div class='axisTarget' style='position:absolute; left:" + box.left + "px; top:" + box.top + "px; width:" + box.width +  "px; height:" + box.height + "px'></div>")
-				.data("axis.direction", axis.direction)
-				.data("axis.n", axis.n)
-				.css({ backgroundColor: "#f00", opacity: 0, cursor: "pointer" })
-				.appendTo(plot.getPlaceholder())
-				.hover(
-					function () { $(this).css({ opacity: 0.10 }) },
-					function () { $(this).css({ opacity: 0 }) }
-				)
-				.click(function () {
-					$("#click").text("You clicked the " + axis.direction + axis.n + "axis!")
-				});
-		});
-
-		// Add the Flot version string to the footer
-
-		$("#footer").prepend("Flot " + $.plot.version + " &ndash; ");
-	});
-
-	</script>
-</head>
-<body>
-
-	<div id="header">
-		<h2>Interacting with axes</h2>
-	</div>
-
-	<div id="content">
-
-		<div class="demo-container">
-			<div id="placeholder" class="demo-placeholder"></div>
-		</div>
-
-		<p>With multiple axes, you sometimes need to interact with them. A simple way to do this is to draw the plot, deduce the axis placements and insert a couple of divs on top to catch events.</p>
-
-		<p>Try clicking an axis.</p>
-
-		<p id="click"></p>
-
-	</div>
-
-	<div id="footer">
-		Copyright &copy; 2007 - 2014 IOLA and Ole Laursen
-	</div>
-
-</body>
-</html>