diff --git a/docs/FRONTEND_DEVELOPMENT.md b/docs/FRONTEND_DEVELOPMENT.md index 92125b1c..697048b8 100755 --- a/docs/FRONTEND_DEVELOPMENT.md +++ b/docs/FRONTEND_DEVELOPMENT.md @@ -1,6 +1,6 @@ # 🖼 Frontend development -This page contains tips for frontend development when extending PiAlert. Guiding principles are: +This page contains tips for frontend development when extending NetAlertX. Guiding principles are: 1. Maintainability 2. Extendability diff --git a/docs/SUBNETS.md b/docs/SUBNETS.md index e94ac6f7..ae2fb63a 100755 --- a/docs/SUBNETS.md +++ b/docs/SUBNETS.md @@ -52,7 +52,7 @@ The adapter will probably be `eth0` or `eth1`. (Check `System info` > `Network H > Community sourced content by [mscreations](https://github.com/mscreations) from this [discussion](https://github.com/jokob-sk/NetAlertX/discussions/404). > [!NOTE] -> The setup this was tested on: Bare Metal -> Hyper-V on Win Server 2019 -> Ubuntu 22.04 VM -> Docker -> PiAlert. +> The setup this was tested on: Bare Metal -> Hyper-V on Win Server 2019 -> Ubuntu 22.04 VM -> Docker -> NetAlertX. **Approach 1 (may cause issues):** @@ -91,8 +91,8 @@ network: via: 192.168.1.1 ``` -3) Run `sudo netplan apply` and the interfaces are then available to scan in PiAlert. -4) In this case, use `192.168.2.0/24 --interface=eth0.2` in PiAlert +3) Run `sudo netplan apply` and the interfaces are then available to scan in NetAlertX. +4) In this case, use `192.168.2.0/24 --interface=eth0.2` in NetAlertX #### VLAN 🔍Example: diff --git a/docs/VERSIONS.md b/docs/VERSIONS.md index f74174b4..40614a01 100755 --- a/docs/VERSIONS.md +++ b/docs/VERSIONS.md @@ -1,6 +1,6 @@ ## Am I running the latest released version? -Since version 23.01.14 PiAlert uses a simple timestamp-based version check to verify if a new version is available. You can check the [current and past releases here](https://github.com/jokob-sk/NetAlertX/releases), or have a look at what I'm [currently working on](https://github.com/jokob-sk/NetAlertX/issues/138). +Since version 23.01.14 NetAlertX uses a simple timestamp-based version check to verify if a new version is available. You can check the [current and past releases here](https://github.com/jokob-sk/NetAlertX/releases), or have a look at what I'm [currently working on](https://github.com/jokob-sk/NetAlertX/issues/138). If you are not on the latest version, the app will notify you, that a new released version is avialable the following way: diff --git a/front/index.php b/front/index.php index 01b62eff..8785e0c4 100755 --- a/front/index.php +++ b/front/index.php @@ -5,7 +5,7 @@ require dirname(__FILE__).'/php/server/init.php'; require 'php/templates/security.php'; - +$CookieSaveLoginName = 'NetAlertX_SaveLogin'; if ($Pia_WebProtection != 'true') { @@ -17,7 +17,7 @@ if ($Pia_WebProtection != 'true') // Logout if (isset ($_GET["action"]) && $_GET["action"] == 'logout') { - setcookie("PiAlert_SaveLogin", '', time()+1); // reset cookie + setcookie($CookieSaveLoginName, '', time()+1); // reset cookie $_SESSION["login"] = 0; header('Location: index.php'); exit; @@ -28,15 +28,15 @@ if (isset ($_POST["loginpassword"]) && $Pia_Password == hash('sha256',$_POST["lo { header('Location: devices.php'); $_SESSION["login"] = 1; - if (isset($_POST['PWRemember'])) {setcookie("PiAlert_SaveLogin", hash('sha256',$_POST["loginpassword"]), time()+604800);} + if (isset($_POST['PWRemember'])) {setcookie($CookieSaveLoginName, hash('sha256',$_POST["loginpassword"]), time()+604800);} } // active Session or valid cookie (cookie not extends) -if (( isset ($_SESSION["login"]) && ($_SESSION["login"] == 1)) || (isset ($_COOKIE["PiAlert_SaveLogin"]) && $Pia_Password == $_COOKIE["PiAlert_SaveLogin"])) +if (( isset ($_SESSION["login"]) && ($_SESSION["login"] == 1)) || (isset ($_COOKIE[$CookieSaveLoginName]) && $Pia_Password == $_COOKIE[$CookieSaveLoginName])) { header('Location: devices.php'); $_SESSION["login"] = 1; - if (isset($_POST['PWRemember'])) {setcookie("PiAlert_SaveLogin", hash('sha256',$_POST["loginpassword"]), time()+604800);} + if (isset($_POST['PWRemember'])) {setcookie($CookieSaveLoginName, hash('sha256',$_POST["loginpassword"]), time()+604800);} } $login_headline = lang('Login_Toggle_Info_headline'); diff --git a/front/php/templates/footer.php b/front/php/templates/footer.php index 85828b2a..16e663be 100755 --- a/front/php/templates/footer.php +++ b/front/php/templates/footer.php @@ -18,7 +18,7 @@ © - 2020 Puche (2022+ jokob-sk) | : + 2020 Puche (2022+ jokob-sk) | : | Version: | Docs diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json index a4ad36cb..ed30f9fc 100755 --- a/front/php/templates/language/en_us.json +++ b/front/php/templates/language/en_us.json @@ -221,7 +221,7 @@ "Device_Title": "Devices", "Donations_Others": "Others", "Donations_Platforms": "Sponsor platforms", - "Donations_Text": "Hey \ud83d\udc4b!
Thanks for clicking on this menu item \ud83d\ude05

