@leiweibau consolidation-2022-08-06

back/pialert.py

@@ -267,11 +267,15 @@ def cleanup_database ():
     print ('    Timestamp:', startTime )
 
     openDB()    
-
+    strdaystokeepEV = str(365)  # str(DAYS_TO_KEEP_EVENTS)
     # Cleanup Online History
     print ('\nCleanup Online_History...')
-    sql.execute ("""DELETE FROM Online_History WHERE Scan_Date <= date('now', '-1 day')""")
+    sql.execute ("DELETE FROM Online_History WHERE Scan_Date <= date('now', '-1 day')")
     print ('\nOptimize Database...')
+    print ('\nCleanup Events, up to the lastest '+strdaystokeepEV+' days...')
+    sql.execute ("DELETE FROM Events WHERE eve_DateTime <= date('now', '-"+strdaystokeepEV+" day')")
+    # Shrink DB
+    print ('\nShrink Database...')
     sql.execute ("VACUUM;")
 
     closeDB()

config/pialert.conf

@@ -17,6 +17,7 @@ PIALERT_WEB_PROTECTION  = False
 PIALERT_WEB_PASSWORD    = '8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92'
 
 # EMAIL settings
+# ----------------------
 SMTP_SERVER             = 'smtp.gmail.com'
 SMTP_PORT               = 587
 SMTP_USER               = 'user@gmail.com'
@@ -31,14 +32,18 @@ REPORT_DEVICE_URL       = 'http://pi.alert/deviceDetails.php?mac='
 REPORT_DASHBOARD_URL    = 'http://pi.alert/'
 
 # NTFY (https://ntfy.sh/) settings
+# ----------------------
 REPORT_NTFY             = False
 NTFY_TOPIC              = 'replace_my_secure_topicname_91h889f28'
 REPORT_DASHBOARD_URL    = 'http://pi.alert/'
 
 # PUSHSAFER (https://www.pushsafer.com/) settings
+# ----------------------
 REPORT_PUSHSAFER        = False
 PUSHSAFER_TOKEN         = 'ApiKey'
 
+# DynDNS
+# ----------------------
 # QUERY_MYIP_SERVER       = 'https://diagnostic.opendns.com/myip'
 QUERY_MYIP_SERVER       = 'http://ipv4.icanhazip.com'
 DDNS_ACTIVE             = False
@@ -48,6 +53,7 @@ DDNS_PASSWORD           = 'A0000000B0000000C0000000D0000000'
 DDNS_UPDATE_URL         = 'https://api.dynu.com/nic/update?'
 
 # PIHOLE settings
+# ----------------------
 PIHOLE_ACTIVE           = False
 PIHOLE_DB               = '/etc/pihole/pihole-FTL.db'
 DHCP_ACTIVE             = False
@@ -65,3 +71,7 @@ DHCP_LEASES             = '/etc/pihole/dhcp.leases'
 # SCAN_SUBNETS    = '--localnet --interface=eth0'
 
 SCAN_SUBNETS            = '--localnet'
+
+# Maintenance Tasks Cron
+# ----------------------
+DAYS_TO_KEEP_EVENTS = 90

front/index.php

@@ -3,10 +3,16 @@ session_start();
 
 if ($_REQUEST['action'] == 'logout') {
   session_destroy();
+  setcookie("PiAler_SaveLogin", "", time() - 3600);
   header('Location: index.php');
 }
+// ##################################################
+// ## Login Processing start
+// ##################################################
+$config_file = "../config/pialert.conf";
+$config_file_lines = file($config_file);
 // ###################################
-// ## Login settings locale start
+// ## Login language settings
 // ###################################
  if (file_exists('../db/setting_darkmode')) {
     $ENABLED_DARKMODE = True;
@@ -21,14 +27,7 @@ if ($_REQUEST['action'] == 'logout') {
   }
   if (strlen($pia_lang_selected) == 0) {$pia_lang_selected = 'en_us';}
   require 'php/templates/language/'.$pia_lang_selected.'.php';
-// ###################################
+
-// ## Login settings locale end
-// ###################################
-// ##################################################
-// ## Login Processing start
-// ##################################################
-$config_file = "../config/pialert.conf";
-$config_file_lines = file($config_file);
 
 // ###################################
 // ## PIALERT_WEB_PROTECTION FALSE
@@ -38,7 +37,7 @@ $config_file_lines_bypass = array_values(preg_grep('/^PIALERT_WEB_PROTECTION\s.*
 $protection_line = explode("=", $config_file_lines_bypass[0]);
 $Pia_WebProtection = strtolower(trim($protection_line[1]));
 
-if ($Pia_WebProtection == 'false')
+if ($Pia_WebProtection != 'true')
   {
       header('Location: devices.php');
       $_SESSION["login"] = 1;
@@ -57,24 +56,30 @@ if ($Pia_Password == hash('sha256',$_POST["loginpassword"]))
   {
       header('Location: devices.php');
       $_SESSION["login"] = 1;
+      if (isset($_POST['PWRemember'])) {setcookie("PiAler_SaveLogin", hash('sha256',$_POST["loginpassword"]), time()+604800);}
   }
 
-if ($_SESSION["login"] == 1)
+// active Session or valid cookie (cookie not extends)
+if (($_SESSION["login"] == 1) || ($Pia_Password == $_COOKIE["PiAler_SaveLogin"]))
   {
       header('Location: devices.php');
+      $_SESSION["login"] = 1;
   }
 
+// no active session, cookie not checked
 if ($_SESSION["login"] != 1)
   {
       if (file_exists('../db/setting_darkmode')) {$ENABLED_DARKMODE = True;}
       if ($Pia_Password == '8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92') {
         $login_info = 'Defaultpassword "123456" is still active';
         $login_mode = 'danger';
-        $login_headline = 'Password Alert!';
+        $login_display_mode = 'display: block;';
+        $login_headline = $pia_lang['Login_Toggle_Alert_headline'];
         $login_icon = 'fa-ban';
   } else {
     $login_mode = 'info';
-    $login_headline = 'Password Information';
+    $login_display_mode = 'display: none;';
+    $login_headline = $pia_lang['Login_Toggle_Info_headline'];
     $login_icon = 'fa-info';
   }
 
@@ -132,22 +137,31 @@ if ($ENABLED_DARKMODE === True) {
         <div class="col-xs-8">
           <div class="checkbox icheck">
             <label>
-              <input type="checkbox" disabled> <?php echo $pia_lang['Login_Remember'];?>
+              <input type="checkbox" name="PWRemember">
+                <div style="margin-left: 10px; display: inline-block; vertical-align: top;"> 
+                  <?php echo $pia_lang['Login_Remember'];?><br><span style="font-size: smaller"><?php echo $pia_lang['Login_Remember_small'];?></span>
+                </div>
             </label>
           </div>
         </div>
         <!-- /.col -->
-        <div class="col-xs-4">
+        <div class="col-xs-4" style="padding-top: 10px;">
           <button type="submit" class="btn btn-primary btn-block btn-flat"><?php echo $pia_lang['Login_Submit'];?></button>
         </div>
         <!-- /.col --> 
       </div>
     </form>
 
+    <div style="padding-top: 10px;">
+      <button class="btn btn-xs btn-primary btn-block btn-flat" onclick="Passwordhinfo()"><?php echo $pia_lang['Login_Toggle_Info'];?></button>
+    </div>
+
   </div>
   <!-- /.login-box-body -->
 
-  <div class="box-body" style="margin-top: 50px;">
+
+
+  <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>
           <h4><i class="icon fa <?php echo $login_icon;?>"></i><?php echo $login_headline;?></h4>
@@ -175,6 +189,16 @@ if ($ENABLED_DARKMODE === True) {
       increaseArea: '20%' /* optional */
     });
   });
+
+function Passwordhinfo() {
+  var x = document.getElementById("myDIV");
+  if (x.style.display === "none") {
+    x.style.display = "block";
+  } else {
+    x.style.display = "none";
+  }
+} 
+
 </script>
 </body>
 </html>

front/php/header.php

@@ -0,0 +1,263 @@
+<!-- ---------------------------------------------------------------------------
+#  Pi.Alert
+#  Open Source Network Guard / WIFI & LAN intrusion detector 
+#
+#  header.php - Front module. Common header to all the web pages 
+#-------------------------------------------------------------------------------
+#  Puche 2021        pi.alert.application@gmail.com        GNU GPLv3
+#--------------------------------------------------------------------------- -->
+
+<?php
+// ###################################
+// ## TimeZone processing start
+// ###################################
+$config_file = "../config/pialert.conf";
+$config_file_lines = file($config_file);
+$config_file_lines_timezone = array_values(preg_grep('/^TIMEZONE\s.*/', $config_file_lines));
+$timezone_line = explode("'", $config_file_lines_timezone[0]);
+$Pia_TimeZone = $timezone_line[1];
+date_default_timezone_set($Pia_TimeZone);
+// ###################################
+// ## TimeZone processing end
+// ###################################
+
+
+// ###################################
+// ## GUI settings processing start
+// ###################################
+if (file_exists('../db/setting_darkmode')) {
+    $ENABLED_DARKMODE = True;
+}
+foreach (glob("../db/setting_skin*") as $filename) {
+    $pia_skin_selected = str_replace('setting_','',basename($filename));
+}
+if (strlen($pia_skin_selected) == 0) {$pia_skin_selected = 'skin-blue';}
+
+foreach (glob("../db/setting_language*") as $filename) {
+    $pia_lang_selected = str_replace('setting_language_','',basename($filename));
+}
+if (strlen($pia_lang_selected) == 0) {$pia_lang_selected = 'en_us';}
+require 'php/templates/language/'.$pia_lang_selected.'.php';
+// ###################################
+// ## GUI settings processing end
+// ###################################
+?>
+
+<!DOCTYPE html> 
+<html>
+
+<!-- ----------------------------------------------------------------------- -->
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="apple-mobile-web-app-capable" content="yes" />
+  <link rel="manifest" href="img/manifest.json">
+  <title>Pi.Alert - <?php echo gethostname();?></title>
+
+  <!-- Tell the browser to be responsive to screen width -->
+  <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+
+  <!-- Bootstrap 3.3.7 -->
+  <link rel="stylesheet" href="lib/AdminLTE/bower_components/bootstrap/dist/css/bootstrap.min.css">
+  
+
+  <!-- Font Awesome -->
+  <link rel="stylesheet" href="lib/AdminLTE/bower_components/font-awesome/css/font-awesome.min.css">
+
+  <!-- Ionicons -->
+  <link rel="stylesheet" href="lib/AdminLTE/bower_components/Ionicons/css/ionicons.min.css">
+
+  <!-- Theme style -->
+  <link rel="stylesheet" href="lib/AdminLTE/dist/css/AdminLTE.min.css">
+
+  <!-- AdminLTE Skins. We have chosen the skin-blue for this starter
+        page. However, you can choose any other skin. Make sure you
+        apply the skin class to the body tag so the changes take effect. -->
+  <link rel="stylesheet" href="lib/AdminLTE/dist/css/skins/<?php echo $pia_skin_selected;?>.min.css">
+
+  <!-- Pi.Alert CSS -->
+  <link rel="stylesheet" href="css/pialert.css">
+
+  <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+  <![endif]-->
+
+  <!-- Google Font -->
+  <!-- <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic"> -->
+  <link rel="stylesheet" href="css/offline-font.css">
+  <link rel="icon" type="image/x-icon" href="img/pialertLogoOrange.png">
+
+  <!-- For better UX on Mobile Devices using the Shortcut on the Homescreen -->
+  <link rel="manifest" href="img/manifest.json">
+  <link rel="apple-touch-icon" href="https://net-dev.de/pialert_homescreen.png">
+  <!-- Dark-Mode Patch -->
+<?php
+if ($ENABLED_DARKMODE === True) {
+   echo '<link rel="stylesheet" href="css/dark-patch.css">';
+   $BACKGROUND_IMAGE_PATCH='style="background-image: url(\'img/boxed-bg-dark.png\');"';
+} else { $BACKGROUND_IMAGE_PATCH='style="background-image: url(\'img/background.png\');"';}
+?>
+<!-- Servertime to the right of the hostname -->
+<script>
+
+var pia_servertime = new Date(<?php echo date("Y, n, j, G, i, s") ?>);
+
+function show_pia_servertime() {
+    if (!document.getElementById) {
+        return;
+    }
+    var pia_hour = pia_servertime.getHours();
+    var pia_minute = pia_servertime.getMinutes();
+    var pia_second = pia_servertime.getSeconds();
+    pia_servertime.setSeconds(pia_second + 1);
+    if (pia_hour <= 9) { pia_hour = "0" + pia_hour; }
+    if (pia_minute <= 9) { pia_minute = "0" + pia_minute; }
+    if (pia_second <= 9) { pia_second = "0" + pia_second; } realtime_pia_servertime = "(" + pia_hour + ":" + pia_minute + ":" + pia_second + ")";
+    if (document.getElementById) { document.getElementById("PIA_Servertime_place").innerHTML = realtime_pia_servertime; } setTimeout("show_pia_servertime()", 1000);
+}
+</script>
+
+</head>
+
+<!-- ----------------------------------------------------------------------- -->
+<!-- Layout Boxed Yellow -->
+<body class="hold-transition <?php echo $pia_skin_selected;?> layout-boxed sidebar-mini" <?php echo $BACKGROUND_IMAGE_PATCH;?> onLoad="show_pia_servertime();" >
+<!-- Site wrapper -->
+<div class="wrapper">
+
+  <!-- Main Header -->
+  <header class="main-header">
+
+<!-- ----------------------------------------------------------------------- -->
+    <!-- Logo -->
+    <a href="devices.php" class="logo">
+      <!-- mini logo for sidebar mini 50x50 pixels -->
+      <span class="logo-mini">P<b>a</b></span>
+      <!-- logo for regular state and mobile devices -->
+      <span class="logo-lg">Pi<b>.Alert</b></span>
+    </a>
+
+<!-- ----------------------------------------------------------------------- -->
+    <!-- Header Navbar -->
+    <nav class="navbar navbar-static-top" role="navigation">
+      <!-- Sidebar toggle button-->
+      <a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
+        <span class="sr-only">Toggle navigation</span>
+      </a>
+      <!-- Navbar Right Menu -->
+      <div class="navbar-custom-menu">
+        <ul class="nav navbar-nav">
+
+          <!-- Server Name -->
+          <li><a style="pointer-events:none;"><?php echo gethostname();?> <span id="PIA_Servertime_place"></span></a></li>
+
+          <!-- Header right info -->
+          <li class="dropdown user user-menu">
+            <!-- Menu Toggle Button -->
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+              <!-- The user image in the navbar-->
+              <img src="img/pialertLogoWhite.png" class="user-image" style="border-radius: initial" alt="Pi.Alert Logo">
+              <!-- hidden-xs hides the username on small devices so only the image appears. -->
+              <span class="hidden-xs">Pi.Alert</span>
+            </a>
+            <ul class="dropdown-menu">
+              <!-- The user image in the menu -->
+              <li class="user-header" style=" height: 100px;">
+                <img src="img/pialertLogoWhite.png" class="img-circle" alt="Pi.Alert Logo" style="border-color:transparent;  height: 50px; width: 50px; margin-top:15px;">
+                <p style="float: right; width: 200px">
+                  Open Source Network Guard
+                  <small>Designed for Raspberry Pi</small>
+                </p>
+              </li>
+
+              <!-- Menu Body -->
+
+              <li class="user-footer">
+                <div class="pull-right">
+                  <a href="index.php?action=logout" class="btn btn-danger">Sign out</a>
+                </div>
+              </li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </nav>
+  </header>
+
+<!-- ----------------------------------------------------------------------- -->
+  <!-- Left side column. contains the logo and sidebar -->
+  <aside class="main-sidebar">
+
+    <!-- sidebar: style can be found in sidebar.less -->
+    <section class="sidebar">
+
+      <!-- Sidebar user panel (optional) -->
+      <div class="user-panel">
+        <a href="." class="logo">
+          <img src="img/pialertLogoGray80.png" class="img-responsive" alt="Pi.Alert Logo"/>
+        </a>
+      </div>
+
+      <!-- search form (Optional) -->
+        <!-- DELETED -->
+
+      <!-- Sidebar Menu -->
+      <ul class="sidebar-menu" data-widget="tree">
+<!--
+        <li class="header">MAIN MENU</li>
+-->
+
+        <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('devices.php', 'deviceDetails.php') ) ){ echo 'active'; } ?>">
+          <a href="devices.php"><i class="fa fa-laptop"></i> <span><?php echo $pia_lang['Navigation_Devices'];?></span></a>
+        </li>
+
+<!--
+         <li><a href="devices.php?status=favorites"><i class="fa fa-star"></i> <span>Favorites Devices</span></a></li>
+-->
+
+        <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('presence.php') ) ){ echo 'active'; } ?>">
+          <a href="presence.php"><i class="fa fa-calendar"></i> <span><?php echo $pia_lang['Navigation_Presence'];?></span></a>
+        </li>
+
+        <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('events.php') ) ){ echo 'active'; } ?>">
+          <a href="events.php"><i class="fa fa-bolt"></i> <span><?php echo $pia_lang['Navigation_Events'];?></span></a>
+        </li>
+
+        <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('network.php') ) ){ echo 'active'; } ?>">
+          <a href="network.php"><i class="fa fa-server"></i> <span><?php echo $pia_lang['Navigation_Network'];?></span></a>
+        </li>
+
+        <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('maintenance.php') ) ){ echo 'active'; } ?>">
+          <a href="maintenance.php"><i class="fa fa-cog"></i> <span><?php echo $pia_lang['Navigation_Maintenance'];?></span></a>
+        </li>
+
+        <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('help_faq.php') ) ){ echo 'active'; } ?>">
+          <a href="help_faq.php"><i class="fa fa-question"></i> <span><?php echo $pia_lang['Navigation_HelpFAQ'];?></span></a>
+        </li>
+
+<!--
+        <li class="treeview">
+          <a href="#"><i class="fa fa-link"></i> <span>Config</span>
+            <span class="pull-right-container">
+                <i class="fa fa-angle-left pull-right"></i>
+              </span>
+          </a>
+
+          <ul class="treeview-menu">
+            <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('scancycles.php', 'scancyclesDetails.php') ) ){ echo 'active'; } ?>">
+              <a href="scancycles.php"><i class="fa fa-link"></i> <span>Scan Cycles</span></a>
+            </li>
+            <li><a href="#">Cron Status</a></li>
+            <li><a href="#">Current IP</a></li>
+          </ul>
+        </li>
+-->
+      </ul>
+
+      <!-- /.sidebar-menu -->
+    </section>
+    <!-- /.sidebar -->
+  </aside>

