diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json index 01b4081d..5c1855c1 100755 --- a/front/php/templates/language/en_us.json +++ b/front/php/templates/language/en_us.json @@ -472,8 +472,15 @@ "settings_missing" : "Not all settings loaded, refresh the page! This is probably caused by a high load on the database or app startup sequence.", "settings_missing_block" : "You can not save your settings without specifying all setting keys. Refresh the page. This is probably caused by a high load on the database.", "settings_old" : "Importing settings and re-initializing...", - "settings_saved" : "
Settings saved to the pialert.conf file.

A time-stamped backup of the previous file created.

Reloading...
", - "settings_imported" : "Last time settings were imported from the pialert.conf file:", + "settings_saved" : "
Settings saved to the pialert.conf file.

A time-stamped backup of the previous file created.

Reloading...
", + "settings_imported_label" : "Settings imported", + "settings_imported" : "Last time settings were imported from the pialert.conf file", + "settings_scanners_enabled_label" : "Enabled scanners", + "settings_scanners_enabled" : "All plugins of the scanner type that are currently enabled.", + "settings_device_scanners_label" : "Device scanners", + "settings_device_scanners" : "Device scanners used to discover devices that write into the CurrentScan database table.", + "settings_publishers_enabled_label" : "Enabled publishers", + "settings_publishers_enabled" : "Enabled notification gateways - publishers, that will send a notification depending on your settings.", "settings_expand_all" : "Expand all", "Setting_Override" : "Override value", "Setting_Override_Description" : "Enabling this option will override an App supplied default value with the value specified above.", diff --git a/front/plugins/arp_scan/config.json b/front/plugins/arp_scan/config.json index 1071eec3..6af554fc 100755 --- a/front/plugins/arp_scan/config.json +++ b/front/plugins/arp_scan/config.json @@ -341,7 +341,7 @@ "description": [ { "language_code": "en_us", - "string": "Arguments to run arps-scan with. Recommended and tested only with the setting sudo arp-scan --ignoredups --retry=6." + "string": "Arguments to run arps-scan with. Recommended and tested only with the setting:
sudo arp-scan --ignoredups --retry=6." } ] } diff --git a/front/settings.php b/front/settings.php index 4d8e69cf..684345c3 100755 --- a/front/settings.php +++ b/front/settings.php @@ -70,8 +70,29 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) { -
+ +
"> +
+ +
+
+
+ +
+ + +
+ +
+ + + + + +
+ +
@@ -123,27 +144,130 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {