Maintaining

Improve Network page and merge a7709ce6e1
This commit is contained in:
leiweibau
2022-07-30 18:52:12 +02:00
parent 8b49a5a53f
commit ace63ade46
9 changed files with 231 additions and 47 deletions

View File

@@ -541,4 +541,4 @@ height: 50px;
.infobox_label { .infobox_label {
font-size: 16px !important; font-size: 16px !important;
} }

View File

@@ -427,6 +427,8 @@ if ($_REQUEST['mac'] == 'Internet') { $DevDetail_Tap_temp = "Tools"; } else { $D
<!-- Buttons --> <!-- Buttons -->
<div class="col-xs-12"> <div class="col-xs-12">
<div class="pull-right"> <div class="pull-right">
<button type="button" class="btn btn-default pa-btn pa-btn-delete" style="margin-left:0px;"
id="btnDeleteEvents" onclick="askDeleteDeviceEvents()"> <?php echo $pia_lang['DevDetail_button_DeleteEvents'];?> </button>
<button type="button" class="btn btn-default pa-btn pa-btn-delete" style="margin-left:0px;" <button type="button" class="btn btn-default pa-btn pa-btn-delete" style="margin-left:0px;"
id="btnDelete" onclick="askDeleteDevice()"> <?php echo $pia_lang['DevDetail_button_Delete'];?> </button> id="btnDelete" onclick="askDeleteDevice()"> <?php echo $pia_lang['DevDetail_button_Delete'];?> </button>
<button type="button" class="btn btn-default pa-btn" style="margin-left:6px;" <button type="button" class="btn btn-default pa-btn" style="margin-left:6px;"
@@ -1345,7 +1347,7 @@ function askSkipNotifications () {
if ($('#chkArchived')[0].checked && $('#txtScanCycle').val().split(' ')[0] != "0") { if ($('#chkArchived')[0].checked && $('#txtScanCycle').val().split(' ')[0] != "0") {
// Ask skip notifications // Ask skip notifications
showModalDefault ('Device Archived', 'Do you want to skip all notifications for this device?', showModalDefault ('Device Archived', 'Do you want to skip all notifications for this device?',
'Cancel', 'Ok', 'skipNotifications'); '<?php echo $pia_lang['Gen_Cancel'];?>', '<?php echo $pia_lang['Gen_Okay'];?>', 'skipNotifications');
} }
} }
@@ -1361,6 +1363,33 @@ function skipNotifications () {
activateSaveRestoreData(); activateSaveRestoreData();
} }
// -----------------------------------------------------------------------------
function askDeleteDeviceEvents () {
// Check MAC
if (mac == '') {
return;
}
// Ask delete device Events
showModalWarning ('<?php echo $pia_lang['DevDetail_button_DeleteEvents'];?>', '<?php echo $pia_lang['DevDetail_button_DeleteEvents_Warning'];?>',
'<?php echo $pia_lang['Gen_Cancel'];?>', '<?php echo $pia_lang['Gen_Delete'];?>', 'deleteDeviceEvents');
}
function deleteDeviceEvents () {
// Check MAC
if (mac == '') {
return;
}
// Delete device events
$.get('php/server/devices.php?action=deleteDeviceEvents&mac='+ mac, function(msg) {
showMessage (msg);
});
// Deactivate controls
$('#panDetails :input').attr('disabled', true);
}
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
function askDeleteDevice () { function askDeleteDevice () {
// Check MAC // Check MAC
@@ -1370,7 +1399,7 @@ function askDeleteDevice () {
// Ask delete device // Ask delete device
showModalWarning ('Delete Device', 'Are you sure you want to delete this device?<br>(maybe you prefer to archive it)', showModalWarning ('Delete Device', 'Are you sure you want to delete this device?<br>(maybe you prefer to archive it)',
'Cancel', 'Delete', 'deleteDevice'); '<?php echo $pia_lang['Gen_Cancel'];?>', '<?php echo $pia_lang['Gen_Delete'];?>', 'deleteDevice');
} }

View File

@@ -310,8 +310,6 @@ if (submit && isset($_POST['langselector_set'])) {
</div> </div>
<div class="db_tools_table_cell_b"><?php echo $pia_lang['Maintenance_Tool_del_allevents_text'];?></div> <div class="db_tools_table_cell_b"><?php echo $pia_lang['Maintenance_Tool_del_allevents_text'];?></div>
</div> </div>
<div class="db_info_table_row"> <div class="db_info_table_row">
<div class="db_tools_table_cell_a" style=""> <div class="db_tools_table_cell_a" style="">
<button type="button" class="btn btn-default pa-btn pa-btn-delete bg-red dbtools-button" id="btnDeleteActHistory" onclick="askDeleteActHistory()"><?php echo $pia_lang['Maintenance_Tool_del_ActHistory'];?></button> <button type="button" class="btn btn-default pa-btn pa-btn-delete bg-red dbtools-button" id="btnDeleteActHistory" onclick="askDeleteActHistory()"><?php echo $pia_lang['Maintenance_Tool_del_ActHistory'];?></button>
@@ -379,7 +377,7 @@ function deleteDevicesWithEmptyMACs()
function askDeleteAllDevices () { function askDeleteAllDevices () {
// Ask // Ask
showModalWarning('<?php echo $pia_lang['Maintenance_Tool_del_alldev_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_del_alldev_noti_text'];?>', showModalWarning('<?php echo $pia_lang['Maintenance_Tool_del_alldev_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_del_alldev_noti_text'];?>',
'Cancel', 'Delete', 'deleteAllDevices'); '<?php echo $pia_lang['Gen_Cancel'];?>', '<?php echo $pia_lang['Gen_Delete'];?>', 'deleteAllDevices');
} }
function deleteAllDevices() function deleteAllDevices()
{ {
@@ -393,7 +391,7 @@ function deleteAllDevices()
function askDeleteUnknown () { function askDeleteUnknown () {
// Ask // Ask
showModalWarning('<?php echo $pia_lang['Maintenance_Tool_del_unknowndev_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_del_unknowndev_noti_text'];?>', showModalWarning('<?php echo $pia_lang['Maintenance_Tool_del_unknowndev_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_del_unknowndev_noti_text'];?>',
'Cancel', 'Delete', 'deleteUnknownDevices'); '<?php echo $pia_lang['Gen_Cancel'];?>', '<?php echo $pia_lang['Gen_Delete'];?>', 'deleteUnknownDevices');
} }
function deleteUnknownDevices() function deleteUnknownDevices()
{ {
@@ -407,7 +405,7 @@ function deleteUnknownDevices()
function askDeleteEvents () { function askDeleteEvents () {
// Ask // Ask
showModalWarning('<?php echo $pia_lang['Maintenance_Tool_del_allevents_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_del_allevents_noti_text'];?>', showModalWarning('<?php echo $pia_lang['Maintenance_Tool_del_allevents_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_del_allevents_noti_text'];?>',
'Cancel', 'Delete', 'deleteEvents'); '<?php echo $pia_lang['Gen_Cancel'];?>', '<?php echo $pia_lang['Gen_Delete'];?>', 'deleteEvents');
} }
function deleteEvents() function deleteEvents()
{ {
@@ -421,7 +419,7 @@ function deleteEvents()
function askDeleteActHistory () { function askDeleteActHistory () {
// Ask // Ask
showModalWarning('<?php echo $pia_lang['Maintenance_Tool_del_ActHistory_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_del_ActHistory_noti_text'];?>', showModalWarning('<?php echo $pia_lang['Maintenance_Tool_del_ActHistory_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_del_ActHistory_noti_text'];?>',
'Cancel', 'Delete', 'deleteActHistory'); '<?php echo $pia_lang['Gen_Cancel'];?>', '<?php echo $pia_lang['Gen_Delete'];?>', 'deleteActHistory');
} }
function deleteActHistory() function deleteActHistory()
{ {
@@ -435,7 +433,7 @@ function deleteActHistory()
function askPiaBackupDBtoArchive () { function askPiaBackupDBtoArchive () {
// Ask // Ask
showModalWarning('<?php echo $pia_lang['Maintenance_Tool_backup_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_backup_noti_text'];?>', showModalWarning('<?php echo $pia_lang['Maintenance_Tool_backup_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_backup_noti_text'];?>',
'Cancel', 'Run Backup', 'PiaBackupDBtoArchive'); '<?php echo $pia_lang['Gen_Cancel'];?>', '<?php echo $pia_lang['Gen_Backup'];?>', 'PiaBackupDBtoArchive');
} }
function PiaBackupDBtoArchive() function PiaBackupDBtoArchive()
{ {
@@ -449,7 +447,7 @@ function PiaBackupDBtoArchive()
function askPiaRestoreDBfromArchive () { function askPiaRestoreDBfromArchive () {
// Ask // Ask
showModalWarning('<?php echo $pia_lang['Maintenance_Tool_restore_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_restore_noti_text'];?>', showModalWarning('<?php echo $pia_lang['Maintenance_Tool_restore_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_restore_noti_text'];?>',
'Cancel', 'Run Restore', 'PiaRestoreDBfromArchive'); '<?php echo $pia_lang['Gen_Cancel'];?>', '<?php echo $pia_lang['Gen_Restore'];?>', 'PiaRestoreDBfromArchive');
} }
function PiaRestoreDBfromArchive() function PiaRestoreDBfromArchive()
{ {
@@ -463,7 +461,7 @@ function PiaRestoreDBfromArchive()
function askPiaPurgeDBBackups() { function askPiaPurgeDBBackups() {
// Ask // Ask
showModalWarning('<?php echo $pia_lang['Maintenance_Tool_purgebackup_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_purgebackup_noti_text'];?>', showModalWarning('<?php echo $pia_lang['Maintenance_Tool_purgebackup_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_purgebackup_noti_text'];?>',
'Cancel', 'Purge', 'PiaPurgeDBBackups'); '<?php echo $pia_lang['Gen_Cancel'];?>', '<?php echo $pia_lang['Gen_Purge'];?>', 'PiaPurgeDBBackups');
} }
function PiaPurgeDBBackups() function PiaPurgeDBBackups()
{ {
@@ -477,7 +475,7 @@ function PiaPurgeDBBackups()
function askPiaEnableDarkmode() { function askPiaEnableDarkmode() {
// Ask // Ask
showModalWarning('<?php echo $pia_lang['Maintenance_Tool_darkmode_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_darkmode_noti_text'];?>', showModalWarning('<?php echo $pia_lang['Maintenance_Tool_darkmode_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_darkmode_noti_text'];?>',
'Cancel', 'Switch', 'PiaEnableDarkmode'); '<?php echo $pia_lang['Gen_Cancel'];?>', '<?php echo $pia_lang['Gen_Switch'];?>', 'PiaEnableDarkmode');
} }
function PiaEnableDarkmode() function PiaEnableDarkmode()
{ {
@@ -491,7 +489,7 @@ function PiaEnableDarkmode()
function askPiaToggleArpScan () { function askPiaToggleArpScan () {
// Ask // Ask
showModalWarning('<?php echo $pia_lang['Maintenance_Tool_arpscansw_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_arpscansw_noti_text'];?>', showModalWarning('<?php echo $pia_lang['Maintenance_Tool_arpscansw_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_arpscansw_noti_text'];?>',
'Cancel', 'Switch', 'PiaToggleArpScan'); '<?php echo $pia_lang['Gen_Cancel'];?>', '<?php echo $pia_lang['Gen_Switch'];?>', 'PiaToggleArpScan');
} }
function PiaToggleArpScan() function PiaToggleArpScan()
{ {

View File

@@ -69,7 +69,7 @@ if ($_REQUEST['Networkdelete'] == "yes") {
<section class="content-header"> <section class="content-header">
<?php require 'php/templates/notification.php'; ?> <?php require 'php/templates/notification.php'; ?>
<h1 id="pageTitle"> <h1 id="pageTitle">
Netzwerkvisualisierung <?php echo $pia_lang['Network_Title'];?>
</h1> </h1>
</section> </section>
@@ -80,7 +80,7 @@ echo $_REQUEST['device_id'];
<section class="content"> <section class="content">
<div class="box box-default collapsed-box"> <!-- collapsed-box --> <div class="box box-default collapsed-box"> <!-- collapsed-box -->
<div class="box-header with-border" data-widget="collapse"> <div class="box-header with-border" data-widget="collapse">
<h3 class="box-title">Verwalte Netzwerk-Geräte</h3> <h3 class="box-title"><?php echo $pia_lang['Network_ManageDevices'];?></h3>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-plus"></i></button> <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-plus"></i></button>
</div> </div>
@@ -89,16 +89,17 @@ echo $_REQUEST['device_id'];
<div class="box-body" style=""> <div class="box-body" style="">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<h4 class="box-title"><?php echo $pia_lang['Network_ManageAdd'];?></h4>
<form role="form" method="post" action="./network.php"> <form role="form" method="post" action="./network.php">
<div class="form-group"> <div class="form-group">
<label for="NetworkDeviceName">Netzwerk Gerät hinzufügen:</label> <label for="NetworkDeviceName"><?php echo $pia_lang['Network_ManageAdd_Name'];?>:</label>
<input type="text" class="form-control" id="NetworkDeviceName" name="NetworkDeviceName" placeholder="Name"> <input type="text" class="form-control" id="NetworkDeviceName" name="NetworkDeviceName" placeholder="<?php echo $pia_lang['Network_ManageAdd_Name_text'];?>">
</div> </div>
<!-- /.form-group --> <!-- /.form-group -->
<div class="form-group"> <div class="form-group">
<label>Typ</label> <label><?php echo $pia_lang['Network_ManageAdd_Type'];?>:</label>
<select class="form-control" name="NetworkDeviceTyp"> <select class="form-control" name="NetworkDeviceTyp">
<option value="">-- Select Type --</option> <option value=""><?php echo $pia_lang['Network_ManageAdd_Type_text'];?></option>
<option value="Router">Router</option> <option value="Router">Router</option>
<option value="Switch">Switch</option> <option value="Switch">Switch</option>
<option value="WLAN">WLAN</option> <option value="WLAN">WLAN</option>
@@ -106,22 +107,23 @@ echo $_REQUEST['device_id'];
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="NetworkDevicePort">Portanzahl des Gerätes:</label> <label for="NetworkDevicePort"><?php echo $pia_lang['Network_ManageAdd_Port'];?>:</label>
<input type="text" class="form-control" id="NetworkDevicePort" name="NetworkDevicePort" placeholder="Portanzahl (bei WLAN leer lassen)"> <input type="text" class="form-control" id="NetworkDevicePort" name="NetworkDevicePort" placeholder="<?php echo $pia_lang['Network_ManageAdd_Port_text'];?>">
</div> </div>
<div class="form-group"> <div class="form-group">
<button type="submit" class="btn btn-success" name="Networkinsert" value="yes">Hinzufügen</button> <button type="submit" class="btn btn-success" name="Networkinsert" value="yes"><?php echo $pia_lang['Network_ManageAdd_Submit'];?></button>
</div> </div>
</form> </form>
<!-- /.form-group --> <!-- /.form-group -->
</div> </div>
<!-- /.col --> <!-- /.col -->
<div class="col-md-4"> <div class="col-md-4">
<h4 class="box-title"><?php echo $pia_lang['Network_ManageEdit'];?></h4>
<form role="form" method="post" action="./network.php"> <form role="form" method="post" action="./network.php">
<div class="form-group"> <div class="form-group">
<label>Netzwerk Gerät bearbeiten:</label> <label><?php echo $pia_lang['Network_ManageEdit_ID'];?>:</label>
<select class="form-control" name="NetworkDeviceID"> <select class="form-control" name="NetworkDeviceID">
<option value="">-- Select Device --</option> <option value=""><?php echo $pia_lang['Network_ManageEdit_ID_text'];?></option>
<?php <?php
$sql = 'SELECT "device_id", "net_device_name", "net_device_typ" FROM "network_infrastructure"'; $sql = 'SELECT "device_id", "net_device_name", "net_device_typ" FROM "network_infrastructure"';
$result = $db->query($sql);//->fetchArray(SQLITE3_ASSOC); $result = $db->query($sql);//->fetchArray(SQLITE3_ASSOC);
@@ -133,13 +135,13 @@ echo $_REQUEST['device_id'];
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="NetworkDeviceName">Neuen Namen festlegen:</label> <label for="NetworkDeviceName"><?php echo $pia_lang['Network_ManageEdit_Name'];?>:</label>
<input type="text" class="form-control" id="NewNetworkDeviceName" name="NewNetworkDeviceName" placeholder="Name"> <input type="text" class="form-control" id="NewNetworkDeviceName" name="NewNetworkDeviceName" placeholder="<?php echo $pia_lang['Network_ManageEdit_Name_text'];?>">
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Neuen Typ festlegen:</label> <label><?php echo $pia_lang['Network_ManageEdit_Type'];?>:</label>
<select class="form-control" name="NewNetworkDeviceTyp"> <select class="form-control" name="NewNetworkDeviceTyp">
<option value="">-- Select Type --</option> <option value=""><?php echo $pia_lang['Network_ManageEdit_Type_text'];?></option>
<option value="Router">Router</option> <option value="Router">Router</option>
<option value="Switch">Switch</option> <option value="Switch">Switch</option>
<option value="WLAN">WLAN</option> <option value="WLAN">WLAN</option>
@@ -147,23 +149,24 @@ echo $_REQUEST['device_id'];
</select> </select>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="NetworkDevicePort">Neue Portanzahl festlegen:</label> <label for="NetworkDevicePort"><?php echo $pia_lang['Network_ManageEdit_Port'];?>:</label>
<input type="text" class="form-control" id="NewNetworkDevicePort" name="NewNetworkDevicePort" placeholder="Portanzahl (bei WLAN leer lassen)"> <input type="text" class="form-control" id="NewNetworkDevicePort" name="NewNetworkDevicePort" placeholder="<?php echo $pia_lang['Network_ManageEdit_Port_text'];?>">
</div> </div>
<!-- /.form-group --> <!-- /.form-group -->
<div class="form-group"> <div class="form-group">
<button type="submit" class="btn btn-primary" name="Networkedit" value="yes">Speichern</button> <button type="submit" class="btn btn-primary" name="Networkedit" value="yes"><?php echo $pia_lang['Network_ManageEdit_Submit'];?></button>
</div> </div>
</form> </form>
<!-- /.form-group --> <!-- /.form-group -->
</div> </div>
<!-- /.col --> <!-- /.col -->
<div class="col-md-4"> <div class="col-md-4">
<h4 class="box-title"><?php echo $pia_lang['Network_ManageDel'];?></h4>
<form role="form" method="post" action="./network.php"> <form role="form" method="post" action="./network.php">
<div class="form-group"> <div class="form-group">
<label>Netzwerk Gerät entfernen:</label> <label><?php echo $pia_lang['Network_ManageDel_Name'];?>:</label>
<select class="form-control" name="NetworkDeviceID"> <select class="form-control" name="NetworkDeviceID">
<option value="">-- Select Device --</option> <option value=""><?php echo $pia_lang['Network_ManageDel_Name_text'];?></option>
<?php <?php
$sql = 'SELECT "device_id", "net_device_name", "net_device_typ" FROM "network_infrastructure"'; $sql = 'SELECT "device_id", "net_device_name", "net_device_typ" FROM "network_infrastructure"';
$result = $db->query($sql);//->fetchArray(SQLITE3_ASSOC); $result = $db->query($sql);//->fetchArray(SQLITE3_ASSOC);
@@ -176,7 +179,7 @@ echo $_REQUEST['device_id'];
</div> </div>
<!-- /.form-group --> <!-- /.form-group -->
<div class="form-group"> <div class="form-group">
<button type="submit" class="btn btn-danger" name="Networkdelete" value="yes">Entfernen</button> <button type="submit" class="btn btn-danger" name="Networkdelete" value="yes"><?php echo $pia_lang['Network_ManageDel_Submit'];?></button>
</div> </div>
</form> </form>
<!-- /.form-group --> <!-- /.form-group -->
@@ -197,15 +200,16 @@ function createnetworktab($pia_func_netdevid, $pia_func_netdevname, $pia_func_ne
echo '</a></li>'; echo '</a></li>';
} }
function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_func_netdevtyp, $pia_func_netdevport, $activetab) { function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_func_netdevtyp, $pia_func_netdevport, $activetab) {
echo '<div class="tab-pane '.$activetab.'" id="'.$pia_func_netdevid.'"> global $pia_lang;
echo '<div class="tab-pane '.$activetab.'" id="'.$pia_func_netdevid.'">
<h4>'.$pia_func_netdevname.' (ID: '.$pia_func_netdevid.')</h4><br>'; <h4>'.$pia_func_netdevname.' (ID: '.$pia_func_netdevid.')</h4><br>';
echo '<div class="box-body no-padding"> echo '<div class="box-body no-padding">
<table class="table table-striped"> <table class="table table-striped">
<tbody><tr> <tbody><tr>
<th style="width: 40px">Port</th> <th style="width: 40px">Port</th>
<th style="width: 100px">State</th> <th style="width: 100px">'.$pia_lang['Network_Table_State'].'</th>
<th>Hostname</th> <th>'.$pia_lang['Network_Table_Hostname'].'</th>
<th>Last known IP</th> <th>'.$pia_lang['Network_Table_IP'].'</th>
</tr>'; </tr>';
// Prepare Array for Devices with Port value // Prepare Array for Devices with Port value
// If no Port is set, the Port number is set to 1 // If no Port is set, the Port number is set to 1
@@ -246,7 +250,7 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_
// Specific icon for devicetype // Specific icon for devicetype
if ($pia_func_netdevtyp == "WLAN") {$dev_port_icon = 'fa-wifi';} if ($pia_func_netdevtyp == "WLAN") {$dev_port_icon = 'fa-wifi';}
if ($pia_func_netdevtyp == "Powerline") {$dev_port_icon = 'fa-flash';} if ($pia_func_netdevtyp == "Powerline") {$dev_port_icon = 'fa-flash';}
echo '<tr><td style="text-align: center;"><i class="fa '.$dev_port_icon.'"></i></td><td>'.$port_state.'</td><td><a href="./deviceDetails.php?mac='.$func_res['dev_MAC'].'"><b>'.$func_res['dev_Name'].'</b></a></td><td>'.$func_res['dev_LastIP'].'</td></tr>'; echo '<tr><td style="text-align: center;"><i class="fa '.$dev_port_icon.'"></i></td><td>'.$port_state.'</td><td style="padding-left: 10px;"><a href="./deviceDetails.php?mac='.$func_res['dev_MAC'].'"><b>'.$func_res['dev_Name'].'</b></a></td><td>'.$func_res['dev_LastIP'].'</td></tr>';
} }
} }
// Create table with Port // Create table with Port
@@ -281,14 +285,14 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_
// Check if multiple Hostnames are set // Check if multiple Hostnames are set
// print single hostname // print single hostname
if (stristr($network_device_portmac[$x],',') == '') { if (stristr($network_device_portmac[$x],',') == '') {
echo '<td><a href="./deviceDetails.php?mac='.$network_device_portmac[$x].'"><b>'.$network_device_portname[$x].'</b></a></td>'; echo '<td style="padding-left: 10px;"><a href="./deviceDetails.php?mac='.$network_device_portmac[$x].'"><b>'.$network_device_portname[$x].'</b></a></td>';
} else { } else {
// print multiple hostnames with separate links // print multiple hostnames with separate links
$multimac = array(); $multimac = array();
$multimac = explode(',',$network_device_portmac[$x]); $multimac = explode(',',$network_device_portmac[$x]);
$multiname = array(); $multiname = array();
$multiname = explode(',',$network_device_portname[$x]); $multiname = explode(',',$network_device_portname[$x]);
echo '<td>'; echo '<td style="padding-left: 10px;">';
foreach($multiname as $key => $value) { foreach($multiname as $key => $value) {
echo '<a href="./deviceDetails.php?mac='.$multimac[$key].'"><b>'.$value.'</b></a><br>'; echo '<a href="./deviceDetails.php?mac='.$multimac[$key].'"><b>'.$value.'</b></a><br>';
} }
@@ -298,12 +302,12 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_
// Check if multiple IP are set // Check if multiple IP are set
// print single IP // print single IP
if (stristr($network_device_portip[$x],',') == '') { if (stristr($network_device_portip[$x],',') == '') {
echo '<td>'.$network_device_portip[$x].'</td>'; echo '<td style="padding-left: 10px;">'.$network_device_portip[$x].'</td>';
} else { } else {
// print multiple IPs // print multiple IPs
$multiip = array(); $multiip = array();
$multiip = explode(',',$network_device_portip[$x]); $multiip = explode(',',$network_device_portip[$x]);
echo '<td>'; echo '<td style="padding-left: 10px;">';
foreach($multiip as $key => $value) { foreach($multiip as $key => $value) {
echo $value.'<br>'; echo $value.'<br>';
} }

View File

@@ -44,6 +44,7 @@ if (strlen($pia_lang_selected) == 0) {$pia_lang_selected = 'en_us';}
case 'deleteUnknownDevices': deleteUnknownDevices(); break; case 'deleteUnknownDevices': deleteUnknownDevices(); break;
case 'deleteEvents': deleteEvents(); break; case 'deleteEvents': deleteEvents(); break;
case 'deleteActHistory': deleteActHistory(); break; case 'deleteActHistory': deleteActHistory(); break;
case 'deleteDeviceEvents': deleteDeviceEvents(); break;
case 'PiaBackupDBtoArchive': PiaBackupDBtoArchive(); break; case 'PiaBackupDBtoArchive': PiaBackupDBtoArchive(); break;
case 'PiaRestoreDBfromArchive': PiaRestoreDBfromArchive(); break; case 'PiaRestoreDBfromArchive': PiaRestoreDBfromArchive(); break;
case 'PiaPurgeDBBackups': PiaPurgeDBBackups(); break; case 'PiaPurgeDBBackups': PiaPurgeDBBackups(); break;
@@ -237,7 +238,25 @@ function deleteUnknownDevices() {
} }
} }
//------------------------------------------------------------------------------
// Delete Device Events
//------------------------------------------------------------------------------
function deleteDeviceEvents() {
global $db;
global $pia_lang;
// sql
$sql = 'DELETE FROM Events WHERE eve_MAC="' . $_REQUEST['mac'] .'"';
// execute sql
$result = $db->query($sql);
// check result
if ($result == TRUE) {
echo $pia_lang['BackDevices_DBTools_DelEvents'];
} else {
echo $pia_lang['BackDevices_DBTools_DelEventsError']."\n\n$sql \n\n". $db->lastErrorMsg();
}
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Delete all devices // Delete all devices

View File

@@ -92,6 +92,7 @@ require 'php/templates/language/'.$pia_lang_selected.'.php';
<!-- For better UX on Mobile Devices using the Shortcut on the Homescreen --> <!-- For better UX on Mobile Devices using the Shortcut on the Homescreen -->
<link rel="manifest" href="img/manifest.json"> <link rel="manifest" href="img/manifest.json">
<link rel="apple-touch-icon" href="https://net-dev.de/pialert_homescreen.png">
<!-- Dark-Mode Patch --> <!-- Dark-Mode Patch -->
<?php <?php
if ($ENABLED_DARKMODE === True) { if ($ENABLED_DARKMODE === True) {
@@ -225,7 +226,7 @@ function show_pia_servertime() {
</li> </li>
<li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('network.php') ) ){ echo 'active'; } ?>"> <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>Netzwerk</span></a> <a href="network.php"><i class="fa fa-server"></i> <span><?php echo $pia_lang['Navigation_Network'];?></span></a>
</li> </li>
<li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('maintenance.php') ) ){ echo 'active'; } ?>"> <li class=" <?php if (in_array (basename($_SERVER['SCRIPT_NAME']), array('maintenance.php') ) ){ echo 'active'; } ?>">

View File

@@ -1,4 +1,15 @@
<?php <?php
//////////////////////////////////////////////////////////////////
// General
//////////////////////////////////////////////////////////////////
$pia_lang['Gen_Delete'] = 'Löschen';
$pia_lang['Gen_Cancel'] = 'Abbrechen';
$pia_lang['Gen_Okay'] = 'Ok';
$pia_lang['Gen_Purge'] = 'Aufräumen';
$pia_lang['Gen_Backup'] = 'Sichern';
$pia_lang['Gen_Restore'] = 'Wiederherstellen';
$pia_lang['Gen_Switch'] = 'Umschalten';
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
// Device Page // Device Page
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
@@ -7,6 +18,7 @@ $pia_lang['Navigation_Devices'] = 'Geräte';
$pia_lang['Navigation_Presence'] = 'Anwesenheit'; $pia_lang['Navigation_Presence'] = 'Anwesenheit';
$pia_lang['Navigation_Events'] = 'Ereignisse'; $pia_lang['Navigation_Events'] = 'Ereignisse';
$pia_lang['Navigation_Maintenance'] = 'Wartung'; $pia_lang['Navigation_Maintenance'] = 'Wartung';
$pia_lang['Navigation_Network'] = 'Netzwerk';
$pia_lang['Device_Title'] = 'Geräte'; $pia_lang['Device_Title'] = 'Geräte';
$pia_lang['Device_Shortcut_AllDevices'] = 'Alle Geräte'; $pia_lang['Device_Shortcut_AllDevices'] = 'Alle Geräte';
$pia_lang['Device_Shortcut_Connected'] = 'Verbunden'; $pia_lang['Device_Shortcut_Connected'] = 'Verbunden';
@@ -140,6 +152,8 @@ $pia_lang['DevDetail_EveandAl_ScanCycle_z'] = 'Gerät nicht scannen (0 min)';
$pia_lang['DevDetail_button_Delete'] = 'Lösche Gerät'; $pia_lang['DevDetail_button_Delete'] = 'Lösche Gerät';
$pia_lang['DevDetail_button_Reset'] = 'Verwerfen'; $pia_lang['DevDetail_button_Reset'] = 'Verwerfen';
$pia_lang['DevDetail_button_Save'] = 'Speichern'; $pia_lang['DevDetail_button_Save'] = 'Speichern';
$pia_lang['DevDetail_button_DeleteEvents'] = 'Lösche Events';
$pia_lang['DevDetail_button_DeleteEvents_Warning'] = 'Sind Sie sicher, dass Sie alle Ereignisse dieses Geräts löschen möchten? (dies löscht den Ereignisverlauf und die Sitzungen und könnte bei ständigen (anhaltenden) Benachrichtigungen helfen)';
$pia_lang['DevDetail_SessionTable_Order'] = 'Order'; $pia_lang['DevDetail_SessionTable_Order'] = 'Order';
$pia_lang['DevDetail_SessionTable_Connection'] = 'Verbindung'; $pia_lang['DevDetail_SessionTable_Connection'] = 'Verbindung';
$pia_lang['DevDetail_SessionTable_Disconnection'] = 'Trennung'; $pia_lang['DevDetail_SessionTable_Disconnection'] = 'Trennung';
@@ -253,5 +267,36 @@ $pia_lang['BackDevices_DBTools_UpgradeError'] = 'Fehler beim Aktualisieren der D
$pia_lang['BackDevices_DBTools_Purge'] = 'Die ältesten Backups wurden gelöscht.'; $pia_lang['BackDevices_DBTools_Purge'] = 'Die ältesten Backups wurden gelöscht.';
$pia_lang['BackDevices_DBTools_DelActHistory'] = 'Die Anzeige der Netzwerkaktivität wurde zurückgesetzt.'; $pia_lang['BackDevices_DBTools_DelActHistory'] = 'Die Anzeige der Netzwerkaktivität wurde zurückgesetzt.';
$pia_lang['BackDevices_DBTools_DelActHistoryError'] = 'Fehler beim Zurücksetzen der Netzwerkaktivitätsanzeige.'; $pia_lang['BackDevices_DBTools_DelActHistoryError'] = 'Fehler beim Zurücksetzen der Netzwerkaktivitätsanzeige.';
?>
//////////////////////////////////////////////////////////////////
// Maintenance Page
//////////////////////////////////////////////////////////////////
$pia_lang['Network_Title'] = 'Netzwerkübersicht';
$pia_lang['Network_ManageDevices'] = 'Geräte verwalten';
$pia_lang['Network_ManageAdd'] = 'Geräte hinzufügen';
$pia_lang['Network_ManageEdit'] = 'Geräte bearbeiten';
$pia_lang['Network_ManageDel'] = 'Geräte löschen';
$pia_lang['Network_ManageAdd_Name'] = 'Name des Geräte';
$pia_lang['Network_ManageAdd_Name_text'] = 'Name ohne Sonderzeichen';
$pia_lang['Network_ManageAdd_Type'] = 'Gerätetyp';
$pia_lang['Network_ManageAdd_Type_text'] = '-- Typ wählen --';
$pia_lang['Network_ManageAdd_Port'] = 'Portanzahl';
$pia_lang['Network_ManageAdd_Port_text'] = 'bei WLAN oder Powerline leer lassen';
$pia_lang['Network_ManageAdd_Submit'] = 'Hinzufügen';
$pia_lang['Network_ManageEdit_ID'] = 'Gerät zum Bearbeiten auswählen';
$pia_lang['Network_ManageEdit_ID_text'] = '-- Gerät wählen --';
$pia_lang['Network_ManageEdit_Name'] = 'Neuer Name des Geräte';
$pia_lang['Network_ManageEdit_Name_text'] = 'Name ohne Sonderzeichen';
$pia_lang['Network_ManageEdit_Type'] = 'Neuer Gerätetyp';
$pia_lang['Network_ManageEdit_Type_text'] = '-- Typ wählen --';
$pia_lang['Network_ManageEdit_Port'] = 'Neue Portanzahl';
$pia_lang['Network_ManageEdit_Port_text'] = 'bei WLAN oder Powerline leer lassen';
$pia_lang['Network_ManageEdit_Submit'] = 'Speichern';
$pia_lang['Network_ManageDel_Name'] = 'Geräte zum Löschen auswählen';
$pia_lang['Network_ManageDel_Name_text'] = '-- Gerät wählen --';
$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';
?>

View File

@@ -1,4 +1,15 @@
<?php <?php
//////////////////////////////////////////////////////////////////
// General
//////////////////////////////////////////////////////////////////
$pia_lang['Gen_Delete'] = 'Delete';
$pia_lang['Gen_Cancel'] = 'Cancel';
$pia_lang['Gen_Okay'] = 'Ok';
$pia_lang['Gen_Purge'] = 'Purge';
$pia_lang['Gen_Backup'] = 'Run Backup';
$pia_lang['Gen_Restore'] = 'Run Restore';
$pia_lang['Gen_Switch'] = 'Switch';
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
// Device Page // Device Page
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
@@ -7,6 +18,7 @@ $pia_lang['Navigation_Devices'] = 'Devices';
$pia_lang['Navigation_Presence'] = 'Presence'; $pia_lang['Navigation_Presence'] = 'Presence';
$pia_lang['Navigation_Events'] = 'Events'; $pia_lang['Navigation_Events'] = 'Events';
$pia_lang['Navigation_Maintenance'] = 'Maintenance'; $pia_lang['Navigation_Maintenance'] = 'Maintenance';
$pia_lang['Navigation_Network'] = 'Network';
$pia_lang['Device_Title'] = 'Devices'; $pia_lang['Device_Title'] = 'Devices';
$pia_lang['Device_Shortcut_AllDevices'] = 'All Devices'; $pia_lang['Device_Shortcut_AllDevices'] = 'All Devices';
$pia_lang['Device_Shortcut_Connected'] = 'Connected'; $pia_lang['Device_Shortcut_Connected'] = 'Connected';
@@ -140,6 +152,8 @@ $pia_lang['DevDetail_EveandAl_ScanCycle_z'] = 'Don&#39;t Scan Device (0 min)';
$pia_lang['DevDetail_button_Delete'] = 'Delete Device'; $pia_lang['DevDetail_button_Delete'] = 'Delete Device';
$pia_lang['DevDetail_button_Reset'] = 'Reset Changes'; $pia_lang['DevDetail_button_Reset'] = 'Reset Changes';
$pia_lang['DevDetail_button_Save'] = 'Save'; $pia_lang['DevDetail_button_Save'] = 'Save';
$pia_lang['DevDetail_button_DeleteEvents'] = 'Delete Events';
$pia_lang['DevDetail_button_DeleteEvents_Warning'] = 'Are you sure you want to delete all Events of this device?<br><br>(this will clear the <b>Events history</b> and the <b>Sessions</b> and might help with constant (persistent) notifications)';
$pia_lang['DevDetail_SessionTable_Order'] = 'Order'; $pia_lang['DevDetail_SessionTable_Order'] = 'Order';
$pia_lang['DevDetail_SessionTable_Connection'] = 'Connection'; $pia_lang['DevDetail_SessionTable_Connection'] = 'Connection';
$pia_lang['DevDetail_SessionTable_Disconnection'] = 'Disconnection'; $pia_lang['DevDetail_SessionTable_Disconnection'] = 'Disconnection';
@@ -251,5 +265,36 @@ $pia_lang['BackDevices_DBTools_UpdDevError'] = 'Error updating device';
$pia_lang['BackDevices_DBTools_Upgrade'] = 'Database upgraded successfully'; $pia_lang['BackDevices_DBTools_Upgrade'] = 'Database upgraded successfully';
$pia_lang['BackDevices_DBTools_UpgradeError'] = 'Database upgrade failed'; $pia_lang['BackDevices_DBTools_UpgradeError'] = 'Database upgrade failed';
$pia_lang['BackDevices_DBTools_Purge'] = 'The oldest backups were deleted'; $pia_lang['BackDevices_DBTools_Purge'] = 'The oldest backups were deleted';
?>
//////////////////////////////////////////////////////////////////
// Network Page
//////////////////////////////////////////////////////////////////
$pia_lang['Network_Title'] = 'Network overview';
$pia_lang['Network_ManageDevices'] = 'Manage Devices';
$pia_lang['Network_ManageAdd'] = 'Add Device';
$pia_lang['Network_ManageEdit'] = 'Update Device';
$pia_lang['Network_ManageDel'] = 'Delete Device';
$pia_lang['Network_ManageAdd_Name'] = 'Device Name';
$pia_lang['Network_ManageAdd_Name_text'] = 'Name without special characters';
$pia_lang['Network_ManageAdd_Type'] = 'Device Type';
$pia_lang['Network_ManageAdd_Type_text'] = '-- Select Type --';
$pia_lang['Network_ManageAdd_Port'] = 'Port Count';
$pia_lang['Network_ManageAdd_Port_text'] = 'leave blank for wifi and powerline';
$pia_lang['Network_ManageAdd_Submit'] = 'Add Device';
$pia_lang['Network_ManageEdit_ID'] = 'Device to update';
$pia_lang['Network_ManageEdit_ID_text'] = '-- Select Device for editing --';
$pia_lang['Network_ManageEdit_Name'] = 'New Device Name';
$pia_lang['Network_ManageEdit_Name_text'] = 'Name without special characters';
$pia_lang['Network_ManageEdit_Type'] = 'New Device Type';
$pia_lang['Network_ManageEdit_Type_text'] = '-- Select Type --';
$pia_lang['Network_ManageEdit_Port'] = ' New Port Count';
$pia_lang['Network_ManageEdit_Port_text'] = 'leave blank for wifi and powerline';
$pia_lang['Network_ManageEdit_Submit'] = 'Save Changes';
$pia_lang['Network_ManageDel_Name'] = 'Device to delete';
$pia_lang['Network_ManageDel_Name_text'] = '-- Select Device --';
$pia_lang['Network_ManageDel_Submit'] = 'Delete';
$pia_lang['Network_Table_State'] = 'State';
$pia_lang['Network_Table_Hostname'] = 'Hostname';
$pia_lang['Network_Table_IP'] = 'IP';
?>

View File

@@ -1,4 +1,15 @@
<?php <?php
//////////////////////////////////////////////////////////////////
// General
//////////////////////////////////////////////////////////////////
$pia_lang['Gen_Delete'] = 'Delete';
$pia_lang['Gen_Cancel'] = 'Cancel';
$pia_lang['Gen_Okay'] = 'Ok';
$pia_lang['Gen_Purge'] = 'Purge';
$pia_lang['Gen_Backup'] = 'Run Backup';
$pia_lang['Gen_Restore'] = 'Run Restore';
$pia_lang['Gen_Switch'] = 'Switch';
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
// Device Page - Update by @TeroRERO 25jul2022 // Device Page - Update by @TeroRERO 25jul2022
////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////
@@ -251,4 +262,36 @@ $pia_lang['BackDevices_DBTools_UpdDevError'] = 'Error al actualizar el dispositi
$pia_lang['BackDevices_DBTools_Upgrade'] = 'Base de datos actualizada correctamente'; $pia_lang['BackDevices_DBTools_Upgrade'] = 'Base de datos actualizada correctamente';
$pia_lang['BackDevices_DBTools_UpgradeError'] = 'Falló la actualización de la base de datos'; $pia_lang['BackDevices_DBTools_UpgradeError'] = 'Falló la actualización de la base de datos';
$pia_lang['BackDevices_DBTools_Purge'] = 'Las copias de seguridad más antiguas fueron eliminadas'; $pia_lang['BackDevices_DBTools_Purge'] = 'Las copias de seguridad más antiguas fueron eliminadas';
//////////////////////////////////////////////////////////////////
// Network Page
//////////////////////////////////////////////////////////////////
$pia_lang['Network_Title'] = 'Network overview';
$pia_lang['Network_ManageDevices'] = 'Manage Devices';
$pia_lang['Network_ManageAdd'] = 'Add Device';
$pia_lang['Network_ManageEdit'] = 'Update Device';
$pia_lang['Network_ManageDel'] = 'Delete Device';
$pia_lang['Network_ManageAdd_Name'] = 'Device Name';
$pia_lang['Network_ManageAdd_Name_text'] = 'Name without special characters';
$pia_lang['Network_ManageAdd_Type'] = 'Device Type';
$pia_lang['Network_ManageAdd_Type_text'] = '-- Select Type --';
$pia_lang['Network_ManageAdd_Port'] = 'Port Count';
$pia_lang['Network_ManageAdd_Port_text'] = 'leave blank for wifi and powerline';
$pia_lang['Network_ManageAdd_Submit'] = 'Add Device';
$pia_lang['Network_ManageEdit_ID'] = 'Device to update';
$pia_lang['Network_ManageEdit_ID_text'] = '-- Select Device for editing --';
$pia_lang['Network_ManageEdit_Name'] = 'New Device Name';
$pia_lang['Network_ManageEdit_Name_text'] = 'Name without special characters';
$pia_lang['Network_ManageEdit_Type'] = 'New Device Type';
$pia_lang['Network_ManageEdit_Type_text'] = '-- Select Type --';
$pia_lang['Network_ManageEdit_Port'] = ' New Port Count';
$pia_lang['Network_ManageEdit_Port_text'] = 'leave blank for wifi and powerline';
$pia_lang['Network_ManageEdit_Submit'] = 'Save Changes';
$pia_lang['Network_ManageDel_Name'] = 'Device to delete';
$pia_lang['Network_ManageDel_Name_text'] = '-- Select Device --';
$pia_lang['Network_ManageDel_Submit'] = 'Delete';
$pia_lang['Network_Table_State'] = 'State';
$pia_lang['Network_Table_Hostname'] = 'Hostname';
$pia_lang['Network_Table_IP'] = 'IP';
?> ?>