front/php/templates/header.php

@@ -233,6 +233,11 @@ function show_pia_servertime() {
         <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('maintenance.php') ) ){ echo 'active'; } ?>">
           <a href="maintenance.php"><i class="fa fa-cog"></i> <span><?php echo $pia_lang['Navigation_Maintenance'];?></span></a>
         </li>
+
+        <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('help_faq.php') ) ){ echo 'active'; } ?>">
+          <a href="help_faq.php"><i class="fa fa-question"></i> <span><?php echo $pia_lang['Navigation_HelpFAQ'];?></span></a>
+        </li>
+
 <!--
         <li class="treeview">
           <a href="#"><i class="fa fa-link"></i> <span>Config</span>

front/php/templates/language/de_de.php

@@ -10,6 +10,23 @@ $pia_lang['Gen_Backup'] = 'Sichern';
 $pia_lang['Gen_Restore'] = 'Wiederherstellen';
 $pia_lang['Gen_Switch'] = 'Umschalten';
 
+//////////////////////////////////////////////////////////////////
+// Login Page - Update by @TeroRERO 03ago2022
+//////////////////////////////////////////////////////////////////
+
+$pia_lang['Login_Box'] = 'Passwort eingeben';
+$pia_lang['Login_Remember'] = 'Passwort speichern';
+$pia_lang['Login_Remember_small'] = '(für 7 Tage gültig)';
+$pia_lang['Login_Submit'] = 'Anmelden';
+$pia_lang['Login_Psw_run'] = 'Um das Passwort zu ändern nutze:';
+$pia_lang['Login_Psw_new'] = 'neues_passwort';
+$pia_lang['Login_Psw_folder'] = 'im Ordner "~/pialert/config"';
+$pia_lang['Login_Psw_alert'] = 'Sicherheitshinweis!';
+$pia_lang['Login_Psw-box'] = 'Passwort';
+$pia_lang['Login_Toggle_Info'] = 'Passwort Informationen';
+$pia_lang['Login_Toggle_Info_headline'] = 'Passwort Information';
+$pia_lang['Login_Toggle_Alert_headline'] = 'Passwort Warnung!';
+
 //////////////////////////////////////////////////////////////////
 // Device Page
 //////////////////////////////////////////////////////////////////
