Skip to content

Commit

Permalink
Update Notes: 2023-03-09
Browse files Browse the repository at this point in the history 
Changed:
* less colors on the settings page

New:
* Wake-on-LAN in the "Tools" tab on the device details page

Updated:
* Language files
  • Loading branch information
@leiweibau
leiweibau committed Mar 9, 2023
1 parent ca00ed9 commit 30427c7
Show file tree
Hide file tree
Showing 9 changed files with 144 additions and 57 deletions.
2 changes: 1 addition & 1 deletion config/version.conf
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
VERSION = ''
VERSION_YEAR = '2023'
VERSION_DATE = '2023-03-07'
VERSION_DATE = '2023-03-09'
43 changes: 36 additions & 7 deletions front/deviceDetails.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,16 +522,29 @@ function speedtestcli() {
})
}
</script>
<?php
<?php
}
?>
<h4 class="">Wake-on-LAN</h4>
<div style="width:100%; text-align: center;">
<script>
setTimeout(function(){
document.getElementById('wakeonlan').innerHTML='<?php echo $pia_lang['DevDetail_Tools_WOL'];?> ' + document.getElementById('txtLastIP').value + '';
}, 2000);
</script>

<button type="button" id="wakeonlan" class="btn btn-primary pa-btn" style="margin-bottom: 20px; margin-left: 10px; margin-right: 10px;" onclick="askwakeonlan()">Loading...</button>

</div>


<h4 class="">Nmap Scans</h4>
<div style="width:100%; text-align: center;">
<script>
setTimeout(function(){
document.getElementById('piamanualnmap_fast').innerHTML='<?php echo $pia_lang['DevDetail_Nmap_buttonFast'];?> (' + document.getElementById('txtLastIP').value +')';
document.getElementById('piamanualnmap_normal').innerHTML='<?php echo $pia_lang['DevDetail_Nmap_buttonDefault'];?> (' + document.getElementById('txtLastIP').value +')';
document.getElementById('piamanualnmap_detail').innerHTML='<?php echo $pia_lang['DevDetail_Nmap_buttonDetail'];?> (' + document.getElementById('txtLastIP').value +')';
document.getElementById('piamanualnmap_fast').innerHTML='<?php echo $pia_lang['DevDetail_Tools_nmap_buttonFast'];?> (' + document.getElementById('txtLastIP').value +')';
document.getElementById('piamanualnmap_normal').innerHTML='<?php echo $pia_lang['DevDetail_Tools_nmap_buttonDefault'];?> (' + document.getElementById('txtLastIP').value +')';
document.getElementById('piamanualnmap_detail').innerHTML='<?php echo $pia_lang['DevDetail_Tools_nmap_buttonDetail'];?> (' + document.getElementById('txtLastIP').value +')';
}, 2000);
</script>

Expand All @@ -541,9 +554,9 @@ function speedtestcli() {

<div style="text-align: left;">
<ul style="padding:20px;">
<li><?php echo $pia_lang['DevDetail_Nmap_buttonFast_text'];?></li>
<li><?php echo $pia_lang['DevDetail_Nmap_buttonDefault_text'];?></li>
<li><?php echo $pia_lang['DevDetail_Nmap_buttonDetail_text'];?></li>
<li><?php echo $pia_lang['DevDetail_Tools_nmap_buttonFast_text'];?></li>
<li><?php echo $pia_lang['DevDetail_Tools_nmap_buttonDefault_text'];?></li>
<li><?php echo $pia_lang['DevDetail_Tools_nmap_buttonDetail_text'];?></li>
</ul>
</div>
</div>
Expand Down Expand Up @@ -1540,4 +1553,20 @@ function setTextValue (textElement, textValue) {
activateSaveRestoreData ();
}

// Restore Configfile
function askwakeonlan() {
// Ask
showModalWarning('<?php echo $pia_lang['DevDetail_Tools_WOL_noti'];?>', '<?php echo $pia_lang['DevDetail_Tools_WOL_noti_text'];?>',
'<?php echo $pia_lang['Gen_Cancel'];?>', '<?php echo $pia_lang['Gen_Run'];?>', 'wakeonlan');
}
function wakeonlan() {
// Execute
$.get('php/server/devices.php?action=wakeonlan&'
+ '&mac=' + $('#txtMAC').val()
+ '&ip=' + $('#txtLastIP').val()
, function(msg) {
showMessage (msg);
});
}

</script>
42 changes: 21 additions & 21 deletions front/maintenance.php
View file

Large diffs are not rendered by default.

38 changes: 38 additions & 0 deletions front/php/server/devices.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
case 'setPiAlertLanguage': setPiAlertLanguage(); break;
case 'setPiAlertArpTimer': setPiAlertArpTimer(); break;
case 'setDeviceListCol': setDeviceListCol(); break;
case 'wakeonlan': wakeonlan(); break;

case 'getDevicesTotals': getDevicesTotals(); break;
case 'getDevicesList': getDevicesList(); break;
Expand Down Expand Up @@ -1052,4 +1053,41 @@ function deleteAllNotifications() {
echo("<meta http-equiv='refresh' content='2; URL=./reports.php'>");
}

//------------------------------------------------------------------------------
// Wake-on-LAN
//------------------------------------------------------------------------------
function crosscheckMAC($query_mac) {
global $db;
$sql = 'SELECT * FROM Devices WHERE dev_MAC="'. $query_mac .'"';
$result = $db->query($sql);
$row = $result -> fetchArray (SQLITE3_ASSOC);
return $row['dev_MAC'];
}

function wakeonlan() {
global $pia_lang;

$WOL_HOST_IP = $_REQUEST['ip'];
$WOL_HOST_MAC = $_REQUEST['mac'];

if (!filter_var($WOL_HOST_IP, FILTER_VALIDATE_IP)) {
echo "Invalid IP! ".$pia_lang['BackDevDetail_Tools_WOL_error']; exit;
}
elseif (!filter_var($WOL_HOST_MAC, FILTER_VALIDATE_MAC)) {
echo "Invalid MAC! ".$pia_lang['BackDevDetail_Tools_WOL_error']; exit;
}
elseif (crosscheckMAC($WOL_HOST_MAC) == "") {
echo "Unknown MAC! ".$pia_lang['BackDevDetail_Tools_WOL_error']; exit;
}

exec('wakeonlan '.$WOL_HOST_MAC , $output);

echo $pia_lang['BackDevDetail_Tools_WOL_okay'];

}


//------------------------------------------------------------------------------
// End
//------------------------------------------------------------------------------
?>
19 changes: 12 additions & 7 deletions front/php/templates/language/de_de.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
$pia_lang['DevDetail_Shortcut_Presence'] = 'Anwesenheit';
$pia_lang['DevDetail_Shortcut_DownAlerts'] = 'Down Meldungen';
$pia_lang['DevDetail_Tab_Details'] = 'Details';
$pia_lang['DevDetail_Tab_Nmap'] = 'Nmap';
$pia_lang['DevDetail_Tab_Nmap'] = 'Tools';
$pia_lang['DevDetail_Tab_Sessions'] = 'Sitzungen';
$pia_lang['DevDetail_Tab_Presence'] = 'Anwesenheit';
$pia_lang['DevDetail_Tab_Events'] = 'Ereignisse';
Expand Down Expand Up @@ -224,12 +224,17 @@
$pia_lang['DevDetail_SessionTable_IP'] = 'IP';
$pia_lang['DevDetail_SessionTable_Additionalinfo'] = 'Zusätzliche Info';
$pia_lang['DevDetail_Events_CheckBox'] = 'Blende Verbindungs-Ereignisse aus';
$pia_lang['DevDetail_Nmap_buttonFast'] = 'Schneller Scan';
$pia_lang['DevDetail_Nmap_buttonDefault'] = 'Standard Scan';
$pia_lang['DevDetail_Nmap_buttonDetail'] = 'Detailierter Scan';
$pia_lang['DevDetail_Nmap_buttonFast_text'] = 'Schneller Scan: Überprüft nur die wichtigsten 100 Ports (wenige Sekunden)';
$pia_lang['DevDetail_Nmap_buttonDefault_text'] = 'Standard Scan: Nmap scannt die ersten 1.000 Ports für jedes angeforderte Scan-Protokoll. Damit werden etwa 93% der TCP-Ports und 49% der UDP-Ports erfasst. (ca. 5-10 Sekunden)';
$pia_lang['DevDetail_Nmap_buttonDetail_text'] = 'Detailierter Scan: Standardscan mit aktivierter Betriebssystemerkennung, Versionserkennung, Skript-Scan und Traceroute (bis zu 30 oder mehr Sekunden)';
$pia_lang['DevDetail_Tools_nmap_buttonFast'] = 'Schneller Scan';
$pia_lang['DevDetail_Tools_nmap_buttonDefault'] = 'Standard Scan';
$pia_lang['DevDetail_Tools_nmap_buttonDetail'] = 'Detailierter Scan';
$pia_lang['DevDetail_Tools_nmap_buttonFast_text'] = 'Schneller Scan: Überprüft nur die wichtigsten 100 Ports (wenige Sekunden)';
$pia_lang['DevDetail_Tools_nmap_buttonDefault_text'] = 'Standard Scan: Nmap scannt die ersten 1.000 Ports für jedes angeforderte Scan-Protokoll. Damit werden etwa 93% der TCP-Ports und 49% der UDP-Ports erfasst. (ca. 5-10 Sekunden)';
$pia_lang['DevDetail_Tools_nmap_buttonDetail_text'] = 'Detailierter Scan: Standardscan mit aktivierter Betriebssystemerkennung, Versionserkennung, Skript-Scan und Traceroute (bis zu 30 oder mehr Sekunden)';
$pia_lang['DevDetail_Tools_WOL'] = 'Sende Wol Befehl an ';
$pia_lang['DevDetail_Tools_WOL_noti'] = 'Wake-on-LAN';
$pia_lang['DevDetail_Tools_WOL_noti_text'] = 'Das Wake-on-LAN Kommando wird an die Broadcast Adresse gesendet. Wenn das Ziel nicht in dem Subnet/vlan von Pi.Alert ist, wird das Ziel-Gerät nicht reagieren.';
$pia_lang['BackDevDetail_Tools_WOL_okay'] = 'Das Kommando wurde ausgeführt';
$pia_lang['BackDevDetail_Tools_WOL_error'] = 'Das Kommando wurde nicht ausgeführt';

//////////////////////////////////////////////////////////////////
// WebServices Details Page
Expand Down
19 changes: 12 additions & 7 deletions front/php/templates/language/en_us.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
$pia_lang['DevDetail_Shortcut_Presence'] = 'Presence';
$pia_lang['DevDetail_Shortcut_DownAlerts'] = 'Down Alerts';
$pia_lang['DevDetail_Tab_Details'] = 'Details';
$pia_lang['DevDetail_Tab_Nmap'] = 'Nmap';
$pia_lang['DevDetail_Tab_Nmap'] = 'Tools';
$pia_lang['DevDetail_Tab_Sessions'] = 'Sessions';
$pia_lang['DevDetail_Tab_Presence'] = 'Presence';
$pia_lang['DevDetail_Tab_Events'] = 'Events';
Expand Down Expand Up @@ -224,12 +224,17 @@
$pia_lang['DevDetail_SessionTable_IP'] = 'IP';
$pia_lang['DevDetail_SessionTable_Additionalinfo'] = 'Additional info';
$pia_lang['DevDetail_Events_CheckBox'] = 'Hide Connection Events';
$pia_lang['DevDetail_Nmap_buttonFast'] = 'Fast Scan';
$pia_lang['DevDetail_Nmap_buttonDefault'] = 'Default Scan';
$pia_lang['DevDetail_Nmap_buttonDetail'] = 'Detailed Scan';
$pia_lang['DevDetail_Nmap_buttonFast_text'] = 'Fast Scan: Scan fewer ports (100) than the default scan (a few seconds)';
$pia_lang['DevDetail_Nmap_buttonDefault_text'] = 'Default Scan: Nmap scans the top 1,000 ports for each scan protocol requested. This catches roughly 93% of the TCP ports and 49% of the UDP ports. (about 5 seconds)';
$pia_lang['DevDetail_Nmap_buttonDetail_text'] = 'Detailed Scan: Default scan with enabled OS detection, version detection, script scanning and traceroute (up to 30 seconds or more)';
$pia_lang['DevDetail_Tools_nmap_buttonFast'] = 'Fast Scan';
$pia_lang['DevDetail_Tools_nmap_buttonDefault'] = 'Default Scan';
$pia_lang['DevDetail_Tools_nmap_buttonDetail'] = 'Detailed Scan';
$pia_lang['DevDetail_Tools_nmap_buttonFast_text'] = 'Fast Scan: Scan fewer ports (100) than the default scan (a few seconds)';
$pia_lang['DevDetail_Tools_nmap_buttonDefault_text'] = 'Default Scan: Nmap scans the top 1,000 ports for each scan protocol requested. This catches roughly 93% of the TCP ports and 49% of the UDP ports. (about 5 seconds)';
$pia_lang['DevDetail_Tools_nmap_buttonDetail_text'] = 'Detailed Scan: Default scan with enabled OS detection, version detection, script scanning and traceroute (up to 30 seconds or more)';
$pia_lang['DevDetail_Tools_WOL'] = 'Send Wol command to ';
$pia_lang['DevDetail_Tools_WOL_noti'] = 'Wake-on-LAN';
$pia_lang['DevDetail_Tools_WOL_noti_text'] = 'The Wake-on-LAN command is sent to the broadcast address. If the target is not in the subnet/vlan of Pi.Alert, the target device will not respond.';
$pia_lang['BackDevDetail_Tools_WOL_okay'] = 'The command was executed';
$pia_lang['BackDevDetail_Tools_WOL_error'] = 'The command was not executed';

//////////////////////////////////////////////////////////////////
// WebServices Details Page
Expand Down
19 changes: 12 additions & 7 deletions front/php/templates/language/es_es.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
$pia_lang['DevDetail_Shortcut_Presence'] = 'Historial';
$pia_lang['DevDetail_Shortcut_DownAlerts'] = 'Alerta(s) de caída(s)';
$pia_lang['DevDetail_Tab_Details'] = 'Detalles';
$pia_lang['DevDetail_Tab_Nmap'] = 'Nmap';
$pia_lang['DevDetail_Tab_Nmap'] = 'Tools';
$pia_lang['DevDetail_Tab_Sessions'] = 'Sesiones';
$pia_lang['DevDetail_Tab_Presence'] = 'Historial';
$pia_lang['DevDetail_Tab_Events'] = 'Eventos';
Expand Down Expand Up @@ -224,12 +224,17 @@
$pia_lang['DevDetail_SessionTable_IP'] = 'Dirección IP';
$pia_lang['DevDetail_SessionTable_Additionalinfo'] = 'Información adicional';
$pia_lang['DevDetail_Events_CheckBox'] = 'Ocultar eventos de conexión';
$pia_lang['DevDetail_Nmap_buttonFast'] = 'Exploración rápida';
$pia_lang['DevDetail_Nmap_buttonDefault'] = 'Escaneado predeterminado';
$pia_lang['DevDetail_Nmap_buttonDetail'] = 'Escaneo detallado';
$pia_lang['DevDetail_Nmap_buttonFast_text'] = 'Escaneo rápido: escanee menos puertos (100) que el escaneo predeterminado (unos pocos segundos)';
$pia_lang['DevDetail_Nmap_buttonDefault_text'] = 'Escaneo predeterminado: NMAP escanea los 1,000 puertos principales para cada protocolo de escaneo solicitado. Esto atrapa aproximadamente el 93% de los puertos TCP y el 49% de los puertos UDP. (aproximadamente 5 segundos)';
$pia_lang['DevDetail_Nmap_buttonDetail_text'] = 'Escaneo detallado: escaneo predeterminado con detección de sistema operativo habilitado, detección de versiones, escaneo de script y traceroute (hasta 30 segundos o más)';
$pia_lang['DevDetail_Tools_nmap_buttonFast'] = 'Exploración rápida';
$pia_lang['DevDetail_Tools_nmap_buttonDefault'] = 'Escaneado predeterminado';
$pia_lang['DevDetail_Tools_nmap_buttonDetail'] = 'Escaneo detallado';
$pia_lang['DevDetail_Tools_nmap_buttonFast_text'] = 'Escaneo rápido: escanee menos puertos (100) que el escaneo predeterminado (unos pocos segundos)';
$pia_lang['DevDetail_Tools_nmap_buttonDefault_text'] = 'Escaneo predeterminado: NMAP escanea los 1,000 puertos principales para cada protocolo de escaneo solicitado. Esto atrapa aproximadamente el 93% de los puertos TCP y el 49% de los puertos UDP. (aproximadamente 5 segundos)';
$pia_lang['DevDetail_Tools_nmap_buttonDetail_text'] = 'Escaneo detallado: escaneo predeterminado con detección de sistema operativo habilitado, detección de versiones, escaneo de script y traceroute (hasta 30 segundos o más)';
$pia_lang['DevDetail_Tools_WOL'] = 'Send Wol command to ';
$pia_lang['DevDetail_Tools_WOL_noti'] = 'Wake-on-LAN';
$pia_lang['DevDetail_Tools_WOL_noti_text'] = 'The Wake-on-LAN command is sent to the broadcast address. If the target is not in the subnet/vlan of Pi.Alert, the target device will not respond.';
$pia_lang['BackDevDetail_Tools_WOL_okay'] = 'The command was executed';
$pia_lang['BackDevDetail_Tools_WOL_error'] = 'The command was not executed';

//////////////////////////////////////////////////////////////////
// WebServices Details Page
Expand Down

0 comments on commit 30427c7

Please sign in to comment.