From 1e197ae749ce8565c2ddb796647d468f335ae888 Mon Sep 17 00:00:00 2001
From: jokob-sk <jokob-sk@gmail.com>
Date: Sat, 28 Sep 2024 11:20:57 +1000
Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A7=B9=20Code=20Cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/index.php                         | 13 +++++++++----
 front/php/templates/language/cs_cz.json |  1 +
 front/php/templates/language/de_de.json |  1 +
 front/php/templates/language/en_us.json |  1 +
 front/php/templates/language/es_es.json |  1 +
 front/php/templates/language/fr_fr.json |  1 +
 front/php/templates/language/it_it.json |  1 +
 front/php/templates/language/nb_no.json |  1 +
 front/php/templates/language/pl_pl.json |  1 +
 front/php/templates/language/pt_br.json |  1 +
 front/php/templates/language/ru_ru.json |  1 +
 front/php/templates/language/tr_tr.json |  1 +
 front/php/templates/language/zh_cn.json |  1 +
 front/php/templates/security.php        |  2 +-
 front/php/templates/skinUI.php          |  0
 15 files changed, 22 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 front/php/templates/skinUI.php

diff --git a/front/index.php b/front/index.php
index 499b318a..c95cd519 100755
--- a/front/index.php
+++ b/front/index.php
@@ -40,7 +40,7 @@ if (( isset ($_SESSION["login"]) && ($_SESSION["login"] == 1)) || (isset ($_COOK
 }
 
 $login_headline = lang('Login_Toggle_Info_headline');
-$login_info = "";
+$login_info = lang('Login_Info');
 $login_mode = 'danger';
 $login_display_mode = 'display: block;';
 $login_icon = 'fa-info';
@@ -91,6 +91,13 @@ if (isset ($_SESSION["login"]) == FALSE || $_SESSION["login"] != 1)
   <link rel="stylesheet" href="lib/AdminLTE/dist/css/AdminLTE.min.css">
   <!-- iCheck -->
   <link rel="stylesheet" href="lib/AdminLTE/plugins/iCheck/square/blue.css">
+  <!-- Font Awesome -->
+  <link rel="stylesheet" href="lib/AdminLTE/bower_components/font-awesome/css/fontawesome.min.css">
+  <link rel="stylesheet" href="lib/AdminLTE/bower_components/font-awesome/css/solid.css">
+  <link rel="stylesheet" href="lib/AdminLTE/bower_components/font-awesome/css/brands.css">
+  <link rel="stylesheet" href="lib/AdminLTE/bower_components/font-awesome/css/v5-font-face.css">
+  <!-- Favicon -->
+  <link id="favicon" rel="icon" type="image/x-icon" href="img/NetAlertX_logo.png">
 
   <!-- Dark-Mode Patch -->
 <?php
@@ -140,11 +147,9 @@ if ($ENABLED_DARKMODE === True) {
   </div>
   <!-- /.login-box-body -->
 
-
-
   <div id="myDIV" class="box-body" style="margin-top: 50px; <?php echo $login_display_mode;?>">
       <div class="alert alert-<?php echo $login_mode;?> alert-dismissible">
-          <button type="button" class="close" data-dismiss="alert" aria-hidden="true">�</button>
+          <button type="button" class="close" onclick="Passwordhinfo()" aria-hidden="true">X</button>
           <h4><i class="icon fa <?php echo $login_icon;?>"></i><?php echo $login_headline;?></h4>
           <p><?php echo $login_info;?></p>
       </div>
diff --git a/front/php/templates/language/cs_cz.json b/front/php/templates/language/cs_cz.json
index 08b74361..f4b27227 100755
--- a/front/php/templates/language/cs_cz.json
+++ b/front/php/templates/language/cs_cz.json
@@ -351,6 +351,7 @@
     "Loading": "",
     "Login_Box": "",
     "Login_Default_PWD": "",
+    "Login_Info": "",
     "Login_Psw-box": "",
     "Login_Psw_alert": "",
     "Login_Psw_folder": "",
diff --git a/front/php/templates/language/de_de.json b/front/php/templates/language/de_de.json
index 04706b6e..09802885 100755
--- a/front/php/templates/language/de_de.json
+++ b/front/php/templates/language/de_de.json
@@ -363,6 +363,7 @@
     "Loading": "Laden...",
     "Login_Box": "Passwort eingeben",
     "Login_Default_PWD": "Standardpasswort \"123456\" noch immer aktiv.",
+    "Login_Info": "",
     "Login_Psw-box": "Passwort",
     "Login_Psw_alert": "Sicherheitshinweis!",
     "Login_Psw_folder": "im Ordner /app/config",
diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json
index f0cb674d..6783797a 100755
--- a/front/php/templates/language/en_us.json
+++ b/front/php/templates/language/en_us.json
@@ -351,6 +351,7 @@
     "Loading": "Loading...",
     "Login_Box": "Enter your password",
     "Login_Default_PWD": "Default password \"123456\" is still active.",
+    "Login_Info": "Passwords are set via the Set Password plugin. Check the <a target=\"_blank\" href=\"https://github.com/jokob-sk/NetAlertX/tree/main/front/plugins/set_password\">SETPWD docs</a> if you have issues logging in.",
     "Login_Psw-box": "Password",
     "Login_Psw_alert": "Password Alert!",
     "Login_Psw_folder": "in the config folder.",
diff --git a/front/php/templates/language/es_es.json b/front/php/templates/language/es_es.json
index cc601a53..133b65f3 100755
--- a/front/php/templates/language/es_es.json
+++ b/front/php/templates/language/es_es.json
@@ -361,6 +361,7 @@
     "Loading": "Cargando...",
     "Login_Box": "Ingrese su contraseña",
     "Login_Default_PWD": "La contraseña por defecto \"123456\" sigue activa.",
+    "Login_Info": "",
     "Login_Psw-box": "Contraseña",
     "Login_Psw_alert": "¡Alerta de Contraseña!",
     "Login_Psw_folder": "en la carpeta config.",
diff --git a/front/php/templates/language/fr_fr.json b/front/php/templates/language/fr_fr.json
index 032b7a13..fb61b838 100755
--- a/front/php/templates/language/fr_fr.json
+++ b/front/php/templates/language/fr_fr.json
@@ -351,6 +351,7 @@
     "Loading": "Chargement...",
     "Login_Box": "Saisir votre mot de passe",
     "Login_Default_PWD": "Le mot de passe par défaut \"123456\" est encore actif.",
+    "Login_Info": "",
     "Login_Psw-box": "Mot de passe",
     "Login_Psw_alert": "Alerte de mot de passe !",
     "Login_Psw_folder": "dans le dossier de configuration.",
diff --git a/front/php/templates/language/it_it.json b/front/php/templates/language/it_it.json
index 33582d4f..c2cb3045 100755
--- a/front/php/templates/language/it_it.json
+++ b/front/php/templates/language/it_it.json
@@ -351,6 +351,7 @@
     "Loading": "Caricamento...",
     "Login_Box": "Inserisci la tua password",
     "Login_Default_PWD": "La password predefinita \"123456\" è ancora attiva.",
+    "Login_Info": "",
     "Login_Psw-box": "Password",
     "Login_Psw_alert": "Avviso password!",
     "Login_Psw_folder": "nella cartella di configurazione.",
diff --git a/front/php/templates/language/nb_no.json b/front/php/templates/language/nb_no.json
index 4e681bf8..06cbe8de 100755
--- a/front/php/templates/language/nb_no.json
+++ b/front/php/templates/language/nb_no.json
@@ -351,6 +351,7 @@
     "Loading": "Laster...",
     "Login_Box": "Skriv inn passordet ditt",
     "Login_Default_PWD": "Standard passordet \"123456\" er fortsatt aktivt.",
+    "Login_Info": "",
     "Login_Psw-box": "Passord",
     "Login_Psw_alert": "Passord varsling!",
     "Login_Psw_folder": "i config-mappen.",
diff --git a/front/php/templates/language/pl_pl.json b/front/php/templates/language/pl_pl.json
index d0dd59e5..d2f9b517 100755
--- a/front/php/templates/language/pl_pl.json
+++ b/front/php/templates/language/pl_pl.json
@@ -351,6 +351,7 @@
     "Loading": "Wczytywanie...",
     "Login_Box": "Wprowadź hasło",
     "Login_Default_PWD": "Podstawowe hasło \"123456\" jest aktywne.",
+    "Login_Info": "",
     "Login_Psw-box": "Hasło",
     "Login_Psw_alert": "Alert HASŁA!",
     "Login_Psw_folder": "w folderze konfiguracji.",
diff --git a/front/php/templates/language/pt_br.json b/front/php/templates/language/pt_br.json
index 08c76a75..54fc0854 100755
--- a/front/php/templates/language/pt_br.json
+++ b/front/php/templates/language/pt_br.json
@@ -351,6 +351,7 @@
     "Loading": "",
     "Login_Box": "",
     "Login_Default_PWD": "",
+    "Login_Info": "",
     "Login_Psw-box": "",
     "Login_Psw_alert": "",
     "Login_Psw_folder": "",
diff --git a/front/php/templates/language/ru_ru.json b/front/php/templates/language/ru_ru.json
index d142ac9f..20f49c98 100755
--- a/front/php/templates/language/ru_ru.json
+++ b/front/php/templates/language/ru_ru.json
@@ -351,6 +351,7 @@
     "Loading": "Загрузка...",
     "Login_Box": "Введите пароль",
     "Login_Default_PWD": "Пароль по умолчанию «123456» все еще активен.",
+    "Login_Info": "",
     "Login_Psw-box": "Пароль",
     "Login_Psw_alert": "Предупреждение о пароле!",
     "Login_Psw_folder": "в папке конфигурации.",
diff --git a/front/php/templates/language/tr_tr.json b/front/php/templates/language/tr_tr.json
index ef93255b..29f23c35 100755
--- a/front/php/templates/language/tr_tr.json
+++ b/front/php/templates/language/tr_tr.json
@@ -351,6 +351,7 @@
     "Loading": "Yükleniyor...",
     "Login_Box": "Şifrenizi giriniz",
     "Login_Default_PWD": "Varsayılan şifre \"123456\" hâlâ aktif.",
+    "Login_Info": "",
     "Login_Psw-box": "Şİfre",
     "Login_Psw_alert": "",
     "Login_Psw_folder": "",
diff --git a/front/php/templates/language/zh_cn.json b/front/php/templates/language/zh_cn.json
index f0e55b41..a078ad5b 100755
--- a/front/php/templates/language/zh_cn.json
+++ b/front/php/templates/language/zh_cn.json
@@ -351,6 +351,7 @@
     "Loading": "加载中...",
     "Login_Box": "输入密码",
     "Login_Default_PWD": "默认密码“123456”仍然有效。",
+    "Login_Info": "",
     "Login_Psw-box": "密码",
     "Login_Psw_alert": "密码警报！",
     "Login_Psw_folder": "在配置文件夹中。",
diff --git a/front/php/templates/security.php b/front/php/templates/security.php
index 9248918f..879365b3 100755
--- a/front/php/templates/security.php
+++ b/front/php/templates/security.php
@@ -62,7 +62,7 @@ if($Pia_WebProtection == 'true')
     } else 
     {
         // we need to redirect        
-        header('Location: index.php');
+        header('Location: /index.php');
     } 
 
 }
diff --git a/front/php/templates/skinUI.php b/front/php/templates/skinUI.php
old mode 100644
new mode 100755