Skip to content

Commit

Permalink
Add possibility to test the notification via frontend
Browse files Browse the repository at this point in the history 
UI changes
  • Loading branch information
@leiweibau
leiweibau committed Sep 28, 2022
1 parent 891210f commit 17abf72
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 6 deletions.
27 changes: 25 additions & 2 deletions front/maintenance.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ function check_github_for_updates() {
<div class="db_tools_table_cell_a" style="text-align:center;">
<form method="post" action="maintenance.php">
<div style="display: inline-block;">
<select name="langselector" class="form-control bg-green" style="width:160px; margin-bottom:5px;">
<select name="langselector" class="form-control" style="width:160px; margin-bottom:5px;">
<option value=""><?php echo $pia_lang['Maintenance_lang_selector_empty'];?></option>
<option value="en_us"><?php echo $pia_lang['Maintenance_lang_en_us'];?></option>
<option value="de_de"><?php echo $pia_lang['Maintenance_lang_de_de'];?></option>
Expand All @@ -287,7 +287,7 @@ function check_github_for_updates() {
<div class="db_tools_table_cell_a" style="text-align: center;">
<form method="post" action="maintenance.php">
<div style="display: inline-block; text-align: center;">
<select name="skinselector" class="form-control bg-green" style="width:160px; margin-bottom:5px;">
<select name="skinselector" class="form-control" style="width:160px; margin-bottom:5px;">
<option value=""><?php echo $pia_lang['Maintenance_themeselector_empty'];?></option>
<option value="skin-black-light">black light</option>
<option value="skin-black">black</option>
Expand Down Expand Up @@ -360,6 +360,14 @@ function check_github_for_updates() {
</div>
<div class="tab-pane <?php echo $pia_tab_tool; ?>" id="tab_DBTools">
<div class="db_info_table">

<div class="db_info_table_row">
<div class="db_tools_table_cell_a" style="">
<button type="button" class="btn btn-default pa-btn pa-btn-delete bg-yellow dbtools-button" id="btnTestNotific" onclick="askTestNotificationSystem()"><?php echo $pia_lang['Maintenance_Tool_test_notification'];?></button>
</div>
<div class="db_tools_table_cell_b"><?php echo $pia_lang['Maintenance_Tool_test_notification_text'];?></div>
</div>

<div class="db_info_table_row">
<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="btnDeleteMAC" onclick="askDeleteDevicesWithEmptyMACs()"><?php echo $pia_lang['Maintenance_Tool_del_empty_macs'];?></button>
Expand Down Expand Up @@ -447,6 +455,21 @@ function deleteDevicesWithEmptyMACs()
});
}


// Test Notifications
function askTestNotificationSystem () {
// Ask
showModalWarning('<?php echo $pia_lang['Maintenance_Tool_test_notification_noti'];?>', '<?php echo $pia_lang['Maintenance_Tool_test_notification_noti_text'];?>',
'<?php echo $pia_lang['Gen_Cancel'];?>', '<?php echo $pia_lang['Gen_Run'];?>', 'TestNotificationSystem');
}
function TestNotificationSystem()
{
// Delete device
$.get('php/server/devices.php?action=TestNotificationSystem', function(msg) {
showMessage (msg);
});
}