I'm trying to collect some donations to make you better software. Also, it would help me not to get burned out, so I can support this app longer. Any small (recurring or not) sponsorship makes me want to put more effort into this app.
I'd love to shorten my work week and in the remaining time fully focus on PiAlert. You'd get more functionality, a more polished app and less bugs.

Thanks for reading - I'm grateful for any support \u2764\ud83d\ude4f

TL;DR: By supporting me you get:


\ud83d\udce7Email me to jokob@duck.com if you want to get in touch or if I should add other sponsorship platforms.
", + "Donations_Text": "Hey \ud83d\udc4b!
Thanks for clicking on this menu item \ud83d\ude05

I'm trying to collect some donations to make you better software. Also, it would help me not to get burned out, so I can support this app longer. Any small (recurring or not) sponsorship makes me want to put more effort into this app.
I'd love to shorten my work week and in the remaining time fully focus on NetAlertX. You'd get more functionality, a more polished app and less bugs.

Thanks for reading - I'm grateful for any support \u2764\ud83d\ude4f

TL;DR: By supporting me you get:


\ud83d\udce7Email me to jokob@duck.com if you want to get in touch or if I should add other sponsorship platforms.
", "Donations_Title": "Donations", "ENABLE_PLUGINS_description": "Enables the plugins functionality. Loading plugins requires more hardware resources so you might want to disable them on low-powered system.", "ENABLE_PLUGINS_name": "Enable Plugins", diff --git a/front/php/templates/security.php b/front/php/templates/security.php index 5ae17081..d0cb62eb 100755 --- a/front/php/templates/security.php +++ b/front/php/templates/security.php @@ -3,6 +3,8 @@ $url = 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']; $isLogonPage = FALSE; +$CookieSaveLoginName = "NetAlertX_SaveLogin"; + if (strpos($url,'index.php') !== false) { $isLogonPage = TRUE; @@ -14,7 +16,7 @@ if(array_search('action', $_REQUEST) != FALSE) { if ($_REQUEST['action'] == 'logout') { session_destroy(); - setcookie("PiAlert_SaveLogin", "", time() - 3600); + setcookie($CookieSaveLoginName, "", time() - 3600); header('Location: index.php'); } } @@ -24,6 +26,7 @@ if(array_search('action', $_REQUEST) != FALSE) // ################################################## $config_file = "../config/pialert.conf"; $config_file_lines = file($config_file); +$CookieSaveLoginName = "NetAlertX_SaveLogin"; // ################################### // ## PIALERT_WEB_PROTECTION FALSE @@ -49,7 +52,7 @@ if($Pia_WebProtection == 'true') $_SESSION["login"] = 0; } - if ( ($_SESSION["login"] == 1) || $isLogonPage || (( isset($_COOKIE["PiAlert_SaveLogin"]) && $Pia_Password == $_COOKIE["PiAlert_SaveLogin"]))) + if ( ($_SESSION["login"] == 1) || $isLogonPage || (( isset($_COOKIE[$CookieSaveLoginName]) && $Pia_Password == $_COOKIE[$CookieSaveLoginName ]))) { //Logged in or stay on this page if we are on the index.php already diff --git a/front/plugins/_publisher_mqtt/config.json b/front/plugins/_publisher_mqtt/config.json index cac8e5e6..3c216274 100755 --- a/front/plugins/_publisher_mqtt/config.json +++ b/front/plugins/_publisher_mqtt/config.json @@ -267,7 +267,7 @@ "description": [ { "language_code": "en_us", - "string" : "Enable sending notifications via MQTT to your Home Assistance instance. Usually, on_notification is recommended. See the PiAlert Home Assistant guide for details." + "string" : "Enable sending notifications via MQTT to your Home Assistance instance. Usually, on_notification is recommended. See the NetAlertX Home Assistant guide for details." }, { "language_code": "es_es", diff --git a/front/plugins/snmp_discovery/README.md b/front/plugins/snmp_discovery/README.md index fc9a6479..b598dde4 100755 --- a/front/plugins/snmp_discovery/README.md +++ b/front/plugins/snmp_discovery/README.md @@ -4,7 +4,7 @@ A plugin for importing devices from an SNMP enabled router or switch. Using SNM ### Usage -Specify the following settings in the Settings section of PiAlert: +Specify the following settings in the Settings section of NetAlertX: - `SNMPDSC_routers` - A list of `snmpwalk` commands to execute against IP addresses of roputers/switches with SNMP turned on. For example: diff --git a/front/plugins/unifi_import/README.md b/front/plugins/unifi_import/README.md index 8591d552..08ea07fd 100755 --- a/front/plugins/unifi_import/README.md +++ b/front/plugins/unifi_import/README.md @@ -4,7 +4,7 @@ A plugin allowing for importing devices from a UniFi controller. ### Usage -Specify the following settings in the Settings section of PiAlert: +Specify the following settings in the Settings section of NetAlertX: - `UNFIMP_username` - Username used to login into the UNIFI controller. - `UNFIMP_password` - Password used to login into the UNIFI controller.