@@ -270,7 +287,7 @@ $pia_lang['BackDevices_DBTools_DelActHistory'] = 'Die Anzeige der Netzwerkaktivi
 $pia_lang['BackDevices_DBTools_DelActHistoryError'] = 'Fehler beim Zurücksetzen der Netzwerkaktivitätsanzeige.';
 
 //////////////////////////////////////////////////////////////////
-// Maintenance Page
+// Network Page
 //////////////////////////////////////////////////////////////////
 
 $pia_lang['Network_Title'] = 'Netzwerkübersicht';
@@ -300,4 +317,10 @@ $pia_lang['Network_ManageDel_Submit'] = 'Löschen';
 $pia_lang['Network_Table_State'] = 'Status';
 $pia_lang['Network_Table_Hostname'] = 'Gerätename';
 $pia_lang['Network_Table_IP'] = 'IP';
+
+//////////////////////////////////////////////////////////////////
+// Help Page
+//////////////////////////////////////////////////////////////////
+
+$pia_lang['Navigation_HelpFAQ'] = 'Hilfe / FAQ';
 ?>

front/php/templates/language/en_us.php

@@ -10,6 +10,22 @@ $pia_lang['Gen_Backup'] = 'Run Backup';
 $pia_lang['Gen_Restore'] = 'Run Restore';
 $pia_lang['Gen_Switch'] = 'Switch';
 
