From a6df2047211d0c2e460c01ff7515c51b47289ab9 Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Tue, 5 Aug 2025 21:32:35 +1000 Subject: [PATCH] github timeout #1124, css fixes, change button on LOADED_PLUGINS --- front/css/system-dark-patch.css | 3 ++- front/maintenance.php | 6 ++++++ server/helper.py | 5 ++++- server/initialise.py | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/front/css/system-dark-patch.css b/front/css/system-dark-patch.css index 75672907..b1f0671e 100755 --- a/front/css/system-dark-patch.css +++ b/front/css/system-dark-patch.css @@ -20,6 +20,7 @@ --color-yellow: #f39c12; --color-red: #dd4b39; --color-gray: #8c8c8c; + --color-white: #fff; } :root { @@ -793,5 +794,5 @@ .btn:hover { - color: var(--color-gray); + color: var(--color-white); } \ No newline at end of file diff --git a/front/maintenance.php b/front/maintenance.php index 6b478431..c8643058 100755 --- a/front/maintenance.php +++ b/front/maintenance.php @@ -185,6 +185,12 @@ $db->close();
+
+
+ +
+
+
diff --git a/server/helper.py b/server/helper.py index ca7b22bb..a50761ee 100755 --- a/server/helper.py +++ b/server/helper.py @@ -667,7 +667,10 @@ def checkNewVersion(): buildTimestamp = int(f.read().strip()) try: - response = requests.get("https://api.github.com/repos/jokob-sk/NetAlertX/releases") + response = requests.get( + "https://api.github.com/repos/jokob-sk/NetAlertX/releases", + timeout=5 + ) response.raise_for_status() # Raise an exception for HTTP errors text = response.text except requests.exceptions.RequestException as e: diff --git a/server/initialise.py b/server/initialise.py index 39af7ed0..234885ce 100755 --- a/server/initialise.py +++ b/server/initialise.py @@ -157,7 +157,7 @@ def importConfigs (db, all_plugins): # ---------------------------------------- # ccd(key, default, config_dir, name, inputtype, options, group, events=[], desc = "", regex = "", setJsonMetadata = {}, overrideTemplate = {}) - conf.LOADED_PLUGINS = ccd('LOADED_PLUGINS', [] , c_d, 'Loaded plugins', '{"dataType":"array", "elements": [{"elementType" : "select", "elementOptions" : [{"multiple":"true", "ordeable": "true"}] ,"transformers": []}]}', '[]', 'General') + conf.LOADED_PLUGINS = ccd('LOADED_PLUGINS', [] , c_d, 'Loaded plugins', '{"dataType":"array","elements":[{"elementType":"select","elementOptions":[{"multiple":"true","ordeable":"true"}],"transformers":[]},{"elementType":"button","elementOptions":[{"sourceSuffixes":[]},{"separator":""},{"cssClasses":"col-xs-12"},{"onClick":"selectChange(this)"},{"getStringKey":"Gen_Change"}],"transformers":[]}]}', '[]', 'General') conf.DISCOVER_PLUGINS = ccd('DISCOVER_PLUGINS', True , c_d, 'Discover plugins', """{"dataType": "boolean","elements": [{"elementType": "input","elementOptions": [{ "type": "checkbox" }],"transformers": []}]}""", '[]', 'General') conf.SCAN_SUBNETS = ccd('SCAN_SUBNETS', ['192.168.1.0/24 --interface=eth1', '192.168.1.0/24 --interface=eth0'] , c_d, 'Subnets to scan', '''{"dataType": "array","elements": [{"elementType": "input","elementOptions": [{"placeholder": "192.168.1.0/24 --interface=eth1"},{"suffix": "_in"},{"cssClasses": "col-sm-10"},{"prefillValue": "null"}],"transformers": []},{"elementType": "button","elementOptions": [{"sourceSuffixes": ["_in"]},{"separator": ""},{"cssClasses": "col-xs-12"},{"onClick": "addList(this, false)"},{"getStringKey": "Gen_Add"}],"transformers": []},{"elementType": "select","elementHasInputValue": 1,"elementOptions": [{"multiple": "true"},{"readonly": "true"},{"editable": "true"}],"transformers": []},{"elementType": "button","elementOptions": [{"sourceSuffixes": []},{"separator": ""},{"cssClasses": "col-xs-6"},{"onClick": "removeAllOptions(this)"},{"getStringKey": "Gen_Remove_All"}],"transformers": []},{"elementType": "button","elementOptions": [{"sourceSuffixes": []},{"separator": ""},{"cssClasses": "col-xs-6"},{"onClick": "removeFromList(this)"},{"getStringKey": "Gen_Remove_Last"}],"transformers": []}]}''', '[]', 'General') conf.LOG_LEVEL = ccd('LOG_LEVEL', 'verbose' , c_d, 'Log verboseness', '{"dataType":"string", "elements": [{"elementType" : "select", "elementOptions" : [] ,"transformers": []}]}', "['none', 'minimal', 'verbose', 'debug', 'trace']", 'General')