From 1a05435691372bc0b19c28b46e920ba242cc5775 Mon Sep 17 00:00:00 2001 From: Jokob-sk Date: Sat, 4 Mar 2023 20:41:48 +1100 Subject: [PATCH] Plugins 0.4 - Further UI work --- README.md | 10 +++++ back/pialert.py | 2 + docker-compose.yml | 2 +- dockerfiles/README.md | 2 + front/maintenance.php | 2 +- front/plugins.php | 50 +++++++++++++++++++------ front/plugins/nmap_services/config.json | 8 ++-- 7 files changed, 58 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 658747ad..dfebb2d5 100755 --- a/README.md +++ b/README.md @@ -105,6 +105,16 @@ Instructions for [pucherot's original code can be found here](https://github.com - [jokob-sk](https://github.com/jokob-sk/Pi.Alert): DB Maintenance tools - Please see the [Git commit history](https://github.com/jokob-sk/Pi.Alert/commits/main) for a full list of people and their contributions to the project +## ☕ Support me + +Disclaimer: Please only donate if you don't have any debt yourself. Support yourself first, then others. + +Sponsor Me on GitHub +Buy Me A Coffee +Support me on patreon + +BTC: 1N8tupjeCK12qRVU2XrV17WvKK7LCawyZM + [main]: ./docs/img/devices_split.png "Main screen" [screen1]: ./docs/img/device_details.png "Screen 1" diff --git a/back/pialert.py b/back/pialert.py index 284c9e34..daf0ac6b 100755 --- a/back/pialert.py +++ b/back/pialert.py @@ -3760,6 +3760,8 @@ def execute_plugin(plugin): else: set_RUN_TIMEOUT = set["value"] + mylog('debug', [' [Plugins] Timeout: ', set_RUN_TIMEOUT]) + # Prepare custom params params = [] diff --git a/docker-compose.yml b/docker-compose.yml index 8039949e..9ae32ef6 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,7 +20,7 @@ services: - ${DEV_LOCATION}/pholus:/home/pi/pialert/pholus - ${DEV_LOCATION}/dockerfiles:/home/pi/pialert/dockerfiles - ${APP_DATA_LOCATION}/pialert/php.ini:/etc/php/7.4/fpm/php.ini - - ${DEV_LOCATION}/front/api:/home/pi/pialert/front/api + # - ${DEV_LOCATION}/front/api:/home/pi/pialert/front/api - ${DEV_LOCATION}/front/css:/home/pi/pialert/front/css - ${DEV_LOCATION}/front/lib/AdminLTE:/home/pi/pialert/front/lib/AdminLTE - ${DEV_LOCATION}/front/js:/home/pi/pialert/front/js diff --git a/dockerfiles/README.md b/dockerfiles/README.md index 1cf2bb5a..2c5140e6 100755 --- a/dockerfiles/README.md +++ b/dockerfiles/README.md @@ -193,3 +193,5 @@ Disclaimer: Please only donate if you don't have any debt yourself. Support your Sponsor Me on GitHub Buy Me A Coffee Support me on patreon + +BTC: 1N8tupjeCK12qRVU2XrV17WvKK7LCawyZM diff --git a/front/maintenance.php b/front/maintenance.php index d5d18af1..05bd8112 100755 --- a/front/maintenance.php +++ b/front/maintenance.php @@ -244,7 +244,7 @@ if (isset($_POST['submit']) && submit && isset($_POST['skinselector_set'])) { - + diff --git a/front/plugins.php b/front/plugins.php index 10dd2baf..6925a695 100755 --- a/front/plugins.php +++ b/front/plugins.php @@ -23,7 +23,7 @@ -
+
@@ -49,6 +49,8 @@ function getFormControl(dbColumnDef, value, index) { break; case 'textboxsave': + console.log(value) + value = value == 'null' ? '' : value; // hide 'null' values id = `${dbColumnDef.column}_${index}` @@ -98,6 +100,16 @@ function saveData (id) { // var result = JSON.parse(data); console.log(data) + + if(sanitize(data) == 'OK') + { + showMessage("Saved") + // Remove navigation prompt "Are you sure you want to leave..." + window.onbeforeunload = null; + } else + { + showMessage("ERROR") + } // if (result) { // period = result; @@ -161,6 +173,8 @@ function getData(){ $.get('api/table_plugins_objects.json', function(res) { pluginObjects = res["data"]; + + console.log(pluginObjects) $.get('api/table_plugins_history.json', function(res) { @@ -212,6 +226,7 @@ function generateTabs() }); // Generate the event rows + var eveCount = 0; for(i=0;i' } evRows += '' + clm + '' + eveCount++; } } - // Generate the history rows + // Generate the history rows + var histCount = 0 for(i=0;i' } hiRows += '' + clm + '' + histCount++; } } - + console.log(pluginObjects) // Generate the object rows + var obCount = 0; for(var i=0;i' } obRows += '' + clm + '' + obCount++; } } @@ -265,25 +291,25 @@ function generateTabs()
  • - + - (${pluginObjects.length}) + (${obCount})
  • - + - (${pluginUnprocessedEvents.length}) + (${eveCount})
  • - + - (${pluginHistory.length}) + (${histCount})
    • @@ -294,7 +320,7 @@ function generateTabs()
    -
    +
    @@ -304,7 +330,7 @@ function generateTabs()
    -
    +
    @@ -315,7 +341,7 @@ function generateTabs()
    -
    +
    diff --git a/front/plugins/nmap_services/config.json b/front/plugins/nmap_services/config.json index 3f4f77a4..1d6d32e5 100755 --- a/front/plugins/nmap_services/config.json +++ b/front/plugins/nmap_services/config.json @@ -9,7 +9,7 @@ }], "icon":[{ "language_code":"en_us", - "string" : "" + "string" : "" }], "description": [{ "language_code":"en_us", @@ -45,7 +45,7 @@ { "column": "Object_PrimaryID", "show": true, - "type": "url", + "type": "label", "default_value":"", "options": [], "localized": ["name"], @@ -57,7 +57,7 @@ { "column": "Object_SecondaryID", "show": true, - "type": "label", + "type": "url", "default_value":"", "options": [], "localized": ["name"], @@ -194,7 +194,7 @@ { "function": "CMD", "type": "text", - "default_value":"SELECT dv.dev_Name as Object_PrimaryID, cast(dv.dev_LastIP as VARCHAR(100)) || ':' || cast( SUBSTR(ns.Port ,0, INSTR(ns.Port , '/')) as VARCHAR(100)) as Object_SecondaryID, datetime() as DateTime, ns.Service as Watched_Value1, ns.State as Watched_Value2, 'null' as Watched_Value3, 'null' as Watched_Value4, ns.Extra as Extra FROM (SELECT * FROM Nmap_Scan) ns LEFT JOIN (SELECT dev_Name, dev_MAC, dev_LastIP FROM Devices) dv ON ns.MAC = dv.dev_MAC", + "default_value":"SELECT dv.dev_Name as Object_PrimaryID, cast('http://' || dv.dev_LastIP as VARCHAR(100)) || ':' || cast( SUBSTR(ns.Port ,0, INSTR(ns.Port , '/')) as VARCHAR(100)) as Object_SecondaryID, datetime() as DateTime, ns.Service as Watched_Value1, ns.State as Watched_Value2, 'null' as Watched_Value3, 'null' as Watched_Value4, ns.Extra as Extra FROM (SELECT * FROM Nmap_Scan) ns LEFT JOIN (SELECT dev_Name, dev_MAC, dev_LastIP FROM Devices) dv ON ns.MAC = dv.dev_MAC", "options": [], "localized": ["name", "description"], "name" : [{