+//////////////////////////////////////////////////////////////////
+// Login Page - Update by @TeroRERO 03ago2022
+//////////////////////////////////////////////////////////////////
+
+$pia_lang['Login_Box'] = 'Enter your password';
+$pia_lang['Login_Remember'] = 'Remember';
+$pia_lang['Login_Remember_small'] = '(valid for 7 days)';
+$pia_lang['Login_Submit'] = 'Log in';
+$pia_lang['Login_Psw_run'] = 'To change password run:';
+$pia_lang['Login_Psw_new'] = 'new_password';
+$pia_lang['Login_Psw_folder'] = 'in the config folder.';
+$pia_lang['Login_Psw_alert'] = 'Password Alert!';
+$pia_lang['Login_Psw-box'] = 'Password';
+$pia_lang['Login_Toggle_Info'] = 'Password Information';
+$pia_lang['Login_Toggle_Info_headline'] = 'Password Information';
+$pia_lang['Login_Toggle_Alert_headline'] = 'Password Alert!';
 
 //////////////////////////////////////////////////////////////////
 // Device Page
@@ -319,19 +335,4 @@ $pia_lang['Network_Table_State'] = 'State';
 $pia_lang['Network_Table_Hostname'] = 'Hostname';
 $pia_lang['Network_Table_IP'] = 'IP';
 
