diff --git a/back/report_template_new_version.html b/back/report_template_new_version.html index 92b87984..6994c012 100755 --- a/back/report_template_new_version.html +++ b/back/report_template_new_version.html @@ -21,9 +21,9 @@ - - 🆕 New version available 🆕 - + + 🆕 New version available 🆕 + diff --git a/docker-compose.yml b/docker-compose.yml index 9a1a0286..832f78c2 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,6 +17,7 @@ services: # DELETE START anyone trying to use this file: comment out / delete BELOW lines, they are only for development purposes - ${DEV_LOCATION}/back/pialert.py:/home/pi/pialert/back/pialert.py - ${DEV_LOCATION}/back/update_vendors.sh:/home/pi/pialert/back/update_vendors.sh + - ${DEV_LOCATION}/back/report_template_new_version.html:/home/pi/pialert/back/report_template_new_version.html - ${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 diff --git a/front/network.php b/front/network.php index 2a75362c..d2ee61c6 100755 --- a/front/network.php +++ b/front/network.php @@ -280,7 +280,7 @@ a.dev_Network_Node_MAC_ADDR as parent_mac, a.dev_Icon as node_icon FROM Devices a - WHERE a.dev_DeviceType in ('AP', 'Gateway', 'Powerline', 'Switch', 'WLAN', 'PLC', 'Router','USB LAN Adapter', 'USB WIFI Adapter', 'Internet') + WHERE a.dev_DeviceType in ('AP', 'Gateway', 'Firewall', 'Powerline', 'Switch', 'WLAN', 'PLC', 'Router','USB LAN Adapter', 'USB WIFI Adapter', 'Internet') ) t1 LEFT JOIN ( diff --git a/front/php/server/devices.php b/front/php/server/devices.php index ee263b28..ea97f229 100755 --- a/front/php/server/devices.php +++ b/front/php/server/devices.php @@ -725,7 +725,7 @@ function getNetworkNodes() { global $db; // Device Data - $sql = 'SELECT * FROM Devices WHERE dev_DeviceType in ( "AP", "Gateway", "Powerline", "Switch", "WLAN", "PLC", "Router","USB LAN Adapter", "USB WIFI Adapter")'; + $sql = 'SELECT * FROM Devices WHERE dev_DeviceType in ( "AP", "Gateway", "Firewall", "Powerline", "Switch", "WLAN", "PLC", "Router","USB LAN Adapter", "USB WIFI Adapter")'; $result = $db->query($sql); @@ -789,7 +789,7 @@ function getDeviceTypes() { "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", "Powerline", "Switch", "WLAN", "PLC", "Router","USB LAN Adapter", "USB WIFI Adapter" ) + "AP", "Gateway", "Firewall", "Powerline", "Switch", "WLAN", "PLC", "Router","USB LAN Adapter", "USB WIFI Adapter" ) UNION SELECT 1 as dev_Order, "Smartphone" UNION SELECT 1 as dev_Order, "Tablet" @@ -817,6 +817,7 @@ function getDeviceTypes() { -- network devices UNION SELECT 5 as dev_Order, "AP" UNION SELECT 5 as dev_Order, "Gateway" + UNION SELECT 5 as dev_Order, "Firewall" UNION SELECT 5 as dev_Order, "Powerline" UNION SELECT 5 as dev_Order, "Switch" UNION SELECT 5 as dev_Order, "WLAN" diff --git a/front/php/server/util.php b/front/php/server/util.php index 8ebdbb68..a08cdb44 100755 --- a/front/php/server/util.php +++ b/front/php/server/util.php @@ -359,7 +359,7 @@ function logServerConsole ($text) { function getNetworkTypes(){ $array = array( - "AP", "Gateway", "Powerline", "Switch", "WLAN", "PLC", "Router","USB LAN Adapter", "USB WIFI Adapter" + "AP", "Gateway", "Firewall", "Powerline", "Switch", "WLAN", "PLC", "Router","USB LAN Adapter", "USB WIFI Adapter" ); return $array; diff --git a/front/php/templates/language/de_de.php b/front/php/templates/language/de_de.php index 29c735e4..76ac6993 100755 --- a/front/php/templates/language/de_de.php +++ b/front/php/templates/language/de_de.php @@ -380,7 +380,7 @@ $lang['de_de'] = array( lösche ggf. die betreffende DHCP-Lease. Anschließend schaue, ebenfalls in Pi-hole, unter Tools -> Network, ob sich dort die immer wiederkehrenden Hosts finden lassen. Wenn ja, lösche diese dort ebenfalls. Nun kannst du Pi.Alert wieder starten. Jetzt sollte das Gerät/die Geräte nicht mehr auftauchen.', 'HelpFAQ_Cat_Detail_300_head' => 'Was bedeutet ', -'HelpFAQ_Cat_Detail_300_text_a' => 'meint ein Netzwerkgerät (welches den typ AP, Gateway, Powerline, Switch, WLAN, PLC, Router,USB LAN Adapter, USB WIFI Adapter, or Internet eingestellt hat)', +'HelpFAQ_Cat_Detail_300_text_a' => 'meint ein Netzwerkgerät (welches den typ AP, Gateway, Firewall, Powerline, Switch, WLAN, PLC, Router,USB LAN Adapter, USB WIFI Adapter, or Internet eingestellt hat)', 'HelpFAQ_Cat_Detail_300_text_b' => 'bezeichnet die Anschlussnummer/Portnummer, an der das gerade bearbeitete Gerät mit diesem Netzwerkgerät verbunden ist.', 'HelpFAQ_Cat_Detail_301_head_a' => 'Wann wird nun gescannt? Bei ', 'HelpFAQ_Cat_Detail_301_head_b' => ' steht 1min aber der Graph zeigt 5min - Abstände an.', diff --git a/front/php/templates/language/en_us.php b/front/php/templates/language/en_us.php index 24a4c3e6..a9e8f31a 100755 --- a/front/php/templates/language/en_us.php +++ b/front/php/templates/language/en_us.php @@ -255,7 +255,7 @@ $lang['en_us'] = array( 'Maintenance_Tools_Tab_Tools' => 'Tools', 'Maintenance_Tools_Tab_BackupRestore' => 'Backup / Restore', 'Maintenance_Tools_Tab_Logging' => 'Logs', -'Maintenance_Tool_displayed_columns_text' => 'Change the order of the columns in the Devices page. (The drag-and-drop is a bit clunky, but for now workable, not a common task).', +'Maintenance_Tool_displayed_columns_text' => 'Change the visibility and order of the columns in the Devices page. (The drag-and-drop is a bit clunky, but for now workable, not a common task - won\'t fix for now (tried for like 3h - happy for someone to submit a PR :) )).', 'Maintenance_Tool_order_columns_text' => '', 'Maintenance_Tool_darkmode' => 'Toggle Modes (Dark/Light)', 'Maintenance_Tool_drag_me' => 'Drag me to reorder columns.', @@ -411,7 +411,7 @@ $lang['en_us'] = array( chmod -R 770 ~/pialert/db
If the database is still read-only, try reinstalling or restoring a database backup from the maintenance page.', -'HelpFAQ_Cat_General_102docker_head' => '(🐳 Docker only) Database issues (AJAX errors, read-only, not found)', +'HelpFAQ_Cat_General_102docker_head' => 'Database issues (AJAX errors, read-only, not found)', 'HelpFAQ_Cat_General_102docker_text' => 'Double-check you\'ve followed the dockerfile readme (most up-to-date info).