// delete all devices
function askDeleteAllDevices () {
// Ask
Expand Down
14 changes: 14 additions & 0 deletions front/php/server/devices.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
case 'runScan15min': runScan15min(); break;
case 'runScan1min': runScan1min(); break;
case 'deleteUnknownDevices': deleteUnknownDevices(); break;
case 'TestNotificationSystem': TestNotificationSystem(); break;
case 'deleteEvents': deleteEvents(); break;
case 'deleteActHistory': deleteActHistory(); break;
case 'deleteDeviceEvents': deleteDeviceEvents(); break;
Expand Down Expand Up @@ -462,6 +463,19 @@ function PiaSetAPIKey() {
}


//------------------------------------------------------------------------------
// Test Notification
//------------------------------------------------------------------------------
function TestNotificationSystem() {
//$file = '../../../db/setting_noonlinehistorygraph';
global $pia_lang;

exec('../../../back/pialert-cli reporting_test', $output);
echo $pia_lang['BackDevices_test_notification'];
//echo("<meta http-equiv='refresh' content='2; URL=./maintenance.php?tab=1'>");
}


//------------------------------------------------------------------------------
// Toggle on/off Arp-Scans
//------------------------------------------------------------------------------
Expand Down
8 changes: 7 additions & 1 deletion front/php/templates/language/de_de.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
$pia_lang['Gen_Backup'] = 'Sichern';
$pia_lang['Gen_Restore'] = 'Wiederherstellen';
$pia_lang['Gen_Switch'] = 'Umschalten';
$pia_lang['Gen_Run'] = 'Ausführen';

//////////////////////////////////////////////////////////////////
// Login Page - Update by @TeroRERO 03ago2022
Expand Down Expand Up @@ -253,6 +254,10 @@
$pia_lang['Maintenance_Tool_upgrade_database_noti'] = 'Aktualisiere Datenbank';
$pia_lang['Maintenance_Tool_upgrade_database_text'] = 'Mit dieser Schaltfläche wird die Datenbank aktualisiert, um das Diagramm der Netzwerkaktivitäten der letzten 12 Stunden zu aktivieren. Bitte sichern Sie Ihre Datenbank, falls Probleme auftreten.';
$pia_lang['Maintenance_Tool_upgrade_database_noti_text'] = 'Machen Sie ein Backup, bevor Sie diese Funk&shy;tion nutzen.';
$pia_lang['Maintenance_Tool_test_notification'] = 'Benachrichtigung testen';
$pia_lang['Maintenance_Tool_test_notification_text'] = 'Führt eine Probe&shy;be&shy;nach&shy;rich&shy;tigung aus, um die korrekte Kon&shy;figu&shy;ration der Dienste zu testen.';
$pia_lang['Maintenance_Tool_test_notification_noti'] = 'Testbenachrichtigung';
$pia_lang['Maintenance_Tool_test_notification_noti_text'] = 'Soll eine Testbenachrichtigung über alle konfigurierten und aktivierten Benachrichtigungsdienste durchgeführt werden?';
$pia_lang['Maintenance_Tool_del_alldev'] = 'Alle Geräte löschen';
$pia_lang['Maintenance_Tool_del_alldev_text'] = 'Machen Sie ein Backup, bevor Sie diese Funk&shy;tion nutzen. Der Vor&shy;gang kann ohne Back&shy;up nicht rück&shy;gängig gemacht werden. Alle Geräte werden in der Datenbank ge&shy;löscht.';
$pia_lang['Maintenance_Tool_del_alldev_noti'] = 'Geräte löschen';
Expand All @@ -262,7 +267,7 @@
$pia_lang['Maintenance_Tool_del_unknowndev_noti'] = 'Lösche (unknown) Geräte';
$pia_lang['Maintenance_Tool_del_unknowndev_noti_text'] = 'Sind Sie sicher, dass Sie alle (unknown) Geräte aus der Datenbank löschen wollen?';
$pia_lang['Maintenance_Tool_del_allevents'] = 'Alle Ereignisse löschen';
$pia_lang['Maintenance_Tool_del_allevents_text'] = 'Machen Sie ein Backup, bevor Sie diese Funk&shy;tion nutzen. Der Vor&shy;gang kann ohne Back&shy;up nicht rück&shy;gängig gemacht werden. Alle Ereignisse werden aus der Datenbank ge&shy;löscht. Dies setzt auch die Anwesenheit zu&shy;rück. Es kann ab dem Moment zu ungültigen Sitzungen kommen. Ein Scan, während das betreffende Gerät "online" ist, sollte das Problem lösen.';
$pia_lang['Maintenance_Tool_del_allevents_text'] = 'Machen Sie ein Backup, bevor Sie diese Funk&shy;tion nutzen. Der Vor&shy;gang kann ohne Back&shy;up nicht rück&shy;gängig gemacht werden. Alle Ereignisse werden aus der Daten&shy;bank ge&shy;löscht. Dies setzt auch die Anwesenheit zu&shy;rück. Es kann ab dem Moment zu ungültigen Sitzungen kommen. Ein Scan, während das be&shy;treffen&shy;de Gerät "online" ist, sollte das Problem lösen.';
$pia_lang['Maintenance_Tool_del_allevents_noti'] = 'Alle Ereignisse löschen';
$pia_lang['Maintenance_Tool_del_allevents_noti_text'] = 'Sind Sie sicher, dass Sie alle Ereignisse aus der Datenbank löschen wollen. Dies setzt die Anwesenheit aller Geräte zurück.';
$pia_lang['Maintenance_Tool_backup'] = 'DB Sicherung';
Expand Down Expand Up @@ -299,6 +304,7 @@
$pia_lang['BackDevices_Arpscan_disabled'] = 'Automatischer Arp-Scan deaktiviert.';
$pia_lang['BackDevices_Arpscan_enabled'] = 'Automatischer Arp-Scan aktiviert.';
$pia_lang['BackDevices_setapikey'] = 'API-Key wurde gesetzt.';
$pia_lang['BackDevices_test_notification'] = 'Testnachricht wurde gesendet';
$pia_lang['BackDevices_darkmode_disabled'] = 'Heller Modus aktiviert.';
$pia_lang['BackDevices_darkmode_enabled'] = 'Dunkler Modus aktiviert.';
$pia_lang['BackDevices_onlinehistorygraph_disabled'] = 'Aktivitätsverlauf deaktiviert.';
Expand Down
6 changes: 6 additions & 0 deletions front/php/templates/language/en_us.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
$pia_lang['Gen_Backup'] = 'Run Backup';
$pia_lang['Gen_Restore'] = 'Run Restore';
$pia_lang['Gen_Switch'] = 'Switch';
$pia_lang['Gen_Run'] = 'Run';

//////////////////////////////////////////////////////////////////
// Login Page - Update by @TeroRERO 03ago2022
Expand Down Expand Up @@ -256,6 +257,10 @@
$pia_lang['Maintenance_Tool_upgrade_database_noti'] = 'Upgrade database';
$pia_lang['Maintenance_Tool_upgrade_database_text'] = 'This button will upgrade the database to enable the Network activity over last 12 hours chart. Please backup your database in case of issues.';
$pia_lang['Maintenance_Tool_upgrade_database_noti_text'] = 'Are you sure you want to upgrade the database?<br>(maybe you prefer to archive it)';
$pia_lang['Maintenance_Tool_test_notification'] = 'Test Notifications';
$pia_lang['Maintenance_Tool_test_notification_text'] = 'Test reporting for all activated services.';
$pia_lang['Maintenance_Tool_test_notification_noti'] = '';
$pia_lang['Maintenance_Tool_test_notification_noti_text'] = '';
$pia_lang['Maintenance_Tool_del_alldev'] = 'Delete all Devices';
$pia_lang['Maintenance_Tool_del_alldev_text'] = 'Before using this function, please make a backup. The deletion cannot be undone. All devices will be deleted from the database.';
$pia_lang['Maintenance_Tool_del_alldev_noti'] = 'Delete Devices';
Expand Down Expand Up @@ -313,6 +318,7 @@
$pia_lang['BackDevices_Arpscan_disabled'] = 'Arp-Scan Disabled';
$pia_lang['BackDevices_Arpscan_enabled'] = 'Arp-Scan Enabled';
$pia_lang['BackDevices_setapikey'] = 'API-Key set';
$pia_lang['BackDevices_test_notification'] = 'Notification sent';
$pia_lang['BackDevices_darkmode_disabled'] = 'Darkmode Disabled';
$pia_lang['BackDevices_darkmode_enabled'] = 'Darkmode Enabled';
$pia_lang['BackDevices_onlinehistorygraph_disabled'] = 'Graph disabled.';
Expand Down
9 changes: 6 additions & 3 deletions front/php/templates/language/es_es.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
$pia_lang['Gen_Backup'] = 'Ejecutar copia de seguridad';
$pia_lang['Gen_Restore'] = 'Ejecutar restauración';
$pia_lang['Gen_Switch'] = 'Cambiar';
$pia_lang['Gen_Run'] = 'Run';

//////////////////////////////////////////////////////////////////
// Login Page - Update by @TeroRERO 03ago2022
Expand Down Expand Up @@ -239,13 +240,14 @@
$pia_lang['Maintenance_Tool_arpscansw_text'] = 'Encender o desactivar el arp-scan. Cuando el escaneo se ha apagado, permanece apagado hasta que se active nuevamente. Los escaneos activos no se cancelan.';
$pia_lang['Maintenance_Tool_arpscansw_noti'] = 'Activar arp-scan on or off';
$pia_lang['Maintenance_Tool_arpscansw_noti_text'] = 'Cuando el escaneo se ha apagado, permanece apagado hasta que se active nuevamente.';
$pia_lang['Maintenance_Tool_test_notification'] = 'Test Notifications';
$pia_lang['Maintenance_Tool_test_notification_text'] = 'Test reporting for all activated services.';
$pia_lang['Maintenance_Tool_test_notification_noti'] = '';
$pia_lang['Maintenance_Tool_test_notification_noti_text'] = '';
$pia_lang['Maintenance_Tool_del_empty_macs'] = 'Eliminar dispositivos con MACs vacíos';
$pia_lang['Maintenance_Tool_del_empty_macs_text'] = 'Antes de usar esta función, haga una copia de seguridad. La eliminación no se puede deshacer. Todos los dispositivos sin Mac se eliminarán de la base de datos.';
$pia_lang['Maintenance_Tool_del_empty_macs_noti'] = 'Eliminar dispositivos';
$pia_lang['Maintenance_Tool_del_empty_macs_noti_text'] = '¿Estás seguro de que quieres eliminar todos los dispositivos con direcciones MAC vacías? <br> (tal vez prefiera archivarlo)';
$pia_lang['Maintenance_Tool_upgrade_database_noti'] = 'Actualizar la base de datos';
$pia_lang['Maintenance_Tool_upgrade_database_text'] = 'Este botón actualizará la base de datos para habilitar la actividad de la red en las últimas 12 horas. Haga una copia de seguridad de su base de datos en caso de problemas.';
$pia_lang['Maintenance_Tool_upgrade_database_noti_text'] = '¿Estás seguro de que quieres actualizar la base de datos? <br> (tal vez prefieras archivarla)';
$pia_lang['Maintenance_Tool_del_alldev'] = 'Eliminar todos los dispositivos';
$pia_lang['Maintenance_Tool_del_alldev_text'] = 'Antes de usar esta función, haga una copia de seguridad. La eliminación no se puede deshacer. Todos los dispositivos se eliminarán de la base de datos.';
$pia_lang['Maintenance_Tool_del_alldev_noti'] = 'Eliminar dispositivos';
Expand Down Expand Up @@ -304,6 +306,7 @@
$pia_lang['BackDevices_Arpscan_disabled'] = 'Arp-Scan Desactivado';
$pia_lang['BackDevices_Arpscan_enabled'] = 'Arp-Scan Activado';
$pia_lang['BackDevices_setapikey'] = 'API-Key set';
$pia_lang['BackDevices_test_notification'] = 'Notification sent';
$pia_lang['BackDevices_darkmode_disabled'] = 'Darkmode Desactivado';
$pia_lang['BackDevices_darkmode_enabled'] = 'Darkmode Activado';
$pia_lang['BackDevices_onlinehistorygraph_disabled'] = 'Graph disabled.';
Expand Down

0 comments on commit 17abf72

Please sign in to comment.