-//////////////////////////////////////////////////////////////////
-// Login Page - Update by @TeroRERO 03ago2022
-//////////////////////////////////////////////////////////////////
-
-// TeroRERO Off $pia_lang['Login_Box'] = 'Inicie su sesión';
-$pia_lang['Login_Box'] = 'Enter your password';
-$pia_lang['Login_Remember'] = 'Remember';
-$pia_lang['Login_Submit'] = 'Log in';
-$pia_lang['Login_Psw_run'] = 'To change password run:';
-$pia_lang['Login_Psw_new'] = 'new_password';
-$pia_lang['Login_Psw_folder'] = 'in the config folder.';
-$pia_lang['Login_Psw_alert'] = 'Password Alert!';
-$pia_lang['Login_Psw-box'] = 'Password';
-
-
 ?>

front/php/templates/language/es_es.php

@@ -10,6 +10,24 @@ $pia_lang['Gen_Backup'] = 'Ejecutar copia de seguridad';
 $pia_lang['Gen_Restore'] = 'Ejecutar restauración';
 $pia_lang['Gen_Switch'] = 'Cambiar';
 
+//////////////////////////////////////////////////////////////////
+// Login Page - Update by @TeroRERO 03ago2022
+//////////////////////////////////////////////////////////////////
+
+// TeroRERO Off $pia_lang['Login_Box'] = 'Inicie su sesión';
+$pia_lang['Login_Box'] = 'Ingrese su contraseña';
+$pia_lang['Login_Remember'] = 'Recordar';
+$pia_lang['Login_Remember_small'] = '(valid for 7 days)';
+$pia_lang['Login_Submit'] = 'Ingresar';
+$pia_lang['Login_Psw_run'] = 'Para cambiar contraseña ejecute:';
+$pia_lang['Login_Psw_new'] = 'nueva_contraseña';
+$pia_lang['Login_Psw_folder'] = 'en la carpeta config.';
+$pia_lang['Login_Psw_alert'] = '¡Alerta de Contraseña!';
+$pia_lang['Login_Psw-box'] = 'Contraseña';
+$pia_lang['Login_Toggle_Info'] = 'Password Information';
+$pia_lang['Login_Toggle_Info_headline'] = 'Password Information';
+$pia_lang['Login_Toggle_Alert_headline'] = 'Password Alert!';
+
 //////////////////////////////////////////////////////////////////
 // Device Page - Update by @TeroRERO 03ago2022
 //////////////////////////////////////////////////////////////////
@@ -301,17 +319,4 @@ $pia_lang['Network_Table_State'] = 'Estado';
 $pia_lang['Network_Table_Hostname'] = 'Nombre de host';
 $pia_lang['Network_Table_IP'] = 'Dirección IP';
 
-//////////////////////////////////////////////////////////////////
-// Login Page - Update by @TeroRERO 03ago2022
-//////////////////////////////////////////////////////////////////
-
-// TeroRERO Off $pia_lang['Login_Box'] = 'Inicie su sesión';
-$pia_lang['Login_Box'] = 'Ingrese su contraseña';
-$pia_lang['Login_Remember'] = 'Recordar';
-$pia_lang['Login_Submit'] = 'Ingresar';
-$pia_lang['Login_Psw_run'] = 'Para cambiar contraseña ejecute:';
-$pia_lang['Login_Psw_new'] = 'nueva_contraseña';
-$pia_lang['Login_Psw_folder'] = 'en la carpeta config.';
-$pia_lang['Login_Psw_alert'] = '¡Alerta de Contraseña!';
-$pia_lang['Login_Psw-box'] = 'Contraseña';
 ?>