Merge branch 'origin/main' into Weblate.

Currently translated at 100.0% (718 of 718 strings)

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

.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

Dockerfile

@@ -15,7 +15,7 @@ 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  \
     && 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 {} \;"

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)
 
 # 🖧🔍 Network scanner & notification framework
 
@@ -95,7 +95,6 @@ Thank you to all the wonderful people who are sponsoring this project.
 <!-- SPONSORS-LIST DO NOT MODIFY BELOW -->
 | All Sponsors |
 |---|
-| [joel72265](https://github.com/joel72265) |
 
 <!-- SPONSORS-LIST DO NOT MODIFY ABOVE -->
 

docker-compose.yml

@@ -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
@@ -64,7 +65,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,9 +41,11 @@ 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` |
-|`APP_CONF_OVERRIDE` | JSON override for settings, e.g. `{"SCAN_SUBNETS":"['192.168.1.0/24 --interface=eth1']","UI_dark_mode":"True"}` (Experimental 🧪)  |  `N/A` |
+|`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
 
 > [!NOTE]
@@ -237,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

docs/API.md

@@ -58,38 +58,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/BACKUPS.md

@@ -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/DEBUG_PLUGINS.md

@@ -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,6 +49,17 @@ 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

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

@@ -11,16 +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.
+1. **Scan Device** - Completely disable the scanning of the device.
+2. **Alert Events** - Enables alerts of connections, disconnections, IP changes.
+3. **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.
 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.
 
 ## Plugin settings 🔌
@@ -40,7 +39,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

@@ -22,3 +22,10 @@ The database cleanup plugin. Check details and related setting in the [DB Cleanu
 ### 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

@@ -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" : [{
@@ -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",
@@ -527,7 +527,7 @@ The UI component is defined as a JSON object containing a list of `elements`. Ea
 
 ```json
 {
-      "function": "dev_Icon",
+      "function": "devIcon",
       "type": {
         "dataType": "string",
         "elements": [
@@ -536,7 +536,7 @@ The UI component is defined as a JSON object containing a list of `elements`. Ea
             "elementOptions": [
               { "cssClasses": "input-group-addon iconPreview" },
               { "getStringKey": "Gen_SelectToPreview" },
-              { "customId": "NEWDEV_dev_Icon_preview" }
+              { "customId": "NEWDEV_devIcon_preview" }
             ],
             "transformers": []
           },
@@ -548,7 +548,7 @@ The UI component is defined as a JSON object containing a list of `elements`. Ea
               {
                 "onChange": "updateIconPreview(this)"
               },
-              { "customParams": "NEWDEV_dev_Icon,NEWDEV_dev_Icon_preview" }
+              { "customParams": "NEWDEV_devIcon,NEWDEV_devIcon_preview" }
             ],
             "transformers": []
           }          
@@ -649,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. |
@@ -669,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": "",
@@ -678,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)
@@ -64,6 +65,7 @@ There is also an in-app Help / FAQ section that should be answering frequently a
 
 - [Version history (legacy)](/docs/VERSIONS_HISTORY.md)
 - [Reverse proxy (Nginx, Apache, SWAG)](/docs/REVERSE_PROXY.md)
+- [Installing Updates](/docs/UPDATES.md)
 - [Setting up Authelia](/docs/AUTHELIA.md) (DRAFT)
 
 #### 👩‍💻For Developers👨‍💻

docs/SUBNETS.md

@@ -110,3 +110,21 @@ Please note the accessibility of macvlans when configured on the same computer.
 
 - 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/front/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/front/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.

front/css/app.css

@@ -12,11 +12,26 @@
 ----------------------------------------------------------------------------- */
 :root {
     --color-aqua: #00c0ef;
+    --color-blue: #0060df;
     --color-green: #00a65a;
     --color-yellow: #f39c12;
     --color-red: #dd4b39;
 }
 
+/* -----------------------------------------------------------------------------
+   Helper Classes
+----------------------------------------------------------------------------- */
+
+.pointer
+{
+    cursor: pointer;
+}
+
+.question
+{
+    cursor: help;
+}
+
 /* -----------------------------------------------------------------------------
    Text Classes
 ----------------------------------------------------------------------------- */
@@ -212,6 +227,12 @@
 {
     line-height: 30px;
 }
+
+body
+{
+    background-image: url('../img/background.png');
+}
+
 /* -----------------------------------------------------------------------------
    Customized Main Menu
 ----------------------------------------------------------------------------- */
@@ -772,6 +793,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                            */
 /* --------------------------------------------------------- */
@@ -1052,7 +1102,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 {
@@ -1062,11 +1116,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 {
@@ -1085,7 +1140,7 @@ input[readonly] {
     width: 14px;
     position: absolute;
     right: -6px;
-    top: 6px;
+    top: 13px;
 
 }
 
@@ -1097,9 +1152,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 
@@ -1136,7 +1191,6 @@ input[readonly] {
     height: 200px; */
     background-color: #f3f3f3;
     border: 1px solid #ccc;
-    margin: 20px;
     z-index: 10;
   }
 
@@ -1176,11 +1230,6 @@ input[readonly] {
     font-size: large;
 }
 
-.pointer
-{
-    cursor: pointer;
-}
-
 .drag
 {
     cursor: move; /* fallback if grab cursor is unsupported */
@@ -1203,7 +1252,7 @@ input[readonly] {
     background-color:#606060 !important;
 }
 
-.networkPageHelp{
+.helpIconSmallTopRight{
     position: absolute;
     font-size: x-small;
     margin-bottom: 6px;
@@ -1320,7 +1369,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;
 }
@@ -1401,7 +1451,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
@@ -1456,6 +1516,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/deviceDetails.php

@@ -325,7 +325,7 @@
                       </div>
 
                       <!-- Network -->
-                      <h4 class="bottom-border-aqua"><?= lang('DevDetail_MainInfo_Network_Title');?><span class="networkPageHelp"> <a target="_blank" href="https://github.com/jokob-sk/NetAlertX/blob/main/docs/NETWORK_TREE.md"><i class="fa fa-circle-question"></i></a><span></h4>                    
+                      <h4 class="bottom-border-aqua"><?= lang('DevDetail_MainInfo_Network_Title');?><span class="helpIconSmallTopRight"> <a target="_blank" href="https://github.com/jokob-sk/NetAlertX/blob/main/docs/NETWORK_TREE.md"><i class="fa fa-circle-question"></i></a><span></h4>                    
                       <div class="form-group" title="<?= lang('DevDetail_Network_Node_hover');?>">
                         <label class="col-sm-3 control-label"><?= lang('DevDetail_MainInfo_Network');?></label>
                         <div class="col-sm-9">  
@@ -370,7 +370,8 @@
 
     <!-- column 3 -->
                   <div class="col-lg-4 col-sm-6 col-xs-12">
-                    <h4 class="bottom-border-aqua"><?= lang('DevDetail_EveandAl_Title');?></h4>
+                    <h4 class="bottom-border-aqua"><?= lang('DevDetail_EveandAl_Title');?>
+                    <span class="helpIconSmallTopRight"> <a target="_blank" href="https://github.com/jokob-sk/NetAlertX/blob/main/docs/NOTIFICATIONS.md"><i class="fa fa-circle-question"></i></a><span></h4>
                     <div class="box-body form-horizontal">
 
                       <!-- Scan Cycle -->
@@ -455,7 +456,8 @@
                             <i style="font-size: 24px;" class="text-yellow glyphicon glyphicon-random"></i> &nbsp &nbsp </span>
 
                           <a href="https://github.com/jokob-sk/NetAlertX/blob/main/docs/RANDOM_MAC.md" target="_blank" style="color: #777;"> 
-                            <i class="fa fa-info-circle"></i> </a>
+                            <i class="fa fa-info-circle"></i> 
+                          </a>
                         </div>
                       </div>
                     </div>
@@ -641,8 +643,14 @@
 
 <!-- Dark-Mode Patch -->
 <?php
-if ($ENABLED_DARKMODE === True) {
-   echo '<link rel="stylesheet" href="css/dark-patch-cal.css">';
+switch ($UI_THEME) {
+  case "Dark":
+    echo '<link rel="stylesheet" href="css/dark-patch-cal.css">';
+    break;
+  case "System":
+    echo '<link rel="stylesheet" href="css/system-dark-patch-cal.css">';
+    break;
+
 }
 ?>
 
@@ -673,7 +681,7 @@ if ($ENABLED_DARKMODE === True) {
       // 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.dev_MAC)) {
+        if (visibleDevicesMACs.includes(item.devMac)) {
           devicesList_tmp.push(item);
         }
       });
@@ -819,12 +827,12 @@ function initializeCombos () {
   //                      nameTransformer)   // callback to transform name
 
 
-  generateOptionsOrSetOptions("NEWDEV_dev_Icon", [], "dropdownIcon_tmp", genListWithInputSet, 'txtIcon', ["base64"])
-  generateOptionsOrSetOptions("NEWDEV_dev_DeviceType", [], "dropdownDeviceType_tmp", genListWithInputSet, 'txtDeviceType' )
-  generateOptionsOrSetOptions("NEWDEV_dev_Owner", [], "dropdownOwner_tmp", genListWithInputSet, 'txtOwner' )
-  generateOptionsOrSetOptions("NEWDEV_dev_Group", [], "dropdownGroup_tmp", genListWithInputSet, 'txtGroup' )
-  generateOptionsOrSetOptions("NEWDEV_dev_Location", [], "dropdownLocation_tmp", genListWithInputSet, 'txtLocation' )
-  generateOptionsOrSetOptions("NEWDEV_dev_Network_Node_MAC_ADDR", [], "dropdownNetworkNodeMac_tmp", genListWithInputSet, 'txtNetworkNodeMac' )
+  generateOptionsOrSetOptions("NEWDEV_devIcon", [], "dropdownIcon_tmp", genListWithInputSet, 'txtIcon', ["base64"])
+  generateOptionsOrSetOptions("NEWDEV_devType", [], "dropdownDeviceType_tmp", genListWithInputSet, 'txtDeviceType' )
+  generateOptionsOrSetOptions("NEWDEV_devOwner", [], "dropdownOwner_tmp", genListWithInputSet, 'txtOwner' )
+  generateOptionsOrSetOptions("NEWDEV_devGroup", [], "dropdownGroup_tmp", genListWithInputSet, 'txtGroup' )
+  generateOptionsOrSetOptions("NEWDEV_devLocation", [], "dropdownLocation_tmp", genListWithInputSet, 'txtLocation' )
+  generateOptionsOrSetOptions("NEWDEV_devParentMAC", [], "dropdownNetworkNodeMac_tmp", genListWithInputSet, 'txtNetworkNodeMac' )
 
   // Initialize static combos
   initializeComboSkipRepeated ();
@@ -1163,7 +1171,7 @@ function getDeviceData (readAllData=false) {
     var deviceData = JSON.parse(data);
 
     // check device exists
-    if (deviceData['dev_MAC'] == null) {
+    if (deviceData['devMac'] == null) {
       // Status
       $('#deviceStatus').html ('--');
       $('#deviceStatus')[0].className = 'text-gray';
@@ -1219,16 +1227,16 @@ function getDeviceData (readAllData=false) {
     } else {
 
       // Name
-      if (deviceData['dev_Owner'] == null || deviceData['dev_Owner'] == '' ||
-      (deviceData['dev_Name'].toString()).indexOf (deviceData['dev_Owner']) != -1 )  {
-        $('#pageTitle').html (deviceData['dev_Name']);
+      if (deviceData['devOwner'] == null || deviceData['devOwner'] == '' ||
+      (deviceData['devName'].toString()).indexOf (deviceData['devOwner']) != -1 )  {
+        $('#pageTitle').html (deviceData['devName']);
       } else {
-        $('#pageTitle').html (deviceData['dev_Name'] + ' ('+ deviceData['dev_Owner'] +')');
+        $('#pageTitle').html (deviceData['devName'] + ' ('+ deviceData['devOwner'] +')');
       }
 
       // Status
-      $('#deviceStatus').html (deviceData['dev_Status'].replace('-', ''));
-      switch (deviceData['dev_Status']) {
+      $('#deviceStatus').html (deviceData['devStatus'].replace('-', ''));
+      switch (deviceData['devStatus']) {
         case 'On-line':   icon='fa fa-check';    color='text-green';   break;
         case 'Off-line':  icon='fa fa-close';    color='text-gray';    break;
         case 'Down':      icon='fa fa-warning';  color='text-red';     break;
@@ -1239,16 +1247,16 @@ function getDeviceData (readAllData=false) {
       $('#deviceStatusIcon')[0].className = icon +' '+ color;
   
       // Totals
-      $('#deviceSessions').html   (deviceData['dev_Sessions'].toLocaleString());
-      $('#deviceDownAlerts').html (deviceData['dev_DownAlerts'].toLocaleString());
+      $('#deviceSessions').html   (deviceData['devSessions'].toLocaleString());
+      $('#deviceDownAlerts').html (deviceData['devDownAlerts'].toLocaleString());
   
       // Presence
       $('#deviceEventsTitle').html ('Presence');
       $('#deviceEventsIcon').html  ('<i class="fa fa-calendar">');
-      if (deviceData['dev_PresenceHours'] == null || deviceData['dev_PresenceHours'] < 0) {
+      if (deviceData['devPresenceHours'] == null || deviceData['devPresenceHours'] < 0) {
         $('#deviceEvents').html ('0 h.');
       } else {
-        $('#deviceEvents').html (deviceData['dev_PresenceHours'].toLocaleString() +' h.');
+        $('#deviceEvents').html (deviceData['devPresenceHours'].toLocaleString() +' h.');
       }
   
       // Device info
@@ -1256,7 +1264,7 @@ function getDeviceData (readAllData=false) {
         // Activate controls
         $('#panDetails :input').attr('disabled', false);
 
-        mac                                          = deviceData['dev_MAC'];
+        mac                                          = deviceData['devMac'];
 
         // update the mac parameter in the URL, this makes the selected device persistent when the page is reloaded
         var searchParams = new URLSearchParams(window.location.search);
@@ -1267,51 +1275,51 @@ function getDeviceData (readAllData=false) {
         
         devicesList = getDevicesList();        
 
-        // handle empty dev_Network_Node_MAC_ADDR
-        networkParentMac = deviceData['dev_Network_Node_MAC_ADDR']
+        // handle empty devParentMAC
+        networkParentMac = deviceData['devParentMAC']
         if(networkParentMac)
         {
-          networkParentMacName = getDeviceDataByMac(deviceData['dev_Network_Node_MAC_ADDR'], "dev_Name")
+          networkParentMacName = getDeviceDataByMac(deviceData['devParentMAC'], "devName")
         } else
         {
           networkParentMacName = '--'
         }
 
-        $('#txtMAC').val                             (deviceData['dev_MAC']);
-        $('#txtName').val                            (deviceData['dev_Name']);
-        $('#txtOwner').val                           (deviceData['dev_Owner']);
-        $('#txtDeviceType').val                      (deviceData['dev_DeviceType']);
-        $('#txtVendor').val                          (deviceData['dev_Vendor']);
-        $('#txtIcon').val                            (initDefault(deviceData['dev_Icon'], 'PGkgY2xhc3M9ImZhIGZhLWxhcHRvcCI+PC9pPg==')); // base64 laptop icon
+        $('#txtMAC').val                             (deviceData['devMac']);
+        $('#txtName').val                            (deviceData['devName']);
+        $('#txtOwner').val                           (deviceData['devOwner']);
+        $('#txtDeviceType').val                      (deviceData['devType']);
+        $('#txtVendor').val                          (deviceData['devVendor']);
+        $('#txtIcon').val                            (initDefault(deviceData['devIcon'], 'PGkgY2xhc3M9ImZhIGZhLWxhcHRvcCI+PC9pPg==')); // base64 laptop icon
         $('#txtIcon').trigger('change')
   
-        if (deviceData['dev_Favorite'] == 1)         {$('#chkFavorite').iCheck('check');}    else {$('#chkFavorite').iCheck('uncheck');}
-        $('#txtGroup').val                           (deviceData['dev_Group']);
-        $('#txtLocation').val                        (deviceData['dev_Location']);
-        $('#txtComments').val                        (decodeSpecialChars(deviceData['dev_Comments']));        
+        if (deviceData['devFavorite'] == 1)         {$('#chkFavorite').iCheck('check');}    else {$('#chkFavorite').iCheck('uncheck');}
+        $('#txtGroup').val                           (deviceData['devGroup']);
+        $('#txtLocation').val                        (deviceData['devLocation']);
+        $('#txtComments').val                        (decodeSpecialChars(deviceData['devComments']));        
         $('#txtNetworkNodeMac').val                  ( networkParentMacName) ;
-        $('#txtNetworkNodeMac').attr                 ('data-mynodemac', deviceData['dev_Network_Node_MAC_ADDR']);        
-        $('#txtNetworkPort').val                     (deviceData['dev_Network_Node_port']);
-        $('#txtNetworkSite').val                     (deviceData['dev_NetworkSite']);
-        $('#txtSSID').val                            (deviceData['dev_SSID']);
+        $('#txtNetworkNodeMac').attr                 ('data-mynodemac', deviceData['devParentMAC']);        
+        $('#txtNetworkPort').val                     (deviceData['devParentPort']);
+        $('#txtNetworkSite').val                     (deviceData['devSite']);
+        $('#txtSSID').val                            (deviceData['devSSID']);
         // disabling network node configuration if root Internet node
         toggleNetworkConfiguration(mac == 'Internet')         
         
   
-        $('#txtFirstConnection').val                 (deviceData['dev_FirstConnection']);
-        $('#txtLastConnection').val                  (deviceData['dev_LastConnection']);
-        $('#txtLastIP').val                          (deviceData['dev_LastIP']);
-        $('#txtStatus').val                          (deviceData['dev_Status'].replace('-', ''));
-        if (deviceData['dev_StaticIP'] == 1)         {$('#chkStaticIP').iCheck('check');}    else {$('#chkStaticIP').iCheck('uncheck');}
+        $('#txtFirstConnection').val                 (deviceData['devFirstConnection']);
+        $('#txtLastConnection').val                  (deviceData['devLastConnection']);
+        $('#txtLastIP').val                          (deviceData['devLastIP']);
+        $('#txtStatus').val                          (deviceData['devStatus'].replace('-', ''));
+        if (deviceData['devStaticIP'] == 1)         {$('#chkStaticIP').iCheck('check');}    else {$('#chkStaticIP').iCheck('uncheck');}
     
-        $('#txtScanCycle').val                       (deviceData['dev_ScanCycle'] == "1" ? "yes" : "no");
-        if (deviceData['dev_AlertEvents'] == 1)      {$('#chkAlertEvents').iCheck('check');} else {$('#chkAlertEvents').iCheck('uncheck');}
-        if (deviceData['dev_AlertDeviceDown'] == 1)  {$('#chkAlertDown').iCheck('check');}   else {$('#chkAlertDown').iCheck('uncheck');}
-        $('#txtSkipRepeated').val                    (findSkipRepeated (deviceData['dev_SkipRepeated']));
-        if (deviceData['dev_NewDevice'] == 1)        {$('#chkNewDevice').iCheck('check');}   else {$('#chkNewDevice').iCheck('uncheck');}
-        if (deviceData['dev_Archived'] == 1)         {$('#chkArchived').iCheck('check');}    else {$('#chkArchived').iCheck('uncheck');}
+        $('#txtScanCycle').val                       (deviceData['devScan'] == "1" ? "yes" : "no");
+        if (deviceData['devAlertEvents'] == 1)      {$('#chkAlertEvents').iCheck('check');} else {$('#chkAlertEvents').iCheck('uncheck');}
+        if (deviceData['devAlertDown'] == 1)  {$('#chkAlertDown').iCheck('check');}   else {$('#chkAlertDown').iCheck('uncheck');}
+        $('#txtSkipRepeated').val                    (findSkipRepeated (deviceData['devSkipRepeated']));
+        if (deviceData['devIsNew'] == 1)        {$('#chkNewDevice').iCheck('check');}   else {$('#chkNewDevice').iCheck('uncheck');}
+        if (deviceData['devIsArchived'] == 1)         {$('#chkArchived').iCheck('check');}    else {$('#chkArchived').iCheck('uncheck');}
 
-        if (deviceData['dev_RandomMAC'] == 1)        {$('#iconRandomMACactive').removeClass   ('hidden');
+        if (deviceData['devRandomMAC'] == 1)        {$('#iconRandomMACactive').removeClass   ('hidden');
                                                       $('#iconRandomMACinactive').addClass    ('hidden'); }
         else                                         {$('#iconRandomMACactive').addClass      ('hidden');
                                                       $('#iconRandomMACinactive').removeClass ('hidden'); };        
@@ -1321,7 +1329,7 @@ function getDeviceData (readAllData=false) {
       pos = devicesList.findIndex(item => item.rowid == deviceData['rowid']);          
       
       if (pos == -1) {
-        devicesList.push({"rowid" : deviceData['rowid'], "mac" : deviceData['dev_MAC'], "name": deviceData['dev_Name'], "type": deviceData['dev_DeviceType']});
+        devicesList.push({"rowid" : deviceData['rowid'], "mac" : deviceData['devMac'], "name": deviceData['devName'], "type": deviceData['devType']});
         pos=0;
       }
     }
@@ -1393,7 +1401,7 @@ function performSwitch(direction)
   // get new mac from the devicesList. Don't change to the commented out line below, the mac query string in the URL isn't updated yet!
   // mac = params.mac;
   
-  mac = devicesList[pos].dev_MAC.toString();
+  mac = devicesList[pos].devMac.toString();
 
   setCache("piaDeviceDetailsMac", mac);
     
@@ -1720,7 +1728,7 @@ function setTextValue (textElement, textValue) {
   if(textElement == "txtNetworkNodeMac")
   {
     $('#'+textElement).attr ('data-mynodemac', textValue);
-    $('#'+textElement).val (getDeviceDataByMac(textValue, "dev_Name")); 
+    $('#'+textElement).val (getDeviceDataByMac(textValue, "devName")); 
   } else
   {
     $('#'+textElement).attr ('data-myvalue', textValue);

front/deviceDetailsTools.php

@@ -77,16 +77,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(getDeviceDataByMac(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(getDeviceDataByMac(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(getDeviceDataByMac(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(getDeviceDataByMac(getMac(), 'devLastIP'), 'skipdiscovery')">
         <?= lang("DevDetail_Loading") ?>
     </button>
 
@@ -155,7 +155,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=" + getDeviceDataByMac(getMac(), 'devLastIP') + "",
                     beforeSend: function() { $('#tracerouteoutput').addClass("ajax_scripts_loading"); },
                     complete: function() { $('#tracerouteoutput').removeClass("ajax_scripts_loading"); },
                     success: function(data, textStatus) {
@@ -170,7 +170,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=" + getDeviceDataByMac(getMac(), 'devLastIP') + "",
                     beforeSend: function() { $('#nslookupoutput').addClass("ajax_scripts_loading"); },
                     complete: function() { $('#nslookupoutput').removeClass("ajax_scripts_loading"); },
                     success: function(data, textStatus) {

front/devices.php

@@ -159,6 +159,8 @@
   var tableColumnHide = [];
   var tableColumnOrder = [];
   var tableColumnVisible = [];
+  headersDefaultOrder = [];
+  missingNumbers = [];
 
   // Read parameters & Initialize components
   callAfterAppInitialized(main)
@@ -167,9 +169,14 @@
 // -----------------------------------------------------------------------------
 function main () {
 
+  showSpinner();
+
+  // render tiles
+  getDevicesTotals();
+
   //initialize the table headers in the correct order
   var availableColumns = getSettingOptions("UI_device_columns").split(",");
-  var headersDefaultOrder = availableColumns.map(val => getString(val));
+  headersDefaultOrder = availableColumns.map(val => getString(val));
   var selectedColumns = JSON.parse(getSetting("UI_device_columns").replace(/'/g, '"'));
 
   // generate default order lists of given length
@@ -190,27 +197,11 @@ function main () {
   const fullArray = Array.from({ length: tableColumnOrder.length }, (_, i) => i);
 
   // Filter out the elements already present in inputArray
-  const missingNumbers = fullArray.filter(num => !tableColumnVisible.includes(num));
+  missingNumbers = fullArray.filter(num => !tableColumnVisible.includes(num));
 
   // Concatenate the inputArray with the missingNumbers
   tableColumnOrder = [...tableColumnVisible, ...missingNumbers];
 
-  // render table headers
-  html = '';
-                                  
-  for(index = 0; index < tableColumnOrder.length; index++)
-  {
-    html += '<th>' + headersDefaultOrder[tableColumnOrder[index]] + '</th>';
-  }
-
-  $('#tableDevices tr').html(html);  
-
-  // Hide UI elements as per settings
-  // setTimeout(() => {
-    hideUIelements("UI_DEV_SECTIONS")
-    
-  // }, 10);
-
   // Initialize components with parameters
   initializeDatatable(getUrlAnchor('my_devices'));
   
@@ -235,60 +226,77 @@ function mapIndx(oldIndex)
 //------------------------------------------------------------------------------
 //  Query total numbers of Devices by status
 //------------------------------------------------------------------------------
-function getDevicesTotals(devicesData) {
+function getDevicesTotals() {
+  // Check cache first
+  let resultJSON = getCache("getDevicesTotals");
 
-  let resultJSON = "";
-
-  if (getCache("getDevicesTotals") !== "") {
-    resultJSON = getCache("getDevicesTotals");
+  if (resultJSON !== "") {
+    resultJSON = JSON.parse(resultJSON);
+    processDeviceTotals(resultJSON);
   } else {
+    // Fetch data via AJAX
+    $.ajax({
+      url: "/api/table_devices_tiles.json",
+      type: "GET",
+      dataType: "json",
+      success: function(response) {
+        if (response && response.data) {
+          resultJSON = response.data[0]; // Assuming the structure {"data": [ ... ]}
+          
+          // Save the result to cache
+          setCache("getDevicesTotals", JSON.stringify(resultJSON));
 
-    // Define filter conditions and corresponding objects
-    const filters = [
-      { status: 'my_devices', color: 'bg-aqua',   label: getString('Device_Shortcut_AllDevices'), icon: 'fa-laptop' },
-      { status: 'all',        color: 'bg-aqua',   label: getString('Gen_All_Devices'),            icon: 'fa-laptop' },
-      { status: 'connected',  color: 'bg-green',  label: getString('Device_Shortcut_Connected'),  icon: 'fa-plug' },
-      { status: 'favorites',  color: 'bg-yellow', label: getString('Device_Shortcut_Favorites'),  icon: 'fa-star' },
-      { status: 'new',        color: 'bg-yellow', label: getString('Device_Shortcut_NewDevices'), icon: 'fa-plus' },
-      { status: 'down',       color: 'bg-red',    label: getString('Device_Shortcut_DownOnly'),   icon: 'fa-warning' },
-      { status: 'archived',   color: 'bg-gray',   label: getString('Device_Shortcut_Archived'),   icon: 'fa-eye-slash' },
-      { status: 'offline',    color: 'bg-gray',   label: getString('Gen_Offline'),                icon: 'fa-xmark' }
-    ];
-
-    // Initialize an empty array to store the final objects
-    let dataArray = [];
-
-    // Loop through each filter condition
-    filters.forEach(filter => {
-      // Calculate count dynamically based on filter condition
-      let count = filterDataByStatus(devicesData, filter.status).length;
-
-      // Check any condition to skip adding the object to dataArray
-      if (
-        (['', 'False'].includes(getSetting('UI_hide_empty')) || (getSetting('UI_hide_empty') == "True" && count > 0)) &&
-        (getSetting('UI_shown_cards') == "" || getSetting('UI_shown_cards').includes(filter.status))
-      ) {
-        dataArray.push({
-          onclickEvent: `initializeDatatable('${filter.status}')`,
-          color: filter.color,
-          title: count,
-          label: filter.label,
-          icon: filter.icon
-        });
+          // Process the fetched data
+          processDeviceTotals(resultJSON);
+        } else {
+          console.error("Invalid response format from API");
+        }
+      },
+      error: function(xhr, status, error) {
+        console.error("Failed to fetch devices data:", error);
       }
-
     });
+  }
+}
 
-    // render info boxes/tile cards
-    renderInfoboxes(
-      dataArray
-    )
+function processDeviceTotals(devicesData) {
+  // Define filter conditions and corresponding objects
+  const filters = [
+    { status: 'my_devices', color: 'bg-aqua',   label: getString('Device_Shortcut_AllDevices'), icon: 'fa-laptop' },
+    { status: 'all',        color: 'bg-aqua',   label: getString('Gen_All_Devices'),            icon: 'fa-laptop' },
+    { status: 'connected',  color: 'bg-green',  label: getString('Device_Shortcut_Connected'),  icon: 'fa-plug' },
+    { status: 'favorites',  color: 'bg-yellow', label: getString('Device_Shortcut_Favorites'),  icon: 'fa-star' },
+    { status: 'new',        color: 'bg-yellow', label: getString('Device_Shortcut_NewDevices'), icon: 'fa-plus' },
+    { status: 'down',       color: 'bg-red',    label: getString('Device_Shortcut_DownOnly'),   icon: 'fa-warning' },
+    { status: 'archived',   color: 'bg-gray',   label: getString('Device_Shortcut_Archived'),   icon: 'fa-eye-slash' },
+    { status: 'offline',    color: 'bg-gray',   label: getString('Gen_Offline'),                icon: 'fa-xmark' }
+  ];
 
-    // save to cache
-    setCache("getDevicesTotals", resultJSON);
-  }  
+  // Initialize an empty array to store the final objects
+  let dataArray = [];
 
-  // console.log(resultJSON);
+  // Loop through each filter condition
+  filters.forEach(filter => {
+    // Get count directly from API response data
+    let count = devicesData[filter.status] || 0;
+
+    // Check any condition to skip adding the object to dataArray
+    if (
+      (['', 'False'].includes(getSetting('UI_hide_empty')) || (getSetting('UI_hide_empty') == "True" && count > 0)) &&
+      (getSetting('UI_shown_cards') == "" || getSetting('UI_shown_cards').includes(filter.status))
+    ) {
+      dataArray.push({
+        onclickEvent: `forceLoadUrl('devices.php#${filter.status}')`,
+        color: filter.color,
+        title: count,
+        label: filter.label,
+        icon: filter.icon
+      });
+    }
+  });
+
+  // Render info boxes/tile cards
+  renderInfoboxes(dataArray);
 }
 
 //------------------------------------------------------------------------------
@@ -318,68 +326,79 @@ function filterDataByStatus(data, status) {
         
         let result = true;
 
-        if (!to_display.includes('down') && item.dev_PresentLastScan === 0 && item.dev_AlertDeviceDown !== 0) {
+        if (!to_display.includes('down') && item.devPresentLastScan === 0 && item.devAlertDown !== 0) {
             result = false;
-        } else if (!to_display.includes('new') && item.dev_NewDevice === 1) {
+        } else if (!to_display.includes('new') && item.devIsNew === 1) {
             result = false;
-        } else if (!to_display.includes('archived') && item.dev_Archived === 1) {
+        } else if (!to_display.includes('archived') && item.devIsArchived === 1) {
             result = false;
-        } else if (!to_display.includes('offline') && item.dev_PresentLastScan === 0) {
+        } else if (!to_display.includes('offline') && item.devPresentLastScan === 0) {
             result = false;
-        } else if (!to_display.includes('online') && item.dev_PresentLastScan === 1) {
+        } else if (!to_display.includes('online') && item.devPresentLastScan === 1) {
             result = false;
         }  
 
         return result; // Include all items for 'my_devices' status
       case 'connected':
-        return item.dev_PresentLastScan === 1;
+        return item.devPresentLastScan === 1;
       case 'favorites':
-        return item.dev_Favorite === 1;
+        return item.devFavorite === 1;
       case 'new':
-        return item.dev_NewDevice === 1;
+        return item.devIsNew === 1;
       case 'offline':
-        return item.dev_PresentLastScan === 0;
+        return item.devPresentLastScan === 0;
       case 'down':
-        return (item.dev_PresentLastScan === 0 && item.dev_AlertDeviceDown  !== 0);
+        return (item.devPresentLastScan === 0 && item.devAlertDown  !== 0);
       case 'archived':
-        return item.dev_Archived === 1;
+        return item.devIsArchived === 1;
       default:
         return true; // Include all items for unknown statuses
     }
   });
 }
 
-// -----------------------------------------------------------------------------
-function getDeviceStatus(item)
-{
-  
-  if(item.dev_NewDevice === 1)
-  {
-    return 'New';
-  } 
-  else if(item.dev_PresentLastScan === 1)
-  {
-    return 'On-line';
-  }
-  else if(item.dev_PresentLastScan === 0 && item.dev_AlertDeviceDown  !== 0)
-  {
-    return 'Down';
-  }
-  else if(item.dev_Archived === 1)
-  {
-    return 'Archived';
-  }
-  else if(item.dev_PresentLastScan === 0)
-  {
-    return 'Off-line';
-  }
 
-  return "Unknown status"
+// Map column index to column name for GraphQL query
+function mapColumnIndexToFieldName(index, tableColumnVisible) {
+  // the order is important, don't change it!
+  const columnNames = [
+    "devName", 
+    "devOwner", 
+    "devType", 
+    "devIcon", 
+    "devFavorite", 
+    "devGroup", 
+    "devFirstConnection", 
+    "devLastConnection", 
+    "devLastIP", 
+    "devIsRandomMac",   // resolved on the fly
+    "devStatus", // resolved on the fly
+    "devMac", 
+    "devIpLong", //formatIPlong(device.devLastIP) || "",  // IP orderable
+    "rowid", 
+    "devParentMAC", 
+    "devParentChildrenCount",  // resolved on the fly
+    "devLocation",
+    "devVendor", 
+    "devParentPort", 
+    "devGUID", 
+    "devSyncHubNode", 
+    "devSite", 
+    "devSSID", 
+    "devSourcePlugin",
+    "devPresentLastScan",
+    "devAlertDown"
+  ];
+
+  // console.log("OrderBy: " + columnNames[tableColumnOrder[index]]);  
+
+  return columnNames[tableColumnOrder[index]] || null;
 }
 
-// -----------------------------------------------------------------------------
-function initializeDatatable (status) {
 
+// ---------------------------------------------------------
+function initializeDatatable (status) {
+  
   if(!status)
   {
     status = 'my_devices'
@@ -406,6 +425,17 @@ function initializeDatatable (status) {
   $('#tableDevicesBox')[0].className = 'box box-'+ color;
   $('#tableDevicesTitle').html (tableTitle);
 
+  // render table headers
+  html = '';
+                                  
+  for(index = 0; index < tableColumnOrder.length; index++)
+  {
+    html += '<th>' + headersDefaultOrder[tableColumnOrder[index]] + '</th>';
+  }
+
+  $('#tableDevices tr').html(html);  
+
+  hideUIelements("UI_DEV_SECTIONS")
 
   for(i = 0; i < tableColumnOrder.length; i++)
   {    
@@ -416,304 +446,344 @@ function initializeDatatable (status) {
     }    
   }
 
-  $.get('api/table_devices.json?nocache=' + Date.now(), function(result) {      
+  // todo: dynamically filter based on status
 
-    //  refresh devices cache 
-    devicesListAll_JSON = result["data"]
-    devicesListAll_JSON_str = JSON.stringify(devicesListAll_JSON)
-    setCache('devicesListAll_JSON', devicesListAll_JSON_str)
-    
-    // query data
-    getDevicesTotals(result.data);      
-    
-    // Filter the data based on deviceStatus
-    var filteredData = filterDataByStatus(result.data, deviceStatus);
 
-    // Convert JSON data into the desired format
-    var dataArray = {
-        data: filteredData.map(function(item) {
-            var originalRow = [
-                item.dev_Name || "",
-                item.dev_Owner || "",
-                item.dev_DeviceType || "",
-                item.dev_Icon || "",
-                item.dev_Favorite || "",
-                item.dev_Group || "",
-                // ---
-                item.dev_FirstConnection || "",
-                item.dev_LastConnection || "",
-                item.dev_LastIP || "",
-                (isRandomMAC(item.dev_MAC)) || "", // Check if randomized MAC
-                getDeviceStatus(item) || "",
-                item.dev_MAC || "", // hidden
-                formatIPlong(item.dev_LastIP) || "", // IP orderable
-                item.rowid || "",
-                item.dev_Network_Node_MAC_ADDR || "",
-                getNumberOfChildren(item.dev_MAC, result.data) || 0,
-                item.dev_Location || "",
-                item.dev_Vendor || "",
-                item.dev_Network_Node_port || 0,
-                item.dev_GUID || "",
-                item.dev_SyncHubNodeName || "",
-                item.dev_NetworkSite || "",
-                item.dev_SSID || ""
+  var table = $('#tableDevices').DataTable({
+    "serverSide": true,
+    "processing": true,
+    "ajax": {
+      "url": 'php/server/query_graphql.php',  // PHP endpoint that proxies to the GraphQL server
+      "type": "POST",
+      "contentType": "application/json",
+      "data": function (d) {
+        // Construct GraphQL query with pagination and sorting options
+        let graphqlQuery = `
+          query devices($options: PageQueryOptionsInput) {
+            devices(options: $options) {
+              devices {
+                rowid
+                devMac
+                devName
+                devOwner
+                devType
+                devVendor
+                devFavorite
+                devGroup
+                devComments
+                devFirstConnection
+                devLastConnection
+                devLastIP
+                devStaticIP
+                devScan
+                devLogEvents
+                devAlertEvents
+                devAlertDown
+                devSkipRepeated
+                devLastNotification
+                devPresentLastScan
+                devIsNew
+                devIsRandomMac
+                devLocation
+                devIsArchived
+                devParentMAC
+                devParentPort
+                devIcon
+                devGUID
+                devSite
+                devSSID
+                devSyncHubNode
+                devSourcePlugin
+                devStatus
+                devParentChildrenCount
+                devIpLong
+              }
+              count
+            }
+          }
+        `;
+
+        console.log(d);
+               
+
+        // Prepare query variables for pagination, sorting, and search
+        let query = {
+          "operationName": null,
+          "query": graphqlQuery,
+          "variables": {
+            "options": {
+              "page": Math.floor(d.start / d.length) + 1,  // Page number (1-based)
+              "limit": parseInt(d.length, 10),  // Page size (ensure it's an integer)
+              "sort": d.order && d.order[0] ? [{
+                "field": mapColumnIndexToFieldName(d.order[0].column, tableColumnVisible),  // Sort field from DataTable column
+                "order": d.order[0].dir.toUpperCase()  // Sort direction (ASC/DESC)
+              }] : [],  // Default to an empty array if no sorting is defined
+              "search": d.search.value,  // Search query
+              "status": deviceStatus
+            }
+            
+          }
+        };
+
+        return JSON.stringify(query);  // Send the JSON request
+      },
+      "dataSrc": function (json) {
+        console.log(json);
+
+        // Set the total number of records for pagination
+        json.recordsTotal = json.devices.count || 0;
+        json.recordsFiltered = json.devices.count || 0;
+
+        return json.devices.devices.map(device => {
+            // Convert each device record into the required DataTable row format
+            // Order has to be the same as in the UI_device_columns setting options
+            const originalRow = [
+                device.devName || "",
+                device.devOwner || "",
+                device.devType || "",
+                device.devIcon || "",
+                device.devFavorite || "",
+                device.devGroup || "",
+                device.devFirstConnection || "",
+                device.devLastConnection || "",
+                device.devLastIP || "",
+                device.devIsRandomMac || "",  // Custom logic for randomized MAC
+                device.devStatus || "",
+                device.devMac || "",  // hidden
+                device.devIpLong || "",  // IP orderable
+                device.rowid || "",
+                device.devParentMAC || "",
+                device.devParentChildrenCount || 0,
+                device.devLocation || "",
+                device.devVendor || "",
+                device.devParentPort || "",
+                device.devGUID || "",
+                device.devSyncHubNode || "",
+                device.devSite || "",
+                device.devSSID || "",
+                device.devSourcePlugin || "",
+                device.devPresentLastScan || "",
+                device.devAlertDown || ""
             ];
 
-            var newRow = [];
-
-            // reorder data based on user-defined columns order
-            for (index = 0; index < tableColumnOrder.length; index++) {
+            const newRow = [];
+            // Reorder data based on user-defined columns order
+            for (let index = 0; index < tableColumnOrder.length; index++) {
                 newRow.push(originalRow[tableColumnOrder[index]]);
             }
 
             return newRow;
-        })
-    };
-
-    // Check if the DataTable already exists
-    if ($.fn.dataTable.isDataTable('#tableDevices')) {
-      // The DataTable exists, so destroy it
-      var table = $('#tableDevices').DataTable();
-      table.clear().destroy();
-    }
-
-    var table =
-    $('#tableDevices').DataTable({
-      'data'         : dataArray["data"],
-      'paging'       : true,
-      'lengthChange' : true,
-      'lengthMenu'   : [[10, 25, 50, 100, 500, 100000], [10, 25, 50, 100, 500, getString('Device_Tablelenght_all')]],
-      'searching'    : true,
-
-      'ordering'     : true,
-      'info'         : true,
-      'autoWidth'    : false,
-
-      // Parameters
-      'pageLength'   : tableRows,
-      'order'        : tableOrder,   
-      'select'       : true, // Enable selection   
-
-      'columnDefs'   : [
-        {visible:   false,         targets: tableColumnHide },      
-        {className: 'text-center', targets: [mapIndx(3), mapIndx(4), mapIndx(9), mapIndx(10), mapIndx(15), mapIndx(18)] },      
-        {width:     '80px',        targets: [mapIndx(6), mapIndx(7), mapIndx(15)] },      
-        {width:     '30px',        targets: [mapIndx(10), mapIndx(13), mapIndx(18)] },      
-        {orderData: [mapIndx(12)],          targets: mapIndx(8) },
-
-        // Device Name
-        {targets: [mapIndx(0)],
-          'createdCell': function (td, cellData, rowData, row, col) {      
-              
-              // console.log(cellData)      
-              $(td).html ('<b class="anonymizeDev"><a href="deviceDetails.php?mac='+ rowData[mapIndx(11)] +'" class="">'+ cellData +'</a></b>');
-        } },
-
-        // Connected Devices       
-        {targets: [mapIndx(15)],
-          'createdCell': function (td, cellData, rowData, row, col) {         
-            // check if this is a network device
-            if(getSetting("NETWORK_DEVICE_TYPES").includes(`'${rowData[mapIndx(2)]}'`)   )
-            {
-              $(td).html ('<b><a href="./network.php?mac='+ rowData[mapIndx(11)] +'" class="">'+ cellData +'</a></b>');
-            }
-            else
-            {
-              $(td).html (`<i class="fa-solid fa-xmark" title="${getString("Device_Table_Not_Network_Device")}"></i>`)
-            }
-              
-        } },
-
-        // Icon      
-        {targets: [mapIndx(3)],
-          'createdCell': function (td, cellData, rowData, row, col) {
-            if (!emptyArr.includes(cellData)){
-              $(td).html (atob(cellData));
-            } else {
-              $(td).html ('');
-            }
-        } },
-
-        // Full MAC      
-        {targets: [mapIndx(11)],
-          'createdCell': function (td, cellData, rowData, row, col) {
-            if (!emptyArr.includes(cellData)){
-              $(td).html ('<span class="anonymizeMac">'+cellData+'</span>');
-            } else {
-              $(td).html ('');
-            }
-        } },
-        
-        // IP address      
-        {targets: [mapIndx(12)],
-          'createdCell': function (td, cellData, rowData, row, col) {
-            if (!emptyArr.includes(cellData)){
-              $(td).html ('<span class="anonymizeIp">'+cellData+'</span>');
-            } else {
-              $(td).html ('');
-            }
-        } },
-        
-        // Favorite      
-        {targets: [mapIndx(4)],
-          'createdCell': function (td, cellData, rowData, row, col) {
-            if (cellData == 1){
-              $(td).html ('<i class="fa fa-star text-yellow" style="font-size:16px"></i>');
-            } else {
-              $(td).html ('');
-            }
-        } },
-          
-        // Dates      
-        {targets: [mapIndx(6), mapIndx(7)],
-          'createdCell': function (td, cellData, rowData, row, col) {
-            var result = cellData.toString(); // Convert to string
-            if (result.includes("+")) { // Check if timezone offset is present
-                result = result.split('+')[0]; // Remove timezone offset
-            }
-            $(td).html (translateHTMLcodes (result));
-        } },
-
-        // Random MAC      
-        {targets: [mapIndx(9)],
-          'createdCell': function (td, cellData, rowData, row, col) {
-            // console.log(cellData)
-            if (cellData == 1){
-              $(td).html ('<i data-toggle="tooltip" data-placement="right" title="Random MAC" style="font-size: 16px;" class="text-yellow glyphicon glyphicon-random"></i>');
-            } else {
-              $(td).html ('');
-            }
-        } },
-
-        // Status color      
-        {targets: [mapIndx(10)],
-          'createdCell': function (td, cellData, rowData, row, col) {
-
-            devData = getDeviceDataByMac(rowData[mapIndx(11)])
-
-            if (devData.dev_PresentLastScan == 1)
-            {
-              css = "green text-white statusOnline"
-              icon = '<i class="fa-solid fa-plug"></i>'
-            } else if (devData.dev_PresentLastScan != 1 && devData.dev_AlertDeviceDown == 1)
-            {
-              css = "red text-white statusDown"
-              icon = '<i class="fa-solid fa-triangle-exclamation"></i>'
-            } else if(devData.dev_PresentLastScan != 1)
-            {
-              css = "gray text-white statusOffline"
-              icon = '<i class="fa-solid fa-xmark"></i>'
-            } else
-            {
-              css = "gray text-white statusUnknown"
-              icon = '<i class="fa-solid fa-question"></i>'
-            }
-        
-            $(td).html (`<a href="deviceDetails.php?mac=${rowData[mapIndx(11)]}" class="badge bg-${css}">${icon} ${cellData.replace('-', '')}</a>`);
-        } },
-      ],
-      
-      // Processing
-      'processing'  : true,
-      'language'    : {
-        processing: '<table> <td width="130px" align="middle">Loading...</td><td><i class="ion ion-ios-loop-strong fa-spin fa-2x fa-fw"></td> </table>',
-        emptyTable: 'No data',
-        "lengthMenu": "<?= lang('Device_Tablelenght');?>",
-        "search":     "<?= lang('Device_Searchbox');?>: ",
-        "paginate": {
-            "next":       "<?= lang('Device_Table_nav_next');?>",
-            "previous":   "<?= lang('Device_Table_nav_prev');?>"
-        },
-        "info":           "<?= lang('Device_Table_info');?>",
+        });
       }
-    });
+    },
+    'paging'       : true,
+    'lengthChange' : true,
+    'lengthMenu'   : [[10, 25, 50, 100, 500, 100000], [10, 25, 50, 100, 500, getString('Device_Tablelenght_all')]],
+    'searching'    : true,
 
-    // Save cookie Rows displayed, and Parameters rows & order
-    $('#tableDevices').on( 'length.dt', function ( e, settings, len ) {
-      setCookie ("nax_parTableRows", len, 129600); // save for 90 days
-    } );
+    'ordering'     : true,
+    'info'         : true,
+    'autoWidth'    : false,
+
+    // Parameters
+    'pageLength'   : tableRows,
+    'order'        : tableOrder,   
+    'select'       : true, // Enable selection   
+
+    'columnDefs'   : [
+      {visible:   false,         targets: tableColumnHide },      
+      {className: 'text-center', targets: [mapIndx(3), mapIndx(4), mapIndx(9), mapIndx(10), mapIndx(15), mapIndx(18)] },      
+      {width:     '80px',        targets: [mapIndx(6), mapIndx(7), mapIndx(15)] },      
+      {width:     '30px',        targets: [mapIndx(10), mapIndx(13), mapIndx(18)] },      
+      {orderData: [mapIndx(12)],          targets: mapIndx(8) },
+
+      // Device Name
+      {targets: [mapIndx(0)],
+        'createdCell': function (td, cellData, rowData, row, col) {      
+            
+            // console.log(cellData)      
+            $(td).html ('<b class="anonymizeDev"><a href="deviceDetails.php?mac='+ rowData[mapIndx(11)] +'" class="">'+ cellData +'</a></b>');
+      } },
+
+      // Connected Devices       
+      {targets: [mapIndx(15)],
+        'createdCell': function (td, cellData, rowData, row, col) {   
+
+                
+          // check if this is a network device
+          if(getSetting("NETWORK_DEVICE_TYPES").includes(`'${rowData[mapIndx(2)]}'`)   )
+          {
+            $(td).html ('<b><a href="./network.php?mac='+ rowData[mapIndx(11)] +'" class="">'+ cellData +'</a></b>');
+          }
+          else
+          {
+            $(td).html (`<i class="fa-solid fa-xmark" title="${getString("Device_Table_Not_Network_Device")}"></i>`)
+          }
+            
+      } },
+
+      // Icon      
+      {targets: [mapIndx(3)],
+        'createdCell': function (td, cellData, rowData, row, col) {
+         
+          if (!emptyArr.includes(cellData)){
+            $(td).html (atob(cellData));
+          } else {
+            $(td).html ('');
+          }
+      } },
+
+      // Full MAC      
+      {targets: [mapIndx(11)],
+        'createdCell': function (td, cellData, rowData, row, col) {
+          if (!emptyArr.includes(cellData)){
+            $(td).html ('<span class="anonymizeMac">'+cellData+'</span>');
+          } else {
+            $(td).html ('');
+          }
+      } },
       
-    $('#tableDevices').on( 'order.dt', function () {
-      setCookie ("nax_parTableOrder", JSON.stringify (table.order()), 129600); // save for 90 days
-      setCache ('devicesList', getDevicesFromTable(table) );
-    } );
-
-    $('#tableDevices').on( 'search.dt', function () {
-      setCache ('devicesList', getDevicesFromTable(table) ); 
-    } );
-
-    // add multi-edit button
-    $('#multiEditPlc').append(
-        `<button type="submit" id="multiEdit" class="btn btn-primary" style="display:none" onclick="multiEditDevices();">
-          <i class="fa fa-pencil pointer" ></i>  ${getString("Device_MultiEdit")}
-        </button>`)
-
-    // Event listener for row selection in DataTable
-    $('#tableDevices').on('click', 'tr', function (e) {
-      setTimeout(function(){
-          // Check if any row is selected
-          var anyRowSelected = $('#tableDevices tr.selected').length > 0;
-
-          // Toggle visibility of element with ID 'multiEdit'
-          $('#multiEdit').toggle(anyRowSelected);
-      }, 200);
-
-
+      // IP address     
+      {targets: [mapIndx(8)],
+        'createdCell': function (td, cellData, rowData, row, col) {
+            if (!emptyArr.includes(cellData)){
+              $(td).html (`<span class="anonymizeIp">
+                            <a href="http://${cellData}" class="pointer" target="_blank">
+                                ${cellData}
+                            </a>
+                            <a href="https://${cellData}" class="pointer" target="_blank">
+                                <i class="fa fa-lock "></i>
+                            </a>
+                          <span>`);
+            } else {
+              $(td).html ('');
+            }
+        } 
+      },
+      // IP address (ordeable)     
+      {targets: [mapIndx(12)],
+        'createdCell': function (td, cellData, rowData, row, col) {
+            if (!emptyArr.includes(cellData)){
+              $(td).html (`<span class="anonymizeIp">${cellData}<span>`);
+            } else {
+              $(td).html ('');
+            }
+        } 
+      },
       
-    });
+      // Favorite      
+      {targets: [mapIndx(4)],
+        'createdCell': function (td, cellData, rowData, row, col) {
+          if (cellData == 1){
+            $(td).html ('<i class="fa fa-star text-yellow" style="font-size:16px"></i>');
+          } else {
+            $(td).html ('');
+          }
+      } },
+        
+      // Dates      
+      {targets: [mapIndx(6), mapIndx(7)],
+        'createdCell': function (td, cellData, rowData, row, col) {
+          var result = cellData.toString(); // Convert to string
+          if (result.includes("+")) { // Check if timezone offset is present
+              result = result.split('+')[0]; // Remove timezone offset
+          }
+          $(td).html (translateHTMLcodes (result));
+      } },
 
-    hideSpinner();
+      // Random MAC      
+      {targets: [mapIndx(9)],
+        'createdCell': function (td, cellData, rowData, row, col) {
+          // console.log(cellData)
+          if (cellData == 1){
+            $(td).html ('<i data-toggle="tooltip" data-placement="right" title="Random MAC" style="font-size: 16px;" class="text-yellow glyphicon glyphicon-random"></i>');
+          } else {
+            $(td).html ('');
+          }
+      } },
 
-  });  
-};
+      // Status color      
+      {targets: [mapIndx(10)],
+        'createdCell': function (td, cellData, rowData, row, col) {
+          
+          tmp_devPresentLastScan = rowData[mapIndx(24)]
+          tmp_devAlertDown = rowData[mapIndx(25)]
 
+          if (tmp_devPresentLastScan == 1)
+          {
+            css = "green text-white statusOnline"
+            icon = '<i class="fa-solid fa-plug"></i>'
+          } else if (tmp_devPresentLastScan != 1 && tmp_devAlertDown == 1)
+          {
+            css = "red text-white statusDown"
+            icon = '<i class="fa-solid fa-triangle-exclamation"></i>'
+          } else if(tmp_devPresentLastScan != 1)
+          {
+            css = "gray text-white statusOffline"
+            icon = '<i class="fa-solid fa-xmark"></i>'
+          } else
+          {
+            css = "gray text-white statusUnknown"
+            icon = '<i class="fa-solid fa-question"></i>'
+          }
+      
+          $(td).html (`<a href="deviceDetails.php?mac=${rowData[mapIndx(11)]}" class="badge bg-${css}">${icon} ${cellData.replace('-', '')}</a>`);
+      } },
+    ],
+    
+    // Processing
+    'processing'  : true,
+    'language'    : {
+      emptyTable: 'No data',
+      "lengthMenu": "<?= lang('Device_Tablelenght');?>",
+      "search":     "<?= lang('Device_Searchbox');?>: ",
+      "paginate": {
+          "next":       "<?= lang('Device_Table_nav_next');?>",
+          "previous":   "<?= lang('Device_Table_nav_prev');?>"
+      },
+      "info":           "<?= lang('Device_Table_info');?>",
+    },
+    initComplete: function (settings, devices) {
+      // Handle any additional interactions or event listeners as required
 
-// -----------------------------------------------------------------------------
-// Gets a JSON list of rowID and mac from the displayed table in the UI
-function getDevicesFromTable(table)
-{  
-  rowIDs = table.column(mapIndx(13), { 'search': 'applied' }).data().toArray()  //   
-  rowMACs = table.column(mapIndx(11), { 'search': 'applied' }).data().toArray() // 
-  rowNames = table.column(mapIndx(0), { 'search': 'applied' }).data().toArray() // 
-  rowTypes = table.column(mapIndx(2), { 'search': 'applied' }).data().toArray() // 
-  rowIcons = table.column(mapIndx(3), { 'search': 'applied' }).data().toArray() // 
-  rowParentMAC = table.column(mapIndx(14), { 'search': 'applied' }).data().toArray() // 
-  rowStatus = table.column(mapIndx(10), { 'search': 'applied' }).data().toArray() // 
+      // Save cookie Rows displayed, and Parameters rows & order
+      $('#tableDevices').on( 'length.dt', function ( e, settings, len ) {
+            setCookie ("nax_parTableRows", len, 129600); // save for 90 days
+          } );
+            
+          $('#tableDevices').on( 'order.dt', function () {
+            setCookie ("nax_parTableOrder", JSON.stringify (table.order()), 129600); // save for 90 days
+          } );
 
-  result = []
+          // add multi-edit button
+          $('#multiEditPlc').append(
+              `<button type="submit" id="multiEdit" class="btn btn-primary" style="display:none" onclick="multiEditDevices();">
+                <i class="fa fa-pencil pointer" ></i>  ${getString("Device_MultiEdit")}
+              </button>`)
 
-  rowIDs.map(function(rowID, index){
-    result.push({
-                  "rowid": rowID, 
-                  "mac"  : rowMACs[index], 
-                  "name" : rowNames[index],
-                  "type" : rowTypes[index],
-                  "icon" : rowIcons[index],
-                  "parentMac" : rowParentMAC[index],
-                  "status" : rowStatus[index] })
-  })
+          // Event listener for row selection in DataTable
+          $('#tableDevices').on('click', 'tr', function (e) {
+            setTimeout(function(){
+                // Check if any row is selected
+                var anyRowSelected = $('#tableDevices tr.selected').length > 0;
 
-  return JSON.stringify (result)
-}
+                // Toggle visibility of element with ID 'multiEdit'
+                $('#multiEdit').toggle(anyRowSelected);
+            }, 100);
+            
+          });
 
-
-// -----------------------------------------------------------------------------
-function getNumberOfChildren(mac, devices)
-{
-  childrenCount = 0;
-
-  $.each(devices, function(index, dev) {
-
-    if(dev.dev_Network_Node_MAC_ADDR != null && dev.dev_Network_Node_MAC_ADDR.trim() == mac.trim())
-    {
-      childrenCount++;        
-    }    
+          
+          hideSpinner();
+          
+    }
     
   });
 
-  return childrenCount;
+  
 }
 
+
 // -----------------------------------------------------------------------------
 function handleLoadingDialog(needsReload = false)
 {

front/index.php

@@ -103,10 +103,14 @@ if (isset ($_SESSION["login"]) == FALSE || $_SESSION["login"] != 1)
 
   <!-- 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>

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", "ar_ar"]; // 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  = {}
 
 
@@ -336,6 +336,9 @@ function getLangCode() {
       case 'Arabic (ar_ar)':
         lang_code = 'ar_ar';
         break;
+      case 'Catalan (ca_ca)':
+        lang_code = 'ca_ca';
+        break;
     }
 
     return lang_code;
@@ -686,6 +689,13 @@ function openUrl(urls) {
   }
 }
 
+// -----------------------------------------------------------------------------
+// force laod URL in current window with specific anchor
+function forceLoadUrl(relativeUrl) {
+  window.location.replace(relativeUrl);
+  window.location.reload()
+}
+
 
 // -----------------------------------------------------------------------------
 function navigateToDeviceWithIp (ip) {
@@ -698,9 +708,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");
       }
@@ -711,7 +721,7 @@ function navigateToDeviceWithIp (ip) {
 
 // -----------------------------------------------------------------------------
 function getNameByMacAddress(macAddress) {
-  return getDeviceDataByMac(macAddress, "dev_Name")
+  return getDeviceDataByMac(macAddress, "devName")
 }
 
 // -----------------------------------------------------------------------------
@@ -877,7 +887,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)
         {
@@ -967,6 +977,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')
 {
 
@@ -985,20 +1008,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))
   }
 }
 // -----------------------------------------------------------------------------
@@ -1186,20 +1196,24 @@ function hideUIelements(settingKey) {
 
 
 // -----------------------------------------------------------------------------
-// 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");
   }
 });
 
@@ -1253,39 +1267,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('api/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) {
@@ -1294,6 +1344,7 @@ async function executeOnce() {
   }
 }
 
+
 // -----------------------------------------------------------------------------
 // Function to handle successful completion of an AJAX call
 const handleSuccess = (callName) => {

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,6 +67,35 @@ 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  

front/multiEditCore.php

@@ -77,11 +77,11 @@
         
         settingsData = res["data"];
 
-        excludedColumns = ["NEWDEV_dev_MAC", "NEWDEV_dev_FirstConnection", "NEWDEV_dev_LastConnection", "NEWDEV_dev_LastNotification", "NEWDEV_dev_LastIP", "NEWDEV_dev_StaticIP", "NEWDEV_dev_ScanCycle", "NEWDEV_dev_PresentLastScan" ]
+        excludedColumns = ["NEWDEV_devMac", "NEWDEV_devFirstConnection", "NEWDEV_devLastConnection", "NEWDEV_devLastNotification", "NEWDEV_devLastIP", "NEWDEV_devStaticIP", "NEWDEV_devScan", "NEWDEV_devPresentLastScan" ]
         
         const relevantColumns = settingsData.filter(set =>
             set.Group === "NEWDEV" &&
-            set.Code_Name.includes("_dev_") &&
+            set.Code_Name.includes("_dev") &&
             !excludedColumns.includes(set.Code_Name) &&
             !set.Code_Name.includes("__metadata")
         );
@@ -143,13 +143,13 @@
 
                     console.log(columns[j].Code_Name)
                     //  Handle Icons as they need a preview                 
-                    if(columns[j].Code_Name == 'NEWDEV_dev_Icon')
+                    if(columns[j].Code_Name == 'NEWDEV_devIcon')
                     {
                       input = `
-                            <span class="input-group-addon iconPreview" my-customid="NEWDEV_dev_Icon_preview"></span>
+                            <span class="input-group-addon iconPreview" my-customid="NEWDEV_devIcon_preview"></span>
                             <select  class="form-control"
                                       onChange="updateIconPreview(this)"
-                                      my-customparams="NEWDEV_dev_Icon,NEWDEV_dev_Icon_preview"
+                                      my-customparams="NEWDEV_devIcon,NEWDEV_devIcon_preview"
                                       id="${columns[j].Code_Name}"
                                       data-my-column="${columns[j].Code_Name}" 
                                       data-my-targetColumns="${columns[j].Code_Name.replace('NEWDEV_','')}" >
@@ -283,7 +283,7 @@
     console.log(columnValue);
 
     // update selected
-    executeAction('update', 'dev_MAC', selectorMacs(), targetColumns, columnValue )
+    executeAction('update', 'devMac', selectorMacs(), targetColumns, columnValue )
 
     
 }
@@ -333,7 +333,7 @@ function askDeleteSelectedDevices () {
 function deleteSelectedDevices()
 { 
   macs_tmp = selectorMacs()
-  executeAction('delete', 'dev_MAC', macs_tmp )
+  executeAction('delete', 'devMac', macs_tmp )
   write_notification('[Multi edit] Manually deleted devices with MACs:' + macs_tmp, 'info')
 }
 

front/network.php

@@ -19,7 +19,7 @@
   <?php require 'php/templates/notification.php'; ?>
     <h1 id="pageTitle">
       <i class="fa fa-network-wired"></i> <?= lang('Network_Title');?>
-      <span class="networkPageHelp"> <a target="_blank" href="https://github.com/jokob-sk/NetAlertX/blob/main/docs/NETWORK_TREE.md"><i class="fa fa-circle-question"></i></a><span>
+      <span class="helpIconSmallTopRight"> <a target="_blank" href="https://github.com/jokob-sk/NetAlertX/blob/main/docs/NETWORK_TREE.md"><i class="fa fa-circle-question"></i></a><span>
     </h1>    
   </section>
 
@@ -162,14 +162,14 @@
         }
 
         // Get all leafs connected to a node based on the node_mac        
-        $func_sql = 'SELECT dev_Network_Node_port as port,
-                            dev_MAC as mac,  
-                            dev_PresentLastScan as online, 
-                            dev_Name as name,
-                            dev_DeviceType as type, 
-                            dev_LastIP as last_ip,
-                            (select dev_DeviceType from Devices a where dev_MAC = "'.$node_mac.'") as node_type
-                        FROM Devices WHERE dev_Network_Node_MAC_ADDR = "'.$node_mac.'" order by port, name asc';
+        $func_sql = 'SELECT devParentPort as port,
+                            devMac as mac,  
+                            devPresentLastScan as online, 
+                            devName as name,
+                            devType as type, 
+                            devLastIP as last_ip,
+                            (select devType from Devices a where devMac = "'.$node_mac.'") as node_type
+                        FROM Devices WHERE devParentMAC = "'.$node_mac.'" order by port, name asc';
         
         global $db;
         $func_result = $db->query($func_sql);  
@@ -278,21 +278,21 @@
     $sql = "SELECT node_name, node_mac, online, node_type, node_ports_count, parent_mac, node_icon
             FROM 
             (
-                  SELECT  a.dev_Name as  node_name,        
-                        a.dev_MAC as node_mac,
-                        a.dev_PresentLastScan as online,
-                        a.dev_DeviceType as node_type,
-                        a.dev_Network_Node_MAC_ADDR as parent_mac,
-                        a.dev_Icon as node_icon
+                  SELECT  a.devName as  node_name,        
+                        a.devMac as node_mac,
+                        a.devPresentLastScan as online,
+                        a.devType as node_type,
+                        a.devParentMAC as parent_mac,
+                        a.devIcon as node_icon
                   FROM Devices a 
-                  WHERE a.dev_DeviceType in (".$networkDeviceTypes.")					
+                  WHERE a.devType in (".$networkDeviceTypes.")					
             ) t1
             LEFT JOIN
             (
-                  SELECT  b.dev_Network_Node_MAC_ADDR as node_mac_2,
+                  SELECT  b.devParentMAC as node_mac_2,
                         count() as node_ports_count 
                   FROM Devices b 
-                  WHERE b.dev_Network_Node_MAC_ADDR NOT NULL group by b.dev_Network_Node_MAC_ADDR
+                  WHERE b.devParentMAC NOT NULL group by b.devParentMAC
             ) t2
             ON (t1.node_mac = t2.node_mac_2);
           ";
@@ -360,15 +360,15 @@
 
     // Get all Unassigned / unconnected nodes 
     $func_sql = 'SELECT 
-                  dev_MAC AS mac,
-                  dev_PresentLastScan AS online,
-                  dev_Name AS name,
-                  dev_LastIP AS last_ip,
-                  dev_Network_Node_MAC_ADDR
+                  devMac AS mac,
+                  devPresentLastScan AS online,
+                  devName AS name,
+                  devLastIP AS last_ip,
+                  devParentMAC
                 FROM Devices
-                WHERE dev_Network_Node_MAC_ADDR IS NULL 
-                  OR dev_Network_Node_MAC_ADDR IN ("", " ", "undefined", "null")
-                  AND dev_MAC NOT LIKE "%internet%"
+                WHERE devParentMAC IS NULL 
+                  OR devParentMAC IN ("", " ", "undefined", "null")
+                  AND devMac NOT LIKE "%internet%"
                 ORDER BY name ASC;'; 
 
     global $db;
@@ -481,21 +481,31 @@
       return;
     }
 
-    devicesListnew = rawData["data"].map(item =>  { return {
-                                                            "name":item[0], 
-                                                            "type":item[2], 
-                                                            "icon":item[3], 
-                                                            "mac":item[11], 
-                                                            "parentMac":item[14], 
-                                                            "rowid":item[13], 
-                                                            "status":item[10],
-                                                            "childrenQty":item[15],
-                                                            "port":item[18]                                                              
-                                                            }})
+    devicesListnew = rawData["data"].map(item =>  { 
+      return {
+          "name": item[0], 
+          "type": item[2], 
+          "icon": item[3], 
+          "mac": item[11], 
+          "parentMac": item[14], 
+          "rowid": item[13], 
+          "status": item[10],
+          "childrenQty": item[15],
+          "port": item[18]
+        };
+    }).sort((a, b) => {
+        // First sort by name alphabetically
+        const nameCompare = a.name.localeCompare(b.name);
+        if (nameCompare !== 0) {
+            return nameCompare;
+        }
+        // If names are the same, sort by port numerically
+        return a.port - b.port;
+    });
 
-    setCache('devicesListNew', JSON.stringify(devicesListnew))
+    setCache('devicesListNew', JSON.stringify(devicesListnew));
 
-    // init global variable
+    // Init global variable
     deviceListGlobal = devicesListnew;
 
     
@@ -525,53 +535,57 @@
   
 
   // ---------------------------------------------------------------------------
-  function getChildren(node, list, path)
+  // Recursively get children nodes and build a tree
+  function getChildren(node, list, path, visited = [])
   {
-    var children = [];
-
-    // loop thru all items and find childern...
-    for(var i in list)
-    {
-      //... of the current node
-      
-      if(list[i].parentMac.toLowerCase() == node.mac.toLowerCase() && !hiddenMacs.includes(list[i].parentMac))
-      {   
-
-        visibleNodesCount++
-
-        // and process them 
-        children.push(getChildren(list[i], list, path + ((path == "") ? "" : '|') + list[i].parentMac, hiddenMacs))
+      var children = [];
 
+      // Check for infinite recursion by seeing if the node has been visited before
+      if (visited.includes(node.mac.toLowerCase())) {
+          console.error("Infinite recursion detected at node:", node.mac);
+          write_notification("[ERROR] ⚠ Infinite recursion detected. You probably have assigned the Internet node to another children node or to itself. Please open a new issue on GitHub and describe how you did it.", 'interrupt')
+          return { error: "Infinite recursion detected", node: node.mac };
       }
-    }
 
-    // note the total number of leaf nodes to calculate the font scaling
-    if(children.length == 0) 
-    { 
-      leafNodesCount++ 
-    } else
-    {
-      parentNodesCount++
-    }  
-    
-    return { 
-      name: node.name,      
-      path: path,
-      mac: node.mac,
-      port: node.port,
-      id: node.mac,
-      parentMac: node.parentMac,
-      icon: node.icon,
-      type: node.type,
-      status: node.status,
-      hasChildren: children.length > 0 || hiddenMacs.includes(node.mac),
-      hiddenChildren: hiddenMacs.includes(node.mac),
-      qty: children.length,
-      children:  children
-    };
-        
+      // Add current node to visited list
+      visited.push(node.mac.toLowerCase());
+
+      // Loop through all items to find children of the current node
+      for (var i in list) {
+          if (list[i].parentMac.toLowerCase() == node.mac.toLowerCase() && !hiddenMacs.includes(list[i].parentMac)) {   
+
+              visibleNodesCount++;
+
+              // Process children recursively, passing a copy of the visited list
+              children.push(getChildren(list[i], list, path + ((path == "") ? "" : '|') + list[i].parentMac, visited));
+          }
+      }
+
+      // Track leaf and parent node counts
+      if (children.length == 0) {
+          leafNodesCount++;
+      } else {
+          parentNodesCount++;
+      }
+
+      return { 
+          name: node.name,
+          path: path,
+          mac: node.mac,
+          port: node.port,
+          id: node.mac,
+          parentMac: node.parentMac,
+          icon: node.icon,
+          type: node.type,
+          status: node.status,
+          hasChildren: children.length > 0 || hiddenMacs.includes(node.mac),
+          hiddenChildren: hiddenMacs.includes(node.mac),
+          qty: children.length,
+          children: children
+      };
   }
 
+
   // ---------------------------------------------------------------------------
   
   function getHierarchy()

front/php/server/devices.php

@@ -73,22 +73,22 @@ function getDeviceData() {
 
   // Device Data
   $sql = 'SELECT rowid, *,
-            CASE WHEN dev_AlertDeviceDown !=0 AND dev_PresentLastScan=0 THEN "Down"
-                 WHEN dev_PresentLastScan=1 THEN "On-line"
-                 ELSE "Off-line" END as dev_Status
+            CASE WHEN devAlertDown !=0 AND devPresentLastScan=0 THEN "Down"
+                 WHEN devPresentLastScan=1 THEN "On-line"
+                 ELSE "Off-line" END as devStatus
           FROM Devices
-          WHERE dev_MAC="'. $mac .'" or cast(rowid as text)="'. $mac. '"';
+          WHERE devMac="'. $mac .'" or cast(rowid as text)="'. $mac. '"';
   $result = $db->query($sql);
   $row = $result -> fetchArray (SQLITE3_ASSOC);
   $deviceData = $row;
-  $mac = $deviceData['dev_MAC'];
+  $mac = $deviceData['devMac'];
 
-  $deviceData['dev_Network_Node_MAC_ADDR'] = $row['dev_Network_Node_MAC_ADDR'];
-  $deviceData['dev_Network_Node_port'] = $row['dev_Network_Node_port'];
-  $deviceData['dev_FirstConnection'] = formatDate ($row['dev_FirstConnection']); // Date formated
-  $deviceData['dev_LastConnection'] =  formatDate ($row['dev_LastConnection']);  // Date formated
+  $deviceData['devParentMAC'] = $row['devParentMAC'];
+  $deviceData['devParentPort'] = $row['devParentPort'];
+  $deviceData['devFirstConnection'] = formatDate ($row['devFirstConnection']); // Date formated
+  $deviceData['devLastConnection'] =  formatDate ($row['devLastConnection']);  // Date formated
 
-  $deviceData['dev_RandomMAC'] = isRandomMAC($mac);
+  $deviceData['devRandomMAC'] = isRandomMAC($mac);
 
   // Count Totals
   $condition = ' WHERE eve_MAC="'. $mac .'" AND eve_DateTime >= '. $periodDate;
@@ -101,19 +101,19 @@ function getDeviceData() {
                OR ses_StillConnected = 1 )';
   $result = $db->query($sql);
   $row = $result -> fetchArray (SQLITE3_NUM);
-  $deviceData['dev_Sessions'] = $row[0];
+  $deviceData['devSessions'] = $row[0];
   
   // Events
   $sql = 'SELECT COUNT(*) FROM Events '. $condition .' AND eve_EventType <> "Connected" AND eve_EventType <> "Disconnected" ';
   $result = $db->query($sql);
   $row = $result -> fetchArray (SQLITE3_NUM);
-  $deviceData['dev_Events'] = $row[0];
+  $deviceData['devEvents'] = $row[0];
 
   // Down Alerts
   $sql = 'SELECT COUNT(*) FROM Events '. $condition .' AND eve_EventType = "Device Down"';
   $result = $db->query($sql);
   $row = $result -> fetchArray (SQLITE3_NUM);
-  $deviceData['dev_DownAlerts'] = $row[0];
+  $deviceData['devDownAlerts'] = $row[0];
 
   // Get current date using php, sql datetime does not return time respective to timezone.
   $currentdate = date("Y-m-d H:i:s");
@@ -130,7 +130,7 @@ function getDeviceData() {
                  OR ses_StillConnected = 1 )';
   $result = $db->query($sql);
   $row = $result -> fetchArray (SQLITE3_NUM);
-  $deviceData['dev_PresenceHours'] = round ($row[0]);
+  $deviceData['devPresenceHours'] = round ($row[0]);
 
   // Return json
   echo (json_encode ($deviceData));
@@ -145,27 +145,27 @@ function setDeviceData() {
 
   // sql
   $sql = 'UPDATE Devices SET
-                 dev_Name                   = "'. quotes($_REQUEST['name'])         .'",
-                 dev_Owner                  = "'. quotes($_REQUEST['owner'])        .'",
-                 dev_DeviceType             = "'. quotes($_REQUEST['type'])         .'",
-                 dev_Vendor                 = "'. quotes($_REQUEST['vendor'])       .'",
-                 dev_Icon                   = "'. quotes($_REQUEST['icon'])         .'",
-                 dev_Favorite               = "'. quotes($_REQUEST['favorite'])     .'",
-                 dev_Group                  = "'. quotes($_REQUEST['group'])        .'",
-                 dev_Location               = "'. quotes($_REQUEST['location'])     .'",
-                 dev_Comments               = "'. quotes($_REQUEST['comments'])     .'",
-                 dev_Network_Node_MAC_ADDR  = "'. quotes($_REQUEST['networknode']).'",
-                 dev_Network_Node_port      = "'. quotes($_REQUEST['networknodeport']).'",
-                 dev_SSID                   = "'. quotes($_REQUEST['ssid']).'",
-                 dev_NetworkSite            = "'. quotes($_REQUEST['networksite']).'",
-                 dev_StaticIP               = "'. quotes($_REQUEST['staticIP'])     .'",
-                 dev_ScanCycle              = "'. quotes($_REQUEST['scancycle'])    .'",
-                 dev_AlertEvents            = "'. quotes($_REQUEST['alertevents'])  .'",
-                 dev_AlertDeviceDown        = "'. quotes($_REQUEST['alertdown'])    .'",
-                 dev_SkipRepeated           = "'. quotes($_REQUEST['skiprepeated']) .'",
-                 dev_NewDevice              = "'. quotes($_REQUEST['newdevice'])    .'",
-                 dev_Archived               = "'. quotes($_REQUEST['archived'])     .'"
-          WHERE dev_MAC="' . $_REQUEST['mac'] .'"';
+                 devName                   = "'. quotes($_REQUEST['name'])         .'",
+                 devOwner                  = "'. quotes($_REQUEST['owner'])        .'",
+                 devType             = "'. quotes($_REQUEST['type'])         .'",
+                 devVendor                 = "'. quotes($_REQUEST['vendor'])       .'",
+                 devIcon                   = "'. quotes($_REQUEST['icon'])         .'",
+                 devFavorite               = "'. quotes($_REQUEST['favorite'])     .'",
+                 devGroup                  = "'. quotes($_REQUEST['group'])        .'",
+                 devLocation               = "'. quotes($_REQUEST['location'])     .'",
+                 devComments               = "'. quotes($_REQUEST['comments'])     .'",
+                 devParentMAC  = "'. quotes($_REQUEST['networknode']).'",
+                 devParentPort      = "'. quotes($_REQUEST['networknodeport']).'",
+                 devSSID                   = "'. quotes($_REQUEST['ssid']).'",
+                 devSite            = "'. quotes($_REQUEST['networksite']).'",
+                 devStaticIP               = "'. quotes($_REQUEST['staticIP'])     .'",
+                 devScan              = "'. quotes($_REQUEST['scancycle'])    .'",
+                 devAlertEvents            = "'. quotes($_REQUEST['alertevents'])  .'",
+                 devAlertDown        = "'. quotes($_REQUEST['alertdown'])    .'",
+                 devSkipRepeated           = "'. quotes($_REQUEST['skiprepeated']) .'",
+                 devIsNew              = "'. quotes($_REQUEST['newdevice'])    .'",
+                 devIsArchived               = "'. quotes($_REQUEST['archived'])     .'"
+          WHERE devMac="' . $_REQUEST['mac'] .'"';
   // update Data
   $result = $db->query($sql);
 
@@ -185,7 +185,7 @@ function deleteDevice() {
   global $db;
 
   // sql
-  $sql = 'DELETE FROM Devices WHERE dev_MAC="' . $_REQUEST['mac'] .'"';
+  $sql = 'DELETE FROM Devices WHERE devMac="' . $_REQUEST['mac'] .'"';
   // execute sql
   $result = $db->query($sql);
 
@@ -204,7 +204,7 @@ function deleteAllWithEmptyMACs() {
   global $db;  
 
   // sql
-  $sql = 'DELETE FROM Devices WHERE dev_MAC=""';
+  $sql = 'DELETE FROM Devices WHERE devMac=""';
   // execute sql
   $result = $db->query($sql);
 
@@ -223,7 +223,7 @@ function deleteUnknownDevices() {
   global $db;  
 
   // sql
-  $sql = 'DELETE FROM Devices WHERE dev_Name="(unknown)" OR dev_Name="(name not found)"';
+  $sql = 'DELETE FROM Devices WHERE devName="(unknown)" OR devName="(name not found)"';
   // execute sql
   $result = $db->query($sql);
 
@@ -598,29 +598,30 @@ function getDevicesList() {
 
   // This object is used to map from the old order ( second parameter, first number) to the new mapping, that is represented by the 3rd parameter (Second number)
   $columnOrderMapping = array(
-    array("dev_Name", 0, 0),               
-    array("dev_Owner", 1, 1),              
-    array("dev_DeviceType", 2, 2),         
-    array("dev_Icon", 3, 3),               
-    array("dev_Favorite", 4, 4),           
-    array("dev_Group", 5, 5),              
-    array("dev_FirstConnection", 6, 6),    
-    array("dev_LastConnection", 7, 7),     
-    array("dev_LastIP", 8, 8),             
-    array("dev_MAC", 9, 9),                
-    array("dev_Status", 10, 10),            
-    array("dev_MAC_full", 11, 11),          
-    array("dev_LastIP_orderable", 12, 12),  
+    array("devName", 0, 0),               
+    array("devOwner", 1, 1),              
+    array("devType", 2, 2),         
+    array("devIcon", 3, 3),               
+    array("devFavorite", 4, 4),           
+    array("devGroup", 5, 5),              
+    array("devFirstConnection", 6, 6),    
+    array("devLastConnection", 7, 7),     
+    array("devLastIP", 8, 8),             
+    array("devMac", 9, 9),                
+    array("devStatus", 10, 10),            
+    array("devMac_full", 11, 11),          
+    array("devLastIP_orderable", 12, 12),  
     array("rowid", 13, 13),            
-    array("dev_Network_Node_MAC_ADDR", 14, 14),
+    array("devParentMAC", 14, 14),
     array("connected_devices", 15, 15),
-    array("dev_Location", 16, 16),
-    array("dev_Vendor", 17, 17),           
-    array("dev_Network_Node_port", 18, 18),           
-    array("dev_GUID", 19, 19),           
-    array("dev_SyncHubNodeName", 20, 20),           
-    array("dev_NetworkSite", 21, 21),           
-    array("dev_SSID", 22, 22)           
+    array("devLocation", 16, 16),
+    array("devVendor", 17, 17),           
+    array("devParentPort", 18, 18),           
+    array("devGUID", 19, 19),           
+    array("devSyncHubNode", 20, 20),           
+    array("devSite", 21, 21),           
+    array("devSSID", 22, 22),           
+    array("devSourcePlugin", 23, 23)           
   );
 
   if($forceDefaultOrder == FALSE) 
@@ -649,19 +650,19 @@ function getDevicesList() {
 
   $sql = 'SELECT * FROM (
               SELECT rowid, *, CASE
-                      WHEN t1.dev_AlertDeviceDown !=0 AND t1.dev_PresentLastScan=0 THEN "Down"
-                      WHEN t1.dev_NewDevice=1 THEN "New"
-                      WHEN t1.dev_PresentLastScan=1 THEN "On-line"
-                      ELSE "Off-line"  END AS dev_Status
+                      WHEN t1.devAlertDown !=0 AND t1.devPresentLastScan=0 THEN "Down"
+                      WHEN t1.devIsNew=1 THEN "New"
+                      WHEN t1.devPresentLastScan=1 THEN "On-line"
+                      ELSE "Off-line"  END AS devStatus
                       FROM Devices t1 '.$condition.') t3  
                     LEFT JOIN
                               (
-                                    SELECT dev_Network_Node_MAC_ADDR as dev_Network_Node_MAC_ADDR_t2, dev_MAC as dev_MAC_t2,
+                                    SELECT devParentMAC as devParentMAC_t2, devMac as devMac_t2,
                                           count() as connected_devices 
                                     FROM Devices b 
-                                    WHERE b.dev_Network_Node_MAC_ADDR NOT NULL group by b.dev_Network_Node_MAC_ADDR
+                                    WHERE b.devParentMAC NOT NULL group by b.devParentMAC
                               ) t2
-                              ON (t3.dev_MAC = t2.dev_Network_Node_MAC_ADDR_t2);';
+                              ON (t3.devMac = t2.devParentMAC_t2);';
 
   $result = $db->query($sql);
   
@@ -670,30 +671,31 @@ function getDevicesList() {
   while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
 
     $defaultOrder = array (
-                            $row['dev_Name'],
-                            $row['dev_Owner'],
-                            handleNull($row['dev_DeviceType']),
-                            handleNull($row['dev_Icon'], "PGkgY2xhc3M9J2ZhIGZhLWxhcHRvcCc+PC9pPg=="), // laptop icon
-                            $row['dev_Favorite'],
-                            $row['dev_Group'],
+                            $row['devName'],
+                            $row['devOwner'],
+                            handleNull($row['devType']),
+                            handleNull($row['devIcon'], "PGkgY2xhc3M9J2ZhIGZhLWxhcHRvcCc+PC9pPg=="), // laptop icon
+                            $row['devFavorite'],
+                            $row['devGroup'],
                             // ----
-                            formatDate ($row['dev_FirstConnection']),
-                            formatDate ($row['dev_LastConnection']),
-                            $row['dev_LastIP'],
-                            ( isRandomMAC($row['dev_MAC']) ),
-                            $row['dev_Status'],
-                            $row['dev_MAC'], // MAC (hidden)
-                            formatIPlong ($row['dev_LastIP']), // IP orderable
+                            formatDate ($row['devFirstConnection']),
+                            formatDate ($row['devLastConnection']),
+                            $row['devLastIP'],
+                            ( isRandomMAC($row['devMac']) ),
+                            $row['devStatus'],
+                            $row['devMac'], // MAC (hidden)
+                            formatIPlong ($row['devLastIP']), // IP orderable
                             $row['rowid'], // Rowid (hidden)      
-                            handleNull($row['dev_Network_Node_MAC_ADDR']),
+                            handleNull($row['devParentMAC']),
                             handleNull($row['connected_devices']),
-                            handleNull($row['dev_Location']), 
-                            handleNull($row['dev_Vendor']),                            
-                            handleNull($row['dev_Network_Node_port']),                            
-                            handleNull($row['dev_GUID']),                            
-                            handleNull($row['dev_SyncHubNodeName']),                            
-                            handleNull($row['dev_NetworkSite']),                            
-                            handleNull($row['dev_SSID'])                            
+                            handleNull($row['devLocation']), 
+                            handleNull($row['devVendor']),                            
+                            handleNull($row['devParentPort']),                            
+                            handleNull($row['devGUID']),                            
+                            handleNull($row['devSyncHubNode']),                            
+                            handleNull($row['devSite']),                            
+                            handleNull($row['devSSID']),                            
+                            handleNull($row['devSourcePlugin'])                            
                           );
 
     $newOrder = array();
@@ -756,13 +758,13 @@ function getDevicesListCalendar() {
   // arrays of rows
   $tableData = array();
   while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
-    if ($row['dev_Favorite'] == 1) {
-      $row['dev_Name'] = '<span class="text-yellow">&#9733</span>&nbsp'. $row['dev_Name'];
+    if ($row['devFavorite'] == 1) {
+      $row['devName'] = '<span class="text-yellow">&#9733</span>&nbsp'. $row['devName'];
     }
 
-    $tableData[] = array ('id'       => $row['dev_MAC'],
-                          'title'    => $row['dev_Name'],
-                          'favorite' => $row['dev_Favorite']);
+    $tableData[] = array ('id'       => $row['devMac'],
+                          'title'    => $row['devName'],
+                          'favorite' => $row['devFavorite']);
   }
 
   // Return json
@@ -779,14 +781,14 @@ function getIcons() {
   global $db;
 
   // Device Data
-  $sql = 'select dev_Icon from Devices group by dev_Icon';
+  $sql = 'select devIcon from Devices group by devIcon';
 
   $result = $db->query($sql);
 
   // arrays of rows
   $tableData = array();
   while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {  
-    $icon = handleNull($row['dev_Icon'], "<i class='fa fa-laptop'></i>"); 
+    $icon = handleNull($row['devIcon'], "<i class='fa fa-laptop'></i>"); 
     // Push row data
     $tableData[] = array('id'    => $icon, 
                          'name'  => $icon );                          
@@ -819,7 +821,7 @@ function getDevices() {
   global $db;
 
   // Device Data
-  $sql = 'select dev_MAC, dev_Name from Devices';
+  $sql = 'select devMac, devName from Devices';
 
   $result = $db->query($sql);
 
@@ -827,8 +829,8 @@ function getDevices() {
   $tableData = array();
 
   while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {  
-    $name = handleNull($row['dev_Name'], "(unknown)"); 
-    $mac = handleNull($row['dev_MAC'], "(unknown)"); 
+    $name = handleNull($row['devName'], "(unknown)"); 
+    $mac = handleNull($row['devMac'], "(unknown)"); 
     // Push row data
     $tableData[] = array('id'    => $mac, 
                          'name'  => $name  );                          
@@ -856,7 +858,7 @@ function updateNetworkLeaf()
   {
     global $db;
     // sql
-    $sql = 'UPDATE Devices SET "dev_Network_Node_MAC_ADDR" = "'. $nodeMac .'" WHERE "dev_MAC"="' . $leafMac.'"' ;
+    $sql = 'UPDATE Devices SET "devParentMAC" = "'. $nodeMac .'" WHERE "devMac"="' . $leafMac.'"' ;
     // update Data
     $result = $db->query($sql);
 
@@ -883,7 +885,7 @@ function overwriteIconType()
   {
     global $db;
     // sql    
-    $sql = 'UPDATE Devices SET "dev_Icon" = "'. $icon .'" where dev_DeviceType in (select dev_DeviceType from Devices where dev_MAC = "' . $mac.'")' ;
+    $sql = 'UPDATE Devices SET "devIcon" = "'. $icon .'" where devType in (select devType from Devices where devMac = "' . $mac.'")' ;
     // update Data
     $result = $db->query($sql);
 
@@ -933,19 +935,19 @@ function copyFromDevice() {
   $result = $db->query($sql);
 
   // create temporary table with the source data
-  $sql = "CREATE  TABLE temp_devices AS SELECT * FROM Devices WHERE dev_MAC = '". $MAC_FROM . "';";
+  $sql = "CREATE  TABLE temp_devices AS SELECT * FROM Devices WHERE devMac = '". $MAC_FROM . "';";
   $result = $db->query($sql);
 
   // update temporary table with the correct target MAC
-  $sql = "UPDATE temp_devices SET dev_MAC = '". $MAC_TO . "';";
+  $sql = "UPDATE temp_devices SET devMac = '". $MAC_TO . "';";
   $result = $db->query($sql);
   
   // delete previous entry
-  $sql = "DELETE FROM Devices WHERE dev_MAC = '". $MAC_TO . "';";
+  $sql = "DELETE FROM Devices WHERE devMac = '". $MAC_TO . "';";
   $result = $db->query($sql);
 
   // insert new entry with the correct target MAC from the temporary table
-  $sql = "INSERT INTO Devices SELECT * FROM temp_devices WHERE dev_MAC = '".$MAC_TO."'";
+  $sql = "INSERT INTO Devices SELECT * FROM temp_devices WHERE devMac = '".$MAC_TO."'";
   $result = $db->query($sql);
 
   // clean-up temporary table
@@ -966,13 +968,13 @@ function copyFromDevice() {
 //------------------------------------------------------------------------------
 function getDeviceCondition ($deviceStatus) {
   switch ($deviceStatus) {
-    case 'all':        return 'WHERE dev_Archived=0';                                                        break;
-    case 'my':         return 'WHERE dev_Archived=0';                                                        break;
-    case 'connected':  return 'WHERE dev_Archived=0 AND dev_PresentLastScan=1';                              break;
-    case 'favorites':  return 'WHERE dev_Archived=0 AND dev_Favorite=1';                                     break;
-    case 'new':        return 'WHERE dev_Archived=0 AND dev_NewDevice=1';                                    break;
-    case 'down':       return 'WHERE dev_Archived=0 AND dev_AlertDeviceDown !=0 AND dev_PresentLastScan=0';  break;
-    case 'archived':   return 'WHERE dev_Archived=1';                                                        break;
+    case 'all':        return 'WHERE devIsArchived=0';                                                        break;
+    case 'my':         return 'WHERE devIsArchived=0';                                                        break;
+    case 'connected':  return 'WHERE devIsArchived=0 AND devPresentLastScan=1';                              break;
+    case 'favorites':  return 'WHERE devIsArchived=0 AND devFavorite=1';                                     break;
+    case 'new':        return 'WHERE devIsArchived=0 AND devIsNew=1';                                    break;
+    case 'down':       return 'WHERE devIsArchived=0 AND devAlertDown !=0 AND devPresentLastScan=0';  break;
+    case 'archived':   return 'WHERE devIsArchived=1';                                                        break;
     default:           return 'WHERE 1=0';                                                                   break;
   }  
 }

front/php/server/events.php

@@ -108,12 +108,12 @@ function getEvents() {
   $periodDate = getDateFromPeriod();
 
   // SQL 
-  $SQL1 = 'SELECT eve_DateTime AS eve_DateTimeOrder, dev_name, dev_owner, eve_DateTime, eve_EventType, NULL, NULL, NULL, NULL, eve_IP, NULL, eve_AdditionalInfo, NULL, Dev_MAC, eve_PendingAlertEmail
+  $SQL1 = 'SELECT eve_DateTime AS eve_DateTimeOrder, devName, devOwner, eve_DateTime, eve_EventType, NULL, NULL, NULL, NULL, eve_IP, NULL, eve_AdditionalInfo, NULL, devMac, eve_PendingAlertEmail
            FROM Events_Devices 
            WHERE eve_DateTime >= '. $periodDate;
  
   $SQL2 = 'SELECT IFNULL (ses_DateTimeConnection, ses_DateTimeDisconnection) ses_DateTimeOrder,
-                  dev_name, dev_owner, Null, Null, ses_DateTimeConnection, ses_DateTimeDisconnection, NULL, NULL, ses_IP, NULL,  ses_AdditionalInfo, ses_StillConnected, Dev_MAC
+                  devName, devOwner, Null, Null, ses_DateTimeConnection, ses_DateTimeDisconnection, NULL, NULL, ses_IP, NULL,  ses_AdditionalInfo, ses_StillConnected, devMac
            FROM Sessions_Devices ';
 
   // SQL Variations for status

front/php/server/query_graphql.php

@@ -0,0 +1,84 @@
+<?php
+
+// ---- IMPORTS ----
+//------------------------------------------------------------------------------
+// Check if authenticated
+require_once $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
+// Get init.php 
+require dirname(__FILE__).'/../server/init.php';
+// ---- IMPORTS ----
+
+
+// Helper function to get GraphQL URL (you can replace this with environment variables)
+function getGraphQLUrl() {
+    $port = getSettingValue("GRAPHQL_PORT");  // Port for the GraphQL server
+    return "0.0.0.0:$port/graphql";  // Full URL to the GraphQL endpoint
+}
+
+// Function to make a GraphQL query
+function queryGraphQL($query, $variables = null) {
+    $url = getGraphQLUrl();
+    
+    // Prepare the request data
+    $data = [
+        'query' => $query
+    ];
+
+    // prepare header
+    $api_token = getSettingValue("API_TOKEN");
+    $headers = [
+        'Content-Type: application/json',
+        'Authorization: Bearer ' . $api_token  // Add Authorization header
+    ];
+
+
+    // Add variables if provided
+    if ($variables) {
+        $data['variables'] = $variables;
+    }
+
+    // Encode the data as JSON
+    $dataJson = json_encode($data);
+
+    // Initialize cURL
+    $ch = curl_init($url);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, $dataJson);
+
+    // Execute the request and handle errors
+    $response = curl_exec($ch);
+    if ($response === false) {
+        error_log('GraphQL Request Error: ' . curl_error($ch));
+        return ["error" => "Request failed (GraphQL server might be down). URL: " .$url . "  Error: ". curl_error($ch)];
+    }
+
+    curl_close($ch);
+    return json_decode($response, true);  // Decode and return the JSON response
+}
+
+//------------------------------------------------------------------------------
+// Handle incoming requests
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    // Decode the JSON input from the AJAX request
+    $input = json_decode(file_get_contents('php://input'), true);
+    
+    // Ensure the query is set
+    if (!isset($input['query'])) {
+        echo json_encode(['error' => 'No query provided']);
+        exit;
+    }
+
+    // Extract the query and variables
+    $query = $input['query'];
+    $variables = isset($input['variables']) ? $input['variables'] : null;
+
+    // Call the GraphQL function
+    $result = queryGraphQL($query, $variables);
+
+    // Send the response back to the client
+    header('Content-Type: application/json');
+    echo json_encode($result);
+}
+?>

front/php/server/util.php

@@ -548,35 +548,36 @@ function decodeSpecialChars($str) {
 // -------------------------------------------------------------------------------------------
 function getDevicesColumns(){
 
-  $columns = ["dev_MAC", 
-              "dev_Name",
-              "dev_Owner",
-              "dev_DeviceType",
-              "dev_Vendor",
-              "dev_Favorite",
-              "dev_Group",
-              "dev_Comments", 
-              "dev_FirstConnection",
-              "dev_LastConnection",
-              "dev_LastIP",
-              "dev_StaticIP",
-              "dev_ScanCycle",
-              "dev_LogEvents",
-              "dev_AlertEvents",
-              "dev_AlertDeviceDown",
-              "dev_SkipRepeated",
-              "dev_LastNotification",
-              "dev_PresentLastScan",
-              "dev_NewDevice",
-              "dev_Location",
-              "dev_Archived",
-              "dev_Network_Node_port",
-              "dev_Network_Node_MAC_ADDR",
-              "dev_Icon",
-              "dev_GUID",
-              "dev_SyncHubNodeName",
-              "dev_NetworkSite",
-              "dev_SSID"
+  $columns = ["devMac", 
+              "devName",
+              "devOwner",
+              "devType",
+              "devVendor",
+              "devFavorite",
+              "devGroup",
+              "devComments", 
+              "devFirstConnection",
+              "devLastConnection",
+              "devLastIP",
+              "devStaticIP",
+              "devScan",
+              "devLogEvents",
+              "devAlertEvents",
+              "devAlertDown",
+              "devSkipRepeated",
+              "devLastNotification",
+              "devPresentLastScan",
+              "devIsNew",
+              "devLocation",
+              "devIsArchived",
+              "devParentPort",
+              "devParentMAC",
+              "devIcon",
+              "devGUID",
+              "devSyncHubNode",
+              "devSite",
+              "devSSID",
+              "devSourcePlugin"
             ]; 
               
   return $columns;

front/php/templates/footer.php

@@ -31,6 +31,7 @@
       | <a href="https://github.com/jokob-sk/NetAlertX/tree/main/docs#documentation-overview" target="_blank">Docs <i class="fa fa-circle-question"></i></a>
       | <a href="https://github.com/jokob-sk/NetAlertX/issues"><i class="fa-solid fa-bug"></i></a> 
       | <a href="https://github.com/jokob-sk/NetAlertX/"><i class="fa-brands fa-github"></i></a> 
+      | <a href="https://discord.gg/UQnnHNYV"><i class="fa-brands fa-discord"></i></a> 
       | <a href="mailto:jokob@duck.com?subject=NetAlertX"><i class="fa-solid fa-envelope"></i></a> 
       | <a href="https://github.com/pucherot/Pi.Alert">&copy;</a> 
       | <?= lang('Maintenance_built_on');?>:  <?php include 'php/templates/build.php'; ?> 

front/php/templates/header.php

@@ -73,10 +73,14 @@
   <!-- 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;
+  }
   ?>
 
 
@@ -114,7 +118,7 @@
 <!-- ----------------------------------------------------------------------- -->
 <!-- Layout Boxed Yellow -->
 
-<body class="hold-transition fixed <?php echo $pia_skin_selected;?> sidebar-mini" <?php echo $BACKGROUND_IMAGE_PATCH;?> onLoad="show_pia_servertime();" >
+<body class="hold-transition fixed <?php echo $pia_skin_selected;?> sidebar-mini" onLoad="show_pia_servertime();" >
 <!-- Site wrapper -->
 <div class="wrapper">
 
@@ -251,28 +255,28 @@
           </a>
           <ul class="treeview-menu" style="display: <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('devices.php', 'deviceDetails.php') ) ){ echo 'block'; } else {echo 'none';} ?>;">
             <li>
-              <a href="devices.php#my" onclick="initializeDatatable('my')" >  <?= lang("Device_Shortcut_AllDevices");?> </a>
+              <a href="devices.php#my_devices" onclick="forceLoadUrl('devices.php#my_devices')" >  <?= lang("Device_Shortcut_AllDevices");?> </a>
             </li>
             <li>
-              <a href="devices.php#connected" onclick="initializeDatatable('connected')" >  <?= lang("Device_Shortcut_Connected");?> </a>
+              <a href="devices.php#connected" onclick="forceLoadUrl('devices.php#connected')" >  <?= lang("Device_Shortcut_Connected");?> </a>
             </li>
             <li>
-              <a href="devices.php#favorites" onclick="initializeDatatable('favorites')" > <?= lang("Device_Shortcut_Favorites");?> </a>
+              <a href="devices.php#favorites" onclick="forceLoadUrl('devices.php#favorites')" > <?= lang("Device_Shortcut_Favorites");?> </a>
             </li>
             <li>
-              <a href="devices.php#new" onclick="initializeDatatable('new')"  >  <?= lang("Device_Shortcut_NewDevices");?> </a>
+              <a href="devices.php#new" onclick="forceLoadUrl('devices.php#new')" >  <?= lang("Device_Shortcut_NewDevices");?> </a>
             </li>
             <li>
-              <a href="devices.php#down" onclick="initializeDatatable('down')" >  <?= lang("Device_Shortcut_DownOnly");?> </a>
+              <a href="devices.php#down" onclick="forceLoadUrl('devices.php#down')" >  <?= lang("Device_Shortcut_DownOnly");?> </a>
             </li>
             <li>
-              <a href="devices.php#offline" onclick="initializeDatatable('offline')" > <?= lang("Gen_Offline");?> </a>
+              <a href="devices.php#offline" onclick="forceLoadUrl('devices.php#offline')" > <?= lang("Gen_Offline");?> </a>
             </li>
             <li>
-              <a href="devices.php#archived" onclick="initializeDatatable('archived')" >  <?= lang("Device_Shortcut_Archived");?> </a>
+              <a href="devices.php#archived" onclick="forceLoadUrl('devices.php#archived')" >  <?= lang("Device_Shortcut_Archived");?> </a>
             </li>
-            
           </ul>
+
         </li>
 
         <!-- Monitoring menu item -->

front/php/templates/language/ar_ar.json

@@ -1,6 +1,8 @@
 {
     "API_CUSTOM_SQL_description": "",
     "API_CUSTOM_SQL_name": "",
+    "API_TOKEN_description": "",
+    "API_TOKEN_name": "",
     "API_display_name": "",
     "API_icon": "",
     "About_Design": "",
@@ -197,6 +199,7 @@
     "Device_Shortcut_Favorites": "",
     "Device_Shortcut_NewDevices": "",
     "Device_Shortcut_OnlineChart": "",
+    "Device_TableHead_AlertDown": "",
     "Device_TableHead_Connected_Devices": "",
     "Device_TableHead_Favorite": "",
     "Device_TableHead_FirstSession": "",
@@ -214,9 +217,11 @@
     "Device_TableHead_Owner": "",
     "Device_TableHead_Parent_MAC": "",
     "Device_TableHead_Port": "",
+    "Device_TableHead_PresentLastScan": "",
     "Device_TableHead_RowID": "",
     "Device_TableHead_Rowid": "",
     "Device_TableHead_SSID": "",
+    "Device_TableHead_SourcePlugin": "",
     "Device_TableHead_Status": "",
     "Device_TableHead_SyncHubNodeName": "",
     "Device_TableHead_Type": "",
@@ -269,6 +274,8 @@
     "Events_Tablelenght": "",
     "Events_Tablelenght_all": "",
     "Events_Title": "",
+    "GRAPHQL_PORT_description": "",
+    "GRAPHQL_PORT_name": "",
     "Gen_Action": "",
     "Gen_Add": "",
     "Gen_Add_All": "",
@@ -284,6 +291,7 @@
     "Gen_Description": "",
     "Gen_Error": "",
     "Gen_Filter": "",
+    "Gen_Generate": "",
     "Gen_LockedDB": "",
     "Gen_Offline": "",
     "Gen_Okay": "",
@@ -309,6 +317,8 @@
     "General_icon": "",
     "HRS_TO_KEEP_NEWDEV_description": "",
     "HRS_TO_KEEP_NEWDEV_name": "",
+    "HRS_TO_KEEP_OFFDEV_description": "",
+    "HRS_TO_KEEP_OFFDEV_name": "",
     "HelpFAQ_Cat_Detail": "",
     "HelpFAQ_Cat_Detail_300_head": "",
     "HelpFAQ_Cat_Detail_300_text_a": "",
@@ -545,6 +555,12 @@
     "Presence_CalHead_week": "",
     "Presence_CalHead_year": "",
     "Presence_CallHead_Devices": "",
+    "Presence_Key_OnlineNow": "",
+    "Presence_Key_OnlineNow_desc": "",
+    "Presence_Key_OnlinePast": "",
+    "Presence_Key_OnlinePastMiss": "",
+    "Presence_Key_OnlinePastMiss_desc": "",
+    "Presence_Key_OnlinePast_desc": "",
     "Presence_Loading": "",
     "Presence_Shortcut_AllDevices": "",
     "Presence_Shortcut_Archived": "",
@@ -695,6 +711,7 @@
     "settings_publishers_icon": "",
     "settings_publishers_info": "",
     "settings_publishers_label": "",
+    "settings_readonly": "",
     "settings_saved": "",
     "settings_system_icon": "",
     "settings_system_label": "",

front/php/templates/language/ca_ca.json

@@ -0,0 +1,721 @@
+{
+    "API_CUSTOM_SQL_description": "Pots especificar una consulta SQL personalitzada que generarà un fitxer JSON i el mostrarà mitjançant <a href=\"/api/table_custom_endpoint.json\" target=\"_blank\"><code>table_custom_endpoint.json</code> file endpoint</a>.",
+    "API_CUSTOM_SQL_name": "Punt final personalitzat",
+    "API_TOKEN_description": "",
+    "API_TOKEN_name": "",
+    "API_display_name": "API",
+    "API_icon": "",
+    "About_Design": "Dissenyat per:",
+    "About_Exit": "Sortir",
+    "About_Title": "",
+    "AppEvents_DateTimeCreated": "",
+    "AppEvents_Extra": "Extra",
+    "AppEvents_GUID": "",
+    "AppEvents_Helper1": "Ajudant 1",
+    "AppEvents_Helper2": "Ajudant 2",
+    "AppEvents_Helper3": "Ajudant 3",
+    "AppEvents_ObjectForeignKey": "Clau forana",
+    "AppEvents_ObjectIndex": "Índex",
+    "AppEvents_ObjectIsArchived": "",
+    "AppEvents_ObjectIsNew": "",
+    "AppEvents_ObjectPlugin": "",
+    "AppEvents_ObjectPrimaryID": "ID primari",
+    "AppEvents_ObjectSecondaryID": "ID secundari",
+    "AppEvents_ObjectStatus": "",
+    "AppEvents_ObjectStatusColumn": "Columna d'estat",
+    "AppEvents_ObjectType": "Tipus d'objecte",
+    "AppEvents_Plugin": "",
+    "AppEvents_Type": "Tipus",
+    "BackDevDetail_Actions_Ask_Run": "Vol executar aquesta comanda?",
+    "BackDevDetail_Actions_Not_Registered": "Comanda no registrada: ",
+    "BackDevDetail_Actions_Title_Run": "Executar la comanda",
+    "BackDevDetail_Copy_Ask": "",
+    "BackDevDetail_Copy_Title": "Copiar detalls",
+    "BackDevDetail_Tools_WOL_error": "La comanda NO s'ha executat.",
+    "BackDevDetail_Tools_WOL_okay": "La comanda s'ha executat.",
+    "BackDevices_Arpscan_disabled": "Arp-Scan Desactivat",
+    "BackDevices_Arpscan_enabled": "Arp-Scan Activat",
+    "BackDevices_Backup_CopError": "La base de dades original no s'ha pogut guardar.",
+    "BackDevices_Backup_Failed": "",
+    "BackDevices_Backup_okay": "La còpia de seguretat s'ha executat en un nou arxiu",
+    "BackDevices_DBTools_DelDevError_a": "Error esborrant el Dispositiu",
+    "BackDevices_DBTools_DelDevError_b": "Error esborrant els Dispositius",
+    "BackDevices_DBTools_DelDev_a": "Dispositiu esborrat",
+    "BackDevices_DBTools_DelDev_b": "Dispositius esborrats",
+    "BackDevices_DBTools_DelEvents": "Esdeveniments esborrats",
+    "BackDevices_DBTools_DelEventsError": "Error esborrant Esdeveniments",
+    "BackDevices_DBTools_ImportCSV": "Els dispositius del fitxer CSV s'han importat correctament.",
+    "BackDevices_DBTools_ImportCSVError": "El fitxer CSV no s'ha pogut importar. Comprovi que el format és correcte.",
+    "BackDevices_DBTools_ImportCSVMissing": "No es pot trobar el fitxer CSV a la ubicació <b>/config/devices.csv.</b>",
+    "BackDevices_DBTools_Purge": "Les còpies de seguretat més antigues s'han esborrat",
+    "BackDevices_DBTools_UpdDev": "Dispositiu actualitzat correctament",
+    "BackDevices_DBTools_UpdDevError": "Error actualitzant el dispositiu",
+    "BackDevices_DBTools_Upgrade": "Base de dades actualitzada correctament",
+    "BackDevices_DBTools_UpgradeError": "Actualització de la base de dades fallida",
+    "BackDevices_Device_UpdDevError": "Error actualitzant dispositius, intenti-ho més endavant. Potser la base de dades està bloquejada per una altra tasca.",
+    "BackDevices_Restore_CopError": "La base de dades original no s'ha pogut guardar.",
+    "BackDevices_Restore_Failed": "Ha fallat la restauració. Si us plau faci una restauració manual de la còpia de seguretat.",
+    "BackDevices_Restore_okay": "Restauració completada correctament.",
+    "BackDevices_darkmode_disabled": "Mode fosc Desactivat",
+    "BackDevices_darkmode_enabled": "Mode fosc Activat",
+    "CLEAR_NEW_FLAG_description": "",
+    "CLEAR_NEW_FLAG_name": "Netejar indicador de nou",
+    "DAYS_TO_KEEP_EVENTS_description": "Això és una configuració de manteniment. Especifica el nombre de dies que es conservaran els esdeveniments. Els esdeveniments antics s'esborraran periòdicament. També aplica als esdeveniments dels Connectors (Plugins).",
+    "DAYS_TO_KEEP_EVENTS_name": "Esborrar esdeveniments més vells de",
+    "DevDetail_Copy_Device_Title": "<i class=\"fa fa-copy\"></i> Copiar detalls des del dispositiu",
+    "DevDetail_Copy_Device_Tooltip": "Copiar detalls del dispositius des de la llista desplegable. Tot el d'aquesta pàgina es sobre-escriurà",
+    "DevDetail_EveandAl_AlertAllEvents": "Alertes",
+    "DevDetail_EveandAl_AlertDown": "",
+    "DevDetail_EveandAl_Archived": "Arxivat",
+    "DevDetail_EveandAl_NewDevice": "Nou Dispositiu",
+    "DevDetail_EveandAl_NewDevice_Tooltip": "Es mostrarà el nou estat del dispositiu i s'inclourà a les llistes quan el filtre New Devices estigui actiu. No afecta les notificacions.",
+    "DevDetail_EveandAl_RandomMAC": "MAC aleatori",
+    "DevDetail_EveandAl_ScanCycle": "Dispositiu d'escaneig",
+    "DevDetail_EveandAl_ScanCycle_a": "Dispositiu d'escaneig",
+    "DevDetail_EveandAl_ScanCycle_z": "No Escanejar Dispositiu",
+    "DevDetail_EveandAl_Skip": "Omet notificacions repetides per",
+    "DevDetail_EveandAl_Title": "<i class=\"fa fa-bolt\"></i> Configuració de Successos i Alertes",
+    "DevDetail_Events_CheckBox": "Amagar successos de connexió",
+    "DevDetail_GoToNetworkNode": "Navegació a la pàgina de la Xarxa del node donat.",
+    "DevDetail_Icon": "Icona",
+    "DevDetail_Icon_Descr": "",
+    "DevDetail_Loading": "",
+    "DevDetail_MainInfo_Comments": "",
+    "DevDetail_MainInfo_Favorite": "",
+    "DevDetail_MainInfo_Group": "",
+    "DevDetail_MainInfo_Location": "",
+    "DevDetail_MainInfo_Name": "",
+    "DevDetail_MainInfo_Network": "",
+    "DevDetail_MainInfo_Network_Port": "",
+    "DevDetail_MainInfo_Network_Site": "",
+    "DevDetail_MainInfo_Network_Title": "",
+    "DevDetail_MainInfo_Owner": "",
+    "DevDetail_MainInfo_SSID": "",
+    "DevDetail_MainInfo_Title": "",
+    "DevDetail_MainInfo_Type": "",
+    "DevDetail_MainInfo_Vendor": "Venedor",
+    "DevDetail_MainInfo_mac": "MAC",
+    "DevDetail_Network_Node_hover": "",
+    "DevDetail_Network_Port_hover": "El port on el dispositiu està connectat al dispositiu de xarxa del pare. Si es deixa buit, sortirà una icona wifi a la representació de la Xarxa.",
+    "DevDetail_Nmap_Scans": "Escaneig manual Nmap",
+    "DevDetail_Nmap_Scans_desc": "Aquí podeu executar les exploracions NMAP manuals. També podeu programar les exploracions NMAP automàtiques a través del connector Serveis i Ports (NMAP). Ves a <a href='/settings.php' target='_blank'>Configuració</a> per saber-ne més",
+    "DevDetail_Nmap_buttonDefault": "Escaneig predeterminat",
+    "DevDetail_Nmap_buttonDefault_text": "Escaneig predeterminat: Nmap escaneja els 1000 ports superiors per a cada protocol d'exploració sol·licitat. El 93% dels ports TCP i el 49% dels ports UDP. (uns 5 segons)",
+    "DevDetail_Nmap_buttonDetail": "Escaneig Detallat",
+    "DevDetail_Nmap_buttonDetail_text": "Escaneig detallat: Escaneig predeterminat amb detecció del sistema operatiu habilitat, detecció de versions, escaneig i traça (fins a 30 segons o més)",
+    "DevDetail_Nmap_buttonFast": "Escaneig ràpid",
+    "DevDetail_Nmap_buttonFast_text": "Escaneig ràpid: Escaneig de menys ports (100) que l'exploració predeterminada (uns pocs segons)",
+    "DevDetail_Nmap_buttonSkipDiscovery": "Ometre el descobriment de Hosts",
+    "DevDetail_Nmap_buttonSkipDiscovery_text": "Omet descobriment de Host (-Pn opció): exploració predeterminada sense descobriment de host",
+    "DevDetail_Nmap_resultsLink": "Podeu sortir d'aquesta pàgina després d'iniciar una exploració. Els resultats també estaran disponibles al fitxer <code>app_front.log</code>.",
+    "DevDetail_Owner_hover": "Titular d'aquest dispositiu. Camp de text lliure.",
+    "DevDetail_Periodselect_All": "Tota la informació",
+    "DevDetail_Periodselect_LastMonth": "Darrer Mes",
+    "DevDetail_Periodselect_LastWeek": "Darrera setmana",
+    "DevDetail_Periodselect_LastYear": "Últim any",
+    "DevDetail_Periodselect_today": "Avui",
+    "DevDetail_Run_Actions_Title": "<i class=\"fa fa-play\"></i> Executar l'acció al dispositiu",
+    "DevDetail_Run_Actions_Tooltip": "Executar una acció al dispositiu actual des de la llista desplegable.",
+    "DevDetail_SessionInfo_FirstSession": "Primera Sessió",
+    "DevDetail_SessionInfo_LastIP": "Darrera IP",
+    "DevDetail_SessionInfo_LastSession": "Últim Fora de línia",
+    "DevDetail_SessionInfo_StaticIP": "IP estàtica",
+    "DevDetail_SessionInfo_Status": "Estat",
+    "DevDetail_SessionInfo_Title": "<i class=\"fa fa-calendar\"></i> Informació de la sessió",
+    "DevDetail_SessionTable_Additionalinfo": "Informació addicional",
+    "DevDetail_SessionTable_Connection": "Connexió",
+    "DevDetail_SessionTable_Disconnection": "Desconnexió",
+    "DevDetail_SessionTable_Duration": "Durada",
+    "DevDetail_SessionTable_IP": "IP",
+    "DevDetail_SessionTable_Order": "Ordre",
+    "DevDetail_Shortcut_CurrentStatus": "Estat actual",
+    "DevDetail_Shortcut_DownAlerts": "",
+    "DevDetail_Shortcut_Presence": "Presència",
+    "DevDetail_Shortcut_Sessions": "Sessions",
+    "DevDetail_Tab_Details": "<i class=\"fa fa-info-circle\"></i> Detalls",
+    "DevDetail_Tab_Events": "<i class=\"fa fa-bolt\"></i> Esdeveniments",
+    "DevDetail_Tab_EventsTableDate": "Data",
+    "DevDetail_Tab_EventsTableEvent": "Tipus d'esdeveniment",
+    "DevDetail_Tab_EventsTableIP": "IP",
+    "DevDetail_Tab_EventsTableInfo": "Informació addicional",
+    "DevDetail_Tab_Nmap": "<i class=\"fa fa-ethernet\"></i> Nmap",
+    "DevDetail_Tab_NmapEmpty": "Cap port detectat amb Nmap en aquest dispositiu.",
+    "DevDetail_Tab_NmapTableExtra": "Extra",
+    "DevDetail_Tab_NmapTableHeader": "Resultats de la exploració programada",
+    "DevDetail_Tab_NmapTableIndex": "Índex",
+    "DevDetail_Tab_NmapTablePort": "Port",
+    "DevDetail_Tab_NmapTableService": "Servei",
+    "DevDetail_Tab_NmapTableState": "Estat",
+    "DevDetail_Tab_NmapTableText": "Configurar un calendari a <a href=\"/settings.php#NMAP_ACTIVE\">Configuració</a>",
+    "DevDetail_Tab_NmapTableTime": "Temps",
+    "DevDetail_Tab_Plugins": "<i class=\"fa fa-plug\"></i> Connectors (Plugins)",
+    "DevDetail_Tab_Presence": "<i class=\"fa fa-calendar\"></i> Presència",
+    "DevDetail_Tab_Sessions": "<i class=\"fa fa-list-ol\"></i> Sessions",
+    "DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> Eines",
+    "DevDetail_Tab_Tools_Internet_Info_Description": "L'eina d'informació d'Internet mostra informació sobre la connexió a Internet, com ara adreça IP, ciutat, país, codi d'àrea i zona horària.",
+    "DevDetail_Tab_Tools_Internet_Info_Error": "S'ha produït un error",
+    "DevDetail_Tab_Tools_Internet_Info_Start": "Inici Informació d'Internet",
+    "DevDetail_Tab_Tools_Internet_Info_Title": "Informació d'Internet",
+    "DevDetail_Tab_Tools_Nslookup_Description": "Nslookup és una eina de línia de comandes utilitzada per consultar el sistema de noms de domini (DNS). DNS és un sistema que tradueix noms de domini, com www.google.com, a adreces d'IP, com 172.217.0.142.",
+    "DevDetail_Tab_Tools_Nslookup_Error": "Error: l'adreça IP no és vàlida",
+    "DevDetail_Tab_Tools_Nslookup_Start": "Iniciar Nslookup",
+    "DevDetail_Tab_Tools_Nslookup_Title": "Nslookup",
+    "DevDetail_Tab_Tools_Speedtest_Description": "L'eina Speedtest mesura la velocitat de descàrrega, la velocitat de pujada i la latència de la connexió a Internet.",
+    "DevDetail_Tab_Tools_Speedtest_Start": "Iniciar Speedtest",
+    "DevDetail_Tab_Tools_Speedtest_Title": "Speedtest Online",
+    "DevDetail_Tab_Tools_Traceroute_Description": "Traceroute és una ordre de diagnòstic de xarxa utilitzada per traçar el camí que els paquets de dades prenen d'un amfitrió a un altre.<br><br> L'ordre utilitza el protocol de missatges de control d'Internet (ICMP) per enviar paquets a nodes intermedis de la ruta, cada node intermedi respon amb un paquet de temps de sortida ICMP (TTL a temps).<br><br> La sortida de l'ordre traceroute mostra l'adreça IP de cada node intermedi de la ruta.<br><br> L'ordre traceroute es pot utilitzar per diagnosticar problemes de xarxa, com ara retards, pèrdua de paquets i rutes bloquejades.<br><br> També es pot utilitzar per identificar la localització d’un node intermedi en una xarxa.",
+    "DevDetail_Tab_Tools_Traceroute_Error": "Error: l'adreça IP no és vàlida",
+    "DevDetail_Tab_Tools_Traceroute_Start": "Inici Traceroute",
+    "DevDetail_Tab_Tools_Traceroute_Title": "Traceroute",
+    "DevDetail_Tools_WOL": "Enviar comanda WoL a ",
+    "DevDetail_Tools_WOL_noti": "Wake-on-LAN",
+    "DevDetail_Tools_WOL_noti_text": "L'ordre Wake-on-LAN s'envia a l'adreça de difusió. Si l'objectiu no és a la subxarxa/VLAN de NetAlertX, el dispositiu objectiu no respondrà.",
+    "DevDetail_Type_hover": "Tipus del dispositiu. Si seleccioneu qualsevol dels dispositius de xarxa predefinits (per exemple: AP, Firewall, Router, Switch...) es mostrarà a la configuració de Xarxa com a possible node de xarxa mare.",
+    "DevDetail_Vendor_hover": "El venedor ha de ser autodetectat. Pots sobreescriure o afegir el teu valor personalitzat.",
+    "DevDetail_WOL_Title": "<i class=\"fa fa-power-off\"></i> Wake-on-LAN",
+    "DevDetail_button_AddIcon": "Afegir nova icona",
+    "DevDetail_button_AddIcon_Help": "Enganxeu en una etiqueta html SVG o en una icona etiqueta html Font Awesome. Llegir el <a href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/ICONS.md\" target=\"_blank\">Icons docs</a> per a més detalls.",
+    "DevDetail_button_AddIcon_Tooltip": "Afegir una nova Icona a aquest dispositiu que encara no està disponible al desplegable.",
+    "DevDetail_button_Delete": "Eliminar dispositiu",
+    "DevDetail_button_DeleteEvents": "Eliminar Esdeveniments",
+    "DevDetail_button_DeleteEvents_Warning": "Estàs segur que vols eliminar tots els esdeveniments d'aquest dispositiu?<br><br>(això esborrarà la <b>Historial d'esdeveniments</b> i la <b>Sessions</b> i pot ajudar amb les notificacions constants (persistents)",
+    "DevDetail_button_OverwriteIcons": "Sobreescriure icones",
+    "DevDetail_button_OverwriteIcons_Tooltip": "Sobreescriure icones de tots els dispositius amb el mateix tipus de dispositiu",
+    "DevDetail_button_OverwriteIcons_Warning": "Estàs segur que vols sobreescriure totes les icones de tots els dispositius amb el mateix tipus de dispositiu que el tipus de dispositiu actual?",
+    "DevDetail_button_Reset": "Restablir canvis",
+    "DevDetail_button_Save": "Guardar",
+    "Device_MultiEdit": "Multi-edició",
+    "Device_MultiEdit_Backup": "Atenció, entrar valors incorrectes a continuació trencarà la configuració. Si us plau, abans feu còpia de seguretat la vostra base de dades o configuració de Dispositius (<a href=\"php/server/devices.php?action=ExportCSV\">clic per descarregar <i class=\"fa-solid fa-download fa-bounce\"></i></a>). Llegiu com per recuperar Dispositius des d'aquest fitxer dins el <a href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/BACKUPS.md#scenario-2-corrupted-database\" target=\"_blank\">documentació de Còpies de seguretat</a>.",
+    "Device_MultiEdit_Fields": "Editar camps:",
+    "Device_MultiEdit_MassActions": "Accions massives:",
+    "Device_MultiEdit_Tooltip": "Atenció. Si feu clic a això s'aplicarà el valor de l'esquerra a tots els dispositius seleccionats a dalt.",
+    "Device_Searchbox": "Cerca",
+    "Device_Shortcut_AllDevices": "Els meus dispositius",
+    "Device_Shortcut_Archived": "Arxivat",
+    "Device_Shortcut_Connected": "Connectat",
+    "Device_Shortcut_Devices": "Dispositius",
+    "Device_Shortcut_DownAlerts": "Aturat i Fora de línia",
+    "Device_Shortcut_DownOnly": "Aturat",
+    "Device_Shortcut_Favorites": "Favorits",
+    "Device_Shortcut_NewDevices": "Nous dispositius",
+    "Device_Shortcut_OnlineChart": "Presència de dispositius",
+    "Device_TableHead_AlertDown": "",
+    "Device_TableHead_Connected_Devices": "Connexions",
+    "Device_TableHead_Favorite": "Favorit",
+    "Device_TableHead_FirstSession": "Primera Sessió",
+    "Device_TableHead_GUID": "GUID",
+    "Device_TableHead_Group": "Grup",
+    "Device_TableHead_Icon": "Icona",
+    "Device_TableHead_LastIP": "Darrera IP",
+    "Device_TableHead_LastIPOrder": "Últim Ordre d'IP",
+    "Device_TableHead_LastSession": "Últim Offline",
+    "Device_TableHead_Location": "Ubicació",
+    "Device_TableHead_MAC": "MAC aleatori",
+    "Device_TableHead_MAC_full": "MAC complet",
+    "Device_TableHead_Name": "Nom",
+    "Device_TableHead_NetworkSite": "Network Site",
+    "Device_TableHead_Owner": "Propietari",
+    "Device_TableHead_Parent_MAC": "MAC del node pare",
+    "Device_TableHead_Port": "Port",
+    "Device_TableHead_PresentLastScan": "",
+    "Device_TableHead_RowID": "ID de fila",
+    "Device_TableHead_Rowid": "ID de fila",
+    "Device_TableHead_SSID": "SSID",
+    "Device_TableHead_SourcePlugin": "Connector(Plugin) font",
+    "Device_TableHead_Status": "Estat",
+    "Device_TableHead_SyncHubNodeName": "Node Sync",
+    "Device_TableHead_Type": "Tipus",
+    "Device_TableHead_Vendor": "Venedor",
+    "Device_Table_Not_Network_Device": "No configurat com a dispositiu de xarxa",
+    "Device_Table_info": "Mostrant _INICI_ a_FINAL_ d'entrades_ TOTALS",
+    "Device_Table_nav_next": "Següent",
+    "Device_Table_nav_prev": "Anterior",
+    "Device_Tablelenght": "Veure_entrades_MENU",
+    "Device_Tablelenght_all": "Tot",
+    "Device_Title": "Dispositius",
+    "Donations_Others": "Altres",
+    "Donations_Platforms": "Plataformes patrocinadores",
+    "Donations_Text": "Hola 👋! </br> Gràcies per fer clic en aquest element de menú 😅 </br> </br> Estic intentant recollir algunes donacions per fer un millor programari. També, m'ajudaria per cremar-me, i així recolzar aquesta aplicació més temps. Qualsevol petit (recurrent o no) patrocini em farà posar més esforç a aquesta aplicació. </br>  M'agradaria escurçar la meva setmana de feina i en el temps restant enfocar-me en el NetAlertX. Així rebries més funcionalitat, una aplicació més neta i menys bugs. </br> </br> Gràcies per llegir-ho - Agraeixo qualsevol suport ❤🙏 </br>  </br> TL;DR: Pel teu suport reps: </br>  </br> <ul><li>Actualitzacions regulars per seguir les vostres dades i mantenir la família segura 🔄</li><li>Menys bugs 🐛🔫</li><li>Millor i més funcionalitat➕</li><li>Que no m'arribi el \"burn out\" 🔥🤯</li><li>Menys actualitzacions d'emergència 💨</li><li>Millors documentacions📚</li><li>Suport més ràpid i millor amb les incidències 🆘</li></ul> </br> 📧Correu electrònic <a href='mailto:jokob@duck.com?subject=NetAlertX'>jokob@duck.com</a> si vols contactar o si hauria d'afegir altres programes de patrocini. </br>",
+    "Donations_Title": "Donacions",
+    "ENABLE_PLUGINS_description": "Habilita la <a target=\"_blank\" href=\"https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins\">connectors</a> funcionalitat. Carregar els connectors requereix més recursos de maquinari així podries voler desactivar-los en un sistema de baixos recursos.",
+    "ENABLE_PLUGINS_name": "Activa els connectors(Plugins)",
+    "Email_display_name": "Correu electrònic",
+    "Email_icon": "<i class=\"fa fa-at\"></i>",
+    "Events_Loading": "Carregant ...",
+    "Events_Periodselect_All": "Tota la informació",
+    "Events_Periodselect_LastMonth": "Darrer Mes",
+    "Events_Periodselect_LastWeek": "Darrera setmana",
+    "Events_Periodselect_LastYear": "Últim Any",
+    "Events_Periodselect_today": "Avui",
+    "Events_Searchbox": "",
+    "Events_Shortcut_AllEvents": "Tots els esdeveniments",
+    "Events_Shortcut_DownAlerts": "Aturar alertes",
+    "Events_Shortcut_Events": "Esdeveniments",
+    "Events_Shortcut_MissSessions": "",
+    "Events_Shortcut_NewDevices": "Nous dispositius",
+    "Events_Shortcut_Sessions": "Sessions",
+    "Events_Shortcut_VoidSessions": "Sessions Anulades",
+    "Events_TableHead_AdditionalInfo": "Informació addicional",
+    "Events_TableHead_Connection": "Connexió",
+    "Events_TableHead_Date": "Data",
+    "Events_TableHead_Device": "Dispositiu",
+    "Events_TableHead_Disconnection": "Desconnexió",
+    "Events_TableHead_Duration": "Durada",
+    "Events_TableHead_DurationOrder": "",
+    "Events_TableHead_EventType": "Tipus d'esdeveniment",
+    "Events_TableHead_IP": "IP",
+    "Events_TableHead_IPOrder": "",
+    "Events_TableHead_Order": "",
+    "Events_TableHead_Owner": "Propietari",
+    "Events_TableHead_PendingAlert": "Alerta pendent",
+    "Events_Table_info": "Mostrant _INICI_ a_FINAL_ d'entrades_ TOTALS",
+    "Events_Table_nav_next": "Següent",
+    "Events_Table_nav_prev": "Anterior",
+    "Events_Tablelenght": "Veure_entrades_MENU",
+    "Events_Tablelenght_all": "Tot",
+    "Events_Title": "Esdeveniments",
+    "GRAPHQL_PORT_description": "El número de port del servidor GraphQL.",
+    "GRAPHQL_PORT_name": "Port GraphQL",
+    "Gen_Action": "Acció",
+    "Gen_Add": "Afegir",
+    "Gen_Add_All": "Afegeix tot",
+    "Gen_All_Devices": "Tots els dispositius",
+    "Gen_AreYouSure": "Estàs segur?",
+    "Gen_Backup": "Executar Backup",
+    "Gen_Cancel": "Cancel·lar",
+    "Gen_Change": "Canviar",
+    "Gen_Copy": "Executar",
+    "Gen_DataUpdatedUITakesTime": "D'acord - Pot passar una estona perquè la interfície d'usuari s'actualitzi si s'està executant una exploració.",
+    "Gen_Delete": "Esborrar",
+    "Gen_DeleteAll": "Esborrar tot",
+    "Gen_Description": "Descripció",
+    "Gen_Error": "Error",
+    "Gen_Filter": "Filtrar",
+    "Gen_Generate": "Generar",
+    "Gen_LockedDB": "ERROR - DB podria estar bloquejada - Fes servir F12 Eines desenvolupament -> Consola o provar-ho més tard.",
+    "Gen_Offline": "Fora de línia",
+    "Gen_Okay": "Ok",
+    "Gen_Purge": "Elimina",
+    "Gen_ReadDocs": "Llegit més dins el docs.",
+    "Gen_Remove_All": "Esborra tot",
+    "Gen_Remove_Last": "Esborra el darrer",
+    "Gen_Restore": "Executar Restaurar",
+    "Gen_Run": "Executar",
+    "Gen_Save": "Guardar",
+    "Gen_Saved": "Guardat",
+    "Gen_Search": "",
+    "Gen_SelectToPreview": "Seleccioneu la vista prèvia",
+    "Gen_Selected_Devices": "Dispositius seleccionats:",
+    "Gen_Switch": "Switch",
+    "Gen_Upd": "Actualitzat correctament",
+    "Gen_Upd_Fail": "Actualització fallida",
+    "Gen_Update": "Actualitza",
+    "Gen_Update_Value": "Actualitzar Valor",
+    "Gen_Warning": "Advertència",
+    "Gen_Work_In_Progress": "Work in progress, un bon moment per retroalimentació a https://github.com/jokob-sk/NetAlertX/issues",
+    "General_display_name": "General",
+    "General_icon": "<i class=\"fa fa-gears\"></i>",
+    "HRS_TO_KEEP_NEWDEV_description": "Això és un paràmetre de manteniment <b>ELIMINANT dispositius</b>. Si s'activa (<code>0</code> està desactivat), els dispositius marcats com <b>Dispositiu Nou</b> seran eliminats si el temps de <b>Primera Sessió</b> es més vell que les hores especificades en aquest paràmetre. Faci servir aquest paràmetre si vol auto-eliminar <b>Nous Dispositius</b> després de <code>X</code> hores.",
+    "HRS_TO_KEEP_NEWDEV_name": "Eliminar nous dispositius després de",
+    "HRS_TO_KEEP_OFFDEV_description": "Això és un paràmetre de manteniment <b>ELIMINANT dispositius</b>. Si s'activa (<code>0</code> està desactivat), els dispositius que estan <b>Offline</b> i el seu temps <b>Last Offline</b> es més vell que les hores especificades en aquest paràmetre, s'esborraran. Faci servir aquest paràmetre si vol auto-eliminar  <b>Dispositius Offline</b> després de <code>X</code> hores sense connexió.",
+    "HRS_TO_KEEP_OFFDEV_name": "Eliminar dispositius fora de línia després",
+    "HelpFAQ_Cat_Detail": "Detalls",
+    "HelpFAQ_Cat_Detail_300_head": "Què significa ",
+    "HelpFAQ_Cat_Detail_300_text_a": "significa un dispositiu de xarxa (un dispositiu del tipus AP, Gateway, Firewall, Hypervisor, Powerline, Switch, WLAN, PLC, router, adaptador LAN USB, adaptador WIFI USB, o Internet). Els tipus personalitzats es poden afegir a través de la configuració <code>NETWORK_DEVICE_TYPES</code>.",
+    "HelpFAQ_Cat_Detail_300_text_b": "designa el número de port on el dispositiu que s'està editant està connectat al dispositiu de xarxa. Llegir <a target=\"_blank\" href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/NETWORK_TREE.md\">aquesta guia</a> per a més informació.",
+    "HelpFAQ_Cat_Detail_301_head_a": "",
+    "HelpFAQ_Cat_Detail_301_head_b": " diu 1min però el gràfic mostra intervals de 5min.",
+    "HelpFAQ_Cat_Detail_301_text": "L'interval de temps entre les exploracions es defineix per la \"Cronjob\", que s'estableix a 5min per defecte. La denominació \"1min\" fa referència a la durada prevista de l'exploració. Segons la configuració de la xarxa, aquesta vegada pot variar. Per editar el cronjob, podeu utilitzar l'ordre següent al terminal/consol <span class=\"text-danger help_faq_code\">crontab -e</span> i canviar l'interval.",
+    "HelpFAQ_Cat_Detail_302_head_a": "Què significa ",
+    "HelpFAQ_Cat_Detail_302_head_b": "i per què no puc seleccionar això?",
+    "HelpFAQ_Cat_Detail_302_text": "Alguns dispositius moderns generen adreça MAC aleatòria per a raons de privacitat, ja no es poden associar amb els fabricants i canvien amb cada connexió nova. NetAlertX detecta si és aquest tipus d'adreça MAC aleatoria i activa aquest \"camp\" automàticament. Per desactivar aquesta conducta has de mirar en el vostre dispositiu com desactivar la randomització d'adreça MAC.",
+    "HelpFAQ_Cat_Detail_303_head": "Què és Nmap i perquè serveix?",
+    "HelpFAQ_Cat_Detail_303_text": "Nmap és un escàner de xarxa amb múltiples capacitats.<br> Quan un nou dispositiu apareix a la seva llista, vostè té la possibilitat d'obtenir informació més detallada sobre el dispositiu mitjançant l'exploració Nmap.",
+    "HelpFAQ_Cat_Device_200_head": "Tinc dispositius en la meva llista que no conec. Després de suprimir-los, sempre tornen a aparèixer.",
+    "HelpFAQ_Cat_Device_200_text": "Si utilitzes Pi-hole, per favor recorda que NetAlertX recupera informació des de Pi-hole. Pausa NetAlertX, ves a la pàgina de paràmetres en Pi-hole i elimina en les concessions DHCP si és necessari. També al Pi-hole, sota Eines -> Xarxa revisa si pots trobar amfitrions recurrents allà. Si n'hi ha, elimina'ls allà també. Després pots tornar a arrencar NetAlertX. Ara el(s) dispositiu(s) no hauria d'aparèixer més.",
+    "HelpFAQ_Cat_General": "General",
+    "HelpFAQ_Cat_General_100_head": "El rellotge a la part dreta superior i el temps dels esdeveniments no son correctes (diferència de temps).",
+    "HelpFAQ_Cat_General_100_text_a": "En el seu PC la següent zona horària s'ha establert per a l'entorn PHP:",
+    "HelpFAQ_Cat_General_100_text_b": "Si no és la zona horària en la qual es troba, ha de canviar la zona horària en el fitxer de configuració PHP. Podeu trobar-lo en aquest directori:",
+    "HelpFAQ_Cat_General_100_text_c": "Cerca en aquest fitxer per a l'entrada \"date.timezone\", traieu el líder \";\" si cal i introduïu la zona horària desitjada. Podeu trobar una llista amb les zones horàries suportades aquí (<a href=\"https://www.php.net/manual/en/timezones.php\" target=\"blank\">Link</a>)",
+    "HelpFAQ_Cat_General_101_head": "La meva xarxa sembla alentir, streaming es congela.",
+    "HelpFAQ_Cat_General_101_text": "Pot ser que els dispositius de baixa potència arribin als seus límits de rendiment per la manera que NetalertX detecta nous dispositius a la xarxa. Això s'amplifica encara més, si aquests dispositius comuniquen amb la xarxa via WLAN. Les solucions aquí serien canviar a una connexió per cable si és possible o, si el dispositiu s'utilitza per un període limitat de temps, per usar el scan arp, aturar el scan arp a la pàgina de manteniment.",
+    "HelpFAQ_Cat_General_102_head": "Rebo el missatge que la base de dades és només de lectura.",
+    "HelpFAQ_Cat_General_102_text": "Comprova dins del directori NetAlertX si la carpeta de base de dades (db) té assignats els permisos correctes:<br> <span class=\"text-danger help_faq_code\">drwxrwx---  2 (el vostre username) www-dada</span><br> Si el permís no és correcte, el pots posar de nou amb les ordres següents en la terminal o la consola:<br> <span class=\"text-danger help_faq_code\">sudo chgrp -R www-aplicació /de dades/db<br>chmod -R 770 /aplicació/db</span><br>Si la base de dades és encara només de lectura, prova reinstal·lar o restaurar una còpia de seguretat de base de dades des de la pàgina de manteniment.",
+    "HelpFAQ_Cat_General_102docker_head": "Assumptes de base de dades (AJAX errors, només de lectura, no trobat)",
+    "HelpFAQ_Cat_General_102docker_text": "Comprova si has seguit el <a target=\"_blank\" href=\"https://github.com/jokob-sk/NetAlertX/tree/main/dockerfiles\">dockerfile readme (informació més actual)</a>. <br/> <br/> <ul data-sourcepos=\"49:4-52:146\" dir=\"auto\"><li data-sourcepos=\"49:4-49:106\">Descarrega la <a target=\"_blank\"  href=\"https://github.com/jokob-sk/NetAlertX/blob/main/db/app.db\">  base de dades original des de GitHub</a>.</li><li data-sourcepos=\"50:4-50:195\">Mapeja el <code>app.db</code> fitxer (<g-emoji class=\"g-emoji\" alias=\"warning\" fallback-src=\"https://github.githubassets.com/images/icons/emoji/unicode/26a0.png\">⚠</g-emoji> not folder) des de sobre a <code>/app/db/app.db</code> (veure <a target=\"_blank\"  href=\"https://github.com/jokob-sk/NetAlertX/tree/main/dockerfiles#-examples\">Exemples</a> per detalls).</li><li data-sourcepos=\"51:4-51:161\">Si trobes problemes (AJAX errors, que no es pot escriure a DB, etc,) assegura que els permisos s'han posat correctament, alternativament comprova els registres a <code>/app/front/log</code>.</li><li data-sourcepos=\"52:4-52:146\">Per solucionar els permisos també pot intentar crear un DB còpia de seguretat i llavors executar una restauració DB via la secció <strong>Manteniment &gt; Backup/Restaurar</strong> .</li><li data-sourcepos=\"53:4-53:228\">Si la base de dades esta en mode només de lectura, pots solucionar això configuranr el propietari i el grup amb l'ordre següent en el sistema amfitrió: <code>docker exec netalertx chown -R www-data:www-data /app/db/app.db</code>.</li></ul>",
+    "HelpFAQ_Cat_General_103_head": "La pàgina de login no apareix, fins i tot després de canviar la contrasenya.",
+    "HelpFAQ_Cat_General_103_text": "A més de la contrasenya, el fitxer de configuració ha de contenir <span class=\"text-danger help_faq_code\">/app/config/app.conf</span> també el paràmetre <span class=\"text-danger help_faq_code\">PIALERT_WEB_PROTECTION</span> i s'ha d'establir a <span class=\"text-danger help_faq_code\">True</span>.",
+    "HelpFAQ_Cat_Network_600_head": "Per a què serveix aquesta pàgina?",
+    "HelpFAQ_Cat_Network_600_text": "Aquesta pàgina t'hauria d'oferir la possibilitat de mapejar l'assignació dels vostres dispositius de xarxa. Per a aquest propòsit, pots crear un o més switch, WLANs, enrutadors, etc., proporciona'ls un número de port si és necessari i assigna'ls dispositius ja detectats. Aquesta assignació es fa dins la vista detallada del dispositiu. Així és possible determinar ràpidament a quin port s'ha connectat un host i si està en línia. Llegir <a target=\"_blank\" href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/NETWORK_TREE.md\">aquesta guia</a> per més informació.",
+    "HelpFAQ_Cat_Network_601_head": "Hi ha altres documents?",
+    "HelpFAQ_Cat_Network_601_text": "Sí, hi ha! <a target=\"_blank\" href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/\">tots els documents</a> per a més informació.",
+    "HelpFAQ_Cat_Presence_400_head": "Els dispositius són mostrats amb un marcador groc i la nota \"succés desaparegut\".",
+    "HelpFAQ_Cat_Presence_400_text": "Si això passa, tens l'opció d'esborrar els esdeveniments del dispositiu en qüestió (veure detalls). Una altra possibilitat seria canviar el dispositiu i esperar fins que NetAlertX detecti el dispositiu com \"en línia\" amb la següent exploració i, a continuació, simplement torneu a activar el dispositiu. NetAlert X ha de tenir en compte l'estat del dispositiu a la base de dades amb la següent exploració.",
+    "HelpFAQ_Cat_Presence_401_head": "Un dispositiu és mostrat tan present tot i que és Fora de línia \"\".",
+    "HelpFAQ_Cat_Presence_401_text": "Si això passa, tens la possibilitat d'esborrar els esdeveniments del dispositiu en qüestió (veure detalls). Una altra possibilitat seria canviar el dispositiu i esperar fins a NetAlert X reconeix el dispositiu com a \"en línia\" amb la següent exploració i, a continuació, simplement torneu a desactivar el dispositiu. NetAlert X ha de tenir en compte l'estat del dispositiu a la base de dades amb la següent exploració.",
+    "HelpFAQ_Title": "Ajuda / FAQ",
+    "LOADED_PLUGINS_description": "Quins Connectors(Plugins) carregar. Afegir connectors podria alentir l'aplicació. Llegir més sobre quins connectors necessiten estar habilitats, tipus, o opcions d'escanejar dins del <a target=\"_blank\" href=\"https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins#readme\">documents de connectors</a>. Els connectors descarregats perdran els vostres paràmetres. Només <code>desactivats</code> es poden eliminar els connectors.",
+    "LOADED_PLUGINS_name": "Connectors carregats",
+    "LOG_LEVEL_description": "Aquest paràmetre permetrà un registre més verbal. Útil per a la depuració d'esdeveniments escrivint a la base de dades.",
+    "LOG_LEVEL_name": "Imprimeix el registre addicional",
+    "Loading": "Carregant ...",
+    "Login_Box": "Introduïu la vostra contrasenya",
+    "Login_Default_PWD": "Contrasenya per defecte \"123456\" encara és activa.",
+    "Login_Info": "Les contrasenyes es canvien al connector(plugin) Configurar Contrasenya. Comprova el <a target=\"_blank\" href=\"https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/set_password\">SETPWD docs</a> si tens dubtes fent logging.",
+    "Login_Psw-box": "Contrasenya",
+    "Login_Psw_alert": "Alerta de contrasenya!",
+    "Login_Psw_folder": "a la carpeta config.",
+    "Login_Psw_new": "new_password",
+    "Login_Psw_run": "Per canviar la contrasenya:",
+    "Login_Remember": "Recorda",
+    "Login_Remember_small": "(vàlid per 7 dies)",
+    "Login_Submit": "Inici de sessió",
+    "Login_Toggle_Alert_headline": "Alerta de contrasenya!",
+    "Login_Toggle_Info": "Informació de contrasenya",
+    "Login_Toggle_Info_headline": "Informació de contrasenya",
+    "Maint_PurgeLog": "Registre de purga",
+    "Maint_RestartServer": "Reinici del servidor",
+    "Maint_Restart_Server_noti_text": "Estàs segur que vols reiniciar el servidor backend? Això pot causar incongruència a l'aplicació. Abans fes còpia de seguretat de la vostra configuració. <br/> <br/> Nota: Això pot durar uns quants minuts.",
+    "Maintenance_Running_Version": "Versió instal·lada",
+    "Maintenance_Status": "Estat",
+    "Maintenance_Title": "Eines de manteniment",
+    "Maintenance_Tool_ExportCSV": "CSV Exportació",
+    "Maintenance_Tool_ExportCSV_noti": "CSV Exportació",
+    "Maintenance_Tool_ExportCSV_noti_text": "Estàs segur que vols generar un fitxer CSV?",
+    "Maintenance_Tool_ExportCSV_text": "Genera un fitxer CSV (comma separated value) que conté la llista dels dispositius incloent les relacions de Xarxa entre Nodes i dispositius connectats. També pots disparar-ho accedint a la URL <code>el vostre NetAlertX url/php/server/devices.php?acció=ExportCSV</code> o activant el connector <a href=\"settings.php#CSVBCKP_header\">CSV Còpia de seguretat</a>.",
+    "Maintenance_Tool_ImportCSV": "CSV Importació",
+    "Maintenance_Tool_ImportCSV_noti": "CSV Importació",
+    "Maintenance_Tool_ImportCSV_noti_text": "Estàs segur que vols importar el fitxer CSV? Això <b> sobreescriurà</b> completament els dispositius de la seva base de dades.",
+    "Maintenance_Tool_ImportCSV_text": "Abans d'utilitzar aquesta funció, fes una còpia de seguretat, si us plau. Importa un CSV (comma separated value) el fitxer que conté la llista dels dispositius que inclouen les relacions de Xarxa entre Nodes i dispositius connectats. Per fer-ho col·loca el CSV el fitxer anomenat <b>devices.csv</b> a la vostra <b>/config</b> carpeta.",
+    "Maintenance_Tool_ImportPastedCSV": "CSV Import (Paste)",
+    "Maintenance_Tool_ImportPastedCSV_noti_text": "Estàs segur que vols importar el CSV copiat? Això <b> sobreescriurà</b> completament els dispositius de la base de dades.",
+    "Maintenance_Tool_ImportPastedCSV_text": "Abans d'utilitzar aquesta funció, feu una còpia de seguretat. Importar un fitxer CSV (comma separated value) que contingui la llista de dispositius, incloent les relacions de xarxa entre els nodes i els dispositius connectats.",
+    "Maintenance_Tool_arpscansw": "Conmuta arp-Scan (on/off)",
+    "Maintenance_Tool_arpscansw_noti": "Conmuta arp-Scan on or off",
+    "Maintenance_Tool_arpscansw_noti_text": "Quan l'escàner ha estat canviat a off es queda off fins que és activat de bell nou.",
+    "Maintenance_Tool_arpscansw_text": "Canviant el arp-escàner on o off. Quan el scan ha estat canviat off es queda off fins que és activat de bell nou. Els escàners actius no són anul·lats.",
+    "Maintenance_Tool_backup": "DB Còpia de seguretat",
+    "Maintenance_Tool_backup_noti": "Preguntes Freqüents - FAQ",
+    "Maintenance_Tool_backup_noti_text": "Estàs segur que vols executar el Backup DB? Assegura't que no hi ha exploració en funcionament.",
+    "Maintenance_Tool_backup_text": "Les còpies de seguretat de la base de dades es troben al directori de bases de dades com a arxiu zip, anomenat amb la data de creació. No hi ha un nombre màxim de còpies de seguretat.",
+    "Maintenance_Tool_check_visible": "Desmarqueu-ho per amagar la columna.",
+    "Maintenance_Tool_darkmode": "Canvia Modes (Fosc/Clar)",
+    "Maintenance_Tool_darkmode_noti": "Canvia Modes",
+    "Maintenance_Tool_darkmode_noti_text": "Després del canvi de tema, la pàgina intenta recarregar-se per activar el canvi. Si és necessari, s'ha de netejar la memòria cau.",
+    "Maintenance_Tool_darkmode_text": "Canvia entre mode fosc i mode clar. Si el canvi no funciona correctament, prova per netejar la memòria cau de navegador. El canvi té lloc en el cantó de servidor, així que afecta tots dispositius en ús.",
+    "Maintenance_Tool_del_ActHistory": "Eliminant l'activitat de xarxa",
+    "Maintenance_Tool_del_ActHistory_noti": "Eliminar l'activitat de xarxa",
+    "Maintenance_Tool_del_ActHistory_noti_text": "Estàs segur que vols restablir l’activitat de la xarxa?",
+    "Maintenance_Tool_del_ActHistory_text": "El gràfic d’activitat de la xarxa es reinicialitzarà. No afecta als esdeveniments.",
+    "Maintenance_Tool_del_alldev": "Eliminar tots els dispositius",
+    "Maintenance_Tool_del_alldev_noti": "Eliminar dispositius",
+    "Maintenance_Tool_del_alldev_noti_text": "Estàs segur que vols eliminar tots els dispositius?",
+    "Maintenance_Tool_del_alldev_text": "Abans d'utilitzar aquesta funció, feu una còpia de seguretat. La supressió no es pot desfer. Tots els dispositius s'eliminaran de la base de dades.",
+    "Maintenance_Tool_del_allevents": "Suprimeix esdeveniments (Elimina presència)",
+    "Maintenance_Tool_del_allevents30": "Suprimeix tots els esdeveniments més vells que 30 dies",
+    "Maintenance_Tool_del_allevents30_noti": "Eliminar Esdeveniments",
+    "Maintenance_Tool_del_allevents30_noti_text": "T'és segur vols eliminar tot els successos més vells que 30 dies? Això elimina la Presencia de tots els Dispositius.",
+    "Maintenance_Tool_del_allevents30_text": "Abans d'utilitzar aquesta funció, feu una còpia de seguretat. La supressió no es pot desfer. S'eliminaran tots els esdeveniments mes vells de 30 dies a la base de dades. També es restablirà la presència de tots els dispositius. Això pot portar a sessions no vàlides. Això significa que els dispositius es mostren com a \"present\" encara que estiguin fora de línia. Una anàlisi mentre el dispositiu en qüestió està en línia resol el problema.",
+    "Maintenance_Tool_del_allevents_noti": "Eliminar Esdeveniments",
+    "Maintenance_Tool_del_allevents_noti_text": "Estàs segur que vols eliminar tots els esdeveniments? Això reinicialització Presència de tots els dispositius.",
+    "Maintenance_Tool_del_allevents_text": "",
+    "Maintenance_Tool_del_empty_macs": "",
+    "Maintenance_Tool_del_empty_macs_noti": "",
+    "Maintenance_Tool_del_empty_macs_noti_text": "",
+    "Maintenance_Tool_del_empty_macs_text": "",
+    "Maintenance_Tool_del_selecteddev": "",
+    "Maintenance_Tool_del_selecteddev_text": "",
+    "Maintenance_Tool_del_unknowndev": "",
+    "Maintenance_Tool_del_unknowndev_noti": "",
+    "Maintenance_Tool_del_unknowndev_noti_text": "",
+    "Maintenance_Tool_del_unknowndev_text": "",
+    "Maintenance_Tool_displayed_columns_text": "",
+    "Maintenance_Tool_drag_me": "",
+    "Maintenance_Tool_order_columns_text": "",
+    "Maintenance_Tool_purgebackup": "",
+    "Maintenance_Tool_purgebackup_noti": "",
+    "Maintenance_Tool_purgebackup_noti_text": "",
+    "Maintenance_Tool_purgebackup_text": "",
+    "Maintenance_Tool_restore": "",
+    "Maintenance_Tool_restore_noti": "",
+    "Maintenance_Tool_restore_noti_text": "",
+    "Maintenance_Tool_restore_text": "",
+    "Maintenance_Tool_upgrade_database_noti": "",
+    "Maintenance_Tool_upgrade_database_noti_text": "",
+    "Maintenance_Tool_upgrade_database_text": "",
+    "Maintenance_Tools_Tab_BackupRestore": "",
+    "Maintenance_Tools_Tab_Logging": "",
+    "Maintenance_Tools_Tab_Settings": "",
+    "Maintenance_Tools_Tab_Tools": "",
+    "Maintenance_Tools_Tab_UISettings": "",
+    "Maintenance_arp_status": "",
+    "Maintenance_arp_status_off": "",
+    "Maintenance_arp_status_on": "",
+    "Maintenance_built_on": "",
+    "Maintenance_current_version": "",
+    "Maintenance_database_backup": "",
+    "Maintenance_database_backup_found": "",
+    "Maintenance_database_backup_total": "",
+    "Maintenance_database_lastmod": "",
+    "Maintenance_database_path": "",
+    "Maintenance_database_rows": "",
+    "Maintenance_database_size": "",
+    "Maintenance_lang_selector_apply": "",
+    "Maintenance_lang_selector_empty": "",
+    "Maintenance_lang_selector_lable": "",
+    "Maintenance_lang_selector_text": "",
+    "Maintenance_new_version": "",
+    "Maintenance_themeselector_apply": "",
+    "Maintenance_themeselector_empty": "",
+    "Maintenance_themeselector_lable": "",
+    "Maintenance_themeselector_text": "",
+    "Maintenance_version": "",
+    "NETWORK_DEVICE_TYPES_description": "",
+    "NETWORK_DEVICE_TYPES_name": "",
+    "Navigation_About": "",
+    "Navigation_Devices": "",
+    "Navigation_Donations": "",
+    "Navigation_Events": "",
+    "Navigation_HelpFAQ": "",
+    "Navigation_Integrations": "",
+    "Navigation_Maintenance": "",
+    "Navigation_Monitoring": "",
+    "Navigation_Network": "",
+    "Navigation_Notifications": "",
+    "Navigation_Plugins": "",
+    "Navigation_Presence": "",
+    "Navigation_Report": "",
+    "Navigation_Settings": "",
+    "Navigation_SystemInfo": "",
+    "Navigation_Workflows": "",
+    "Network_Assign": "",
+    "Network_Cant_Assign": "",
+    "Network_Configuration_Error": "",
+    "Network_Connected": "",
+    "Network_ManageAdd": "",
+    "Network_ManageAdd_Name": "",
+    "Network_ManageAdd_Name_text": "",
+    "Network_ManageAdd_Port": "",
+    "Network_ManageAdd_Port_text": "",
+    "Network_ManageAdd_Submit": "",
+    "Network_ManageAdd_Type": "",
+    "Network_ManageAdd_Type_text": "",
+    "Network_ManageAssign": "",
+    "Network_ManageDel": "",
+    "Network_ManageDel_Name": "",
+    "Network_ManageDel_Name_text": "",
+    "Network_ManageDel_Submit": "",
+    "Network_ManageDevices": "",
+    "Network_ManageEdit": "",
+    "Network_ManageEdit_ID": "",
+    "Network_ManageEdit_ID_text": "",
+    "Network_ManageEdit_Name": "",
+    "Network_ManageEdit_Name_text": "",
+    "Network_ManageEdit_Port": "",
+    "Network_ManageEdit_Port_text": "",
+    "Network_ManageEdit_Submit": "",
+    "Network_ManageEdit_Type": "",
+    "Network_ManageEdit_Type_text": "",
+    "Network_ManageLeaf": "",
+    "Network_ManageUnassign": "",
+    "Network_NoAssignedDevices": "",
+    "Network_NoDevices": "",
+    "Network_Node": "",
+    "Network_Node_Name": "",
+    "Network_Parent": "",
+    "Network_Root": "",
+    "Network_Root_Not_Configured": "",
+    "Network_Root_Unconfigurable": "",
+    "Network_Table_Hostname": "",
+    "Network_Table_IP": "",
+    "Network_Table_State": "",
+    "Network_Title": "",
+    "Network_UnassignedDevices": "",
+    "Notifications_All": "",
+    "Notifications_Mark_All_Read": "",
+    "PIALERT_WEB_PASSWORD_description": "",
+    "PIALERT_WEB_PASSWORD_name": "",
+    "PIALERT_WEB_PROTECTION_description": "",
+    "PIALERT_WEB_PROTECTION_name": "",
+    "PLUGINS_KEEP_HIST_description": "",
+    "PLUGINS_KEEP_HIST_name": "",
+    "Plugins_DeleteAll": "",
+    "Plugins_Filters_Mac": "",
+    "Plugins_History": "",
+    "Plugins_Obj_DeleteListed": "",
+    "Plugins_Objects": "",
+    "Plugins_Out_of": "",
+    "Plugins_Unprocessed_Events": "",
+    "Plugins_no_control": "",
+    "Presence_CalHead_day": "",
+    "Presence_CalHead_lang": "",
+    "Presence_CalHead_month": "",
+    "Presence_CalHead_quarter": "",
+    "Presence_CalHead_week": "",
+    "Presence_CalHead_year": "",
+    "Presence_CallHead_Devices": "",
+    "Presence_Key_OnlineNow": "",
+    "Presence_Key_OnlineNow_desc": "",
+    "Presence_Key_OnlinePast": "",
+    "Presence_Key_OnlinePastMiss": "",
+    "Presence_Key_OnlinePastMiss_desc": "",
+    "Presence_Key_OnlinePast_desc": "",
+    "Presence_Loading": "",
+    "Presence_Shortcut_AllDevices": "",
+    "Presence_Shortcut_Archived": "",
+    "Presence_Shortcut_Connected": "",
+    "Presence_Shortcut_Devices": "",
+    "Presence_Shortcut_DownAlerts": "",
+    "Presence_Shortcut_Favorites": "",
+    "Presence_Shortcut_NewDevices": "",
+    "Presence_Title": "",
+    "REPORT_DASHBOARD_URL_description": "",
+    "REPORT_DASHBOARD_URL_name": "",
+    "REPORT_ERROR": "",
+    "REPORT_MAIL_description": "",
+    "REPORT_MAIL_name": "",
+    "REPORT_TITLE": "",
+    "RandomMAC_hover": "",
+    "Reports_Sent_Log": "",
+    "SCAN_SUBNETS_description": "",
+    "SCAN_SUBNETS_name": "",
+    "SYSTEM_TITLE": "",
+    "Setting_Override": "",
+    "Setting_Override_Description": "",
+    "Settings_Metadata_Toggle": "",
+    "Settings_Show_Description": "",
+    "Settings_device_Scanners_desync": "",
+    "Settings_device_Scanners_desync_popup": "",
+    "Speedtest_Results": "",
+    "Systeminfo_CPU": "",
+    "Systeminfo_CPU_Cores": "",
+    "Systeminfo_CPU_Name": "",
+    "Systeminfo_CPU_Speed": "",
+    "Systeminfo_CPU_Temp": "",
+    "Systeminfo_CPU_Vendor": "",
+    "Systeminfo_Client_Resolution": "",
+    "Systeminfo_Client_User_Agent": "",
+    "Systeminfo_General": "",
+    "Systeminfo_General_Date": "",
+    "Systeminfo_General_Date2": "",
+    "Systeminfo_General_Full_Date": "",
+    "Systeminfo_General_TimeZone": "",
+    "Systeminfo_Memory": "",
+    "Systeminfo_Memory_Total_Memory": "",
+    "Systeminfo_Memory_Usage": "",
+    "Systeminfo_Memory_Usage_Percent": "",
+    "Systeminfo_Motherboard": "",
+    "Systeminfo_Motherboard_BIOS": "",
+    "Systeminfo_Motherboard_BIOS_Date": "",
+    "Systeminfo_Motherboard_BIOS_Vendor": "",
+    "Systeminfo_Motherboard_Manufactured": "",
+    "Systeminfo_Motherboard_Name": "",
+    "Systeminfo_Motherboard_Revision": "",
+    "Systeminfo_Network": "",
+    "Systeminfo_Network_Accept_Encoding": "",
+    "Systeminfo_Network_Accept_Language": "",
+    "Systeminfo_Network_Connection_Port": "",
+    "Systeminfo_Network_HTTP_Host": "",
+    "Systeminfo_Network_HTTP_Referer": "",
+    "Systeminfo_Network_HTTP_Referer_String": "",
+    "Systeminfo_Network_Hardware": "",
+    "Systeminfo_Network_Hardware_Interface_Mask": "",
+    "Systeminfo_Network_Hardware_Interface_Name": "",
+    "Systeminfo_Network_Hardware_Interface_RX": "",
+    "Systeminfo_Network_Hardware_Interface_TX": "",
+    "Systeminfo_Network_IP": "",
+    "Systeminfo_Network_IP_Connection": "",
+    "Systeminfo_Network_IP_Server": "",
+    "Systeminfo_Network_MIME": "",
+    "Systeminfo_Network_Request_Method": "",
+    "Systeminfo_Network_Request_Time": "",
+    "Systeminfo_Network_Request_URI": "",
+    "Systeminfo_Network_Secure_Connection": "",
+    "Systeminfo_Network_Secure_Connection_String": "",
+    "Systeminfo_Network_Server_Name": "",
+    "Systeminfo_Network_Server_Name_String": "",
+    "Systeminfo_Network_Server_Query": "",
+    "Systeminfo_Network_Server_Query_String": "",
+    "Systeminfo_Network_Server_Version": "",
+    "Systeminfo_Services": "",
+    "Systeminfo_Services_Description": "",
+    "Systeminfo_Services_Name": "",
+    "Systeminfo_Storage": "",
+    "Systeminfo_Storage_Device": "",
+    "Systeminfo_Storage_Mount": "",
+    "Systeminfo_Storage_Size": "",
+    "Systeminfo_Storage_Type": "",
+    "Systeminfo_Storage_Usage": "",
+    "Systeminfo_Storage_Usage_Free": "",
+    "Systeminfo_Storage_Usage_Mount": "",
+    "Systeminfo_Storage_Usage_Total": "",
+    "Systeminfo_Storage_Usage_Used": "",
+    "Systeminfo_System": "",
+    "Systeminfo_System_AVG": "",
+    "Systeminfo_System_Architecture": "",
+    "Systeminfo_System_Kernel": "",
+    "Systeminfo_System_OSVersion": "",
+    "Systeminfo_System_Running_Processes": "",
+    "Systeminfo_System_System": "",
+    "Systeminfo_System_Uname": "",
+    "Systeminfo_System_Uptime": "",
+    "Systeminfo_This_Client": "",
+    "Systeminfo_USB_Devices": "",
+    "TICKER_MIGRATE_TO_NETALERTX": "",
+    "TIMEZONE_description": "",
+    "TIMEZONE_name": "",
+    "UI_DEV_SECTIONS_description": "",
+    "UI_DEV_SECTIONS_name": "",
+    "UI_ICONS_description": "",
+    "UI_ICONS_name": "",
+    "UI_LANG_description": "",
+    "UI_LANG_name": "",
+    "UI_MY_DEVICES_description": "",
+    "UI_MY_DEVICES_name": "",
+    "UI_NOT_RANDOM_MAC_description": "",
+    "UI_NOT_RANDOM_MAC_name": "",
+    "UI_PRESENCE_description": "",
+    "UI_PRESENCE_name": "",
+    "UI_REFRESH_description": "",
+    "UI_REFRESH_name": "",
+    "VERSION_description": "",
+    "VERSION_name": "",
+    "devices_old": "",
+    "general_event_description": "",
+    "general_event_title": "",
+    "report_guid": "",
+    "report_guid_missing": "",
+    "report_select_format": "",
+    "report_time": "",
+    "run_event_icon": "",
+    "run_event_tooltip": "",
+    "settings_core_icon": "",
+    "settings_core_label": "",
+    "settings_device_scanners": "",
+    "settings_device_scanners_icon": "",
+    "settings_device_scanners_info": "",
+    "settings_device_scanners_label": "",
+    "settings_enabled": "",
+    "settings_enabled_icon": "",
+    "settings_expand_all": "",
+    "settings_imported": "",
+    "settings_imported_label": "",
+    "settings_missing": "",
+    "settings_missing_block": "",
+    "settings_old": "",
+    "settings_other_scanners": "",
+    "settings_other_scanners_icon": "",
+    "settings_other_scanners_label": "",
+    "settings_publishers": "",
+    "settings_publishers_icon": "",
+    "settings_publishers_info": "",
+    "settings_publishers_label": "",
+    "settings_readonly": "",
+    "settings_saved": "",
+    "settings_system_icon": "",
+    "settings_system_label": "",
+    "settings_update_item_warning": "",
+    "test_event_icon": "",
+    "test_event_tooltip": ""
+}

front/php/templates/language/cs_cz.json

@@ -1,6 +1,8 @@
 {
     "API_CUSTOM_SQL_description": "",
     "API_CUSTOM_SQL_name": "",
+    "API_TOKEN_description": "",
+    "API_TOKEN_name": "",
     "API_display_name": "",
     "API_icon": "",
     "About_Design": "",
@@ -197,6 +199,7 @@
     "Device_Shortcut_Favorites": "",
     "Device_Shortcut_NewDevices": "",
     "Device_Shortcut_OnlineChart": "",
+    "Device_TableHead_AlertDown": "",
     "Device_TableHead_Connected_Devices": "",
     "Device_TableHead_Favorite": "",
     "Device_TableHead_FirstSession": "",
@@ -214,9 +217,11 @@
     "Device_TableHead_Owner": "",
     "Device_TableHead_Parent_MAC": "",
     "Device_TableHead_Port": "",
+    "Device_TableHead_PresentLastScan": "",
     "Device_TableHead_RowID": "",
     "Device_TableHead_Rowid": "",
     "Device_TableHead_SSID": "",
+    "Device_TableHead_SourcePlugin": "",
     "Device_TableHead_Status": "",
     "Device_TableHead_SyncHubNodeName": "",
     "Device_TableHead_Type": "",
@@ -269,6 +274,8 @@
     "Events_Tablelenght": "",
     "Events_Tablelenght_all": "",
     "Events_Title": "",
+    "GRAPHQL_PORT_description": "",
+    "GRAPHQL_PORT_name": "",
     "Gen_Action": "",
     "Gen_Add": "",
     "Gen_Add_All": "",
@@ -284,6 +291,7 @@
     "Gen_Description": "",
     "Gen_Error": "",
     "Gen_Filter": "",
+    "Gen_Generate": "",
     "Gen_LockedDB": "",
     "Gen_Offline": "",
     "Gen_Okay": "",
@@ -309,6 +317,8 @@
     "General_icon": "",
     "HRS_TO_KEEP_NEWDEV_description": "",
     "HRS_TO_KEEP_NEWDEV_name": "",
+    "HRS_TO_KEEP_OFFDEV_description": "",
+    "HRS_TO_KEEP_OFFDEV_name": "",
     "HelpFAQ_Cat_Detail": "",
     "HelpFAQ_Cat_Detail_300_head": "",
     "HelpFAQ_Cat_Detail_300_text_a": "",
@@ -545,6 +555,12 @@
     "Presence_CalHead_week": "",
     "Presence_CalHead_year": "",
     "Presence_CallHead_Devices": "",
+    "Presence_Key_OnlineNow": "",
+    "Presence_Key_OnlineNow_desc": "",
+    "Presence_Key_OnlinePast": "",
+    "Presence_Key_OnlinePastMiss": "",
+    "Presence_Key_OnlinePastMiss_desc": "",
+    "Presence_Key_OnlinePast_desc": "",
     "Presence_Loading": "",
     "Presence_Shortcut_AllDevices": "",
     "Presence_Shortcut_Archived": "",
@@ -695,6 +711,7 @@
     "settings_publishers_icon": "",
     "settings_publishers_info": "",
     "settings_publishers_label": "",
+    "settings_readonly": "",
     "settings_saved": "",
     "settings_system_icon": "",
     "settings_system_label": "",

front/php/templates/language/de_de.json

@@ -1,6 +1,8 @@
 {
     "API_CUSTOM_SQL_description": "Benutzerdefinierte SQL-Abfrage, welche eine JSON-Datei generiert und diese mit dem <a href=\"/api/table_custom_endpoint.json\" target=\"_blank\">Dateiendpunkt <code>table_custom_endpoint.json</code></a> zur Verfügung stellt.",
     "API_CUSTOM_SQL_name": "Benutzerdefinierte SQL-Abfrage",
+    "API_TOKEN_description": "",
+    "API_TOKEN_name": "",
     "API_display_name": "API",
     "API_icon": "<i class=\"fa fa-arrow-down-up-across-line\"></i>",
     "APPRISE_HOST_description": "Apprise host URL starting with <code>http://</code> or <code>https://</code>. (do not forget to include <code>/notify</code> at the end)",
@@ -11,7 +13,7 @@
     "APPRISE_SIZE_name": "Max payload size",
     "APPRISE_URL_description": "Apprise notification target URL. For example for Telegram it would be <code>tgram://{bot_token}/{chat_id}</code>.",
     "APPRISE_URL_name": "Apprise notification URL",
-    "About_Design": "Designed for:",
+    "About_Design": "Entworfen für:",
     "About_Exit": "Abmelden",
     "About_Title": "Netzwerksicherheitsscanner und Benachrichtigungsframework",
     "AppEvents_DateTimeCreated": "protokolliert",
@@ -27,29 +29,29 @@
     "AppEvents_ObjectPlugin": "Verknüpfte Plugins",
     "AppEvents_ObjectPrimaryID": "Primär ID",
     "AppEvents_ObjectSecondaryID": "Sekundär ID",
-    "AppEvents_ObjectStatus": "",
+    "AppEvents_ObjectStatus": "Status (zum Log-Zeitpunkt)",
     "AppEvents_ObjectStatusColumn": "Statusspalte",
     "AppEvents_ObjectType": "Objekttyp",
     "AppEvents_Plugin": "Plugin",
     "AppEvents_Type": "Typ",
     "Apprise_display_name": "Apprise",
     "Apprise_icon": "<i class=\"fa fa-bullhorn\"></i>",
-    "BackDevDetail_Actions_Ask_Run": "Do you want to execute the action?",
-    "BackDevDetail_Actions_Not_Registered": "Action not registered: ",
-    "BackDevDetail_Actions_Title_Run": "Run action",
-    "BackDevDetail_Copy_Ask": "Copy details from device from the dropdown list (Everything on this page will be overwritten)?",
-    "BackDevDetail_Copy_Title": "Copy details",
+    "BackDevDetail_Actions_Ask_Run": "Möchtest du die Aktion ausführen?",
+    "BackDevDetail_Actions_Not_Registered": "Aktion nicht registriert: ",
+    "BackDevDetail_Actions_Title_Run": "Aktion ausführen",
+    "BackDevDetail_Copy_Ask": "Details vom Gerät aus der Dropdown-Liste kopieren (alles auf dieser Seite wird überschrieben)?",
+    "BackDevDetail_Copy_Title": "Details kopieren",
     "BackDevDetail_Tools_WOL_error": "Befehl wurde NICHT ausgeführt.",
-    "BackDevDetail_Tools_WOL_okay": "Befehl wurde ausgeführt.",
-    "BackDevices_Arpscan_disabled": "Automatischer Arp-Scan deaktiviert.",
-    "BackDevices_Arpscan_enabled": "Automatischer Arp-Scan aktiviert.",
+    "BackDevDetail_Tools_WOL_okay": "Der Befehl wurde ausgeführt.",
+    "BackDevices_Arpscan_disabled": "Arp-Scan deaktiviert",
+    "BackDevices_Arpscan_enabled": "Arp-Scan aktiviert",
     "BackDevices_Backup_CopError": "Die originale Datenbank konnte nicht gesichert werden.",
     "BackDevices_Backup_Failed": "Das Backup wurde teilweise ausgeführt. Das Archiv ist entweder leer oder nicht vorhanden.",
-    "BackDevices_Backup_okay": "Das Backup wurde erfolgreich beendet.",
+    "BackDevices_Backup_okay": "Die Sicherung wurde erfolgreich mit dem neuen Archiv ausgeführt",
     "BackDevices_DBTools_DelActHistory": "Die Anzeige der Netzwerkaktivität wurde zurückgesetzt.",
     "BackDevices_DBTools_DelActHistoryError": "Fehler beim Zurücksetzen der Netzwerkaktivitätsanzeige.",
-    "BackDevices_DBTools_DelDevError_a": "Fehler beim Löschen des Gerätes.",
-    "BackDevices_DBTools_DelDevError_b": "Fehler beim Löschen der Geräte.",
+    "BackDevices_DBTools_DelDevError_a": "Fehler beim Löschen des Gerätes",
+    "BackDevices_DBTools_DelDevError_b": "Fehler beim Löschen der Geräte",
     "BackDevices_DBTools_DelDev_a": "Gerät wurde gelöscht",
     "BackDevices_DBTools_DelDev_b": "Geräte wurden gelöscht",
     "BackDevices_DBTools_DelEvents": "Events wurden gelöscht",
@@ -69,11 +71,11 @@
     "BackDevices_darkmode_disabled": "Heller Modus aktiviert",
     "BackDevices_darkmode_enabled": "Dunkler Modus aktiviert",
     "CLEAR_NEW_FLAG_description": "",
-    "CLEAR_NEW_FLAG_name": "",
+    "CLEAR_NEW_FLAG_name": "Neues Flag löschen",
     "DAYS_TO_KEEP_EVENTS_description": "Dies ist eine Wartungseinstellung. Spezifiziert wie viele Tage Events gespeichert bleiben. Alle älteren Events werden periodisch gelöscht. Wird auch auf die Plugins History angewendet.",
     "DAYS_TO_KEEP_EVENTS_name": "Lösche Events älter als",
     "DevDetail_Copy_Device_Title": "<i class=\"fa fa-copy\"></i> Details von Gerät kopieren",
-    "DevDetail_Copy_Device_Tooltip": "Copy details from device from the dropdown list. Everything on this page will be overwritten",
+    "DevDetail_Copy_Device_Tooltip": "Details vom Gerät aus der Dropdown-Liste kopieren. Alles auf dieser Seite wird überschrieben",
     "DevDetail_EveandAl_AlertAllEvents": "Melde alle Ereignisse",
     "DevDetail_EveandAl_AlertDown": "Melde Down",
     "DevDetail_EveandAl_Archived": "Archivierung",
@@ -86,9 +88,9 @@
     "DevDetail_EveandAl_Skip": "pausiere wiederhol. Meldungen für",
     "DevDetail_EveandAl_Title": "Ereignisse & Alarme einstellen",
     "DevDetail_Events_CheckBox": "Blende Verbindungs-Ereignisse aus",
-    "DevDetail_GoToNetworkNode": "Navigate to the Network page of the given node.",
+    "DevDetail_GoToNetworkNode": "Zur Netzwerkseite des angegebenen Knotens navigieren.",
     "DevDetail_Icon": "Icon",
-    "DevDetail_Icon_Descr": "Enter a font awesome icon name without the fa- prefix or with complete class, e.g.: fa fa-brands fa-apple.",
+    "DevDetail_Icon_Descr": "",
     "DevDetail_Loading": "Laden ...",
     "DevDetail_MainInfo_Comments": "Notiz",
     "DevDetail_MainInfo_Favorite": "Favorit",
@@ -97,7 +99,7 @@
     "DevDetail_MainInfo_Name": "Name",
     "DevDetail_MainInfo_Network": "<i class=\"fa fa-server\"></i> Knoten (MAC)",
     "DevDetail_MainInfo_Network_Port": "<i class=\"fa fa-ethernet\"></i> Port",
-    "DevDetail_MainInfo_Network_Site": "",
+    "DevDetail_MainInfo_Network_Site": "Seite",
     "DevDetail_MainInfo_Network_Title": "<i class=\"fa fa-network-wired\"></i> Network",
     "DevDetail_MainInfo_Owner": "Eigen&shy;tümer",
     "DevDetail_MainInfo_SSID": "SSID",
@@ -106,7 +108,7 @@
     "DevDetail_MainInfo_Vendor": "Hersteller",
     "DevDetail_MainInfo_mac": "MAC",
     "DevDetail_Network_Node_hover": "Wählen Sie das Elternnetzgerät aus, an das das aktuelle Gerät angeschlossen ist, um den Netzwerkbaum zu erstellen.",
-    "DevDetail_Network_Port_hover": "The port this device is connected to on the parent network device. If left empty a wifi icon is displayed in the Network tree.",
+    "DevDetail_Network_Port_hover": "Der Port, mit dem dieses Gerät am übergeordneten Netzwerkgerät verbunden ist. Bleibt er leer, wird ein WLAN-Symbol in der Netzwerkstruktur angezeigt.",
     "DevDetail_Nmap_Scans": "Nmap Scans",
     "DevDetail_Nmap_Scans_desc": "Hier kannst du manuelle NMAP Scans starten. Reguläre automatische NMAP Scans können mit dem Services & Ports (NMAP) Plugin geplant werden. Gehe zu den <a href='/settings.php' target='_blank'>Einstellungen</a> um erfahren",
     "DevDetail_Nmap_buttonDefault": "Standard Scan",
@@ -137,7 +139,7 @@
     "DevDetail_SessionTable_Disconnection": "Trennung",
     "DevDetail_SessionTable_Duration": "Dauer",
     "DevDetail_SessionTable_IP": "IP",
-    "DevDetail_SessionTable_Order": "Order",
+    "DevDetail_SessionTable_Order": "Reihenfolge",
     "DevDetail_Shortcut_CurrentStatus": "aktueller Status",
     "DevDetail_Shortcut_DownAlerts": "Down Meldungen",
     "DevDetail_Shortcut_Presence": "Anwesenheit",
@@ -161,7 +163,7 @@
     "DevDetail_Tab_Plugins": "<i class=\"fa fa-plug\"></i> Plugins",
     "DevDetail_Tab_Presence": "<i class=\"fa fa-calendar\"></i> Anwesenheit",
     "DevDetail_Tab_Sessions": "<i class=\"fa fa-list-ol\"></i> Sitzungen",
-    "DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> Tools",
+    "DevDetail_Tab_Tools": "<i class=\"fa fa-screwdriver-wrench\"></i> Werkzeuge",
     "DevDetail_Tab_Tools_Internet_Info_Description": "Das Internet-Info-Tool zeigt Informationen über die Internetverbindung an, wie z. B. IP-Adresse, Stadt, Land, Ortsvorwahl und Zeitzone.",
     "DevDetail_Tab_Tools_Internet_Info_Error": "Es ist ein Fehler aufgetreten",
     "DevDetail_Tab_Tools_Internet_Info_Start": "Internet-Info starten",
@@ -181,24 +183,24 @@
     "DevDetail_Tools_WOL_noti": "Wake-on-LAN",
     "DevDetail_Tools_WOL_noti_text": "Der Wake-on-LAN Befehl wurde and die Broadcast Adresse gesendet. Wenn sich das zu startende Gerät nicht im gleichen Subnet / VLan wie NetAlertX befindet, wird das Gerät nicht reagieren.",
     "DevDetail_Type_hover": "Der Type des Gerätes. If you select any of the pre-defined network devices (e.g.: AP, Firewall, Router, Switch...) they will show up in the Network tree configuration as possible parent network nodes.",
-    "DevDetail_Vendor_hover": "Vendor should be auto-detected. You can overwrite or add your custom value.",
+    "DevDetail_Vendor_hover": "Der Anbieter sollte automatisch erkannt werden. Du kannst den Wert überschreiben oder deinen eigenen Wert hinzufügen.",
     "DevDetail_WOL_Title": "<i class=\"fa fa-power-off\"></i> Wake-on-LAN",
     "DevDetail_button_AddIcon": "Neues Symbol Hinzufügen",
     "DevDetail_button_AddIcon_Help": "Füge ein HTML SVG Tag oder Font Awesome HTML Tag ein. Siehe <a href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/ICONS.md\" target=\"_blank\">Icon Dokumentation</a> für details.",
     "DevDetail_button_AddIcon_Tooltip": "Neues Icon zu diesem Gerät hinzufügen, welches es noch nicht im dropdown gibt.",
-    "DevDetail_button_Delete": "Lösche Gerät",
-    "DevDetail_button_DeleteEvents": "Lösche Events",
+    "DevDetail_button_Delete": "Gerät löschen",
+    "DevDetail_button_DeleteEvents": "Ereignisse löschen",
     "DevDetail_button_DeleteEvents_Warning": "Sind Sie sicher, dass Sie alle Ereignisse dieses Geräts löschen möchten? (dies löscht den Ereignisverlauf und die Sitzungen und könnte bei ständigen (anhaltenden) Benachrichtigungen helfen)",
-    "DevDetail_button_OverwriteIcons": "Overwrite Icons",
-    "DevDetail_button_OverwriteIcons_Tooltip": "Overwrite icons of all devices with the same device type",
-    "DevDetail_button_OverwriteIcons_Warning": "Are you sure you want to overwrite all icons of all devices with the same device type as the current device type?",
+    "DevDetail_button_OverwriteIcons": "Symbole überschreiben",
+    "DevDetail_button_OverwriteIcons_Tooltip": "Symbole aller Geräte mit demselben Gerätetyp überschreiben",
+    "DevDetail_button_OverwriteIcons_Warning": "Bist du sicher, dass du alle Symbole aller Geräte mit dem gleichen Gerätetyp wie dem aktuellen Gerätetyp überschreiben willst?",
     "DevDetail_button_Reset": "Verwerfen",
     "DevDetail_button_Save": "Speichern",
     "Device_MultiEdit": "Mehrfach-bearbeiten",
     "Device_MultiEdit_Backup": "",
     "Device_MultiEdit_Fields": "Felder bearbeiten:",
     "Device_MultiEdit_MassActions": "Massen aktionen:",
-    "Device_MultiEdit_Tooltip": "",
+    "Device_MultiEdit_Tooltip": "Achtung! Beim Drücken werden alle Werte auf die oben ausgewählten Geräte übertragen.",
     "Device_Searchbox": "Suche",
     "Device_Shortcut_AllDevices": "Meine Geräte",
     "Device_Shortcut_Archived": "Archiviert",
@@ -209,26 +211,29 @@
     "Device_Shortcut_Favorites": "Favoriten",
     "Device_Shortcut_NewDevices": "Neue Geräte",
     "Device_Shortcut_OnlineChart": "Gerätepräsenz im Laufe der Zeit",
-    "Device_TableHead_Connected_Devices": "Verbundene Geräte",
+    "Device_TableHead_AlertDown": "",
+    "Device_TableHead_Connected_Devices": "Verbindungen",
     "Device_TableHead_Favorite": "Favorit",
     "Device_TableHead_FirstSession": "Erste Sitzung",
     "Device_TableHead_GUID": "GUID",
     "Device_TableHead_Group": "Gruppe",
     "Device_TableHead_Icon": "Icon",
     "Device_TableHead_LastIP": "Letzte IP",
-    "Device_TableHead_LastIPOrder": "Last IP Order",
+    "Device_TableHead_LastIPOrder": "Letzte erhaltene IP",
     "Device_TableHead_LastSession": "Zuletzt offline",
     "Device_TableHead_Location": "Standort",
-    "Device_TableHead_MAC": "MAC",
+    "Device_TableHead_MAC": "Zufälliger MAC",
     "Device_TableHead_MAC_full": "Gesamte MAC",
     "Device_TableHead_Name": "Name",
-    "Device_TableHead_NetworkSite": "",
+    "Device_TableHead_NetworkSite": "Netzwerkseite",
     "Device_TableHead_Owner": "Eigentümer",
     "Device_TableHead_Parent_MAC": "Übergeordnete MAC",
     "Device_TableHead_Port": "Port",
+    "Device_TableHead_PresentLastScan": "",
     "Device_TableHead_RowID": "Zeilen ID",
     "Device_TableHead_Rowid": "Zeilennummer",
     "Device_TableHead_SSID": "SSID",
+    "Device_TableHead_SourcePlugin": "",
     "Device_TableHead_Status": "Status",
     "Device_TableHead_SyncHubNodeName": "Synchronisationsknoten",
     "Device_TableHead_Type": "Typ",
@@ -240,10 +245,10 @@
     "Device_Tablelenght": "Zeige _MENU_ Einträge",
     "Device_Tablelenght_all": "Alle",
     "Device_Title": "Geräte",
-    "Donations_Others": "Others",
-    "Donations_Platforms": "Sponsor platforms",
+    "Donations_Others": "Andere",
+    "Donations_Platforms": "Sponsor-Platformen",
     "Donations_Text": "Hey 👋! </br> Thanks for clicking on this menu item 😅 </br> </br> I'm trying to collect some donations to make you better software. Also, it would help me not to get burned out. Me burning out might mean end of support for this app. Any small (recurring or not) sponsorship makes me want ot put more effort into this app. I don't want to lock features (new plugins) behind paywalls 🔐. </br> Currently, I'm waking up 2h before work so I contribute to the app a bit. If I had some recurring income I could shorten my workweek and in the remaining time fully focus on NetAlertX. You'd get more functionality, a more polished app and less bugs. </br> </br> Thanks for reading - I'm super grateful for any support ❤🙏 </br>  </br> TL;DR: By supporting me you get: </br>  </br> <ul><li>Regular updates to keep your data and family safe 🔄</li><li>Less bugs 🐛🔫</li><li>Better and more functionality➕</li><li>I don't get burned out 🔥🤯</li><li>Less rushed releases 💨</li><li>Better docs📚</li><li>Quicker and better support with issues 🆘</li><li>Less grumpy me 😄</li></ul> </br> 📧Email me to <a href='mailto:jokob@duck.com?subject=NetAlertX'>jokob@duck.com</a> if you want to get in touch or if I should add other sponsorship platforms. </br>",
-    "Donations_Title": "Donations",
+    "Donations_Title": "Spenden",
     "ENABLE_PLUGINS_description": "NOTUSED Enables the <a target=\"_blank\" href=\"https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins\">plugins</a> functionality. Loading plugins requires more hardware resources so you might want to disable them on low-powered system.",
     "ENABLE_PLUGINS_name": "NOTUSED Enable Plugins",
     "Email_display_name": "Email",
@@ -268,11 +273,11 @@
     "Events_TableHead_Device": "Gerät",
     "Events_TableHead_Disconnection": "Trennung",
     "Events_TableHead_Duration": "Dauer",
-    "Events_TableHead_DurationOrder": "Duration Order",
+    "Events_TableHead_DurationOrder": "Dauer-Reihenfolge",
     "Events_TableHead_EventType": "Ereignis Typ",
     "Events_TableHead_IP": "IP",
-    "Events_TableHead_IPOrder": "IP Order",
-    "Events_TableHead_Order": "Order",
+    "Events_TableHead_IPOrder": "IP-Reihenfolge",
+    "Events_TableHead_Order": "Reihenfolge",
     "Events_TableHead_Owner": "Eigentümer",
     "Events_TableHead_PendingAlert": "Ausstehender Alarm",
     "Events_Table_info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",
@@ -281,6 +286,8 @@
     "Events_Tablelenght": "Zeige _MENU_ Einträge",
     "Events_Tablelenght_all": "Alle",
     "Events_Title": "Ereignisse",
+    "GRAPHQL_PORT_description": "",
+    "GRAPHQL_PORT_name": "",
     "Gen_Action": "Action",
     "Gen_Add": "Hinzufügen",
     "Gen_Add_All": "Alle hinzufügen",
@@ -288,14 +295,15 @@
     "Gen_AreYouSure": "Sind Sie sich sicher?",
     "Gen_Backup": "Sichern",
     "Gen_Cancel": "Abbrechen",
-    "Gen_Change": "",
-    "Gen_Copy": "Run",
+    "Gen_Change": "Ändern",
+    "Gen_Copy": "Ausführen",
     "Gen_DataUpdatedUITakesTime": "OK – Es kann einen Moment dauern, bis die Benutzeroberfläche aktualisiert wird, während ein Scan ausgeführt wird.",
     "Gen_Delete": "Löschen",
-    "Gen_DeleteAll": "Delete all",
-    "Gen_Description": "",
+    "Gen_DeleteAll": "Alles löschen",
+    "Gen_Description": "Beschreibung",
     "Gen_Error": "Fehler",
     "Gen_Filter": "Filter",
+    "Gen_Generate": "",
     "Gen_LockedDB": "ERROR - DB eventuell gesperrt - Nutze die Konsole in den Entwickler Werkzeugen (F12) zur Überprüfung oder probiere es später erneut.",
     "Gen_Offline": "Offline",
     "Gen_Okay": "Ok",
@@ -304,11 +312,11 @@
     "Gen_Remove_All": "Alle entfernen",
     "Gen_Remove_Last": "Letzte entfernen",
     "Gen_Restore": "Wiederherstellen",
-    "Gen_Run": "Run",
+    "Gen_Run": "Ausführen",
     "Gen_Save": "Speichern",
     "Gen_Saved": "Gespeichert",
     "Gen_Search": "Suchen",
-    "Gen_SelectToPreview": "",
+    "Gen_SelectToPreview": "Zur Vorschau auswählen",
     "Gen_Selected_Devices": "Ausgewählte Geräte:",
     "Gen_Switch": "Umschalten",
     "Gen_Upd": "Aktualisierung erfolgreich",
@@ -319,8 +327,10 @@
     "Gen_Work_In_Progress": "Keine Finalversion, feedback bitte unter: https://github.com/jokob-sk/NetAlertX/issues",
     "General_display_name": "Allgemein",
     "General_icon": "<i class=\"fa fa-gears\"></i>",
-    "HRS_TO_KEEP_NEWDEV_description": "Dies ist eine Wartungseinstellung. Wenn aktiviert (<code>0</code> bedeutet deaktiviert), werden als <b>\"Neues Gerät\"</b> markierte Geräte gelöscht, wenn ihre <b>erste Sitzung</b> länger her ist als in dieser Einstellung angegeben. Verwenden Sie diese Einstellung, wenn Sie <b>Neue Geräte</b> nach <code>X</code> Stunden automatisch löschen wollen.",
-    "HRS_TO_KEEP_NEWDEV_name": "Neue Geräte speichern für",
+    "HRS_TO_KEEP_NEWDEV_description": "Dies ist eine Wartungseinstellung <b>DELETING devices</b>. Wenn aktiviert (<code>0</code> bedeutet deaktiviert), werden als <b>\"Neues Gerät\"</b> markierte Geräte gelöscht, wenn ihre <b>erste Sitzung</b> länger her ist als in dieser Einstellung angegeben. Verwenden Sie diese Einstellung, wenn Sie <b>Neue Geräte</b> nach <code>X</code> Stunden automatisch löschen wollen.",
+    "HRS_TO_KEEP_NEWDEV_name": "Neue Geräte löschen nach",
+    "HRS_TO_KEEP_OFFDEV_description": "",
+    "HRS_TO_KEEP_OFFDEV_name": "",
     "HelpFAQ_Cat_Detail": "Detailansicht",
     "HelpFAQ_Cat_Detail_300_head": "Was bedeutet ",
     "HelpFAQ_Cat_Detail_300_text_a": "meint ein Netzwerkgerät (ein Gerät vom Typ AP, Gateway, Firewall, Hypervisor, Powerline, Switch, WLAN, PLC, Router, USB-LAN-Adapter oder Internet). Benutzerdefinierte Typen können über die <code>NETWORK_DEVICE_TYPES</code> Einstellung hinzugefügt werden.",
@@ -339,13 +349,13 @@
     "HelpFAQ_Cat_General_100_head": "Die Uhr oben rechts und die Zeiten der Events/Anwesenheit stimmen nicht überein (Zeitverschiebung).",
     "HelpFAQ_Cat_General_100_text_a": "Auf deinem PC ist für die PHP Umgebung folgende Zeitzone voreingestellt:",
     "HelpFAQ_Cat_General_100_text_b": "Sollte dies nicht die Zeitzone sein, in der du dich aufhältst, solltest du die Zeitzone in der PHP Konfigurationsdatei anpassen. Diese findest du in diesem Verzeichnis:",
-    "HelpFAQ_Cat_General_100_text_c": "Suche in dieser Datei nach dem Eintrag 'date.timezone', entferne ggf. das führende ';' und trage die gewünschte Zeitzone ein. Eine Liste mit den unterstützten Zeitzonen findest du hier (<a href=\"https://www.php.net/manual/de/timezones.php\" target=\"blank\">Link</a>).",
+    "HelpFAQ_Cat_General_100_text_c": "Suche in dieser Datei nach dem Eintrag 'date.timezone', entferne ggf. das führende ';' und trage die gewünschte Zeitzone ein. Eine Liste mit den unterstützten Zeitzonen findest du hier: (<a href=\"https://www.php.net/manual/de/timezones.php\" target=\"blank\">Link</a>)",
     "HelpFAQ_Cat_General_101_head": "Mein Netzwerk scheint langsamer zu werden, Streaming ruckelt.",
     "HelpFAQ_Cat_General_101_text": "Es kann durchaus sein, das leistungsschwache Geräte mit der Art und Weise, wie NetAlertX neue Geräte im Netzwerk erkennt, an ihre Leistungsgrenzen kommen. Dies verstärkt sich noch einmal, <br/> wenn diese Geräte per WLAN mit dem Netzwerk kommunizieren. Lösungen wären hier, wenn möglich ein Wechsel auf eine Kabelverbindung oder, falls das Geräte nur einen begrenzten Zeitraum genutzt <br/> werden soll, den arp-Scan auf der Wartungsseite zu pausieren.",
     "HelpFAQ_Cat_General_102_head": "Ich bekomme die Meldung, dass die Datenbank schreibgeschützt (read only) ist.",
     "HelpFAQ_Cat_General_102_text": "Prüfe im NetAlertX verzeichnis ob der Ordner der Datenbank (db) die richtigen Rechte zugewiesen bekommen hat:<br> <span class=\"text-danger help_faq_code\">drwxrwx---  2 (dein Username) www-data</span><br> Sollte die Berechtigung nicht stimmen, kannst du sie mit folgenden Befehlen im Terminal oder der Konsole wieder setzen:<br> <span class=\"text-danger help_faq_code\"> sudo chgrp -R www-data /app/db<br> chmod -R 770 /app/db </span><br> Wenn die Datenbank danach noch immer schreibgeschützt ist, versuche eine erneute Installation, oder das Zuückspielen eines Datenbank-Backups über die Wartungsseite.",
     "HelpFAQ_Cat_General_102docker_head": "(🐳 Docker only) Database issues (AJAX errors, read-only, not found)",
-    "HelpFAQ_Cat_General_102docker_text": "Double-check you have followed the <a href=\"https://github.com/jokob-sk/NetAlertX/tree/main/dockerfiles\">dockerfile readme (most up-to-date info)</a>. <br/> <br/> <ul data-sourcepos=\"49:4-52:146\" dir=\"auto\"> <li data-sourcepos=\"49:4-49:106\">Download the <a href=\"https://github.com/jokob-sk/NetAlertX/blob/main/db/app.db\">original DB from GitHub</a>.</li> <li data-sourcepos=\"50:4-50:195\">Map the <code>app.db</code> file (<g-emoji class=\"g-emoji\" alias=\"warning\" fallback-src=\"https://github.githubassets.com/images/icons/emoji/unicode/26a0.png\">⚠</g-emoji> not folder) from above to <code>/app/db/app.db</code> (see <a href=\"https://github.com/jokob-sk/NetAlertX/tree/main/dockerfiles#-examples\">Examples</a> for details).</li><li data-sourcepos=\"51:4-51:161\">If facing issues (AJAX errors, can not write to DB, etc,) make sure permissions are set correctly, alternatively check the logs under <code>/app/front/log</code>.</li> <li data-sourcepos=\"52:4-52:146\">To solve permission issues you can also try to create a DB backup and then run a DB Restore via the <strong>Maintenance &gt; Backup/Restore</strong> section.</li> <li data-sourcepos=\"53:4-53:228\">If the database is in read-only mode you can solve this by setting the owner and group by executing the following command on the host system: <code>docker exec netalertx chown -R www-data:www-data /app/db/app.db</code>.</li></ul>",
+    "HelpFAQ_Cat_General_102docker_text": "",
     "HelpFAQ_Cat_General_103_head": "Die Login-Seite erscheint nicht, auch nicht nach der Passwortänderung.",
     "HelpFAQ_Cat_General_103_text": "Neben dem Passwort, muss in der Konfigurationsdatei <span class=\"text-danger help_faq_code\">/app/config/app.conf</span> auch der Parameter <span class=\"text-danger help_faq_code\">PIALERT_WEB_PROTECTION</span> auf <span class=\"text-danger help_faq_code\">True</span> gesetzt sein.",
     "HelpFAQ_Cat_Network_600_head": "Was bringt mir diese Seite?",
@@ -367,7 +377,7 @@
     "Login_Info": "",
     "Login_Psw-box": "Passwort",
     "Login_Psw_alert": "Sicherheitshinweis!",
-    "Login_Psw_folder": "im Ordner /app/config",
+    "Login_Psw_folder": "im Konfigurationsordner.",
     "Login_Psw_new": "neues_passwort",
     "Login_Psw_run": "Um das Passwort zu ändern nutze:",
     "Login_Remember": "Passwort speichern",
@@ -407,8 +417,8 @@
     "Maintenance_Tool_ImportPastedCSV": "CSV-Import (Einfügen)",
     "Maintenance_Tool_ImportPastedCSV_noti_text": "",
     "Maintenance_Tool_ImportPastedCSV_text": "",
-    "Maintenance_Tool_arpscansw": "arp-Scan stoppen/starten",
-    "Maintenance_Tool_arpscansw_noti": "arp-Scan stoppen/starten",
+    "Maintenance_Tool_arpscansw": "ARP-Scan umschalten (ein/aus)",
+    "Maintenance_Tool_arpscansw_noti": "ARP-Scan ein- oder ausschalten",
     "Maintenance_Tool_arpscansw_noti_text": "Wenn der Scan aus ist, bleibt er so lange aus bis er wieder aktiviert wird.",
     "Maintenance_Tool_arpscansw_text": "Schaltet den arp-Scan an oder aus. Wenn der Scan aus ist, bleibt er so lange aus bis er wieder aktiviert wird. Bereits laufende Scans werden dabei nicht beendet.",
     "Maintenance_Tool_backup": "DB Sicherung",
@@ -433,7 +443,7 @@
     "Maintenance_Tool_del_allevents30_noti": "Ereignisse löschen",
     "Maintenance_Tool_del_allevents30_noti_text": "Sind Sie sich sicher, dass Sie alle Ereignisse älter als 30 Tage löschen wollen? Dies setzt die Präsenz aller Geräte zurück.",
     "Maintenance_Tool_del_allevents30_text": "Machen Sie ein Backup, bevor Sie diese Funk­tion nutzen. Der Vor­gang kann ohne Back­up nicht rück­gängig gemacht werden. Alle Ereignisse älter als 30 Tage werden aus der Datenbank ge­löscht. Dies setzt auch die Anwesenheit zu­rück. Es kann ab dem Moment zu ungültigen Sitzungen kommen. Ein Scan, während das betreffende Gerät online ist, sollte das Problem lösen.",
-    "Maintenance_Tool_del_allevents_noti": "Alle Ereignisse löschen",
+    "Maintenance_Tool_del_allevents_noti": "Ereignisse löschen",
     "Maintenance_Tool_del_allevents_noti_text": "Sind Sie sicher, dass Sie alle Ereignisse aus der Datenbank löschen wollen. Dies setzt die Anwesenheit aller Geräte zurück.",
     "Maintenance_Tool_del_allevents_text": "Machen Sie ein Backup, bevor Sie diese Funk&shy;tion nutzen. Der Vor&shy;gang kann ohne Back&shy;up nicht rück&shy;gängig gemacht werden. Alle Ereignisse werden aus der Datenbank ge&shy;löscht. Dies setzt auch die Anwesenheit zu&shy;rück. Es kann ab dem Moment zu ungültigen Sitzungen kommen. Ein Scan, während das betreffende Gerät online ist, sollte das Problem lösen.",
     "Maintenance_Tool_del_empty_macs": "Alle Geräte ohne MAC löschen",
@@ -446,7 +456,7 @@
     "Maintenance_Tool_del_unknowndev_noti": "Lösche (unknown) Geräte",
     "Maintenance_Tool_del_unknowndev_noti_text": "Sind Sie sicher, dass Sie alle (unknown) Geräte aus der Datenbank löschen wollen?",
     "Maintenance_Tool_del_unknowndev_text": "Machen Sie ein Backup, bevor Sie diese Funk&shy;tion nutzen. Der Vor&shy;gang kann ohne Back&shy;up nicht rück&shy;gängig gemacht werden. Alle Gräte mit dem Namen (unknown) werden aus der Datenbank ge&shy;löscht.",
-    "Maintenance_Tool_displayed_columns_text": "Ändere die Sichtbarkeit und Anordnung der Spalten in der <a href=\"devices.php\"><b> <i class=\"fa fa-laptop\"></i> Geräte</b></a>-Seite. (Drag-and-Drop funktioniert nicht einwandfrei, ist aber verwendbar. Ich habe <a href=\"https://github.com/jokob-sk/NetAlertX/commit/94b32f0f7332879f5a7d2af05dafa2e5d5cfa5da\">3 Stunden</a> versucht das zu beheben, werde es aber nicht weiter verfolgen. Über einen PR mit einem Fix würde ich mich freuen :) ).",
+    "Maintenance_Tool_displayed_columns_text": "Ändere die Sichtbarkeit und Anordnung der Spalten in der <a href=\"devices.php\"><b> <i class=\"fa fa-laptop\"></i> Geräte</b></a>-Seite.",
     "Maintenance_Tool_drag_me": "Zieh mich um die Anordnung der Spalten zu ändern.",
     "Maintenance_Tool_order_columns_text": "",
     "Maintenance_Tool_purgebackup": "Sicherungen aufräumen",
@@ -458,14 +468,14 @@
     "Maintenance_Tool_restore_noti_text": "Sind Sie sicher, dass Sie die Datenbank aus der neusten Sicherung wiederherstellen möchten? Prüfen Sie, dass gerade keine Scans stattfinden.",
     "Maintenance_Tool_restore_text": "Das neuste Backup kann über diese Funk&shy;tion wiederhergestellt werden. Ältere Sicher&shy;ungen müssen manuell wieder&shy;hergestellt wer&shy;den. Es empfiehlt sich eine Integritäts&shy;prüfung nach der Wieder&shy;her&shy;stellung zu machen, falls die Datenbank bei der Sicherung geöffnet war.",
     "Maintenance_Tool_upgrade_database_noti": "Aktualisiere Datenbank",
-    "Maintenance_Tool_upgrade_database_noti_text": "Machen Sie ein Backup, bevor Sie diese Funk&shy;tion nutzen.",
+    "Maintenance_Tool_upgrade_database_noti_text": "",
     "Maintenance_Tool_upgrade_database_text": "Mit dieser Schaltfläche wird die Datenbank aktualisiert, um das Diagramm der Netzwerkaktivitäten der letzten 12 Stunden zu aktivieren. Bitte sichern Sie Ihre Datenbank, falls Probleme auftreten.",
-    "Maintenance_Tools_Tab_BackupRestore": "Sicherg. / Wiederherstellg.",
-    "Maintenance_Tools_Tab_Logging": "Logs",
+    "Maintenance_Tools_Tab_BackupRestore": "Sichern / Wiederherstellen",
+    "Maintenance_Tools_Tab_Logging": "Protokolle",
     "Maintenance_Tools_Tab_Settings": "Einstellungen",
     "Maintenance_Tools_Tab_Tools": "Werkzeuge",
     "Maintenance_Tools_Tab_UISettings": "UI Einstellungen",
-    "Maintenance_arp_status": "Scan Status",
+    "Maintenance_arp_status": "Scan-Status",
     "Maintenance_arp_status_off": "ist im Moment deaktiviert",
     "Maintenance_arp_status_on": "Scan(s) sind gerade aktiv",
     "Maintenance_built_on": "Erstellt am",
@@ -501,7 +511,7 @@
     "NTFY_icon": "<i class=\"fa fa-terminal\"></i>",
     "Navigation_About": "Über",
     "Navigation_Devices": "Geräte",
-    "Navigation_Donations": "Donations",
+    "Navigation_Donations": "Spenden",
     "Navigation_Events": "Ereignisse",
     "Navigation_Flows": "Flows",
     "Navigation_HelpFAQ": "Hilfe / FAQ",
@@ -539,7 +549,7 @@
     "Network_ManageEdit_ID_text": "-- Gerät wählen --",
     "Network_ManageEdit_Name": "Neuer Name",
     "Network_ManageEdit_Name_text": "Name ohne Sonderzeichen",
-    "Network_ManageEdit_Port": "Neue Portanzahl",
+    "Network_ManageEdit_Port": " Neue Portanzahl",
     "Network_ManageEdit_Port_text": "bei WLAN oder Powerline leer lassen",
     "Network_ManageEdit_Submit": "Speichern",
     "Network_ManageEdit_Type": "Neuer Typ",
@@ -564,21 +574,21 @@
     "PIALERT_WEB_PASSWORD_description": "Das Standardpasswort ist <code>123456</code>. Um das Passwort zu ändern, entweder <code>/app/back/pialert-cli</code> im Container starten oder <a onclick=\"toggleAllSettings()\" href=\"#SETPWD_RUN\"><code>SETPWD_RUN</code> Set password plugin</a> nutzen.",
     "PIALERT_WEB_PASSWORD_name": "Login-Passwort",
     "PIALERT_WEB_PROTECTION_description": "Ein Loginfenster wird angezeigt wenn aktiviert. Untere Beschreibung genau durchlesen falls Sie sich aus Ihrer Instanz aussperren.",
-    "PIALERT_WEB_PROTECTION_name": "Login aktivieren",
+    "PIALERT_WEB_PROTECTION_name": "Anmeldung aktivieren",
     "PLUGINS_KEEP_HIST_description": "Wie viele Plugin Scanresultate behalten werden (pro Plugin, nicht gerätespezifisch).",
     "PLUGINS_KEEP_HIST_name": "Plugins Verlauf",
     "PUSHSAFER_TOKEN_description": "Your secret Pushsafer API key (token).",
     "PUSHSAFER_TOKEN_name": "Pushsafer token",
     "PUSHSAFER_display_name": "Pushsafer",
     "PUSHSAFER_icon": "<i class=\"fa fa-bell\"></i>",
-    "Plugins_DeleteAll": "Delete all (filters are ignored)",
+    "Plugins_DeleteAll": "Alles löschen (Filter werden ignoriert)",
     "Plugins_Filters_Mac": "Mac Filter",
-    "Plugins_History": "Events History",
-    "Plugins_Obj_DeleteListed": "",
-    "Plugins_Objects": "Plugin Objects",
+    "Plugins_History": "Verlauf der Ereignisse",
+    "Plugins_Obj_DeleteListed": "Aufgelistete Objekte löschen",
+    "Plugins_Objects": "Plugin-Objekte",
     "Plugins_Out_of": "von",
-    "Plugins_Unprocessed_Events": "Unprocessed Events",
-    "Plugins_no_control": "No form control was found to render this value.",
+    "Plugins_Unprocessed_Events": "Unverarbeitete Ereignisse",
+    "Plugins_no_control": "",
     "Presence_CalHead_day": "Tag",
     "Presence_CalHead_lang": "de",
     "Presence_CalHead_month": "Monat",
@@ -586,6 +596,12 @@
     "Presence_CalHead_week": "Woche",
     "Presence_CalHead_year": "Jahr",
     "Presence_CallHead_Devices": "Geräte",
+    "Presence_Key_OnlineNow": "",
+    "Presence_Key_OnlineNow_desc": "",
+    "Presence_Key_OnlinePast": "",
+    "Presence_Key_OnlinePastMiss": "",
+    "Presence_Key_OnlinePastMiss_desc": "",
+    "Presence_Key_OnlinePast_desc": "",
     "Presence_Loading": "Laden...",
     "Presence_Shortcut_AllDevices": "Meine Geräte",
     "Presence_Shortcut_Archived": "Archiviert",
@@ -603,7 +619,7 @@
     "REPORT_FROM_description": "Notification email subject line. Some SMTP servers need this to be an email.",
     "REPORT_FROM_name": "Email subject",
     "REPORT_MAIL_description": "If enabled an email is sent out with a list of changes you nove subscribed to. Please also fill out all remaining settings related to the SMTP setup below. If facing issues, set <code>LOG_LEVEL</code> to <code>debug</code> and check the <a  href=\"/maintenance.php#tab_Logging\">error log</a>.",
-    "REPORT_MAIL_name": "Enable email",
+    "REPORT_MAIL_name": "E-Mail aktivieren",
     "REPORT_MQTT_description": "Enable sending notifications via <a target=\"_blank\" href=\"https://www.home-assistant.io/integrations/mqtt/\">MQTT</a> to your Home Assistance instance.",
     "REPORT_MQTT_name": "Enable MQTT",
     "REPORT_NTFY_description": "Enable sending notifications via <a target=\"_blank\" href=\"https://ntfy.sh/\">NTFY</a>.",
@@ -615,10 +631,10 @@
     "REPORT_TO_name": "Send email to",
     "REPORT_WEBHOOK_description": "Enable webhooks for notifications. Webhooks help you to connect to a lot of 3rd party tools, such as IFTTT, Zapier or <a href=\"https://n8n.io/\" target=\"_blank\">n8n</a> to name a few. Check out this simple <a href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/WEBHOOK_N8N.md\" target=\"_blank\">n8n guide here</a> to get started. If enabled, configure related settings below.",
     "REPORT_WEBHOOK_name": "Enable Webhooks",
-    "RandomMAC_hover": "Autodetected - indicates if the device randomizes it's MAC address.",
+    "RandomMAC_hover": "Automatisch erkannt - gibt an, ob das Gerät seine MAC-Adresse zufällig ermittelt.",
     "Reports_Sent_Log": "Protokoll gesendeter Berichte",
     "SCAN_SUBNETS_description": "",
-    "SCAN_SUBNETS_name": "",
+    "SCAN_SUBNETS_name": "scan Netzwerke",
     "SMTP_FORCE_SSL_description": "Force SSL when connecting to your SMTP server.",
     "SMTP_FORCE_SSL_name": "Force SSL",
     "SMTP_PASS_description": "The SMTP server password. ",
@@ -634,10 +650,10 @@
     "SMTP_USER_description": "The user name used to login into the SMTP server (sometimes a full email address).",
     "SMTP_USER_name": "SMTP user",
     "SYSTEM_TITLE": "Systeminformationen",
-    "Setting_Override": "Override value",
-    "Setting_Override_Description": "Enabling this option will override an App supplied default value with the value specified above.",
-    "Settings_Metadata_Toggle": "Show/hide metadata for the given setting.",
-    "Settings_Show_Description": "",
+    "Setting_Override": "Wert überschreiben",
+    "Setting_Override_Description": "",
+    "Settings_Metadata_Toggle": "Metadaten für die angegebene Einstellung anzeigen/ausblenden.",
+    "Settings_Show_Description": "Beschreibung der Einstellung anzeigen.",
     "Settings_device_Scanners_desync": "⚠ Die Zeitpläne des Gerätescanners sind nicht synchronisiert.",
     "Settings_device_Scanners_desync_popup": "",
     "Speedtest_Results": "Ergebnisse des Geschwindigkeitstests",
@@ -721,19 +737,19 @@
     "UI_DEV_SECTIONS_description": "Auswählen, welche Elemente in der Geräteseite versteckt werden sollen.",
     "UI_DEV_SECTIONS_name": "Geräteauswahl verstecken",
     "UI_ICONS_description": "",
-    "UI_ICONS_name": "Vorgefertigte Icons",
-    "UI_LANG_description": "Bevorzugte Oberflächensprache auswählen. Du möchtest beim Übersetzen helfen? Gerne hier:  <a href=\"https://hosted.weblate.org/projects/pialert/core/\" target=\"_blank\">Weblate</a>.",
-    "UI_LANG_name": "UI Sprache",
+    "UI_ICONS_name": "Vordefinierte Symbole",
+    "UI_LANG_description": "Bevorzugte Oberflächensprache auswählen. Du möchtest beim Übersetzen helfen? Gerne hier: <a href=\"https://hosted.weblate.org/projects/pialert/core/\" target=\"_blank\">Weblate</a>.",
+    "UI_LANG_name": "Sprache der Benutzeroberfläche",
     "UI_MY_DEVICES_description": "",
     "UI_MY_DEVICES_name": "In \"Meine Geräte\" anzeigen",
     "UI_NOT_RANDOM_MAC_description": "",
-    "UI_NOT_RANDOM_MAC_name": "",
-    "UI_PRESENCE_description": "Auswählen, welche Status im <b>Gerätepräsenz im Laufe der Zeit</b>-Diagramm in der <a href=\"/devices.php\" target=\"_blank\">Geräte</a>-Seite angzeigt werden sollen. (<code>STRG + klicken</code> zum aus-/abwählen).",
+    "UI_NOT_RANDOM_MAC_name": "Nicht als zufällig markieren",
+    "UI_PRESENCE_description": "Auswählen, welche Status im <b>Gerätepräsenz im Laufe der Zeit</b>-Diagramm in der <a href=\"/devices.php\" target=\"_blank\">Geräte</a>-Seite angzeigt werden sollen.",
     "UI_PRESENCE_name": "Anzeige im Präsenzdiagramm",
     "UI_REFRESH_description": "",
-    "UI_REFRESH_name": "Automatisch Aktualisieren",
+    "UI_REFRESH_name": "Benutzeroberfläche automatisch auffrischen",
     "VERSION_description": "",
-    "VERSION_name": "",
+    "VERSION_name": "Version oder Zeitstempel",
     "WEBHOOK_PAYLOAD_description": "The Webhook payload data format for the <code>body</code> > <code>attachments</code> > <code>text</code> attribute in the payload json. See an example of the payload <a target=\"_blank\" href=\"https://github.com/jokob-sk/NetAlertX/blob/main/front/report_templates/webhook_json_sample.json\">here</a>. (e.g.: for discord use <code>text</code>)",
     "WEBHOOK_PAYLOAD_name": "Payload type",
     "WEBHOOK_REQUEST_METHOD_description": "The HTTP request method to be used for the webhook call.",
@@ -748,13 +764,13 @@
     "Webhooks_icon": "<i class=\"fa fa-circle-nodes\"></i>",
     "devices_old": "Aktualisiert...",
     "general_event_description": "Das Ereignis, das Sie ausgelöst haben, könnte eine Weile dauern, bis Hintergrundprozesse abgeschlossen sind. Die Ausführung endet, wenn die unten ausgeführte Warteschlangen abgearbeitet ist. (Siehe <a href='/maintenance.php#tab_Logging'>error log</a>, wenn Probleme auftreten.)<br/> <br/> Ausführungsschlange:",
-    "general_event_title": "Executing an ad-hoc event",
+    "general_event_title": "",
     "report_guid": "",
     "report_guid_missing": "",
     "report_select_format": "Format auswählen:",
     "report_time": "Benachrichtigungszeit:",
-    "run_event_icon": "fa-play",
-    "run_event_tooltip": "Enable the setting and save your changes at first before you run it.",
+    "run_event_icon": "",
+    "run_event_tooltip": "Aktiviere die Einstellung und speichere deine Änderungen, bevor du sie ausführst.",
     "settings_core_icon": "",
     "settings_core_label": "Kern",
     "settings_device_scanners": "",
@@ -763,23 +779,24 @@
     "settings_device_scanners_label": "Gerätescanner",
     "settings_enabled": "Aktive Einstellungen",
     "settings_enabled_icon": "",
-    "settings_expand_all": "Expand all",
+    "settings_expand_all": "Alles ausklappen",
     "settings_imported": "Die letzten Einstellungen wurden aus der Datei app.conf importiert",
     "settings_imported_label": "Einstellungen importiert",
     "settings_missing": "",
     "settings_missing_block": "",
-    "settings_old": "Importing settings and re-initializing...",
+    "settings_old": "",
     "settings_other_scanners": "",
     "settings_other_scanners_icon": "",
     "settings_other_scanners_label": "Andere Scanner",
     "settings_publishers": "",
-    "settings_publishers_icon": "fa-solid fa-paper-plane",
-    "settings_publishers_info": "",
+    "settings_publishers_icon": "",
+    "settings_publishers_info": "Lade mehr Veröffentlicher mit den <a href=\"/settings.php#LOADED_PLUGINS\">geladene Plugins</a>-Einstellungen",
     "settings_publishers_label": "Veröffentlicher",
-    "settings_saved": "",
+    "settings_readonly": "",
+    "settings_saved": "<br/>Einstellungen gespeichert. <br/> Wird geladen... <br/><i class=\"ion ion-ios-loop-strong fa-spin fa-2x fa-fw\"></i> <br/>",
     "settings_system_icon": "",
     "settings_system_label": "System",
     "settings_update_item_warning": "",
-    "test_event_icon": "fa-vial-circle-check",
-    "test_event_tooltip": "Save your changes at first before you test your settings."
+    "test_event_icon": "",
+    "test_event_tooltip": "Speichere die Änderungen, bevor Sie die Einstellungen testen."
 }

front/php/templates/language/en_us.json

@@ -1,6 +1,8 @@
 {
     "API_CUSTOM_SQL_description": "You can specify a custom SQL query which will generate a JSON file and then expose it via the <a href=\"/api/table_custom_endpoint.json\" target=\"_blank\"><code>table_custom_endpoint.json</code> file endpoint</a>.",
     "API_CUSTOM_SQL_name": "Custom endpoint",
+    "API_TOKEN_description": "API token to secure communication, you can generate one or enter any value. It's sent in the request header. Used in the <code>SYNC</code> plugin, GraphQL server.",
+    "API_TOKEN_name": "API token",
     "API_display_name": "API",
     "API_icon": "<i class=\"fa fa-arrow-down-up-across-line\"></i>",
     "About_Design": "Designed for:",
@@ -62,7 +64,7 @@
     "DAYS_TO_KEEP_EVENTS_name": "Delete events older than",
     "DevDetail_Copy_Device_Title": "<i class=\"fa fa-copy\"></i> Copy details from device",
     "DevDetail_Copy_Device_Tooltip": "Copy details from device from the dropdown list. Everything on this page will be overwritten",
-    "DevDetail_EveandAl_AlertAllEvents": "Alert All Events",
+    "DevDetail_EveandAl_AlertAllEvents": "Alert Events",
     "DevDetail_EveandAl_AlertDown": "Alert Down",
     "DevDetail_EveandAl_Archived": "Archived",
     "DevDetail_EveandAl_NewDevice": "New Device",
@@ -197,6 +199,7 @@
     "Device_Shortcut_Favorites": "Favorites",
     "Device_Shortcut_NewDevices": "New Devices",
     "Device_Shortcut_OnlineChart": "Device presence",
+    "Device_TableHead_AlertDown": "Alert Down",
     "Device_TableHead_Connected_Devices": "Connections",
     "Device_TableHead_Favorite": "Favorite",
     "Device_TableHead_FirstSession": "First Session",
@@ -214,9 +217,11 @@
     "Device_TableHead_Owner": "Owner",
     "Device_TableHead_Parent_MAC": "Parent node MAC",
     "Device_TableHead_Port": "Port",
+    "Device_TableHead_PresentLastScan": "Presence",
     "Device_TableHead_RowID": "Row ID",
     "Device_TableHead_Rowid": "Row ID",
     "Device_TableHead_SSID": "SSID",
+    "Device_TableHead_SourcePlugin": "Source Plugin",
     "Device_TableHead_Status": "Status",
     "Device_TableHead_SyncHubNodeName": "Sync Node",
     "Device_TableHead_Type": "Type",
@@ -269,6 +274,8 @@
     "Events_Tablelenght": "Show _MENU_ entries",
     "Events_Tablelenght_all": "All",
     "Events_Title": "Events",
+    "GRAPHQL_PORT_description": "The port number of the GraphQL server.",
+    "GRAPHQL_PORT_name": "GraphQL port",
     "Gen_Action": "Action",
     "Gen_Add": "Add",
     "Gen_Add_All": "Add all",
@@ -284,6 +291,7 @@
     "Gen_Description": "Description",
     "Gen_Error": "Error",
     "Gen_Filter": "Filter",
+    "Gen_Generate": "Generate",
     "Gen_LockedDB": "ERROR - DB might be locked - Check F12 Dev tools -> Console or try later.",
     "Gen_Offline": "Offline",
     "Gen_Okay": "Ok",
@@ -309,6 +317,8 @@
     "General_icon": "<i class=\"fa fa-gears\"></i>",
     "HRS_TO_KEEP_NEWDEV_description": "This is a maintenance setting <b>DELETING devices</b>. If enabled (<code>0</code> is disabled), devices marked as <b>New Device</b> will be deleted if their <b>First Session</b> time was older than the specified hours in this setting. Use this setting if you want to auto-delete <b>New Devices</b> after <code>X</code> hours.",
     "HRS_TO_KEEP_NEWDEV_name": "Delete new devices after",
+    "HRS_TO_KEEP_OFFDEV_description": "This is a maintenance setting <b>DELETING devices</b>. If enabled (<code>0</code> is disabled), devices that are <b>Offline</b> and their <b>Last Offline</b> date time is older than the specified hours in this setting, will be deleted. Use this setting if you want to auto-delete <b>Offline Devices</b> after <code>X</code> hours being offline.",
+    "HRS_TO_KEEP_OFFDEV_name": "Delete offline devices after",
     "HelpFAQ_Cat_Detail": "Details",
     "HelpFAQ_Cat_Detail_300_head": "What means ",
     "HelpFAQ_Cat_Detail_300_text_a": "means a network device (a device of the type AP, Gateway, Firewall, Hypervisor, Powerline, Switch, WLAN, PLC, Router,USB LAN Adapter, USB WIFI Adapter, or Internet). Custom types can be added via the <code>NETWORK_DEVICE_TYPES</code> setting.",
@@ -545,6 +555,12 @@
     "Presence_CalHead_week": "week",
     "Presence_CalHead_year": "year",
     "Presence_CallHead_Devices": "Devices",
+    "Presence_Key_OnlineNow": "Now online",
+    "Presence_Key_OnlineNow_desc": "Device detected in the last scan as online.",
+    "Presence_Key_OnlinePast": "Past online",
+    "Presence_Key_OnlinePastMiss": "Past online (miss-match)",
+    "Presence_Key_OnlinePastMiss_desc": "Device online in the past, but currently offline, but the start session might be missing or has conflicting data. (might be a bug - please submit a PR if you know how to fix it - I'm a bit lost in code here)",
+    "Presence_Key_OnlinePast_desc": "Device online in the past, but currently offline.",
     "Presence_Loading": "Loading...",
     "Presence_Shortcut_AllDevices": "My Devices",
     "Presence_Shortcut_Archived": "Archived",
@@ -695,6 +711,7 @@
     "settings_publishers_icon": "fa-solid fa-paper-plane",
     "settings_publishers_info": "Load more Publishers with the <a href=\"/settings.php#LOADED_PLUGINS\">LOADED_PLUGINS</a> setting",
     "settings_publishers_label": "Publishers",
+    "settings_readonly": "Can't READ or WRITE <code>app.conf</code>. Try restarting the container and read the <a href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/FILE_PERMISSIONS.md\" target=\"_blank\">file permissions documentation</a>",
     "settings_saved": "<br/>Settings saved. <br/> Reloading... <br/><i class=\"ion ion-ios-loop-strong fa-spin fa-2x fa-fw\"></i> <br/>",
     "settings_system_icon": "fa-solid fa-gear",
     "settings_system_label": "System",

front/php/templates/language/es_es.json

@@ -1,6 +1,8 @@
 {
     "API_CUSTOM_SQL_description": "Puede especificar una consulta SQL personalizada que generará un archivo JSON y luego lo expondrá a través del <a href=\"/api/table_custom_endpoint.json\" target=\"_blank\">archivo <code>table_custom_endpoint.json</code ></a>.",
     "API_CUSTOM_SQL_name": "Endpoint personalizado",
+    "API_TOKEN_description": "Token de API para asegurar la comunicación, puede generar uno o introducir cualquier valor. Se envía en el encabezado de solicitud. Se utiliza en el plugin <code>SYNC</code> del servidor GraphQL.",
+    "API_TOKEN_name": "Token de la API",
     "API_display_name": "API",
     "API_icon": "<i class=\"fa fa-arrow-down-up-across-line\"></i>",
     "APPRISE_HOST_description": "URL del host de Apprise que comienza con <code>http://</code> o <code>https://</code>. (no olvide incluir <code>/notify</code> al final)",
@@ -72,7 +74,7 @@
     "DAYS_TO_KEEP_EVENTS_name": "Eliminar eventos anteriores a",
     "DevDetail_Copy_Device_Title": "<i class=\"fa fa-copy\"></i> Copiar detalles del dispositivo",
     "DevDetail_Copy_Device_Tooltip": "Copiar detalles del dispositivo de la lista desplegable. Todo en esta página se sobrescribirá",
-    "DevDetail_EveandAl_AlertAllEvents": "Alerta a todos los eventos",
+    "DevDetail_EveandAl_AlertAllEvents": "Notificaciones de eventos",
     "DevDetail_EveandAl_AlertDown": "Alerta de caída",
     "DevDetail_EveandAl_Archived": "Archivada",
     "DevDetail_EveandAl_NewDevice": "Nuevo dispositivo",
@@ -207,6 +209,7 @@
     "Device_Shortcut_Favorites": "Favorito(s)",
     "Device_Shortcut_NewDevices": "Nuevo(s)",
     "Device_Shortcut_OnlineChart": "Presencia del dispositivo a lo largo del tiempo",
+    "Device_TableHead_AlertDown": "Alerta desactivada",
     "Device_TableHead_Connected_Devices": "Conexiones",
     "Device_TableHead_Favorite": "Favorito",
     "Device_TableHead_FirstSession": "1ra. sesión",
@@ -224,9 +227,11 @@
     "Device_TableHead_Owner": "Propietario",
     "Device_TableHead_Parent_MAC": "Nodo principal de la MAC",
     "Device_TableHead_Port": "Puerto",
+    "Device_TableHead_PresentLastScan": "Historial",
     "Device_TableHead_RowID": "Row ID",
     "Device_TableHead_Rowid": "Row ID",
     "Device_TableHead_SSID": "SSID",
+    "Device_TableHead_SourcePlugin": "Fuente del plugin",
     "Device_TableHead_Status": "Situación",
     "Device_TableHead_SyncHubNodeName": "Nodo de sincronización",
     "Device_TableHead_Type": "Tipo",
@@ -279,6 +284,8 @@
     "Events_Tablelenght": "Mostrando entradas del MENÚ",
     "Events_Tablelenght_all": "Todos",
     "Events_Title": "Eventos",
+    "GRAPHQL_PORT_description": "El número de puerto del servidor GraphQL.",
+    "GRAPHQL_PORT_name": "Puerto GraphQL",
     "Gen_Action": "Acción",
     "Gen_Add": "Añadir",
     "Gen_Add_All": "Añadir todo",
@@ -291,9 +298,10 @@
     "Gen_DataUpdatedUITakesTime": "Correcto - La interfaz puede tardar en actualizarse si se está ejecutando un escaneo.",
     "Gen_Delete": "Eliminar",
     "Gen_DeleteAll": "Eliminar todo",
-    "Gen_Description": "",
+    "Gen_Description": "Descripción",
     "Gen_Error": "Error",
     "Gen_Filter": "Filtro",
+    "Gen_Generate": "Generar",
     "Gen_LockedDB": "Fallo - La base de datos puede estar bloqueada - Pulsa F1 -> Ajustes de desarrolladores -> Consola o prueba más tarde.",
     "Gen_Offline": "Desconectado",
     "Gen_Okay": "Aceptar",
@@ -319,6 +327,8 @@
     "General_icon": "<i class=\"fa fa-gears\"></i>",
     "HRS_TO_KEEP_NEWDEV_description": "Se trata de una configuración de mantenimiento <b>BORRAR dispositivos</b>. Si está activado (<code>0</code> está desactivado), los dispositivos marcados como <b>Nuevo dispositivo</b> se eliminarán si su fecha de <b>primera sesión</b> es anterior a las horas especificadas en este ajuste. Use este ajuste si desea eliminar automáticamente <b>Nuevos dispositivos</b> después de <code>X</code> horas.",
     "HRS_TO_KEEP_NEWDEV_name": "Eliminar nuevos dispositivos después",
+    "HRS_TO_KEEP_OFFDEV_description": "Se trata de una configuración de mantenimiento <b>BORRAR dispositivos</b>. Si está activado (<code>0</code> está desactivado), los dispositivos que están <b>sin conexión</b> y su fecha de <b>última conexión</b> es anterior a las horas especificadas en este ajuste se eliminarán. Use este ajuste si desea eliminar automáticamente <b>los dispositivos sin conexión</b> después de que el <code>X</code> horas esté sin conexión.",
+    "HRS_TO_KEEP_OFFDEV_name": "Borrar dispositivos sin conexión después de",
     "HelpFAQ_Cat_Detail": "Detalles",
     "HelpFAQ_Cat_Detail_300_head": "¿Qué significa? ",
     "HelpFAQ_Cat_Detail_300_text_a": "significa un dispositivo de red (un dispositivo del tipo AP, Gateway, Firewall, Hypervisor, Powerline, Switch, WLAN, PLC, Router,Adaptador LAN USB, Adaptador WIFI USB o Internet). Los tipos personalizados pueden añadirse mediante el ajuste <code>NETWORK_DEVICE_TYPES</code>.",
@@ -584,6 +594,12 @@
     "Presence_CalHead_week": "semana",
     "Presence_CalHead_year": "año",
     "Presence_CallHead_Devices": "Dispositivos",
+    "Presence_Key_OnlineNow": "En línea",
+    "Presence_Key_OnlineNow_desc": "Dispositivo detectado en el último escaneo como conectado.",
+    "Presence_Key_OnlinePast": "Anterior en línea",
+    "Presence_Key_OnlinePastMiss": "Anterior en línea (miss-match)",
+    "Presence_Key_OnlinePastMiss_desc": "Dispositivo en línea en el pasado, pero actualmente desconectado, pero la sesión de inicio podría estar faltando o tiene datos conflictivos. (Puede ser un error - por favor envíe un PR si sabe cómo solucionarlo - estoy un poco perdido en código)",
+    "Presence_Key_OnlinePast_desc": "Dispositivo en línea en el pasado, pero actualmente no conectado.",
     "Presence_Loading": "Cargando...",
     "Presence_Shortcut_AllDevices": "Mis dispositivos",
     "Presence_Shortcut_Archived": "Archivado(s)",
@@ -635,7 +651,7 @@
     "Setting_Override": "Sobreescribir el valor",
     "Setting_Override_Description": "Habilitar esta opción anulará un valor predeterminado proporcionado por la aplicación con el valor especificado anteriormente.",
     "Settings_Metadata_Toggle": "Mostrar/ocultar los metadatos de la configuración.",
-    "Settings_Show_Description": "",
+    "Settings_Show_Description": "Mostrar descripción de la configuración.",
     "Settings_Title": "<i class=\"fa fa-cog\"> Configuración</i>",
     "Settings_device_Scanners_desync": "⚠ Los horarios del escáner de los dispositivos no están sincronizados.",
     "Settings_device_Scanners_desync_popup": "Los horarios de escáneres de dispositivos (<code> *_RUN_SCHD</code> ) no son lo mismo. Esto resultará en notificaciones inconsistentes del dispositivo en línea/fuera de línea. A menos que sea así, utilice el mismo horario para todos los habilitados.<b> 🔍Escáneres de dispositivos</b> .",
@@ -723,11 +739,11 @@
     "UI_ICONS_name": "Iconos predefinidos",
     "UI_LANG_description": "Seleccione el idioma preferido para la interfaz de usuario. Ayude a traducir o sugiera idiomas en el portal en línea de <a href=\"https://hosted.weblate.org/projects/pialert/core/\" target=\"_blank\">Weblate</a>.",
     "UI_LANG_name": "Idioma de interfaz",
-    "UI_MY_DEVICES_description": "Dispositivos cuyos estados deben mostrarse en la vista por defecto <b>Mis dispositivos</b>. (<code>CTRL + Click</code> para seleccionar/deseleccionar)",
+    "UI_MY_DEVICES_description": "Dispositivos cuyos estados deben mostrarse en la vista por defecto <b>Mis dispositivos</b>.",
     "UI_MY_DEVICES_name": "Mostrar en Mis dispositivos",
     "UI_NOT_RANDOM_MAC_description": "Prefijos Mac que no deberían marcarse como dispositivos aleatorios. Introduzca por ejemplo <code>52</code> para excluir los dispositivos que empiecen por <code>52:xx:xx:xx:xx</code> para ser marcados como dispositivos con una dirección MAC aleatoria.",
     "UI_NOT_RANDOM_MAC_name": "No marcar como aleatoria",
-    "UI_PRESENCE_description": "Elige que estados del dispositivo deben mostrarse en la gráfica de <b>Presencia del dispositivo a lo largo del tiempo</b>  de la página de <a href=\"/devices.php\" target=\"_blank\">Dispositivos</a>. (<code>CTRL + Clic</code> para seleccionar / deseleccionar)",
+    "UI_PRESENCE_description": "Elige que estados del dispositivo deben mostrarse en la gráfica de <b>Presencia del dispositivo a lo largo del tiempo</b>  de la página de <a href=\"/devices.php\" target=\"_blank\">Dispositivos</a>.",
     "UI_PRESENCE_name": "Mostrar en el gráfico de presencia",
     "UI_REFRESH_description": "Ingrese el número de segundos después de los cuales se recarga la interfaz de usuario. Ajustado a <code> 0 </code> para desactivar.",
     "UI_REFRESH_name": "Actualización automática de la interfaz de usuario",
@@ -774,10 +790,11 @@
     "settings_publishers_icon": "fa-solid fa-paper-plane",
     "settings_publishers_info": "Cargue más editor@s con el ajuste <a href=\"/settings.php#LOADED_PLUGINS\">LOADED_PLUGINS</a>",
     "settings_publishers_label": "Editores",
+    "settings_readonly": "",
     "settings_saved": "<br/>Ajustes guardados. <br/><br/> Recargando... <br/><i class=\"ion ion-ios-loop-strong fa-spin fa-2x fa-fw\"></i> <br/>",
     "settings_system_icon": "fa-solid fa-gear",
     "settings_system_label": "Sistema",
     "settings_update_item_warning": "Actualice el valor a continuación. Tenga cuidado de seguir el formato anterior. <b>O la validación no se realiza.</b>",
     "test_event_icon": "fa-vial-circle-check",
     "test_event_tooltip": "Guarda tus cambios antes de probar nuevos ajustes."
-}
+}

front/php/templates/language/fr_fr.json

@@ -1,6 +1,8 @@
 {
     "API_CUSTOM_SQL_description": "Vous pouvez spécifier votre propre requête SQL qui retournera un fichier JSON et l'exposer via <a href=\"/api/table_custom_endpoint.json\" target=\"_blank\"><code>table_custom_endpoint.json</code> le point de terminaison de fichier</a>.",
     "API_CUSTOM_SQL_name": "Point de terminaison personnalisé",
+    "API_TOKEN_description": "Vous pouvez renseigner ou générer un jeton API pour sécuriser les échanges. Il est transmis dans le header de la requête. C'est utilisé dans le plugin <code>SYNC</code> du serveur GraphQL.",
+    "API_TOKEN_name": "Jeton d'API",
     "API_display_name": "API",
     "API_icon": "<i class=\"fa fa-arrow-down-up-across-line\"></i>",
     "About_Design": "Conçu pour :",
@@ -56,13 +58,13 @@
     "BackDevices_Restore_okay": "Restauration exécutée avec succès.",
     "BackDevices_darkmode_disabled": "Mode sombre désactivé",
     "BackDevices_darkmode_enabled": "Mode sombre activé",
-    "CLEAR_NEW_FLAG_description": "Si activé (<code>0</code> est activé), les appareils marqués comme <b>Nouvel appareil</b> seront démarqués si la durée limite (spécifiée en heures) dépasse la durée de la <b>Première Session</b>.",
+    "CLEAR_NEW_FLAG_description": "Si activé (<code>0</code> est désactivé), les appareils marqués comme <b>Nouvel appareil</b> seront démarqués si la limite de temps (spécifiée en heures) dépasse la durée de <b>Première Session</b>.",
     "CLEAR_NEW_FLAG_name": "Supprime le nouveau drapeau",
     "DAYS_TO_KEEP_EVENTS_description": "Il s'agit d'un paramètre de maintenance. Il indique le nombre de jours pendant lesquels les entrées d'événements seront conservées. Tous les événements plus anciens seront supprimés périodiquement. S'applique également à l'historique des événements du plugin.",
     "DAYS_TO_KEEP_EVENTS_name": "Supprimer les événements plus anciens que",
     "DevDetail_Copy_Device_Title": "<i class=\"fa fa-copy\"></i> Copier les détails de l'appareil",
     "DevDetail_Copy_Device_Tooltip": "Copier les détails de l'appareil dans la liste déroulante. Tout ce qui se trouve sur cette page sera remplacé",
-    "DevDetail_EveandAl_AlertAllEvents": "Alerter de tous les événements",
+    "DevDetail_EveandAl_AlertAllEvents": "Alerter les événements",
     "DevDetail_EveandAl_AlertDown": "Alerte de panne",
     "DevDetail_EveandAl_Archived": "Archivés",
     "DevDetail_EveandAl_NewDevice": "Nouvel appareil",
@@ -76,7 +78,7 @@
     "DevDetail_Events_CheckBox": "Masquer les événements de connexion",
     "DevDetail_GoToNetworkNode": "Naviguer à la page Réseau pour le nœud sélectionné.",
     "DevDetail_Icon": "Icône",
-    "DevDetail_Icon_Descr": "Renseigner le nom d'une icône Font Awesome sans le préfixe fa- ou la classe complète ; par ex. fa fa-brands fa-apple.",
+    "DevDetail_Icon_Descr": "Renseigner le nom d'une icône Font Awesome sans le préfixe fa- ou la classe complète, par ex. fa fa-brands fa-apple.",
     "DevDetail_Loading": "Chargement…",
     "DevDetail_MainInfo_Comments": "Observations",
     "DevDetail_MainInfo_Favorite": "Favori",
@@ -95,7 +97,7 @@
     "DevDetail_MainInfo_mac": "MAC",
     "DevDetail_Network_Node_hover": "Sélectionner l'appareil du réseau principal auquel cet appareil est connecté afin de compléter l'arborescence du Réseau.",
     "DevDetail_Network_Port_hover": "Le port auquel cet appareil est connecté sur l'appareil du réseau principal. Si vide, une icône Wifi est affichée dans l'arborescence du Réseau.",
-    "DevDetail_Nmap_Scans": "Scans NMAP manuels",
+    "DevDetail_Nmap_Scans": "Scans manuels via Nmap",
     "DevDetail_Nmap_Scans_desc": "Vous pouvez lancer des scans NMAP manuels. Vous pouvez aussi programmer des sans réguliers via le plugin Services & Ports (NMAP). Aller dans les <a href='/settings.php' target='_blank'>Paramètres</a> pour plus de details",
     "DevDetail_Nmap_buttonDefault": "Scan par défaut",
     "DevDetail_Nmap_buttonDefault_text": "Scan par défaut : NMAP scanne les 1 000 premiers ports pour chaque demande de scan de protocole. Cela couvre environ 93% des ports TCP et 49% des ports UDP (environ 5 secondes)",
@@ -197,6 +199,7 @@
     "Device_Shortcut_Favorites": "Favoris",
     "Device_Shortcut_NewDevices": "Nouveaux appareils",
     "Device_Shortcut_OnlineChart": "Présence de l'appareil",
+    "Device_TableHead_AlertDown": "Alerter si En panne",
     "Device_TableHead_Connected_Devices": "Connexions",
     "Device_TableHead_Favorite": "Favori",
     "Device_TableHead_FirstSession": "Première session",
@@ -214,9 +217,11 @@
     "Device_TableHead_Owner": "Propriétaire",
     "Device_TableHead_Parent_MAC": "MAC du nœud principal",
     "Device_TableHead_Port": "Port",
+    "Device_TableHead_PresentLastScan": "Présence",
     "Device_TableHead_RowID": "ID de colonne",
     "Device_TableHead_Rowid": "ID de colonne",
     "Device_TableHead_SSID": "SSID",
+    "Device_TableHead_SourcePlugin": "Source du plugin",
     "Device_TableHead_Status": "État",
     "Device_TableHead_SyncHubNodeName": "Noeud de synchro",
     "Device_TableHead_Type": "Type",
@@ -269,6 +274,8 @@
     "Events_Tablelenght": "Afficher _MENU_ entrées",
     "Events_Tablelenght_all": "Tous",
     "Events_Title": "Évènements",
+    "GRAPHQL_PORT_description": "Le numéro de port du serveur GraphQL.",
+    "GRAPHQL_PORT_name": "Port GraphQL",
     "Gen_Action": "Action",
     "Gen_Add": "Ajouter",
     "Gen_Add_All": "Ajouter tous",
@@ -281,9 +288,10 @@
     "Gen_DataUpdatedUITakesTime": "OK - cela peut prendre du temps à l'interface pour se mettre à jour si un scan est en cours.",
     "Gen_Delete": "Supprimer",
     "Gen_DeleteAll": "Supprimer tous",
-    "Gen_Description": "",
+    "Gen_Description": "Description",
     "Gen_Error": "Erreur",
     "Gen_Filter": "Filtrer",
+    "Gen_Generate": "Générer",
     "Gen_LockedDB": "Erreur - La base de données est peut-être verrouillée - Vérifier avec les outils de dév via F12 -> Console ou essayer plus tard.",
     "Gen_Offline": "Hors ligne",
     "Gen_Okay": "OK",
@@ -307,8 +315,10 @@
     "Gen_Work_In_Progress": "Travaux en cours, c'est le bon moment pour faire un retour via la liste d'anomalies sur Github https://github.com/jokob-sk/NetAlertX/issues",
     "General_display_name": "Général",
     "General_icon": "<i class=\"fa fa-gears\"></i>",
-    "HRS_TO_KEEP_NEWDEV_description": "Paramétrage de maintenance. S'il est activé (<code>0</code> s'il est désactivé), les appareils marqués comme <b>Nouvel appareil</b> seront supprimés si leur durée depuis la <b>première session</b> est plus ancienne que le nombre d'heures paramétré. Utilisez ce paramétrage si vous voulez supprimer automatiquement les <b>Nouveaux appareils</b> après <code>X</code> heures.",
+    "HRS_TO_KEEP_NEWDEV_description": "Paramètre de maintenance. S'il est activé (<code>0</code> s'il est désactivé), les appareils marqués comme <b>Nouvel appareil</b> seront supprimés si leur durée depuis la <b>première session</b> est plus ancienne que le nombre d'heures paramétré. Utilisez ce paramétrage si vous voulez supprimer automatiquement les <b>Nouveaux appareils</b> après <code>X</code> heures.",
     "HRS_TO_KEEP_NEWDEV_name": "Supprimer les nouveaux appareils après",
+    "HRS_TO_KEEP_OFFDEV_description": "Il s'agit d'un paramètre de maintenance <b>SUPPRIMER des appareils</b>. Si cette option est activée (<code>0</code> est désactivé), les appareils qui sont <b>Hors ligne</b> et dont la <b>dernière heure hors ligne</b> est plus ancienne que les heures spécifiées dans ce paramètre. Utilisez ce paramètre si vous souhaitez supprimer automatiquement <b>Appareils hors ligne</b> après <code>X</code> heures de déconnexion.",
+    "HRS_TO_KEEP_OFFDEV_name": "Supprimez les appareils hors ligne après",
     "HelpFAQ_Cat_Detail": "Détails",
     "HelpFAQ_Cat_Detail_300_head": "Que signifie ",
     "HelpFAQ_Cat_Detail_300_text_a": "signifie que cela représente un équipement réseau (Access Point, Gateway, Firewall, Hyperviseur, Powerline, Switch, WLAN, CPL, adaptateur Ethernet USB, adaptateur Wifi USB, Internet). Les types d'appareils personnalisés peuvent être ajoutés via le paramètre <code>NETWORK_DEVICE_TYPES</code>.",
@@ -545,6 +555,12 @@
     "Presence_CalHead_week": "semaine",
     "Presence_CalHead_year": "année",
     "Presence_CallHead_Devices": "Appareils",
+    "Presence_Key_OnlineNow": "Maintenant en ligne",
+    "Presence_Key_OnlineNow_desc": "Appareil détecté comme étant en ligne lors de la dernière analyse.",
+    "Presence_Key_OnlinePast": "Passé en ligne",
+    "Presence_Key_OnlinePastMiss": "Passé en ligne (correspondance manquée)",
+    "Presence_Key_OnlinePastMiss_desc": "Appareil en ligne dans le passé, mais actuellement hors ligne, mais la session de démarrage pourrait être manquante ou avoir des données contradictoires. (il s'agit peut-être d'un bogue - veuillez soumettre un PR si vous savez comment le corriger - je suis un peu perdu dans le code ici)",
+    "Presence_Key_OnlinePast_desc": "Appareil en ligne dans le passé, mais actuellement hors ligne.",
     "Presence_Loading": "Chargement …",
     "Presence_Shortcut_AllDevices": "Mes appareils",
     "Presence_Shortcut_Archived": "Archivés",
@@ -568,7 +584,7 @@
     "Setting_Override": "Remplacer la valeur",
     "Setting_Override_Description": "Activer cette option va remplacer la valeur fournie par défaut par une application par la valeur renseignée au-dessus.",
     "Settings_Metadata_Toggle": "Afficher/masquer les méta données pour le paramètre sélectionné.",
-    "Settings_Show_Description": "",
+    "Settings_Show_Description": "Montrer la description de la configuration.",
     "Settings_device_Scanners_desync": "⚠ La planification des différents scanners d'appareils est désynchronisée.",
     "Settings_device_Scanners_desync_popup": "La planification des scanners (<code>*_RUN_SCHD</code>) n'est pas identique entre scanners. Cela va entraîner des notifications en ligne/hors-ligne non cohérentes. À moins que cela soit attendu, utilisez la même planification pour tous les <b>🔍scanners d'appareils</b> activés.",
     "Speedtest_Results": "Résultats du test de débit",
@@ -655,11 +671,11 @@
     "UI_ICONS_name": "Icones prédéfinies",
     "UI_LANG_description": "Sélectionnez votre langue préféré de l’interface. Aidez à traduire ou suggérez des langues dans le portail en ligne de <a href=\"https://hosted.weblate.org/projects/pialert/core/\" target=\"_blank\">Weblate</a>.",
     "UI_LANG_name": "Langue de l'interface graphique",
-    "UI_MY_DEVICES_description": "Les états autorisant les appareils à être affichés par défaut dans la vue <b>Mes appareils</b>. (<code>CTRL + Clic</code> pour sélectionner/desélectionner",
+    "UI_MY_DEVICES_description": "Les états autorisant les appareils à être affichés par défaut dans la vue <b>Mes appareils</b>.",
     "UI_MY_DEVICES_name": "Afficher dans la vue de mes appareils",
     "UI_NOT_RANDOM_MAC_description": "Les préfixes d'adresses MAC à ne pas considérer comme généré aléatoirement pour les appareils. Renseignez par exemple <code>52</code> pour que les appareils commençant par <code>52:xx:xx:xx:xx:xx</code> ne soient pas considérés comme disposant d'une adresse MAC aléatoire.",
     "UI_NOT_RANDOM_MAC_name": "Ne pas marquer comme aléatoire",
-    "UI_PRESENCE_description": "Sélectionner les états qui doivent être affichés dans le graphique de <b>Présence des appareils</b> de la page <a href=\"/devices.php\" target=\"_blank\">Appareils</a>. (<code>CTRL + Clic</code> pour sélectionner/désélectionner)",
+    "UI_PRESENCE_description": "Sélectionner les états qui doivent être affichés dans le graphique de <b>Présence des appareils</b> de la page <a href=\"/devices.php\" target=\"_blank\">Appareils</a>.",
     "UI_PRESENCE_name": "Afficher dans le graphique de présence",
     "UI_REFRESH_description": "Renseignez le nombre de secondes après lequel rafraîchir l'interface graphique. Renseignez <code>0</code> pour désactiver.",
     "UI_REFRESH_name": "Rafraîchir automatiquement l'interface graphique",
@@ -695,10 +711,11 @@
     "settings_publishers_icon": "fa-solid fa-paper-plane",
     "settings_publishers_info": "Charger plus de passerelles de publication avec le paramètre <a href=\"/settings.php#LOADED_PLUGINS\">LOADED_PLUGINS</a>",
     "settings_publishers_label": "Passerelles de publication",
+    "settings_readonly": "",
     "settings_saved": "<br/>Paramètres enregistrés. <br/> Rechargement... <br/><i class=\"ion ion-ios-loop-strong fa-spin fa-2x fa-fw\"></i> <br/>",
     "settings_system_icon": "fa-solid fa-gear",
     "settings_system_label": "Système",
     "settings_update_item_warning": "Mettre à jour la valeur ci-dessous. Veillez à bien suivre le même format qu'auparavant. <b>Il n'y a pas de pas de contrôle.</b>",
     "test_event_icon": "fa-vial-circle-check",
     "test_event_tooltip": "Enregistrer d'abord vos modifications avant de tester vôtre paramétrage."
-}
+}

front/php/templates/language/it_it.json

@@ -1,6 +1,8 @@
 {
     "API_CUSTOM_SQL_description": "Puoi specificare una query SQL personalizzata che genererà un file JSON e quindi lo esporrà tramite l'<a href=\"/api/table_custom_endpoint.json\" target=\"_blank\"><code>table_custom_endpoint.json</code>endpoint del file</a>.",
     "API_CUSTOM_SQL_name": "Endpoint personalizzato",
+    "API_TOKEN_description": "Token API per proteggere la comunicazione, puoi generarne uno o inserire qualsiasi valore. Viene inviato nell'intestazione della richiesta. Usato nel plugin <code>SYNC</code>, server GraphQL.",
+    "API_TOKEN_name": "Token API",
     "API_display_name": "API",
     "API_icon": "<i class=\"fa fa-arrow-down-up-across-line\"></i>",
     "About_Design": "Progettato per:",
@@ -62,7 +64,7 @@
     "DAYS_TO_KEEP_EVENTS_name": "Elimina eventi più vecchi di",
     "DevDetail_Copy_Device_Title": "<i class=\"fa fa-copy\"></i> Copia dettagli dal dispositivo",
     "DevDetail_Copy_Device_Tooltip": "Copia i dettagli dal dispositivo dall'elenco a discesa. Tutto in questa pagina verrà sovrascritto",
-    "DevDetail_EveandAl_AlertAllEvents": "Notifica tutti gli eventi",
+    "DevDetail_EveandAl_AlertAllEvents": "Notifica eventi",
     "DevDetail_EveandAl_AlertDown": "Avviso disconnessione",
     "DevDetail_EveandAl_Archived": "Archiviato",
     "DevDetail_EveandAl_NewDevice": "Nuovo dispositivo",
@@ -197,6 +199,7 @@
     "Device_Shortcut_Favorites": "Preferiti",
     "Device_Shortcut_NewDevices": "Nuovi dispositivi",
     "Device_Shortcut_OnlineChart": "Presenza dispositivo",
+    "Device_TableHead_AlertDown": "Avviso disconnessione",
     "Device_TableHead_Connected_Devices": "Connessioni",
     "Device_TableHead_Favorite": "Preferito",
     "Device_TableHead_FirstSession": "Prima sessione",
@@ -214,9 +217,11 @@
     "Device_TableHead_Owner": "Proprietario",
     "Device_TableHead_Parent_MAC": "MAC del nodo principale",
     "Device_TableHead_Port": "Porta",
+    "Device_TableHead_PresentLastScan": "Presenza",
     "Device_TableHead_RowID": "ID riga",
     "Device_TableHead_Rowid": "ID riga",
     "Device_TableHead_SSID": "SSID",
+    "Device_TableHead_SourcePlugin": "Plugin sorgente",
     "Device_TableHead_Status": "Stato",
     "Device_TableHead_SyncHubNodeName": "Sincronizza nodo",
     "Device_TableHead_Type": "Tipo",
@@ -269,6 +274,8 @@
     "Events_Tablelenght": "Mostra _MENU_ elementi",
     "Events_Tablelenght_all": "Tutti",
     "Events_Title": "Eventi",
+    "GRAPHQL_PORT_description": "Il numero di porta del server GraphQL.",
+    "GRAPHQL_PORT_name": "Porta GraphQL",
     "Gen_Action": "Azione",
     "Gen_Add": "Aggiungi",
     "Gen_Add_All": "Aggiungi tutti",
@@ -284,6 +291,7 @@
     "Gen_Description": "Descrizione",
     "Gen_Error": "Errore",
     "Gen_Filter": "Filtro",
+    "Gen_Generate": "Genera",
     "Gen_LockedDB": "ERRORE: il DB potrebbe essere bloccato, controlla F12 Strumenti di sviluppo -> Console o riprova più tardi.",
     "Gen_Offline": "Offline",
     "Gen_Okay": "Ok",
@@ -309,6 +317,8 @@
     "General_icon": "<i class=\"fa fa-gears\"></i>",
     "HRS_TO_KEEP_NEWDEV_description": "Questa è un'impostazione di manutenzione <b>ELIMINAZIONE dispositivi</b>. Se abilitata (<code>0</code> è disabilitata), tutti i dispositivi marcati con <b>Nuovo dispositivo</b> verranno eliminati se l'orario della <b>Prima sessione</b> è precedente all'orario di questa impostazione. Usa questa impostazione se vuoi eliminare automaticamente i <b>Nuovi dispositivi</b> dopo <code>X</code> ore.",
     "HRS_TO_KEEP_NEWDEV_name": "Elimina nuovi dispositivi dopo",
+    "HRS_TO_KEEP_OFFDEV_description": "Questa è un'impostazione di manutenzione <b>ELIMINAZIONE dispositivi</b>. Se abilitata (<code>0</code> è disabilitata), i dispositivi che sono <b>Offline</b> e la loro data e ora <b>Ultima offline</b> sono più vecchi delle ore specificate in questa impostazione saranno eliminati. Usa questa impostazione se vuoi eliminare automaticamente <b>Dispositivi offline</b> dopo <code>X</code> ore trascorse offline.",
+    "HRS_TO_KEEP_OFFDEV_name": "Elimina dispositivi offline dopo",
     "HelpFAQ_Cat_Detail": "Dettagli",
     "HelpFAQ_Cat_Detail_300_head": "Cosa significa ",
     "HelpFAQ_Cat_Detail_300_text_a": "indica un dispositivo di rete (un dispositivo di tipo AP, Gateway, Firewall, Hypervisor, Powerline, Switch, WLAN, PLC, Router, USB LAN Adapter, USB WIFI Adapter, o Internet). Tipi personalizzati possono essere aggiunti attraverso l'impostazione <code>NETWORK_DEVICE_TYPES</code>.",
@@ -545,6 +555,12 @@
     "Presence_CalHead_week": "settimana",
     "Presence_CalHead_year": "anno",
     "Presence_CallHead_Devices": "Dispositivi",
+    "Presence_Key_OnlineNow": "Online adesso",
+    "Presence_Key_OnlineNow_desc": "Dispositivo rilevato durante l'ultima scansione come online.",
+    "Presence_Key_OnlinePast": "Online in passato",
+    "Presence_Key_OnlinePastMiss": "Online in passato (non corrispondente)",
+    "Presence_Key_OnlinePastMiss_desc": "Dispositivo online in passato, ma attualmente offline, ma la sessione di avvio potrebbe essere mancante o presentare dati in conflitto. (potrebbe trattarsi di un bug: invia una PR se sai come risolverlo, sono un po' perso nel codice qui)",
+    "Presence_Key_OnlinePast_desc": "Dispositivo online in passato, ma attualmente offline.",
     "Presence_Loading": "Caricamento...",
     "Presence_Shortcut_AllDevices": "Miei dispositivi",
     "Presence_Shortcut_Archived": "Archiviati",
@@ -655,11 +671,11 @@
     "UI_ICONS_name": "Icone predefinite",
     "UI_LANG_description": "Seleziona la lingua preferita dell'interfaccia utente. Aiuta nella traduzione o suggerisci una nuova lingua sul portale online di <a href=\"https://hosted.weblate.org/projects/pialert/core/\" target=\"_blank\">Weblate</a>.",
     "UI_LANG_name": "Lingua UI",
-    "UI_MY_DEVICES_description": "Dispositivi i cui stati devono essere visualizzati nella visualizzazione predefinita <b>Miei dispositivi</b>. (<code>CTRL + clic</code> per selezionare/deselezionare)",
+    "UI_MY_DEVICES_description": "Dispositivi i cui stati devono essere visualizzati nella visualizzazione predefinita <b>Miei dispositivi</b>.",
     "UI_MY_DEVICES_name": "Mostra nella vista Miei dispositivi",
     "UI_NOT_RANDOM_MAC_description": "Prefissi MAC che non devono essere contrassegnati come dispositivi casuali. Inserisci ad esempio <code>52</code> per escludere i dispositivi che iniziano con <code>52:xx:xx:xx:xx:xx</code> dall'essere contrassegnati come dispositivi con un indirizzo MAC casuale.",
     "UI_NOT_RANDOM_MAC_name": "Non segnalare come casuale",
-    "UI_PRESENCE_description": "Seleziona quali stati devono essere mostrati nel grafico <b>Presenza dispositivo</b> nella pagina <a href=\"/devices.php\" target=\"_blank\">Dispositivi</a>. (<code>CTRL + clic</code> per selezionare/deselezionare)",
+    "UI_PRESENCE_description": "Seleziona quali stati devono essere mostrati nel grafico <b>Presenza dispositivo</b> nella pagina <a href=\"/devices.php\" target=\"_blank\">Dispositivi</a>.",
     "UI_PRESENCE_name": "Mostra nel grafico delle presenze",
     "UI_REFRESH_description": "Inserisci il numero di secondi dopo il quale la UI si ricarica. Imposta a <code>0</code> per disabilitare.",
     "UI_REFRESH_name": "Aggiorna automaticamente la UI",
@@ -695,6 +711,7 @@
     "settings_publishers_icon": "fa-solid fa-paper-plane",
     "settings_publishers_info": "Carica più editori con l'impostazione <a href=\"/settings.php#LOADED_PLUGINS\">LOADED_PLUGINS</a>",
     "settings_publishers_label": "Editori",
+    "settings_readonly": "",
     "settings_saved": "<br/>Impostazioni salvate. <br/> Aggiornamento in corso... <br/> <i class=\"ion ion-ios-loop-strong fa-spin fa-2x fa-fw\"></i> <br/>",
     "settings_system_icon": "fa-solid fa-gear",
     "settings_system_label": "Sistema",

front/php/templates/language/lang.php

@@ -5,7 +5,7 @@
 // ###################################
 
 $defaultLang = "en_us";
-$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"];
+$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"];
 
 
 global $db;
@@ -26,6 +26,7 @@ switch($result){
   case 'Chinese (zh_cn)': $pia_lang_selected = 'zh_cn'; break;
   case 'Czech (cs_cz)': $pia_lang_selected = 'cs_cz'; break;
   case 'Arabic (ar_ar)': $pia_lang_selected = 'ar_ar'; break;
+  case 'Catalan (ca_ca)': $pia_lang_selected = 'ca_ca'; break;
   default: $pia_lang_selected = 'en_us'; break;
 }
 

front/php/templates/language/merge_translations.py

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

front/php/templates/language/nb_no.json

@@ -1,6 +1,8 @@
 {
     "API_CUSTOM_SQL_description": "Du kan spesifisere en egendefinert SQL-Spørring som vil generere en JSON-fil og deretter eksponere den via <a href=\"/api/table_custom_endpoint.json\" target=\"_blank\"><code>table_custom_endpoint.json</code> file endpoint</a>.",
     "API_CUSTOM_SQL_name": "Egendefinert endepunkt",
+    "API_TOKEN_description": "",
+    "API_TOKEN_name": "",
     "API_display_name": "API",
     "API_icon": "<i class=\"fa fa-arrow-down-up-across-line\"></i>",
     "About_Design": "Designet for:",
@@ -197,6 +199,7 @@
     "Device_Shortcut_Favorites": "Favoritter",
     "Device_Shortcut_NewDevices": "Nye Enheter",
     "Device_Shortcut_OnlineChart": "Enhetens tilstedeværelse",
+    "Device_TableHead_AlertDown": "",
     "Device_TableHead_Connected_Devices": "Tilkoblinger",
     "Device_TableHead_Favorite": "Favoritt",
     "Device_TableHead_FirstSession": "Første Økt",
@@ -214,9 +217,11 @@
     "Device_TableHead_Owner": "Eier",
     "Device_TableHead_Parent_MAC": "Overordnet node MAC",
     "Device_TableHead_Port": "Port",
+    "Device_TableHead_PresentLastScan": "",
     "Device_TableHead_RowID": "Rad ID",
     "Device_TableHead_Rowid": "Rad ID",
     "Device_TableHead_SSID": "",
+    "Device_TableHead_SourcePlugin": "",
     "Device_TableHead_Status": "Status",
     "Device_TableHead_SyncHubNodeName": "Synkroniser Node",
     "Device_TableHead_Type": "Type",
@@ -269,6 +274,8 @@
     "Events_Tablelenght": "Show _MENU_ entries",
     "Events_Tablelenght_all": "Alle",
     "Events_Title": "Hendelser",
+    "GRAPHQL_PORT_description": "",
+    "GRAPHQL_PORT_name": "",
     "Gen_Action": "Handling",
     "Gen_Add": "Legg til",
     "Gen_Add_All": "Legg til alle",
@@ -284,6 +291,7 @@
     "Gen_Description": "",
     "Gen_Error": "Feil",
     "Gen_Filter": "Filter",
+    "Gen_Generate": "",
     "Gen_LockedDB": "FEIL - DB kan være låst - Sjekk F12 Dev tools -> Konsoll eller prøv senere.",
     "Gen_Offline": "Frakoblet",
     "Gen_Okay": "Ok",
@@ -309,6 +317,8 @@
     "General_icon": "<i class=\"fa fa-gears\"></i>",
     "HRS_TO_KEEP_NEWDEV_description": "Dette er en vedlikeholdsinnstilling. Hvis aktivert (<code>0</code> er deaktivert), vil enheter merket som <b>Ny Enhet</b> bli slettet hvis tiden deres for <b>Første økt</b> var eldre enn de angitte timene i denne innstilling. Bruk denne innstillingen hvis du vil automatisk slette <b>Nye Enheter</b> etter <code>X</code> timer.",
     "HRS_TO_KEEP_NEWDEV_name": "Behold nye enheter for",
+    "HRS_TO_KEEP_OFFDEV_description": "",
+    "HRS_TO_KEEP_OFFDEV_name": "",
     "HelpFAQ_Cat_Detail": "Detaljer",
     "HelpFAQ_Cat_Detail_300_head": "Hva betyr ",
     "HelpFAQ_Cat_Detail_300_text_a": "betyr en nettverksenhet (en enhet av typen AP, Gateway, Brannmur, Hypervisor, Powerline, Switch, WLAN, PLS, ruter, USB LAN-adapter, USB WIFI-adapter eller Internett). Egendefinerte typer kan legges til via <code>NETWORK_DEVICE_TYPES</code>-innstillingen.",
@@ -545,6 +555,12 @@
     "Presence_CalHead_week": "uke",
     "Presence_CalHead_year": "år",
     "Presence_CallHead_Devices": "Enheter",
+    "Presence_Key_OnlineNow": "",
+    "Presence_Key_OnlineNow_desc": "",
+    "Presence_Key_OnlinePast": "",
+    "Presence_Key_OnlinePastMiss": "",
+    "Presence_Key_OnlinePastMiss_desc": "",
+    "Presence_Key_OnlinePast_desc": "",
     "Presence_Loading": "Laster...",
     "Presence_Shortcut_AllDevices": "Mine enheter",
     "Presence_Shortcut_Archived": "Arkivert",
@@ -695,6 +711,7 @@
     "settings_publishers_icon": "fa-solid fa-paper-plane",
     "settings_publishers_info": "",
     "settings_publishers_label": "Utgivere",
+    "settings_readonly": "",
     "settings_saved": "<br/>Innstillinger lagret. <br/> Laster inn på nytt... <br/><i class=\"ion ion-ios-loop-strong fa-spin fa-2x fa-fw\"></i><br/>",
     "settings_system_icon": "fa-solid fa-gear",
     "settings_system_label": "System",

front/php/templates/language/pl_pl.json

@@ -1,6 +1,8 @@
 {
     "API_CUSTOM_SQL_description": "Możesz określić własne zapytanie SQL które będzie generowało plik JSON i udostępnić je poprzez plik typu endpoint <a href=\"/api/table_custom_endpoint.json\" target=\"_blank\"><code>table_custom_endpoint.json</code> </a>.",
     "API_CUSTOM_SQL_name": "Własny endpoint",
+    "API_TOKEN_description": "",
+    "API_TOKEN_name": "",
     "API_display_name": "API",
     "API_icon": "<i class=\"fa fa-arrow-down-up-across-line\"></i>",
     "About_Design": "Zaprojektowany dla:",
@@ -197,6 +199,7 @@
     "Device_Shortcut_Favorites": "Ulubione",
     "Device_Shortcut_NewDevices": "Nowe Urządzenia",
     "Device_Shortcut_OnlineChart": "Obecność urządzenia",
+    "Device_TableHead_AlertDown": "",
     "Device_TableHead_Connected_Devices": "Połączenia",
     "Device_TableHead_Favorite": "Ulubione",
     "Device_TableHead_FirstSession": "Pierwsza Sesja",
@@ -214,9 +217,11 @@
     "Device_TableHead_Owner": "Właściciel",
     "Device_TableHead_Parent_MAC": "MAC rodzica węzła",
     "Device_TableHead_Port": "Port",
+    "Device_TableHead_PresentLastScan": "",
     "Device_TableHead_RowID": "ID wiersza",
     "Device_TableHead_Rowid": "ID wiersza",
     "Device_TableHead_SSID": "SSID",
+    "Device_TableHead_SourcePlugin": "",
     "Device_TableHead_Status": "Status",
     "Device_TableHead_SyncHubNodeName": "Węzeł Synchronizacji",
     "Device_TableHead_Type": "Typ",
@@ -269,6 +274,8 @@
     "Events_Tablelenght": "Pokaż_wpisy_MENU",
     "Events_Tablelenght_all": "Wszystkie",
     "Events_Title": "Wydarzenia",
+    "GRAPHQL_PORT_description": "",
+    "GRAPHQL_PORT_name": "",
     "Gen_Action": "Akcja",
     "Gen_Add": "Dodaj",
     "Gen_Add_All": "Dodaj wszystko",
@@ -284,6 +291,7 @@
     "Gen_Description": "",
     "Gen_Error": "Błąd",
     "Gen_Filter": "Filtr",
+    "Gen_Generate": "",
     "Gen_LockedDB": "BŁĄD - BAZA DANYCH może być zablokowana - Sprawdź F12 narzędzia dewelopera -> Konsola lub spróbuj ponownie później.",
     "Gen_Offline": "Wyłączone",
     "Gen_Okay": "Ok",
@@ -309,6 +317,8 @@
     "General_icon": "<i class=\"fa fa-gears\"></i>",
     "HRS_TO_KEEP_NEWDEV_description": "To jest ustawienie konserwacyjne. Jeżeli uruchomione (<code>0</code> jest wyłączone), urządzenie oznaczone jako <b>Nowe Urządzenie</b> zostanie usunięte jeżeli czas <b>Pierwszej Sesji</b> jest starszy niż godzina podana w tym ustawieniu. Uzyj tego ustawienia jeżeli chcesz automatycznie usuwać <b>Nowe Urządzenia</b> po <code>X</code> godzinach.",
     "HRS_TO_KEEP_NEWDEV_name": "Trzymaj nowe urządzenia przez",
+    "HRS_TO_KEEP_OFFDEV_description": "",
+    "HRS_TO_KEEP_OFFDEV_name": "",
     "HelpFAQ_Cat_Detail": "Szczegóły",
     "HelpFAQ_Cat_Detail_300_head": "Co oznacza ",
     "HelpFAQ_Cat_Detail_300_text_a": "oznacza urządzenie sieciowe (urządzenie typu AP, Gateway, Zapora sieciowa, Hypervisor, Powerline, Switch, WLAN, PLC, Ruter, Adapter USB LAN, Adapter USB WIFI, oraz Internet). Własny typ może zostać dodany poprzez ustawienie <code>NETWORK_DEVICE_TYPE</code>.",
@@ -545,6 +555,12 @@
     "Presence_CalHead_week": "tydzień",
     "Presence_CalHead_year": "rok",
     "Presence_CallHead_Devices": "Urządzenia",
+    "Presence_Key_OnlineNow": "",
+    "Presence_Key_OnlineNow_desc": "",
+    "Presence_Key_OnlinePast": "",
+    "Presence_Key_OnlinePastMiss": "",
+    "Presence_Key_OnlinePastMiss_desc": "",
+    "Presence_Key_OnlinePast_desc": "",
     "Presence_Loading": "Wczytywanie...",
     "Presence_Shortcut_AllDevices": "Moje Urządzenia",
     "Presence_Shortcut_Archived": "Zarchiwizowane",
@@ -695,6 +711,7 @@
     "settings_publishers_icon": "fa-solid fa-paper-plane",
     "settings_publishers_info": "",
     "settings_publishers_label": "Wydawcy",
+    "settings_readonly": "",
     "settings_saved": "<br/>Ustawienia zapisane.<br/>Przeładowanie...<br/><i class=\"ion ion-ios-loop-strong fa-spin fa-2x fa-fw\"></i><br/>",
     "settings_system_icon": "fa-solid fa-gear",
     "settings_system_label": "System",

front/php/templates/language/pt_br.json

@@ -1,6 +1,8 @@
 {
     "API_CUSTOM_SQL_description": "Você pode especificar uma consulta SQL personalizada que irá gerar um arquivo JSON e, em seguida, expô-lo por meio do <a href=\"/api/table_custom_endpoint.json\" target=\"_blank\"><code>table_custom_endpoint.json</code> endpoint do arquivo</a>.",
     "API_CUSTOM_SQL_name": "Endpoint customizado",
+    "API_TOKEN_description": "",
+    "API_TOKEN_name": "",
     "API_display_name": "API",
     "API_icon": "<i class=\"fa fa-arrow-down-up-across-line\"></i>",
     "About_Design": "Desenvolvido por:",
@@ -197,6 +199,7 @@
     "Device_Shortcut_Favorites": "Favoritos",
     "Device_Shortcut_NewDevices": "Novos dispositivos",
     "Device_Shortcut_OnlineChart": "Presença do dispositivo",
+    "Device_TableHead_AlertDown": "",
     "Device_TableHead_Connected_Devices": "Conexões",
     "Device_TableHead_Favorite": "Favorito",
     "Device_TableHead_FirstSession": "Primeira sessão",
@@ -214,9 +217,11 @@
     "Device_TableHead_Owner": "Proprietário",
     "Device_TableHead_Parent_MAC": "Nó pai MAC",
     "Device_TableHead_Port": "Porta",
+    "Device_TableHead_PresentLastScan": "",
     "Device_TableHead_RowID": "ID da linha",
     "Device_TableHead_Rowid": "ID da linha",
     "Device_TableHead_SSID": "SSID",
+    "Device_TableHead_SourcePlugin": "",
     "Device_TableHead_Status": "Status",
     "Device_TableHead_SyncHubNodeName": "Nó de sincronização",
     "Device_TableHead_Type": "Tipo",
@@ -269,6 +274,8 @@
     "Events_Tablelenght": "Mostrar entradas do _MENU_",
     "Events_Tablelenght_all": "Todos",
     "Events_Title": "Eventos",
+    "GRAPHQL_PORT_description": "",
+    "GRAPHQL_PORT_name": "",
     "Gen_Action": "Ação",
     "Gen_Add": "Adicionar",
     "Gen_Add_All": "Adicionar todos",
@@ -284,6 +291,7 @@
     "Gen_Description": "",
     "Gen_Error": "Erro",
     "Gen_Filter": "Filtro",
+    "Gen_Generate": "",
     "Gen_LockedDB": "ERRO - O banco de dados pode estar bloqueado - Verifique F12 Ferramentas de desenvolvimento -> Console ou tente mais tarde.",
     "Gen_Offline": "Offline",
     "Gen_Okay": "Ok",
@@ -309,6 +317,8 @@
     "General_icon": "<i class=\"fa fa-gears\"></i>",
     "HRS_TO_KEEP_NEWDEV_description": "Esta é uma configuração de manutenção. Se habilitada (<code>0</code> is disabled), dispositivos marcados como <b>Novo Dispositivo</b> serão excluídos se o tempo de <b>Primeira Sessão</b> for mais antigo que as horas especificadas nesta configuração. Use esta configuração se quiser excluir automaticamente <b>Novos Dispositivos</b> após <code>X</code> horas.",
     "HRS_TO_KEEP_NEWDEV_name": "Manter novos dispositivos por",
+    "HRS_TO_KEEP_OFFDEV_description": "",
+    "HRS_TO_KEEP_OFFDEV_name": "",
     "HelpFAQ_Cat_Detail": "Detalhes",
     "HelpFAQ_Cat_Detail_300_head": "O que significa ",
     "HelpFAQ_Cat_Detail_300_text_a": "Significa um dispositivo de rede (um dispositivo do tipo AP, Gateway, Firewall, Hypervisor, Powerline, Switch, WLAN, PLC, Roteador, Adaptador LAN USB, Adaptador Wi-Fi USB ou Internet). Tipos personalizados podem ser adicionados através da configuração <code>NETWORK_DEVICE_TYPES</code>.",
@@ -545,6 +555,12 @@
     "Presence_CalHead_week": "",
     "Presence_CalHead_year": "",
     "Presence_CallHead_Devices": "",
+    "Presence_Key_OnlineNow": "",
+    "Presence_Key_OnlineNow_desc": "",
+    "Presence_Key_OnlinePast": "",
+    "Presence_Key_OnlinePastMiss": "",
+    "Presence_Key_OnlinePastMiss_desc": "",
+    "Presence_Key_OnlinePast_desc": "",
     "Presence_Loading": "",
     "Presence_Shortcut_AllDevices": "",
     "Presence_Shortcut_Archived": "",
@@ -695,6 +711,7 @@
     "settings_publishers_icon": "",
     "settings_publishers_info": "",
     "settings_publishers_label": "",
+    "settings_readonly": "",
     "settings_saved": "",
     "settings_system_icon": "",
     "settings_system_label": "",

front/php/templates/language/ru_ru.json

@@ -1,6 +1,8 @@
 {
     "API_CUSTOM_SQL_description": "Вы можете указать собственный SQL-запрос, который будет генерировать файл JSON, а затем предоставлять его через конечную точку файла <a href=\"/api/table_custom_endpoint.json\" target=\"_blank\"><code>table_custom_endpoint.json</code></a>.",
     "API_CUSTOM_SQL_name": "Пользовательская конечная точка",
+    "API_TOKEN_description": "API-токен для защиты соединения. Вы можете сгенерировать его или ввести любое значение. Он отправляется в заголовке запроса. Используется в плагине <code>SYNC</code> и GraphQL сервере.",
+    "API_TOKEN_name": "API token",
     "API_display_name": "API",
     "API_icon": "<i class=\"fa fa-arrow-down-up-across-line\"></i>",
     "About_Design": "Разработан:",
@@ -62,7 +64,7 @@
     "DAYS_TO_KEEP_EVENTS_name": "Удалить события старше",
     "DevDetail_Copy_Device_Title": "<i class=\"fa fa-copy\"></i> Скопировать данные с устройства",
     "DevDetail_Copy_Device_Tooltip": "Скопируйте данные с устройства из раскрывающегося списка. Все на этой странице будет перезаписано",
-    "DevDetail_EveandAl_AlertAllEvents": "Оповещение о всех событиях",
+    "DevDetail_EveandAl_AlertAllEvents": "Оповещения о событиях",
     "DevDetail_EveandAl_AlertDown": "Оповещение о доступности",
     "DevDetail_EveandAl_Archived": "Архив",
     "DevDetail_EveandAl_NewDevice": "Новое устройство",
@@ -71,7 +73,7 @@
     "DevDetail_EveandAl_ScanCycle": "Сканировать устройство",
     "DevDetail_EveandAl_ScanCycle_a": "Сканировать Устройство",
     "DevDetail_EveandAl_ScanCycle_z": "Не сканировать устройство",
-    "DevDetail_EveandAl_Skip": "Пропустить повторные уведомления для",
+    "DevDetail_EveandAl_Skip": "Пропустить повторные уведомления",
     "DevDetail_EveandAl_Title": "<i class=\"fa fa-bolt\"></i> Конфигурация событий и оповещений",
     "DevDetail_Events_CheckBox": "Скрыть события подключения",
     "DevDetail_GoToNetworkNode": "Перейти на страницу Сеть данного узла.",
@@ -116,7 +118,7 @@
     "DevDetail_Run_Actions_Tooltip": "Выполнить действие на текущем устройстве из раскрывающегося списка.",
     "DevDetail_SessionInfo_FirstSession": "Первый сеанс",
     "DevDetail_SessionInfo_LastIP": "Последний IP",
-    "DevDetail_SessionInfo_LastSession": "Последние в оффлайн",
+    "DevDetail_SessionInfo_LastSession": "Последний оффлайн",
     "DevDetail_SessionInfo_StaticIP": "Статический IP",
     "DevDetail_SessionInfo_Status": "Статус",
     "DevDetail_SessionInfo_Title": "<i class=\"fa fa-calendar\"></i> Информация о сеансе",
@@ -196,7 +198,8 @@
     "Device_Shortcut_DownOnly": "Выключены",
     "Device_Shortcut_Favorites": "Избранные",
     "Device_Shortcut_NewDevices": "Новые устройства",
-    "Device_Shortcut_OnlineChart": "Присутствие устройства",
+    "Device_Shortcut_OnlineChart": "Присутствие устройств",
+    "Device_TableHead_AlertDown": "",
     "Device_TableHead_Connected_Devices": "Соединения",
     "Device_TableHead_Favorite": "Избранное",
     "Device_TableHead_FirstSession": "Первый сеанс",
@@ -210,13 +213,15 @@
     "Device_TableHead_MAC": "Случайный MAC-адрес",
     "Device_TableHead_MAC_full": "Полный MAC-адрес",
     "Device_TableHead_Name": "Имя",
-    "Device_TableHead_NetworkSite": "Сайт сети",
+    "Device_TableHead_NetworkSite": "Сайт устройства",
     "Device_TableHead_Owner": "Владелец",
     "Device_TableHead_Parent_MAC": "MAC род. узла",
     "Device_TableHead_Port": "Порт",
+    "Device_TableHead_PresentLastScan": "",
     "Device_TableHead_RowID": "ID строки",
     "Device_TableHead_Rowid": "ID строки",
     "Device_TableHead_SSID": "SSID",
+    "Device_TableHead_SourcePlugin": "Исходный плагин",
     "Device_TableHead_Status": "Статус",
     "Device_TableHead_SyncHubNodeName": "Узел синхронизации",
     "Device_TableHead_Type": "Тип",
@@ -269,6 +274,8 @@
     "Events_Tablelenght": "Показать _MENU_ записей",
     "Events_Tablelenght_all": "Все",
     "Events_Title": "События",
+    "GRAPHQL_PORT_description": "Номер порта сервера GraphQL.",
+    "GRAPHQL_PORT_name": "Порт GraphQL",
     "Gen_Action": "Действия",
     "Gen_Add": "Добавить",
     "Gen_Add_All": "Добавить все",
@@ -281,9 +288,10 @@
     "Gen_DataUpdatedUITakesTime": "ОК - Обновление UI может занять некоторое время, если сканирование выполняется.",
     "Gen_Delete": "Удалить",
     "Gen_DeleteAll": "Удалить все",
-    "Gen_Description": "",
+    "Gen_Description": "Описание",
     "Gen_Error": "Ошибка",
     "Gen_Filter": "Фильтр",
+    "Gen_Generate": "Генерировать",
     "Gen_LockedDB": "ОШИБКА - Возможно, база данных заблокирована. Проверьте инструменты разработчика F12 -> Консоль или повторите попытку позже.",
     "Gen_Offline": "Оффлайн",
     "Gen_Okay": "OK",
@@ -309,6 +317,8 @@
     "General_icon": "<i class=\"fa fa-gears\"></i>",
     "HRS_TO_KEEP_NEWDEV_description": "Это настройка обслуживания <b>УДАЛЕНИЕ устройств</b>. Если этот параметр включен (<code>0</code> отключен), устройства, помеченные как <b>Новое устройство</b>, будут удалены, если время их <b>Первого сеанса</b> было старше указанных в этой настройке часов. Используйте этот параметр, если вы хотите автоматически удалять <b>Новые устройства</b> через <code>X</code> часов.",
     "HRS_TO_KEEP_NEWDEV_name": "Удалить новые устройства после",
+    "HRS_TO_KEEP_OFFDEV_description": "Это настройка обслуживания <b>УДАЛЕНИЕ устройств</b>. Если этот параметр включен (<code>0</code> отключен), устройства, которые находятся <b>в Offline</b> и их дата и время <b>последнего Offline</b> старше, чем часы, указанные в этом параметре. Используйте этот параметр, если вы хотите автоматически удалять <b>Offline устройства</b> после <code>X</code> часов отсутствия в сети.",
+    "HRS_TO_KEEP_OFFDEV_name": "Удалить устройства Offline после",
     "HelpFAQ_Cat_Detail": "Подробности",
     "HelpFAQ_Cat_Detail_300_head": "Что значит ",
     "HelpFAQ_Cat_Detail_300_text_a": "означает сетевое устройство (типа AP, шлюз, межсетевой экран, гипервизор, Powerline, коммутатор, WLAN, PLC, маршрутизатор, USB-адаптер локальной сети, USB-адаптер Wi-Fi или Интернет). Пользовательские типы можно добавить с помощью параметра <code>NETWORK_DEVICE_TYPES</code>.",
@@ -364,18 +374,18 @@
     "Login_Toggle_Alert_headline": "Предупреждение о пароле!",
     "Login_Toggle_Info": "Информация о пароле",
     "Login_Toggle_Info_headline": "Информация о пароле",
-    "Maint_PurgeLog": "Журнал очистки",
+    "Maint_PurgeLog": "Очистить журнал",
     "Maint_RestartServer": "Перезапустить сервер",
     "Maint_Restart_Server_noti_text": "Вы уверены, что хотите перезапустить внутренний сервер? Это может привести к несогласованности работы приложения. Сначала создайте резервную копию настроек. <br/> <br/> Примечание: Это может занять несколько минут.",
     "Maintenance_Running_Version": "Установленная версия",
     "Maintenance_Status": "Статус",
     "Maintenance_Title": "Инструменты обслуживания",
-    "Maintenance_Tool_ExportCSV": "CSV Экспорт",
-    "Maintenance_Tool_ExportCSV_noti": "CSV Экспорт",
+    "Maintenance_Tool_ExportCSV": "Экспорт CSV",
+    "Maintenance_Tool_ExportCSV_noti": "Экспорт CSV",
     "Maintenance_Tool_ExportCSV_noti_text": "Вы уверены, что хотите создать файл CSV?",
     "Maintenance_Tool_ExportCSV_text": "Создайте файл CSV (значения, разделенные запятыми), содержащий список устройств, включая сетевые отношения между сетевыми узлами и подключенными устройствами. Вы также можете открыть этот URL-адрес <code> URL Вашего NetAlertX/php/server/devices.php?action=ExportCSV</code> или включить плагин <a href=\"settings.php#CSVBCKP_header\">Резервное копирование в CSV</a>.",
-    "Maintenance_Tool_ImportCSV": "CSV Импорт",
-    "Maintenance_Tool_ImportCSV_noti": "CSV Импорт",
+    "Maintenance_Tool_ImportCSV": "Импорт CSV",
+    "Maintenance_Tool_ImportCSV_noti": "Импорт CSV",
     "Maintenance_Tool_ImportCSV_noti_text": "Вы уверены, что хотите импортировать файл CSV? Это полностью <b>перезапишет</b> устройства в вашей базе данных.",
     "Maintenance_Tool_ImportCSV_text": "Прежде чем использовать эту функцию, сделайте резервную копию. Импортируйте файл CSV (значения, разделенные запятыми), содержащий список устройств, включая сетевые отношения между сетевыми узлами и подключенными устройствами. Для этого поместите файл CSV с именем <b>devices.csv</b> в папку <b>/config</b>.",
     "Maintenance_Tool_ImportPastedCSV": "Импорт CSV (вставка)",
@@ -402,7 +412,7 @@
     "Maintenance_Tool_del_alldev_noti": "Удалить устройства",
     "Maintenance_Tool_del_alldev_noti_text": "Вы уверены, что хотите удалить все устройства?",
     "Maintenance_Tool_del_alldev_text": "Прежде чем использовать эту функцию, сделайте резервную копию. Удаление невозможно отменить. Все устройства будут удалены из базы данных.",
-    "Maintenance_Tool_del_allevents": "Удалить события (Сбросить присутствие)",
+    "Maintenance_Tool_del_allevents": "Удалить события (Сброс присутствия)",
     "Maintenance_Tool_del_allevents30": "Удалить все события старше 30 дней",
     "Maintenance_Tool_del_allevents30_noti": "Удалить события",
     "Maintenance_Tool_del_allevents30_noti_text": "Вы уверены, что хотите удалить все события старше 30 дней? Это сбрасывает состояние присутствия всех устройств.",
@@ -410,14 +420,14 @@
     "Maintenance_Tool_del_allevents_noti": "Удалить события",
     "Maintenance_Tool_del_allevents_noti_text": "Вы уверены, что хотите удалить все события? Это сбрасывает состояние присутствия всех устройств.",
     "Maintenance_Tool_del_allevents_text": "Прежде чем использовать эту функцию, сделайте резервную копию. Удаление невозможно отменить. Все события в базе данных будут удалены. В этот момент присутствие всех устройств будет сброшено. Это может привести к недействительным сеансам. Это означает, что устройства отображаются как «присутствующие», хотя они находятся в автономном режиме. Сканирование, когда рассматриваемое устройство находится в сети, решает проблему.",
-    "Maintenance_Tool_del_empty_macs": "Удалить устройства с пустыми MAC-адресами",
+    "Maintenance_Tool_del_empty_macs": "Удалить устройства с пустыми MAC",
     "Maintenance_Tool_del_empty_macs_noti": "Удалить устройства",
     "Maintenance_Tool_del_empty_macs_noti_text": "Вы уверены, что хотите удалить все устройства с пустыми MAC-адресами?<br>(возможно, вы предпочитаете заархивировать их)",
     "Maintenance_Tool_del_empty_macs_text": "Прежде чем использовать эту функцию, сделайте резервную копию. Удаление невозможно отменить. Все устройства без MAC-адресов будут удалены из базы данных.",
     "Maintenance_Tool_del_selecteddev": "Удалить выбранные устройства",
     "Maintenance_Tool_del_selecteddev_text": "Прежде чем использовать эту функцию, сделайте резервную копию. Удаление невозможно отменить. Выбранные устройства будут удалены из базы данных.",
-    "Maintenance_Tool_del_unknowndev": "Удалить (неизвестные) устройства",
-    "Maintenance_Tool_del_unknowndev_noti": "Удалить (неизвестные) устройства",
+    "Maintenance_Tool_del_unknowndev": "Удалить неизвест. устр-ва",
+    "Maintenance_Tool_del_unknowndev_noti": "Удалить неизвест. устр-ва",
     "Maintenance_Tool_del_unknowndev_noti_text": "Вы уверены, что хотите удалить все (неизвестные) и (имя не найдено) устройства?",
     "Maintenance_Tool_del_unknowndev_text": "Прежде чем использовать эту функцию, сделайте резервную копию. Удаление невозможно отменить. Все названные устройства (неизвестные) будут удалены из базы данных.",
     "Maintenance_Tool_displayed_columns_text": "Измените видимость и порядок столбцов на странице <a href=\"devices.php\"><b> <i class=\"fa fa-laptop\"></i> Устройства</b></a>.",
@@ -475,7 +485,7 @@
     "Navigation_Notifications": "Уведомления",
     "Navigation_Plugins": "Плагины",
     "Navigation_Presence": "Присутствие",
-    "Navigation_Report": "Отправить отчеты",
+    "Navigation_Report": "Отчеты",
     "Navigation_Settings": "Настройки",
     "Navigation_SystemInfo": "О системе",
     "Navigation_Workflows": "Рабочие процессы",
@@ -545,6 +555,12 @@
     "Presence_CalHead_week": "неделя",
     "Presence_CalHead_year": "год",
     "Presence_CallHead_Devices": "Устройства",
+    "Presence_Key_OnlineNow": "Сейчас в сети",
+    "Presence_Key_OnlineNow_desc": "Устройство, обнаруженное при последнем сканировании как подключенное к сети.",
+    "Presence_Key_OnlinePast": "В прошлом в сети",
+    "Presence_Key_OnlinePastMiss": "В прошлом в сети (несовпадение)",
+    "Presence_Key_OnlinePastMiss_desc": "Устройство в прошлом было подключено к сети, но сейчас находится в автономном режиме, однако стартовый сеанс может отсутствовать или иметь противоречивые данные. (Возможно, это ошибка — отправьте PR, если знаете, как это исправить — здесь я немного запутался в коде)",
+    "Presence_Key_OnlinePast_desc": "Устройство раньше было в сети, но в настоящее время не в сети.",
     "Presence_Loading": "Загрузка...",
     "Presence_Shortcut_AllDevices": "Мои устройства",
     "Presence_Shortcut_Archived": "Архив",
@@ -561,14 +577,14 @@
     "REPORT_MAIL_name": "Включить эл. почту",
     "REPORT_TITLE": "Отчет",
     "RandomMAC_hover": "Автоматически обнаружено — указывает, рандомизирует ли устройство свой MAC-адрес.",
-    "Reports_Sent_Log": "Отправить журнал логов",
+    "Reports_Sent_Log": "Отправленные уведомления",
     "SCAN_SUBNETS_description": "Большинство сетевых сканеров (ARP-SCAN, NMAP, NSLOOKUP, DIG, PHOLUS) полагаются на сканирование определенных сетевых интерфейсов и подсетей. Дополнительную информацию по этому параметру можно найти в <a href=\"https://github.com/jokob-sk/NetAlertX/blob/main/docs/SUBNETS.md\" target=\"_blank\">документации по подсетям</a>, особенно VLAN, какие VLAN поддерживаются или как разобраться в маске сети и своем интерфейсе. <br/> <br/> Альтернативой сетевым сканерам является включение некоторых других сканеров/импортеров устройств, которые не полагаются на NetAlert<sup>X</sup>, имеющий доступ к сети (UNIFI, dhcp.leases , PiHole и др.). <br/> <br/> Примечание. Само время сканирования зависит от количества проверяемых IP-адресов, поэтому тщательно настройте его, указав соответствующую маску сети и интерфейс.",
     "SCAN_SUBNETS_name": "Сети для сканирования",
     "SYSTEM_TITLE": "Системная информация",
     "Setting_Override": "Переопределить значение",
     "Setting_Override_Description": "Включение этой опции приведет к переопределению значения по умолчанию, предоставленного приложением, на значение, указанное выше.",
     "Settings_Metadata_Toggle": "Показать/скрыть метаданные для данного параметра.",
-    "Settings_Show_Description": "",
+    "Settings_Show_Description": "Показать описание настройки.",
     "Settings_device_Scanners_desync": "⚠ Расписания сканера устройств не синхронизированы.",
     "Settings_device_Scanners_desync_popup": "Расписания сканеров устройств (<code>*_RUN_SCHD</code>) не совпадают. Это приведет к несогласованным онлайн/оффлайн уведомлениям устройства. Если это не предусмотрено, используйте одно и то же расписание для всех включенных <b>🔍Сканеров устройств</b>.",
     "Speedtest_Results": "Результаты теста скорости",
@@ -655,11 +671,11 @@
     "UI_ICONS_name": "Предопределенные значки",
     "UI_LANG_description": "Выберите предпочтительный язык пользовательского интерфейса. Помогите перевести или предложите языки на онлайн-портале <a href=\"https://hosted.weblate.org/projects/pialert/core/\" target=\"_blank\">Weblate</a>.",
     "UI_LANG_name": "Язык интерфейса",
-    "UI_MY_DEVICES_description": "Устройства, статусы которых должны отображаться в <b>Мои устройства</b> по умолчанию. (<code>CTRL + Click</code>, чтобы выбрать/отменить выбор)",
+    "UI_MY_DEVICES_description": "Устройства, статусы которых должны отображаться в стандартном представлении <b>Мои устройства</b>.",
     "UI_MY_DEVICES_name": "Показать в «Мои устройства»",
     "UI_NOT_RANDOM_MAC_description": "Префиксы Mac, которые не следует помечать как случайные устройства. Введите, например, <code>52</code>, чтобы исключить устройства, начинающиеся с <code>52:xx:xx:xx:xx:xx</code>, из метки как устройства со случайным MAC-адресом.",
     "UI_NOT_RANDOM_MAC_name": "Не отмечать как случайные",
-    "UI_PRESENCE_description": "Выберите, какие статусы должны отображаться на диаграмме <b>Присутствие устройства</b> · · на странице <a href=\"/devices.php\" target=\"_blank\">Устройства</a>. (<code>CTRL + Click</code>, чтобы выбрать/отменить выбор)",
+    "UI_PRESENCE_description": "Выберите, какие статусы должны отображаться в диаграмме <b>Присутствие устройств</b>- на странице <a href=\"/devices.php\" target=\"_blank\">Устройства</a>.",
     "UI_PRESENCE_name": "Показать в диаграмме присутствия",
     "UI_REFRESH_description": "Введите количество секунд, по истечении которых пользовательский интерфейс перезагружается. Установите значение <code>0</code>, чтобы отключить.",
     "UI_REFRESH_name": "Автоматическое обновление интерфейса",
@@ -668,7 +684,7 @@
     "devices_old": "Актуализируется...",
     "general_event_description": "Событие, которое вы инициировали, может занять некоторое время, прежде чем фоновые процессы завершатся. Выполнение завершится, как только очередь выполнения, указанная ниже, опустеет (Проверьте <a href='/maintenance.php#tab_Logging'>журнал ошибок</a> при возникновении проблем). <br/> <br/>· · Очередь выполнения:",
     "general_event_title": "Выполнение специального события",
-    "report_guid": "Руководство по уведомлениям:",
+    "report_guid": "Идентификатор уведомления:",
     "report_guid_missing": "Связанное уведомление не найдено. Между недавно отправленными уведомлениями и их доступностью существует небольшая задержка. Обновите страницу и кэшируйте ее через несколько секунд. Также возможно, что выбранное уведомление было удалено во время обслуживания, как указано в настройке <code>DBCLNP_NOTIFI_HIST</code>. <br/> <br/>Вместо этого отображается последнее уведомление. Отсутствующее уведомление имеет следующий GUID:",
     "report_select_format": "Выбрать формат:",
     "report_time": "Время уведомления:",
@@ -695,6 +711,7 @@
     "settings_publishers_icon": "fa-solid fa-paper-plane",
     "settings_publishers_info": "Загрузите больше нотификаторов с помощью настройки <a href=\"/settings.php#LOADED_PLUGINS\">LOADED_PLUGINS</a>",
     "settings_publishers_label": "Уведомления",
+    "settings_readonly": "",
     "settings_saved": "<br/>Настройки сохранены. <br/> Перезагрузка... <br/><i class=\"ion ion-ios-loop-strong fa-spin fa-2x fa-fw\"></i> <br/>",
     "settings_system_icon": "fa-solid fa-gear",
     "settings_system_label": "Система",

front/php/templates/language/tr_tr.json

@@ -1,6 +1,8 @@
 {
     "API_CUSTOM_SQL_description": "",
     "API_CUSTOM_SQL_name": "",
+    "API_TOKEN_description": "",
+    "API_TOKEN_name": "",
     "API_display_name": "",
     "API_icon": "",
     "About_Design": "",
@@ -197,6 +199,7 @@
     "Device_Shortcut_Favorites": "Favoriler",
     "Device_Shortcut_NewDevices": "Yeni Cİhazlar",
     "Device_Shortcut_OnlineChart": "",
+    "Device_TableHead_AlertDown": "",
     "Device_TableHead_Connected_Devices": "Bağlantılar",
     "Device_TableHead_Favorite": "",
     "Device_TableHead_FirstSession": "İlk Oturum",
@@ -214,9 +217,11 @@
     "Device_TableHead_Owner": "",
     "Device_TableHead_Parent_MAC": "",
     "Device_TableHead_Port": "",
+    "Device_TableHead_PresentLastScan": "",
     "Device_TableHead_RowID": "",
     "Device_TableHead_Rowid": "",
     "Device_TableHead_SSID": "",
+    "Device_TableHead_SourcePlugin": "",
     "Device_TableHead_Status": "Durum",
     "Device_TableHead_SyncHubNodeName": "",
     "Device_TableHead_Type": "",
@@ -269,6 +274,8 @@
     "Events_Tablelenght": "",
     "Events_Tablelenght_all": "",
     "Events_Title": "",
+    "GRAPHQL_PORT_description": "",
+    "GRAPHQL_PORT_name": "",
     "Gen_Action": "Komut",
     "Gen_Add": "Ekle",
     "Gen_Add_All": "Tümünü ekle",
@@ -284,6 +291,7 @@
     "Gen_Description": "",
     "Gen_Error": "Hata",
     "Gen_Filter": "Filtre",
+    "Gen_Generate": "",
     "Gen_LockedDB": "",
     "Gen_Offline": "Çevrimdışı",
     "Gen_Okay": "Tamam",
@@ -309,6 +317,8 @@
     "General_icon": "<i class=\"fa fa-gears\"></i>",
     "HRS_TO_KEEP_NEWDEV_description": "",
     "HRS_TO_KEEP_NEWDEV_name": "",
+    "HRS_TO_KEEP_OFFDEV_description": "",
+    "HRS_TO_KEEP_OFFDEV_name": "",
     "HelpFAQ_Cat_Detail": "Detaylar",
     "HelpFAQ_Cat_Detail_300_head": "",
     "HelpFAQ_Cat_Detail_300_text_a": "",
@@ -545,6 +555,12 @@
     "Presence_CalHead_week": "hafta",
     "Presence_CalHead_year": "yıl",
     "Presence_CallHead_Devices": "Cihazlar",
+    "Presence_Key_OnlineNow": "",
+    "Presence_Key_OnlineNow_desc": "",
+    "Presence_Key_OnlinePast": "",
+    "Presence_Key_OnlinePastMiss": "",
+    "Presence_Key_OnlinePastMiss_desc": "",
+    "Presence_Key_OnlinePast_desc": "",
     "Presence_Loading": "Yükleniyor...",
     "Presence_Shortcut_AllDevices": "Cihazlarım",
     "Presence_Shortcut_Archived": "",
@@ -695,6 +711,7 @@
     "settings_publishers_icon": "",
     "settings_publishers_info": "",
     "settings_publishers_label": "",
+    "settings_readonly": "",
     "settings_saved": "",
     "settings_system_icon": "",
     "settings_system_label": "Sistem",

front/php/templates/language/zh_cn.json

@@ -1,6 +1,8 @@
 {
     "API_CUSTOM_SQL_description": "您可以指定一个自定义 SQL 查询，它将生成一个 JSON 文件，然后通过 <a href=\"/api/table_custom_endpoint.json\" target=\"_blank\"><code>table_custom_endpoint.json</code> 文件端点</a> 公开它。",
     "API_CUSTOM_SQL_name": "自定义终点",
+    "API_TOKEN_description": "",
+    "API_TOKEN_name": "",
     "API_display_name": "API",
     "API_icon": "<i class=\"fa fa-arrow-down-up-across-line\"></i>",
     "About_Design": "设计用于：",
@@ -197,6 +199,7 @@
     "Device_Shortcut_Favorites": "收藏",
     "Device_Shortcut_NewDevices": "新设备",
     "Device_Shortcut_OnlineChart": "设备统计",
+    "Device_TableHead_AlertDown": "",
     "Device_TableHead_Connected_Devices": "链接",
     "Device_TableHead_Favorite": "收藏",
     "Device_TableHead_FirstSession": "加入",
@@ -214,9 +217,11 @@
     "Device_TableHead_Owner": "所有者",
     "Device_TableHead_Parent_MAC": "父节点",
     "Device_TableHead_Port": "端口",
+    "Device_TableHead_PresentLastScan": "",
     "Device_TableHead_RowID": "排行",
     "Device_TableHead_Rowid": "排行",
     "Device_TableHead_SSID": "SSID",
+    "Device_TableHead_SourcePlugin": "",
     "Device_TableHead_Status": "状态",
     "Device_TableHead_SyncHubNodeName": "同步节点",
     "Device_TableHead_Type": "类型",
@@ -269,6 +274,8 @@
     "Events_Tablelenght": "",
     "Events_Tablelenght_all": "全部",
     "Events_Title": "事件",
+    "GRAPHQL_PORT_description": "",
+    "GRAPHQL_PORT_name": "",
     "Gen_Action": "动作",
     "Gen_Add": "增加",
     "Gen_Add_All": "全部添加",
@@ -284,6 +291,7 @@
     "Gen_Description": "",
     "Gen_Error": "错误",
     "Gen_Filter": "筛选",
+    "Gen_Generate": "",
     "Gen_LockedDB": "错误 - DB 可能被锁定 - 检查 F12 开发工具 -> 控制台或稍后重试。",
     "Gen_Offline": "离线",
     "Gen_Okay": "Ok",
@@ -309,6 +317,8 @@
     "General_icon": "<i class=\"fa fa-gears\"></i>",
     "HRS_TO_KEEP_NEWDEV_description": "这是一项维护设置。如果启用（<code>0</code> 为禁用），则标记为<b>新设备</b>的设备（如果其<b>首次会话</b>时间早于此设置中指定的小时数）将被删除。如果您想在 <code>X</code> 小时后自动删除<b>新设备</b>，请使用此设置。",
     "HRS_TO_KEEP_NEWDEV_name": "保留新设备",
+    "HRS_TO_KEEP_OFFDEV_description": "",
+    "HRS_TO_KEEP_OFFDEV_name": "",
     "HelpFAQ_Cat_Detail": "详细",
     "HelpFAQ_Cat_Detail_300_head": "含义 ",
     "HelpFAQ_Cat_Detail_300_text_a": "表示网络设备（AP、网关、防火墙、虚拟机管理程序、电力线、交换机、WLAN、PLC、路由器、USB LAN 适配器、USB WIFI 适配器或 Internet 类型的设备）。可以通过 <code>NETWORK_DEVICE_TYPES</code> 设置添加自定义类型。",
@@ -545,6 +555,12 @@
     "Presence_CalHead_week": "星期",
     "Presence_CalHead_year": "年",
     "Presence_CallHead_Devices": "设备",
+    "Presence_Key_OnlineNow": "",
+    "Presence_Key_OnlineNow_desc": "",
+    "Presence_Key_OnlinePast": "",
+    "Presence_Key_OnlinePastMiss": "",
+    "Presence_Key_OnlinePastMiss_desc": "",
+    "Presence_Key_OnlinePast_desc": "",
     "Presence_Loading": "加载中...",
     "Presence_Shortcut_AllDevices": "我的设备",
     "Presence_Shortcut_Archived": "已归档",
@@ -695,6 +711,7 @@
     "settings_publishers_icon": "",
     "settings_publishers_info": "使用 <a href=\"/settings.php#LOADED_PLUGINS\">LOADED_PLUGINS</a> 设置加载更多发布商",
     "settings_publishers_label": "出版商",
+    "settings_readonly": "",
     "settings_saved": "<br/>设置已保存。<br/> 正在加载...<br/><i class=\"ion ion-ios-loop-strong fa-spin fa-2x fa-fw\"></i> <br/>",
     "settings_system_icon": "",
     "settings_system_label": "系统",

front/php/templates/security.php

@@ -55,7 +55,7 @@ $configLines = file(CONFIG_PATH);
 // Handle web protection and password
 $nax_WebProtection = strtolower(trim(getConfigLine('/^SETPWD_enable_password.*=/', $configLines)[1] ?? 'false'));
 $nax_Password = getConfigValue('/^SETPWD_password.*=/', $configLines);
-$api_token = getConfigValue('/^SYNC_api_token.*=/', $configLines, "'");
+$api_token = getConfigValue('/^API_TOKEN.*=/', $configLines, "'");
 
 $expectedToken = 'Bearer ' . $api_token;
 

front/php/templates/skinUI.php

@@ -4,12 +4,12 @@
 // ## GUI settings processing start
 // ###################################
 
-if( isset($_COOKIE['UI_dark_mode']))
+if( isset($_COOKIE['UI_theme']))
 {
-    $ENABLED_DARKMODE = $_COOKIE['UI_dark_mode'] == "True";
+    $UI_THEME = $_COOKIE['UI_theme'];
 }else
 {
-    $ENABLED_DARKMODE = False;
+    $UI_THEME = "Light";
 }
 
 $pia_skin_selected = 'skin-blue';
@@ -18,4 +18,4 @@ $pia_skin_selected = 'skin-blue';
 // ## GUI settings processing end
 // ###################################
 
-?>
+?>

front/plugins.php

@@ -5,7 +5,7 @@
 ?>
 
 <!-- Page ------------------------------------------------------------------ -->
-<div class="content-wrapper">
+<div class="content-wrapper integrations-plugins">
 
 <!-- Content header--------------------------------------------------------- -->
 <section class="content-header">

front/plugins/README.md

@@ -1,6 +1,6 @@
 # 🔌 Plugins
 
-NetAlertX supports additional plugins to extend its functionality, each with its own settings and options. Plugins can be loaded via the General -> `LOADED_PLUGINS` setting by using Ctrl + Click. For custom plugin development, refer to the [Plugin development guide](/docs/PLUGINS_DEV.md).   
+NetAlertX supports additional plugins to extend its functionality, each with its own settings and options. Plugins can be loaded via the General -> `LOADED_PLUGINS` setting. For custom plugin development, refer to the [Plugin development guide](/docs/PLUGINS_DEV.md).   
 
 >[!NOTE]
 > Please check this [Plugins debugging guide](https://github.com/jokob-sk/NetAlertX/blob/main/docs/DEBUG_PLUGINS.md) and the corresponding Plugin documentation in the below table if you are facing issues.  
@@ -16,7 +16,6 @@ NetAlertX supports additional plugins to extend its functionality, each with its
 4. Fine-tune [Notifications](/docs/NOTIFICATIONS.md)
 5. [Backup your setup](/docs/BACKUPS.md)
 6. Contribute and [Create custom plugins](/docs/PLUGINS_DEV.md)
-7. Consider [donating](https://github.com/jokob-sk/NetAlertX?tab=readme-ov-file#-sponsors) to keep me going
 
 
 ## 📑 Available Plugins

front/plugins/__template/config.json

@@ -313,6 +313,21 @@
     }
   ],
   "database_column_definitions": [
+    {
+      "column": "Index",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "none",
+      "default_value": "",
+      "options": [],
+      "localized": ["name"],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Index"
+        }
+      ]
+    },
     {
       "column": "Object_PrimaryID",
       "mapped_to_column": "cur_MAC",

front/plugins/_publisher_apprise/config.json

@@ -33,19 +33,15 @@
     {
       "column": "Index",
       "css_classes": "col-sm-2",
-      "show": false,
-      "type": "label",
+      "show": true,
+      "type": "none",
       "default_value": "",
       "options": [],
       "localized": ["name"],
       "name": [
         {
           "language_code": "en_us",
-          "string": "N/A"
-        },
-        {
-          "language_code": "es_es",
-          "string": "N/A"
+          "string": "Index"
         }
       ]
     },
@@ -104,7 +100,7 @@
     },
     {
       "column": "DateTimeCreated",
-      "css_classes": "col-sm-2",
+      "css_classes": "col-sm-3",
       "show": true,
       "type": "label",
       "default_value": "",
@@ -145,7 +141,7 @@
       "options": [
         {
           "type": "eval",
-          "param": "`<a href='/report.php?guid=${value}'>${value}</a>`"
+          "param": "`<a href='/report.php?guid=${value}'>Link</a>`"
         }
       ],
       "localized": ["name"],

front/plugins/_publisher_email/config.json

@@ -33,19 +33,15 @@
     {
       "column": "Index",
       "css_classes": "col-sm-2",
-      "show": false,
-      "type": "label",
+      "show": true,
+      "type": "none",
       "default_value": "",
       "options": [],
       "localized": ["name"],
       "name": [
         {
           "language_code": "en_us",
-          "string": "N/A"
-        },
-        {
-          "language_code": "es_es",
-          "string": "N/A"
+          "string": "Index"
         }
       ]
     },

front/plugins/_publisher_email/email_smtp.py

@@ -11,6 +11,7 @@ from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from email.header import Header
 from email.utils import parseaddr
+from email.utils import formatdate
 import smtplib
 import socket
 import ssl
@@ -111,13 +112,15 @@ def send(pHTML, pText):
     mylog('debug', [f'[{pluginName}] SMTP_REPORT_TO: {hide_email(str(get_setting_value("SMTP_REPORT_TO")))} SMTP_USER: {hide_email(str(get_setting_value("SMTP_USER")))}'])
 
 
-    subject, from_email, to_email, message_html, message_text = sanitize_email_content('Net AlertX Report', get_setting_value("SMTP_REPORT_FROM"), get_setting_value("SMTP_REPORT_TO"), pHTML, pText)
+    subject, from_email, to_email, message_html, message_text = sanitize_email_content('NetAlertX Report', get_setting_value("SMTP_REPORT_FROM"), get_setting_value("SMTP_REPORT_TO"), pHTML, pText)
 
     # Compose email
     msg             = MIMEMultipart('alternative')
     msg['Subject']  = subject
     msg['From']     = from_email
     msg['To']       = to_email
+    msg['Date']     = formatdate(localtime=True) 
+
     msg.attach (MIMEText (message_text, 'plain'))
     msg.attach (MIMEText (message_html, 'html'))
 

front/plugins/_publisher_mqtt/config.json

@@ -41,7 +41,7 @@
     {
       "name": "devices",
       "type": "sql",
-      "value": "SELECT dev_LastIP from DEVICES",
+      "value": "SELECT devLastIP from DEVICES",
       "timeoutMultiplier": true
     }
   ],
@@ -49,19 +49,15 @@
     {
       "column": "Index",
       "css_classes": "col-sm-2",
-      "show": false,
-      "type": "label",
+      "show": true,
+      "type": "none",
       "default_value": "",
       "options": [],
       "localized": ["name"],
       "name": [
         {
           "language_code": "en_us",
-          "string": "N/A"
-        },
-        {
-          "language_code": "es_es",
-          "string": "N/A"
+          "string": "Index"
         }
       ]
     },
@@ -744,7 +740,7 @@
           { "elementType": "input", "elementOptions": [], "transformers": [] }
         ]
       },
-      "default_value": "select rowid, * from Devices where dev_Name not in ({s-quote}null{s-quote}, {s-quote}(name not found){s-quote}, {s-quote}(unknown){s-quote})",
+      "default_value": "select rowid, * from Devices where devName not in ({s-quote}null{s-quote}, {s-quote}(name not found){s-quote}, {s-quote}(unknown){s-quote})",
       "options": [],
       "localized": ["name", "description"],
       "name": [

front/plugins/_publisher_mqtt/mqtt.py

@@ -443,49 +443,49 @@ def mqtt_start(db):
         for device in devices:      
 
             # # debug statement START 🔻
-            # if 'Moto' not in device["dev_Name"]:
+            # if 'Moto' not in device["devName"]:
             #     continue
             # # debug statement END   🔺
             
             # Create devices in Home Assistant - send config messages
-            deviceId        = 'mac_' + device["dev_MAC"].replace(" ", "").replace(":", "_").lower()
+            deviceId        = 'mac_' + device["devMac"].replace(" ", "").replace(":", "_").lower()
             # Normalize the string and remove unwanted characters
-            devDisplayName = re.sub('[^a-zA-Z0-9-_\\s]', '', normalize_string(device["dev_Name"]))            
+            devDisplayName = re.sub('[^a-zA-Z0-9-_\\s]', '', normalize_string(device["devName"]))            
 
-            sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'last_ip', 'ip-network', device["dev_MAC"])
-            sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'mac_address', 'folder-key-network', device["dev_MAC"])
-            sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'is_new', 'bell-alert-outline', device["dev_MAC"])
-            sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'vendor', 'cog', device["dev_MAC"])            
-            sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'first_connection', 'calendar-start', device["dev_MAC"])
-            sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'last_connection', 'calendar-end', device["dev_MAC"])
+            sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'last_ip', 'ip-network', device["devMac"])
+            sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'mac_address', 'folder-key-network', device["devMac"])
+            sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'is_new', 'bell-alert-outline', device["devMac"])
+            sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'vendor', 'cog', device["devMac"])            
+            sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'first_connection', 'calendar-start', device["devMac"])
+            sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'sensor', 'last_connection', 'calendar-end', device["devMac"])
         
 
             devJson = { 
-                        "last_ip": device["dev_LastIP"], 
-                        "is_new": str(device["dev_NewDevice"]), 
-                        "vendor": sanitize_string(device["dev_Vendor"]), 
-                        "mac_address": str(device["dev_MAC"]),
+                        "last_ip": device["devLastIP"], 
+                        "is_new": str(device["devIsNew"]), 
+                        "vendor": sanitize_string(device["devVendor"]), 
+                        "mac_address": str(device["devMac"]),
                         "model": devDisplayName,
-                        "last_connection": prepTimeStamp(str(device["dev_LastConnection"])),
-                        "first_connection": prepTimeStamp(str(device["dev_FirstConnection"]))                    }
+                        "last_connection": prepTimeStamp(str(device["devLastConnection"])),
+                        "first_connection": prepTimeStamp(str(device["devFirstConnection"]))                    }
         
             # bulk update device sensors in home assistant      
             publish_mqtt(mqtt_client, sensorConfig.state_topic, devJson) 
 
             #  create and update is_present sensor
-            sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'binary_sensor', 'is_present', 'wifi', device["dev_MAC"])
+            sensorConfig = create_sensor(mqtt_client, deviceId, devDisplayName, 'binary_sensor', 'is_present', 'wifi', device["devMac"])
             publish_mqtt(mqtt_client, sensorConfig.state_topic, 
                 { 
-                    "is_present": to_binary_sensor(str(device["dev_PresentLastScan"]))
+                    "is_present": to_binary_sensor(str(device["devPresentLastScan"]))
                 }
             ) 
 
             # handle device_tracker
-            sensorConfig  = create_sensor(mqtt_client, deviceId, devDisplayName, 'device_tracker', 'is_home', 'home', device["dev_MAC"])
+            sensorConfig  = create_sensor(mqtt_client, deviceId, devDisplayName, 'device_tracker', 'is_home', 'home', device["devMac"])
 
             # <away|home> are only valid states
             state = 'away'
-            if to_binary_sensor(str(device["dev_PresentLastScan"])) == "ON":
+            if to_binary_sensor(str(device["devPresentLastScan"])) == "ON":
                 state = 'home'
 
             publish_mqtt(mqtt_client, sensorConfig.state_topic, state) 

front/plugins/_publisher_ntfy/config.json

@@ -33,19 +33,15 @@
     {
       "column": "Index",
       "css_classes": "col-sm-2",
-      "show": false,
-      "type": "label",
+      "show": true,
+      "type": "none",
       "default_value": "",
       "options": [],
       "localized": ["name"],
       "name": [
         {
           "language_code": "en_us",
-          "string": "N/A"
-        },
-        {
-          "language_code": "es_es",
-          "string": "N/A"
+          "string": "Index"
         }
       ]
     },

front/plugins/_publisher_pushover/config.json

@@ -33,19 +33,15 @@
     {
       "column": "Index",
       "css_classes": "col-sm-2",
-      "show": false,
-      "type": "label",
+      "show": true,
+      "type": "none",
       "default_value": "",
       "options": [],
       "localized": ["name"],
       "name": [
         {
           "language_code": "en_us",
-          "string": "N/A"
-        },
-        {
-          "language_code": "es_es",
-          "string": "N/A"
+          "string": "Index"
         }
       ]
     },

front/plugins/_publisher_pushsafer/config.json

@@ -33,19 +33,15 @@
     {
       "column": "Index",
       "css_classes": "col-sm-2",
-      "show": false,
-      "type": "label",
+      "show": true,
+      "type": "none",
       "default_value": "",
       "options": [],
       "localized": ["name"],
       "name": [
         {
           "language_code": "en_us",
-          "string": "N/A"
-        },
-        {
-          "language_code": "es_es",
-          "string": "N/A"
+          "string": "Index"
         }
       ]
     },

front/plugins/_publisher_telegram/config.json

@@ -29,19 +29,15 @@
     {
       "column": "Index",
       "css_classes": "col-sm-2",
-      "show": false,
-      "type": "label",
+      "show": true,
+      "type": "none",
       "default_value": "",
       "options": [],
       "localized": ["name"],
       "name": [
         {
           "language_code": "en_us",
-          "string": "N/A"
-        },
-        {
-          "language_code": "es_es",
-          "string": "N/A"
+          "string": "Index"
         }
       ]
     },

front/plugins/_publisher_webhook/config.json

@@ -33,19 +33,15 @@
     {
       "column": "Index",
       "css_classes": "col-sm-2",
-      "show": false,
-      "type": "label",
+      "show": true,
+      "type": "none",
       "default_value": "",
       "options": [],
       "localized": ["name"],
       "name": [
         {
           "language_code": "en_us",
-          "string": "N/A"
-        },
-        {
-          "language_code": "es_es",
-          "string": "N/A"
+          "string": "Index"
         }
       ]
     },

front/plugins/arp_scan/config.json

@@ -367,6 +367,21 @@
     }
   ],
   "database_column_definitions": [
+    {
+      "column": "Index",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "none",
+      "default_value": "",
+      "options": [],
+      "localized": ["name"],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Index"
+        }
+      ]
+    },
     {
       "column": "Object_PrimaryID",
       "mapped_to_column": "cur_MAC",
@@ -443,7 +458,7 @@
       "column": "Dummy",
       "mapped_to_column": "cur_ScanMethod",
       "mapped_to_column_data": {
-        "value": "arp-scan"
+        "value": "ARPSCAN"
       },
       "css_classes": "col-sm-2",
       "show": true,

front/plugins/arp_scan/script.py

@@ -28,6 +28,7 @@ CUR_PATH = str(pathlib.Path(__file__).parent.resolve())
 LOG_FILE = os.path.join(CUR_PATH, 'script.log')
 RESULT_FILE = os.path.join(CUR_PATH, 'last_result.log')
 
+pluginName = 'ARPSCAN'
 
 def main():
    
@@ -58,7 +59,7 @@ def main():
     userSubnetsParam = base64.b64decode(userSubnetsParamBase64).decode('ascii')
 
     # Print the decoded subnet information.
-    mylog('verbose', ['[ARP Scan] userSubnetsParam: ', userSubnetsParam]) 
+    mylog('verbose', [f'[{pluginName}] userSubnetsParam: ', userSubnetsParam]) 
 
     # Check if the decoded subnet information contains multiple subnets separated by commas.
     # If it does, split the string into a list of individual subnets.
@@ -86,7 +87,7 @@ def main():
             watched2    = handleEmpty(device.get('hw', '')),  # Vendor (assuming it's in the 'hw' field)
             watched3    = handleEmpty(device.get('interface', '')),  # Add the interface             
             watched4    = '',
-            extra       = 'arp-scan', 
+            extra       = pluginName, 
             foreignKey  = "")
 
     plugin_objects.write_result_file()
@@ -105,13 +106,13 @@ def execute_arpscan(userSubnets):
 
         arpscan_output = execute_arpscan_on_interface (interface)        
 
-        mylog('verbose', ['[ARP Scan] arpscan_output: ', arpscan_output])         
+        mylog('verbose', [f'[{pluginName}] arpscan_output: ', arpscan_output])         
     
         # Search IP + MAC + Vendor as regular expresion
         re_ip = r'(?P<ip>((2[0-5]|1[0-9]|[0-9])?[0-9]\.){3}((2[0-5]|1[0-9]|[0-9])?[0-9]))'
         re_mac = r'(?P<mac>([0-9a-fA-F]{2}[:-]){5}([0-9a-fA-F]{2}))'
         re_hw = r'(?P<hw>.*)'
-        re_pattern = re.compile (re_ip + '\s+' + re_mac + '\s' + re_hw)
+        re_pattern = re.compile(rf"{re_ip}\s+{re_mac}\s{re_hw}")
 
         devices_list_tmp = [
             {**device.groupdict(), "interface": interface}
@@ -132,10 +133,10 @@ def execute_arpscan(userSubnets):
             unique_devices.append(device)    
 
     # return list
-    mylog('verbose', ['[ARP Scan] Found: Devices without duplicates ', len(unique_devices)  ]) 
+    mylog('verbose', [f'[{pluginName}] Found: Devices without duplicates ', len(unique_devices)  ]) 
 
-    mylog('verbose', ["Devices List len:", len(devices_list)])    # Add this line to print devices_list
-    mylog('verbose',["Devices List:", devices_list])              # Add this line to print devices_list
+    mylog('verbose', [f'[{pluginName}] Devices List len:', len(devices_list)])    
+    mylog('verbose', [f'[{pluginName}] Devices List:', devices_list])              
 
     return devices_list
 

front/plugins/avahi_scan/avahi_scan.py

@@ -56,9 +56,9 @@ def main():
     
     # Mock list of devices (replace with actual device_handler.getUnknown() in production)
     # unknown_devices = [
-    #     {'dev_MAC': '00:11:22:33:44:55', 'dev_LastIP': '192.168.1.121'},
-    #     {'dev_MAC': '00:11:22:33:44:56', 'dev_LastIP': '192.168.1.9'},
-    #     {'dev_MAC': '00:11:22:33:44:57', 'dev_LastIP': '192.168.1.82'},
+    #     {'devMac': '00:11:22:33:44:55', 'devLastIP': '192.168.1.121'},
+    #     {'devMac': '00:11:22:33:44:56', 'devLastIP': '192.168.1.9'},
+    #     {'devMac': '00:11:22:33:44:57', 'devLastIP': '192.168.1.82'},
     # ]
 
     mylog('verbose', [f'[{pluginName}] Unknown devices count: {len(unknown_devices)}'])   
@@ -68,20 +68,20 @@ def main():
         ensure_avahi_running()
 
     for device in unknown_devices:
-        domain_name = execute_name_lookup(device['dev_LastIP'], timeout)
+        domain_name = execute_name_lookup(device['devLastIP'], timeout)
 
         #  check if found and not a timeout ('to')
         if domain_name != '' and domain_name != 'to': 
             plugin_objects.add_object(
             # "MAC", "IP", "Server", "Name"
-            primaryId   = device['dev_MAC'],
-            secondaryId = device['dev_LastIP'],
+            primaryId   = device['devMac'],
+            secondaryId = device['devLastIP'],
             watched1    = '',  # You can add any relevant info here if needed
             watched2    = domain_name,
             watched3    = '',
             watched4    = '',
             extra       = '',
-            foreignKey  = device['dev_MAC'])
+            foreignKey  = device['devMac'])
 
     plugin_objects.write_result_file()
     

front/plugins/avahi_scan/config.json

@@ -6,6 +6,15 @@
   "data_source": "script",
   "execution_order" : "Layer_3",
   "show_ui": true,
+  "data_filters": [
+    {
+      "compare_column": "Object_PrimaryID",
+      "compare_operator": "==",
+      "compare_field_id": "txtMacFilter",
+      "compare_js_template": "'{value}'.toString()",
+      "compare_use_quotes": true
+    }
+  ],
   "localized": ["display_name", "description", "icon"],
   "display_name": [
     {
@@ -29,7 +38,7 @@
     {
       "name": "ips",
       "type": "sql",
-      "value": "SELECT dev_LastIP from DEVICES order by dev_MAC",
+      "value": "SELECT devLastIP from DEVICES order by devMac",
       "timeoutMultiplier": true
     }
   ],
@@ -70,7 +79,7 @@
       "description": [
         {
           "language_code": "en_us",
-          "string": "When the plugin should be executed. If enabled this will execute the scan until there are no <code>(unknown)</code> or <code>(name not found)</code> devices. Setting this to <code>on_new_device</code> or a daily <code>schedule</code> is recommended."
+          "string": "When the plugin should be executed. If enabled this will execute the scan until there are no <code>(unknown)</code> or <code>(name not found)</code> devices. Setting this to <code>before_name_updates</code> is recommended."
         }
       ]
     },
@@ -196,6 +205,21 @@
     }
   ],
   "database_column_definitions": [
+    {
+      "column": "Index",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "none",
+      "default_value": "",
+      "options": [],
+      "localized": ["name"],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Index"
+        }
+      ]
+    },
     {
       "column": "Object_PrimaryID",
       "css_classes": "col-sm-2",

front/plugins/db_cleanup/script.py

@@ -34,6 +34,7 @@ def main():
     
     PLUGINS_KEEP_HIST       = int(get_setting_value("PLUGINS_KEEP_HIST"))
     HRS_TO_KEEP_NEWDEV      = int(get_setting_value("HRS_TO_KEEP_NEWDEV"))
+    HRS_TO_KEEP_OFFDEV      = int(get_setting_value("HRS_TO_KEEP_OFFDEV"))
     DAYS_TO_KEEP_EVENTS     = int(get_setting_value("DAYS_TO_KEEP_EVENTS"))
     PHOLUS_DAYS_DATA        = get_setting_value("PHOLUS_DAYS_DATA")
     CLEAR_NEW_FLAG          = get_setting_value("CLEAR_NEW_FLAG")
@@ -42,7 +43,7 @@ def main():
 
 
     # Execute cleanup/upkeep    
-    cleanup_database(fullDbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP_NEWDEV, PLUGINS_KEEP_HIST, CLEAR_NEW_FLAG)
+    cleanup_database(fullDbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP_NEWDEV, HRS_TO_KEEP_OFFDEV, PLUGINS_KEEP_HIST, CLEAR_NEW_FLAG)
     
     mylog('verbose', [f'[{pluginName}] Cleanup complete'])   
     
@@ -51,7 +52,7 @@ def main():
 #===============================================================================
 # Cleanup / upkeep database
 #===============================================================================
-def cleanup_database (dbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP_NEWDEV, PLUGINS_KEEP_HIST, CLEAR_NEW_FLAG):
+def cleanup_database (dbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP_NEWDEV, HRS_TO_KEEP_OFFDEV, PLUGINS_KEEP_HIST, CLEAR_NEW_FLAG):
     """
     Cleaning out old records from the tables that don't need to keep all data.
     """
@@ -140,7 +141,15 @@ def cleanup_database (dbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP
     # Cleanup New Devices
     if HRS_TO_KEEP_NEWDEV != 0:
         mylog('verbose', [f'[{pluginName}] Devices: Delete all New Devices older than {str(HRS_TO_KEEP_NEWDEV)} hours (HRS_TO_KEEP_NEWDEV setting)'])            
-        query = f"""DELETE FROM Devices WHERE dev_NewDevice = 1 AND dev_FirstConnection < date('now', '-{str(HRS_TO_KEEP_NEWDEV)} hour')"""
+        query = f"""DELETE FROM Devices WHERE devIsNew = 1 AND devFirstConnection < date('now', '-{str(HRS_TO_KEEP_NEWDEV)} hour')"""
+        mylog('verbose', [f'[{pluginName}] Query: {query} '])            
+        cursor.execute (query) 
+        
+    # -----------------------------------------------------
+    # Cleanup Offline Devices
+    if HRS_TO_KEEP_OFFDEV != 0:
+        mylog('verbose', [f'[{pluginName}] Devices: Delete all New Devices older than {str(HRS_TO_KEEP_OFFDEV)} hours (HRS_TO_KEEP_OFFDEV setting)'])            
+        query = f"""DELETE FROM Devices WHERE devPresentLastScan = 0 AND devLastConnection < date('now', '-{str(HRS_TO_KEEP_OFFDEV)} hour'))"""
         mylog('verbose', [f'[{pluginName}] Query: {query} '])            
         cursor.execute (query) 
 
@@ -148,8 +157,8 @@ def cleanup_database (dbPath, DAYS_TO_KEEP_EVENTS, PHOLUS_DAYS_DATA, HRS_TO_KEEP
     # Clear New Flag
     if CLEAR_NEW_FLAG != 0:
         mylog('verbose', [f'[{pluginName}] Devices: Clear "New Device" flag for all devices older than {str(CLEAR_NEW_FLAG)} hours (CLEAR_NEW_FLAG setting)'])            
-        query = f"""UPDATE Devices SET dev_NewDevice = 0 WHERE dev_NewDevice = 1 AND date(dev_FirstConnection, '+{str(CLEAR_NEW_FLAG)} hour') < date('now')"""
-        #  select * from Devices where dev_NewDevice = 1 AND date(dev_FirstConnection, '+3 hour' ) < date('now') 
+        query = f"""UPDATE Devices SET devIsNew = 0 WHERE devIsNew = 1 AND date(devFirstConnection, '+{str(CLEAR_NEW_FLAG)} hour') < date('now')"""
+        #  select * from Devices where devIsNew = 1 AND date(devFirstConnection, '+3 hour' ) < date('now') 
         mylog('verbose', [f'[{pluginName}] Query: {query} '])            
         cursor.execute(query)
 

front/plugins/ddns_update/config.json

@@ -49,7 +49,7 @@
     {
       "name": "prev_ip",
       "type": "sql",
-      "value": "SELECT dev_LastIP FROM Devices WHERE dev_MAC = 'Internet' "
+      "value": "SELECT devLastIP FROM Devices WHERE devMac = 'Internet' "
     },
     {
       "name": "DDNS_UPDATE_URL",
@@ -498,6 +498,21 @@
     }
   ],
   "database_column_definitions": [
+    {
+      "column": "Index",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "none",
+      "default_value": "",
+      "options": [],
+      "localized": ["name"],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Index"
+        }
+      ]
+    },
     {
       "column": "Object_PrimaryID",
       "css_classes": "col-sm-2",

front/plugins/dhcp_leases/config.json

@@ -66,23 +66,15 @@
     {
       "column": "Index",
       "css_classes": "col-sm-2",
-      "show": false,
-      "type": "label",
+      "show": true,
+      "type": "none",
       "default_value": "",
       "options": [],
       "localized": ["name"],
       "name": [
         {
           "language_code": "en_us",
-          "string": "N/A"
-        },
-        {
-          "language_code": "es_es",
-          "string": "N/A"
-        },
-        {
-          "language_code": "de_de",
-          "string": "N/A"
+          "string": "Index"
         }
       ]
     },

front/plugins/dhcp_servers/config.json

@@ -42,19 +42,15 @@
     {
       "column": "Index",
       "css_classes": "col-sm-2",
-      "show": false,
-      "type": "label",
+      "show": true,
+      "type": "none",
       "default_value": "",
       "options": [],
       "localized": ["name"],
       "name": [
         {
           "language_code": "en_us",
-          "string": "N/A"
-        },
-        {
-          "language_code": "es_es",
-          "string": "N/A"
+          "string": "Index"
         }
       ]
     },
@@ -424,7 +420,7 @@
           }
         ]
       },
-      "default_value": 10,
+      "default_value": 20,
       "options": [],
       "localized": ["name", "description"],
       "name": [

front/plugins/dhcp_servers/script.py

@@ -27,7 +27,7 @@ def main():
     last_run_logfile.write("")
     
     plugin_objects = Plugin_Objects(RESULT_FILE)
-    timeoutSec = 10
+    timeoutSec = get_setting_value('DHCPSRVS_RUN_TIMEOUT')
 
     nmapArgs = ['sudo', 'nmap', '--script', 'broadcast-dhcp-discover']
 
@@ -42,6 +42,9 @@ def main():
         newEntries = []
 
         for line in newLines:
+            
+            mylog('verbose', [f'[DHCPSRVS] Processing line: {line} '])
+            
             if 'Response ' in line and ' of ' in line:
                 newEntries.append(Plugin_Object())
             elif 'Server Identifier' in line:
@@ -67,6 +70,7 @@ def main():
                     newEntries[-1].extra += ',' + newVal
 
         for e in newEntries:
+            
             plugin_objects.add_object(
                 primaryId=e.primaryId,
                 secondaryId=e.secondaryId,
@@ -80,7 +84,7 @@ def main():
 
         plugin_objects.write_result_file()
     except Exception as e:
-        mylog('none', ['Error in main:', str(e)])
+        mylog('verbose', ['[DHCPSRVS] Error in main:', str(e)])
 
 if __name__ == '__main__':
     main()

front/plugins/events_notifications/config.json

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

front/plugins/events_notifications/ignore_plugin

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

front/plugins/internet_ip/config.json

@@ -51,7 +51,7 @@
     {
       "name": "prev_ip",
       "type": "sql",
-      "value": "SELECT dev_LastIP FROM Devices WHERE dev_MAC = 'Internet' "
+      "value": "SELECT devLastIP FROM Devices WHERE devMac = 'Internet' "
     },
     {
       "name": "INTRNT_DIG_GET_IP_ARG",
@@ -390,6 +390,21 @@
     }
   ],
   "database_column_definitions": [
+    {
+      "column": "Index",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "none",
+      "default_value": "",
+      "options": [],
+      "localized": ["name"],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Index"
+        }
+      ]
+    },
     {
       "column": "Object_PrimaryID",
       "mapped_to_column": "cur_MAC",

front/plugins/internet_speedtest/config.json

@@ -41,23 +41,15 @@
     {
       "column": "Index",
       "css_classes": "col-sm-2",
-      "show": false,
-      "type": "label",
+      "show": true,
+      "type": "none",
       "default_value": "",
       "options": [],
       "localized": ["name"],
-      "name": [
+     "name": [
         {
           "language_code": "en_us",
-          "string": "N/A"
-        },
-        {
-          "language_code": "es_es",
-          "string": "N/A"
-        },
-        {
-          "language_code": "de_de",
-          "string": "N/A"
+          "string": "Index"
         }
       ]
     },
@@ -188,8 +180,8 @@
           "hexColor": "#7D862D"
         },
         {
-          "maximum": 100,
-          "hexColor": "#05483C"
+          "maximum": 1000000,
+          "hexColor": "#82a39d"
         }
       ],
       "localized": ["name"],
@@ -224,8 +216,8 @@
           "hexColor": "#7D862D"
         },
         {
-          "maximum": 100,
-          "hexColor": "#05483C"
+          "maximum": 1000000,
+          "hexColor": "#82a39d"
         }
       ],
       "localized": ["name"],

front/plugins/internet_speedtest/script.py

@@ -46,17 +46,19 @@ def main():
 
 def run_speedtest():
     try:
-        st = speedtest.Speedtest()
+        st = speedtest.Speedtest(secure=True)
         st.get_best_server()
         download_speed = round(st.download() / 10**6, 2)  # Convert to Mbps
         upload_speed = round(st.upload() / 10**6, 2)  # Convert to Mbps
+        
+        mylog('verbose', [f"[INTRSPD] Result (down|up): {str(download_speed)} Mbps|{upload_speed} Mbps"]) 
 
         return {
             'download_speed': download_speed,
             'upload_speed': upload_speed,
         }
     except Exception as e:
-        mylog('verbose', [f"Error running speedtest: {str(e)}"]) 
+        mylog('verbose', [f"[INTRSPD] Error running speedtest: {str(e)}"]) 
         return {
             'download_speed': -1,
             'upload_speed': -1,

front/plugins/known_template/README.md

@@ -1,11 +0,0 @@
-## Overview
-
-A simple template-based plugin for known devices. You can change to overwrite values for known devices. 
-
-### Usage
-
-- Head to **Settings** > **Known Devices** to adjust the default values.
-
-### Notes
-
-- This plugin generates editable settings that are then used in the `device.py` script to initialize new values. TO FIX

front/plugins/known_template/config.json

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

front/plugins/known_template/ignore_plugin

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

front/plugins/mikrotik_scan/config.json

@@ -30,7 +30,7 @@
     {
       "name": "ips",
       "type": "sql",
-      "value": "SELECT dev_LastIP from DEVICES order by dev_MAC",
+      "value": "SELECT devLastIP from DEVICES order by devMac",
       "timeoutMultiplier": true
     },
     {
@@ -253,6 +253,21 @@
     }
   ],
   "database_column_definitions": [
+    {
+      "column": "Index",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "none",
+      "default_value": "",
+      "options": [],
+      "localized": ["name"],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Index"
+        }
+      ]
+    },
     {
       "column": "Object_PrimaryID",
       "mapped_to_column": "cur_MAC",

front/plugins/nbtscan_scan/config.json

@@ -6,6 +6,15 @@
   "data_source": "script",
   "execution_order" : "Layer_3",
   "show_ui": true,
+  "data_filters": [
+    {
+      "compare_column": "Object_PrimaryID",
+      "compare_operator": "==",
+      "compare_field_id": "txtMacFilter",
+      "compare_js_template": "'{value}'.toString()",
+      "compare_use_quotes": true
+    }
+  ],
   "localized": ["display_name", "description", "icon"],
   "display_name": [
     {
@@ -29,7 +38,7 @@
     {
       "name": "ips",
       "type": "sql",
-      "value": "SELECT dev_LastIP from DEVICES order by dev_MAC",
+      "value": "SELECT devLastIP from DEVICES order by devMac",
       "timeoutMultiplier": true
     }
   ],
@@ -70,7 +79,7 @@
       "description": [
         {
           "language_code": "en_us",
-          "string": "When the plugin should be executed. If enabled this will execute the scan until there are no <code>(unknown)</code> or <code>(name not found)</code> devices. Setting this to <code>on_new_device</code> or a daily <code>schedule</code> is recommended.<br/><br/> Depends on the <a onclick=\"toggleAllSettings()\" href=\"#SCAN_SUBNETS\"><code>SCAN_SUBNETS</code> setting</a>."
+          "string": "When the plugin should be executed. If enabled this will execute the scan until there are no <code>(unknown)</code> or <code>(name not found)</code> devices. Setting this to <code>before_name_updates</code> is recommended.<br/><br/> Depends on the <a onclick=\"toggleAllSettings()\" href=\"#SCAN_SUBNETS\"><code>SCAN_SUBNETS</code> setting</a>."
         }
       ]
     },
@@ -204,6 +213,21 @@
     }
   ],
   "database_column_definitions": [
+    {
+      "column": "Index",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "none",
+      "default_value": "",
+      "options": [],
+      "localized": ["name"],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Index"
+        }
+      ]
+    },
     {
       "column": "Object_PrimaryID",
       "css_classes": "col-sm-2",

front/plugins/nbtscan_scan/nbtscan.py

@@ -60,19 +60,19 @@ def main():
     # execute_name_lookup('192.168.1.121', timeout)
 
     for device in unknown_devices:
-        domain_name, dns_server = execute_name_lookup(device['dev_LastIP'], timeout)
+        domain_name, dns_server = execute_name_lookup(device['devLastIP'], timeout)
 
         if domain_name != '':
             plugin_objects.add_object(
             # "MAC", "IP", "Server", "Name"
-            primaryId   = device['dev_MAC'],
-            secondaryId = device['dev_LastIP'],
+            primaryId   = device['devMac'],
+            secondaryId = device['devLastIP'],
             watched1    = dns_server,
             watched2    = domain_name,
             watched3    = '',
             watched4    = '',
             extra       = '',
-            foreignKey  = device['dev_MAC'])
+            foreignKey  = device['devMac'])
 
     plugin_objects.write_result_file()
     

front/plugins/newdev_template/config.json

@@ -266,7 +266,7 @@
       ]
     },
     {
-      "function": "dev_MAC",
+      "function": "devMac",
       "type": {
         "dataType": "string",
         "elements": [
@@ -295,7 +295,7 @@
       ]
     },
     {
-      "function": "dev_Name",
+      "function": "devName",
       "type": {
         "dataType": "string",
         "elements": [
@@ -324,7 +324,7 @@
       ]
     },
     {
-      "function": "dev_Owner",
+      "function": "devOwner",
       "type": {
         "dataType": "string",
         "elements": [
@@ -338,7 +338,7 @@
         {
           "name": "value",
           "type": "sql",
-          "value": "SELECT DISTINCT '' as id, '❌None' as name UNION SELECT dev_Owner as id, dev_Owner as name FROM (SELECT dev_Owner FROM Devices UNION SELECT 'House' ) AS all_devices ORDER BY id;"
+          "value": "SELECT DISTINCT '' as id, '❌None' as name UNION SELECT devOwner as id, devOwner as name FROM (SELECT devOwner FROM Devices UNION SELECT 'House' ) AS all_devices ORDER BY id;"
         }
       ],
       "localized": ["name", "description"],
@@ -356,7 +356,7 @@
       ]
     },
     {
-      "function": "dev_DeviceType",
+      "function": "devType",
       "type": {
         "dataType": "string",
         "elements": [
@@ -370,7 +370,7 @@
         {
           "name": "value",
           "type": "sql",
-          "value": "SELECT DISTINCT 9 as ord, dev_DeviceType as id, dev_DeviceType as name FROM Devices WHERE dev_DeviceType NOT IN ('', 'Smartphone', 'Tablet', 'Laptop', 'Mini PC', 'PC', 'Printer', 'Server', 'Singleboard Computer (SBC)', 'NAS', 'Domotic', 'IP Camera', 'Game Console', 'SmartTV', 'TV Decoder', 'Virtual Assistance', 'Clock', 'House Appliance', 'Phone', 'Radio', 'AP', 'Gateway', 'Firewall', 'Hypervisor', 'Powerline', 'Switch', 'WLAN', 'PLC', 'Router', 'USB LAN Adapter', 'USB WIFI Adapter') UNION SELECT 0 as ord, '', '❌None' UNION SELECT 1 as ord, '-----', '-- 📱Handhelds --' UNION SELECT 1 as ord, 'Smartphone', 'Smartphone' UNION SELECT 1 as ord, 'Tablet', 'Tablet' UNION SELECT 2 as ord, '-----', '-- 💻Computers --' UNION SELECT 2 as ord, 'Laptop', 'Laptop' UNION SELECT 2 as ord, 'Mini PC', 'Mini PC' UNION SELECT 2 as ord, 'PC', 'PC' UNION SELECT 2 as ord, 'Printer', 'Printer' UNION SELECT 2 as ord, 'Server', 'Server' UNION SELECT 2 as ord, 'Singleboard Computer (SBC)', 'Singleboard Computer (SBC)' UNION SELECT 2 as ord, 'NAS', 'NAS' UNION SELECT 3 as ord, '-----', '-- 🏠Smart home --' UNION SELECT 3 as ord, 'Domotic', 'Domotic' UNION SELECT 3 as ord, 'IP Camera', 'IP Camera' UNION SELECT 3 as ord, 'Game Console', 'Game Console' UNION SELECT 3 as ord, 'SmartTV', 'SmartTV' UNION SELECT 3 as ord, 'TV Decoder', 'TV Decoder' UNION SELECT 3 as ord, 'Virtual Assistance', 'Virtual Assistance' UNION SELECT 4 as ord, '-----', '-- Wired --' UNION SELECT 4 as ord, 'Clock', 'Clock' UNION SELECT 4 as ord, 'House Appliance', 'House Appliance' UNION SELECT 4 as ord, 'Phone', 'Phone' UNION SELECT 4 as ord, 'Radio', 'Radio' UNION SELECT 5 as ord, '-----', '-- 📡Network nodes --' UNION SELECT 5 as ord, 'AP', 'AP' UNION SELECT 5 as ord, 'Gateway', 'Gateway' UNION SELECT 5 as ord, 'Firewall', 'Firewall' UNION SELECT 5 as ord, 'Hypervisor', 'Hypervisor' UNION SELECT 5 as ord, 'Powerline', 'Powerline' UNION SELECT 5 as ord, 'Switch', 'Switch' UNION SELECT 5 as ord, 'WLAN', 'WLAN' UNION SELECT 5 as ord, 'PLC', 'PLC' UNION SELECT 5 as ord, 'Router', 'Router' UNION SELECT 5 as ord, 'USB LAN Adapter', 'USB LAN Adapter' UNION SELECT 5 as ord, 'USB WIFI Adapter', 'USB WIFI Adapter' UNION SELECT 9 as ord, '-----', '-- ⚙Custom --' UNION SELECT 10 as ord, '-----', '-----' UNION SELECT 10 as ord, 'Other', 'Other' ORDER BY 1,2;"
+          "value": "SELECT DISTINCT 9 as ord, devType as id, devType as name FROM Devices WHERE devType NOT IN ('', 'Smartphone', 'Tablet', 'Laptop', 'Mini PC', 'PC', 'Printer', 'Server', 'Singleboard Computer (SBC)', 'NAS', 'Domotic', 'IP Camera', 'Game Console', 'SmartTV', 'TV Decoder', 'Virtual Assistance', 'Clock', 'House Appliance', 'Phone', 'Radio', 'AP', 'Gateway', 'Firewall', 'Hypervisor', 'Powerline', 'Switch', 'WLAN', 'PLC', 'Router', 'USB LAN Adapter', 'USB WIFI Adapter') UNION SELECT 0 as ord, '', '❌None' UNION SELECT 1 as ord, '-----', '-- 📱Handhelds --' UNION SELECT 1 as ord, 'Smartphone', 'Smartphone' UNION SELECT 1 as ord, 'Tablet', 'Tablet' UNION SELECT 2 as ord, '-----', '-- 💻Computers --' UNION SELECT 2 as ord, 'Laptop', 'Laptop' UNION SELECT 2 as ord, 'Mini PC', 'Mini PC' UNION SELECT 2 as ord, 'PC', 'PC' UNION SELECT 2 as ord, 'Printer', 'Printer' UNION SELECT 2 as ord, 'Server', 'Server' UNION SELECT 2 as ord, 'Singleboard Computer (SBC)', 'Singleboard Computer (SBC)' UNION SELECT 2 as ord, 'NAS', 'NAS' UNION SELECT 3 as ord, '-----', '-- 🏠Smart home --' UNION SELECT 3 as ord, 'Domotic', 'Domotic' UNION SELECT 3 as ord, 'IP Camera', 'IP Camera' UNION SELECT 3 as ord, 'Game Console', 'Game Console' UNION SELECT 3 as ord, 'SmartTV', 'SmartTV' UNION SELECT 3 as ord, 'TV Decoder', 'TV Decoder' UNION SELECT 3 as ord, 'Virtual Assistance', 'Virtual Assistance' UNION SELECT 4 as ord, '-----', '-- Wired --' UNION SELECT 4 as ord, 'Clock', 'Clock' UNION SELECT 4 as ord, 'House Appliance', 'House Appliance' UNION SELECT 4 as ord, 'Phone', 'Phone' UNION SELECT 4 as ord, 'Radio', 'Radio' UNION SELECT 5 as ord, '-----', '-- 📡Network nodes --' UNION SELECT 5 as ord, 'AP', 'AP' UNION SELECT 5 as ord, 'Gateway', 'Gateway' UNION SELECT 5 as ord, 'Firewall', 'Firewall' UNION SELECT 5 as ord, 'Hypervisor', 'Hypervisor' UNION SELECT 5 as ord, 'Powerline', 'Powerline' UNION SELECT 5 as ord, 'Switch', 'Switch' UNION SELECT 5 as ord, 'WLAN', 'WLAN' UNION SELECT 5 as ord, 'PLC', 'PLC' UNION SELECT 5 as ord, 'Router', 'Router' UNION SELECT 5 as ord, 'USB LAN Adapter', 'USB LAN Adapter' UNION SELECT 5 as ord, 'USB WIFI Adapter', 'USB WIFI Adapter' UNION SELECT 9 as ord, '-----', '-- ⚙Custom --' UNION SELECT 10 as ord, '-----', '-----' UNION SELECT 10 as ord, 'Other', 'Other' ORDER BY 1,2;"
         },
         {
           "name": "uilang",
@@ -393,7 +393,7 @@
       ]
     },
     {
-      "function": "dev_Vendor",
+      "function": "devVendor",
       "type": {
         "dataType": "string",
         "elements": [
@@ -422,7 +422,7 @@
       ]
     },
     {
-      "function": "dev_Favorite",
+      "function": "devFavorite",
       "type": {
         "dataType": "integer",
         "elements": [
@@ -450,7 +450,7 @@
       ]
     },
     {
-      "function": "dev_Group",
+      "function": "devGroup",
       "type": {
         "dataType": "string",
         "elements": [
@@ -464,7 +464,7 @@
         {
           "name": "value",
           "type": "sql",
-          "value": "SELECT DISTINCT '' as id, '❌None' as name UNION SELECT dev_Group as id, dev_Group as name FROM (SELECT dev_Group FROM Devices WHERE dev_Group <> '' UNION SELECT 'Personal' UNION SELECT 'Always on' UNION SELECT 'Friends' UNION SELECT 'Others' ) AS all_devices ORDER BY id;"
+          "value": "SELECT DISTINCT '' as id, '❌None' as name UNION SELECT devGroup as id, devGroup as name FROM (SELECT devGroup FROM Devices WHERE devGroup <> '' UNION SELECT 'Personal' UNION SELECT 'Always on' UNION SELECT 'Friends' UNION SELECT 'Others' ) AS all_devices ORDER BY id;"
         }
       ],
       "localized": ["name", "description"],
@@ -482,7 +482,7 @@
       ]
     },
     {
-      "function": "dev_Comments",
+      "function": "devComments",
       "type": {
         "dataType": "string",
         "elements": [
@@ -506,7 +506,7 @@
       ]
     },
     {
-      "function": "dev_FirstConnection",
+      "function": "devFirstConnection",
       "type": {
         "dataType": "string",
         "elements": [
@@ -535,7 +535,7 @@
       ]
     },
     {
-      "function": "dev_LastConnection",
+      "function": "devLastConnection",
       "type": {
         "dataType": "string",
         "elements": [
@@ -564,7 +564,7 @@
       ]
     },
     {
-      "function": "dev_LastIP",
+      "function": "devLastIP",
       "type": {
         "dataType": "string",
         "elements": [
@@ -593,7 +593,7 @@
       ]
     },
     {
-      "function": "dev_StaticIP",
+      "function": "devStaticIP",
       "type": {
         "dataType": "integer",
         "elements": [
@@ -621,7 +621,7 @@
       ]
     },
     {
-      "function": "dev_ScanCycle",
+      "function": "devScan",
       "type": {
         "dataType": "integer",
         "elements": [
@@ -649,7 +649,7 @@
       ]
     },
     {
-      "function": "dev_LogEvents",
+      "function": "devLogEvents",
       "type": {
         "dataType": "integer",
         "elements": [
@@ -677,7 +677,7 @@
       ]
     },
     {
-      "function": "dev_AlertEvents",
+      "function": "devAlertEvents",
       "type": {
         "dataType": "integer",
         "elements": [
@@ -700,12 +700,12 @@
       "description": [
         {
           "language_code": "en_us",
-          "string": "Indicates whether events related to the device should trigger alerts. The default value of the <code>Alert All Events</code> checkbox."
+          "string": "Indicates whether events related to the device should trigger alerts. The default value of the <code>Alert Events</code> checkbox. Down and New Device notifications are always sent unless unselected in <code>NTFPRCS_INCLUDED_SECTIONS</code>."
         }
       ]
     },
     {
-      "function": "dev_AlertDeviceDown",
+      "function": "devAlertDown",
       "type": {
         "dataType": "integer",
         "elements": [
@@ -733,7 +733,7 @@
       ]
     },
     {
-      "function": "dev_SkipRepeated",
+      "function": "devSkipRepeated",
       "type": {
         "dataType": "string",
         "elements": [
@@ -764,7 +764,7 @@
       ]
     },
     {
-      "function": "dev_LastNotification",
+      "function": "devLastNotification",
       "type": {
         "dataType": "string",
         "elements": [
@@ -793,7 +793,7 @@
       ]
     },
     {
-      "function": "dev_PresentLastScan",
+      "function": "devPresentLastScan",
       "type": {
         "dataType": "integer",
         "elements": [
@@ -821,7 +821,7 @@
       ]
     },
     {
-      "function": "dev_NewDevice",
+      "function": "devIsNew",
       "type": {
         "dataType": "integer",
         "elements": [
@@ -849,7 +849,7 @@
       ]
     },
     {
-      "function": "dev_Location",
+      "function": "devLocation",
       "type": {
         "dataType": "string",
         "elements": [
@@ -863,7 +863,7 @@
         {
           "name": "value",
           "type": "sql",
-          "value": "SELECT DISTINCT '' as id, '❌None' as name UNION SELECT dev_Location as id, dev_Location as name FROM (SELECT dev_Location FROM Devices where dev_Location not in (null, 'null', '') UNION SELECT 'Bathroom' UNION SELECT 'Bedroom' UNION SELECT 'Dining room' UNION SELECT 'Hall' UNION SELECT 'Kitchen' UNION SELECT 'Laundry' UNION SELECT 'Living room' UNION SELECT 'Study' UNION SELECT 'Attic' UNION SELECT 'Basement' UNION SELECT 'Garage' UNION SELECT 'Back yard' UNION SELECT 'Garden' UNION SELECT 'Terrace') AS all_devices ORDER BY id; "
+          "value": "SELECT DISTINCT '' AS id, '❌None' AS name UNION SELECT devLocation AS id, devLocation AS name FROM Devices WHERE devLocation NOT IN ('', 'null') AND devLocation IS NOT NULL UNION SELECT 'Bathroom' AS id, 'Bathroom' AS name UNION SELECT 'Bedroom', 'Bedroom' UNION SELECT 'Dining room', 'Dining room' UNION SELECT 'Hall', 'Hall' UNION SELECT 'Kitchen', 'Kitchen' UNION SELECT 'Laundry', 'Laundry' UNION SELECT 'Living room', 'Living room' UNION SELECT 'Study', 'Study' UNION SELECT 'Attic', 'Attic' UNION SELECT 'Basement', 'Basement' UNION SELECT 'Garage', 'Garage' UNION SELECT 'Back yard', 'Back yard' UNION SELECT 'Garden', 'Garden' UNION SELECT 'Terrace', 'Terrace' ORDER BY id;"
         }
       ],
       "localized": ["name", "description"],
@@ -881,7 +881,7 @@
       ]
     },
     {
-      "function": "dev_Archived",
+      "function": "devIsArchived",
       "type": {
         "dataType": "integer",
         "elements": [
@@ -909,7 +909,7 @@
       ]
     },
     {
-      "function": "dev_Network_Node_MAC_ADDR",
+      "function": "devParentMAC",
       "type": {
         "dataType": "string",
         "elements": [
@@ -922,7 +922,7 @@
         {
           "name": "value",
           "type": "sql",
-          "value": "SELECT '❌None' as name, '' as id UNION SELECT Dev_Name as name, dev_MAC as id FROM Devices WHERE EXISTS (SELECT 1 FROM Settings WHERE Code_Name = 'NETWORK_DEVICE_TYPES' AND LOWER(value) LIKE '%' || LOWER(dev_DeviceType) || '%' AND dev_DeviceType <> '')"
+          "value": "SELECT '❌None' as name, '' as id UNION SELECT devName as name, devMac as id FROM Devices WHERE EXISTS (SELECT 1 FROM Settings WHERE Code_Name = 'NETWORK_DEVICE_TYPES' AND LOWER(value) LIKE '%' || LOWER(devType) || '%' AND devType <> '')"
         },
         {
           "name": "target_macs",
@@ -945,7 +945,7 @@
       ]
     },
     {
-      "function": "dev_Network_Node_port",
+      "function": "devParentPort",
       "type": {
         "dataType": "string",
         "elements": [
@@ -973,7 +973,7 @@
       ]
     },
     {
-      "function": "dev_Icon",
+      "function": "devIcon",
       "type": {
         "dataType": "string",
         "elements": [
@@ -982,7 +982,7 @@
             "elementOptions": [
               { "cssClasses": "input-group-addon iconPreview" },
               { "getStringKey": "Gen_SelectToPreview" },
-              { "customId": "NEWDEV_dev_Icon_preview" }
+              { "customId": "NEWDEV_devIcon_preview" }
             ],
             "transformers": []
           },
@@ -994,7 +994,7 @@
               {
                 "onChange": "updateIconPreview(this)"
               },
-              { "customParams": "NEWDEV_dev_Icon,NEWDEV_dev_Icon_preview" }
+              { "customParams": "NEWDEV_devIcon,NEWDEV_devIcon_preview" }
             ],
             "transformers": []
           }          
@@ -1006,7 +1006,7 @@
         {
           "name": "value",
           "type": "sql",
-          "value": "WITH RECURSIVE SettingsIcons AS (SELECT REPLACE(REPLACE(REPLACE(Value, '[', ''), ']', ''), '''', '') AS icon_list FROM Settings WHERE Code_Name = 'UI_ICONS'), SplitIcons AS (SELECT TRIM(SUBSTR(icon_list, 1, INSTR(icon_list || ',', ',') - 1)) AS icon, SUBSTR(icon_list, INSTR(icon_list || ',', ',') + 1) AS remaining_icons FROM SettingsIcons WHERE icon_list <> '' UNION ALL SELECT TRIM(SUBSTR(remaining_icons, 1, INSTR(remaining_icons || ',', ',') - 1)) AS icon, SUBSTR(remaining_icons, INSTR(remaining_icons || ',', ',') + 1) AS remaining_icons FROM SplitIcons WHERE remaining_icons <> '') SELECT DISTINCT * FROM (SELECT icon as name, icon as id  FROM SplitIcons UNION SELECT  '❌None' AS name, '' AS id  UNION SELECT Dev_Icon AS name, Dev_Icon AS id FROM Devices WHERE Dev_Icon <> '') AS combined_results;"
+          "value": "WITH RECURSIVE SettingsIcons AS (SELECT REPLACE(REPLACE(REPLACE(Value, '[', ''), ']', ''), '''', '') AS icon_list FROM Settings WHERE Code_Name = 'UI_ICONS'), SplitIcons AS (SELECT TRIM(SUBSTR(icon_list, 1, INSTR(icon_list || ',', ',') - 1)) AS icon, SUBSTR(icon_list, INSTR(icon_list || ',', ',') + 1) AS remaining_icons FROM SettingsIcons WHERE icon_list <> '' UNION ALL SELECT TRIM(SUBSTR(remaining_icons, 1, INSTR(remaining_icons || ',', ',') - 1)) AS icon, SUBSTR(remaining_icons, INSTR(remaining_icons || ',', ',') + 1) AS remaining_icons FROM SplitIcons WHERE remaining_icons <> '') SELECT DISTINCT * FROM (SELECT icon as name, icon as id  FROM SplitIcons UNION SELECT  '❌None' AS name, '' AS id  UNION SELECT devIcon AS name, devIcon AS id FROM Devices WHERE devIcon <> '') AS combined_results;"
         }
       ],
       "localized": ["name", "description"],
@@ -1025,27 +1025,6 @@
     }
   ],
   "required": [
-    "dev_MAC",
-    "dev_Name",
-    "dev_Owner",
-    "dev_FirstConnection",
-    "dev_LastConnection",
-    "dev_LastIP",
-    "dev_StaticIP",
-    "dev_ScanCycle",
-    "dev_LogEvents",
-    "dev_AlertEvents",
-    "dev_AlertDeviceDown",
-    "dev_SkipRepeated",
-    "dev_LastNotification",
-    "dev_PresentLastScan",
-    "dev_NewDevice",
-    "dev_Location",
-    "dev_Archived",
-    "dev_Network_Node_MAC_ADDR",
-    "dev_Network_Node_port",
-    "dev_Icon",
-    "LESS_NAME_CLEANUP"
   ],
   "additionalProperties": false
 }

front/plugins/nmap_dev_scan/config.json

@@ -343,6 +343,21 @@
     }
   ],
   "database_column_definitions": [
+    {
+      "column": "Index",
+      "css_classes": "col-sm-2",
+      "show": true,
+      "type": "none",
+      "default_value": "",
+      "options": [],
+      "localized": ["name"],
+      "name": [
+        {
+          "language_code": "en_us",
+          "string": "Index"
+        }
+      ]
+    },
     {
       "column": "Object_PrimaryID",
       "mapped_to_column": "cur_MAC",

front/plugins/nmap_scan/config.json

@@ -50,13 +50,13 @@
     {
       "name": "ips",
       "type": "sql",
-      "value": "SELECT dev_LastIP from DEVICES order by dev_MAC",
+      "value": "SELECT devLastIP from DEVICES order by devMac",
       "timeoutMultiplier": true
     },
     {
       "name": "macs",
       "type": "sql",
-      "value": "SELECT dev_MAC from DEVICES order by dev_MAC"
+      "value": "SELECT devMac from DEVICES order by devMac"
     },
     {
       "name": "timeout",
@@ -74,15 +74,15 @@
     {
       "column": "Index",
       "css_classes": "col-sm-2",
-      "show": false,
-      "type": "label",
+      "show": true,
+      "type": "none",
       "default_value": "",
       "options": [],
       "localized": ["name"],
       "name": [
         {
           "language_code": "en_us",
-          "string": "N/A"
+          "string": "Index"
         }
       ]
     },