-
@@ -89,16 +89,17 @@ echo $_REQUEST['device_id'];
Verwalte Netzwerk-Geräte
+
+
+
+
@@ -197,15 +200,16 @@ function createnetworktab($pia_func_netdevid, $pia_func_netdevname, $pia_func_ne
echo '';
}
function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_func_netdevtyp, $pia_func_netdevport, $activetab) {
- echo '
+ global $pia_lang;
+ echo '
'; echo '
'.$pia_func_netdevname.' (ID: '.$pia_func_netdevid.')
'; echo '
| Port | -State | -Hostname | -Last known IP | +'.$pia_lang['Network_Table_State'].' | +'.$pia_lang['Network_Table_Hostname'].' | +'.$pia_lang['Network_Table_IP'].' |
|---|---|---|---|---|---|---|
| '.$port_state.' | '.$func_res['dev_Name'].' | '.$func_res['dev_LastIP'].' | ||||
| '.$port_state.' | '.$func_res['dev_Name'].' | '.$func_res['dev_LastIP'].' | '.$network_device_portname[$x].' | '; + echo ''.$network_device_portname[$x].' | '; } else { // print multiple hostnames with separate links $multimac = array(); $multimac = explode(',',$network_device_portmac[$x]); $multiname = array(); $multiname = explode(',',$network_device_portname[$x]); - echo ''; + echo ' | ';
foreach($multiname as $key => $value) {
echo ''.$value.' '; } @@ -298,12 +302,12 @@ function createnetworktabcontent($pia_func_netdevid, $pia_func_netdevname, $pia_ // Check if multiple IP are set // print single IP if (stristr($network_device_portip[$x],',') == '') { - echo ' | '.$network_device_portip[$x].' | '; + echo ''.$network_device_portip[$x].' | '; } else { // print multiple IPs $multiip = array(); $multiip = explode(',',$network_device_portip[$x]); - echo ''; + echo ' | ';
foreach($multiip as $key => $value) {
echo $value.' '; } diff --git a/front/php/server/devices.php b/front/php/server/devices.php index 74818dea..aa7c4bca 100644 --- a/front/php/server/devices.php +++ b/front/php/server/devices.php @@ -44,6 +44,7 @@ if (strlen($pia_lang_selected) == 0) {$pia_lang_selected = 'en_us';} case 'deleteUnknownDevices': deleteUnknownDevices(); break; case 'deleteEvents': deleteEvents(); break; case 'deleteActHistory': deleteActHistory(); break; + case 'deleteDeviceEvents': deleteDeviceEvents(); break; case 'PiaBackupDBtoArchive': PiaBackupDBtoArchive(); break; case 'PiaRestoreDBfromArchive': PiaRestoreDBfromArchive(); 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 diff --git a/front/php/templates/header.php b/front/php/templates/header.php index 9c0a1f3f..37e7a688 100644 --- a/front/php/templates/header.php +++ b/front/php/templates/header.php @@ -92,6 +92,7 @@ require 'php/templates/language/'.$pia_lang_selected.'.php'; + (this will clear the Events history and the Sessions and might help with constant (persistent) notifications)'; $pia_lang['DevDetail_SessionTable_Order'] = 'Order'; $pia_lang['DevDetail_SessionTable_Connection'] = 'Connection'; $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_UpgradeError'] = 'Database upgrade failed'; $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'; +?> \ No newline at end of file diff --git a/front/php/templates/language/es_es.php b/front/php/templates/language/es_es.php index 6634170d..f284df55 100644 --- a/front/php/templates/language/es_es.php +++ b/front/php/templates/language/es_es.php @@ -1,4 +1,15 @@ |