From 09da773b12b32ce79a73cd2824bd6414ff45004c Mon Sep 17 00:00:00 2001
From: Florian Schaal <info@schaal-24.de>
Date: Wed, 22 Jul 2020 17:04:07 +0200
Subject: [PATCH] Extended client delete dialog (Implements #4370)
---
interface/web/client/client_del.php | 53 +++++++++++++-----
.../web/client/lib/lang/ar_client_del.lng | 3 +
.../web/client/lib/lang/bg_client_del.lng | 3 +
.../web/client/lib/lang/br_client_del.lng | 3 +
.../web/client/lib/lang/ca_client_del.lng | 3 +
.../web/client/lib/lang/cz_client_del.lng | 3 +
.../web/client/lib/lang/de_client_del.lng | 5 +-
.../web/client/lib/lang/dk_client_del.lng | 3 +
.../web/client/lib/lang/el_client_del.lng | 3 +
.../web/client/lib/lang/en_client_del.lng | 3 +
.../web/client/lib/lang/es_client_del.lng | 3 +
.../web/client/lib/lang/fi_client_del.lng | 3 +
.../web/client/lib/lang/fr_client_del.lng | 3 +
.../web/client/lib/lang/hr_client_del.lng | 3 +
.../web/client/lib/lang/hu_client_del.lng | 3 +
.../web/client/lib/lang/id_client_del.lng | 3 +
.../web/client/lib/lang/it_client_del.lng | 3 +
.../web/client/lib/lang/ja_client_del.lng | 3 +
.../web/client/lib/lang/nl_client_del.lng | 3 +
.../web/client/lib/lang/pl_client_del.lng | 3 +
.../web/client/lib/lang/pt_client_del.lng | 3 +
.../web/client/lib/lang/ro_client_del.lng | 3 +
.../web/client/lib/lang/ru_client_del.lng | 3 +
.../web/client/lib/lang/se_client_del.lng | 3 +
.../web/client/lib/lang/sk_client_del.lng | 3 +
.../web/client/lib/lang/tr_client_del.lng | 3 +
interface/web/client/templates/client_del.htm | 56 +++++++++++--------
27 files changed, 148 insertions(+), 38 deletions(-)
diff --git a/interface/web/client/client_del.php b/interface/web/client/client_del.php
index d92dc56008..c018b7a27d 100644
--- a/interface/web/client/client_del.php
+++ b/interface/web/client/client_del.php
@@ -51,6 +51,32 @@ $app->load('tform_actions');
class page_action extends tform_actions {
+ // db_table => info_field for onDelete - empty = show only the amount
+ private $tables = array(
+ 'cron' => '',
+ 'client' => 'contact_name',
+ 'dns_rr' => '',
+ 'dns_soa' => 'origin',
+ 'dns_slave' => 'origin',
+ 'domain' => 'domain',
+ 'ftp_user' => 'username',
+ 'mail_access' => 'source',
+ 'mail_content_filter' => '',
+ 'mail_domain' => 'domain',
+ 'mail_forwarding' => '',
+ 'mail_get' => '',
+ 'mail_mailinglist' => 'listname',
+ 'mail_user' => 'email',
+ 'mail_user_filter' => '',
+ 'shell_user' => 'username',
+ 'spamfilter_users' => '', 'spamfilter_wblist' => '',
+ 'support_message' => '',
+ 'web_domain' => 'domain',
+ 'web_folder' => 'path',
+ 'web_folder_user' => 'username',
+ 'web_database_user' => 'database_user',
+ );
+
function onDelete() {
global $app, $conf, $list_def_file, $tform_def_file;
@@ -80,19 +106,22 @@ class page_action extends tform_actions {
$this->dataRecord = $app->tform->getDataRecord($this->id);
$client_id = $app->functions->intval($this->dataRecord['client_id']);
$client_group = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = ?", $client_id);
-
- // Get all records (sub-clients, mail, web, etc....) of this client.
- $tables = 'cron,client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_database_user,web_domain,web_traffic,domain';
- $tables_array = explode(',', $tables);
- $client_group_id = $app->functions->intval($client_group['groupid']);
-
$table_list = array();
+ $client_group_id = $app->functions->intval($client_group['groupid']);
if($client_group_id > 1) {
- foreach($tables_array as $table) {
+ foreach($this->tables as $table => $field) {
if($table != '') {
$records = $app->db->queryAllRecords("SELECT * FROM ?? WHERE sys_groupid = ?", $table, $client_group_id);
- $number = count($records);
- if($number > 0) $table_list[] = array('table' => $table."(".$number.")");
+ if(is_array($records) && !empty($records) && $field !== false) {
+ $data = array();
+ $number = count($records);
+ foreach($records as $rec) {
+ if($field != '' && $field !== false) $data['data'] .= '<li>'.$rec[$field].'</li>';
+ }
+ $data['count'] = $number;
+ $data['table'] = $table;
+ $table_list[] = $data;
+ }
}
}
}
@@ -100,7 +129,6 @@ class page_action extends tform_actions {
$app->tpl->setVar('id', $this->id);
$app->tpl->setVar('number_records', $number);
$app->tpl->setLoop('records', $table_list);
-
//* load language file
$lng_file = 'lib/lang/'.$app->functions->check_language($_SESSION['s']['language']).'_client_del.lng';
include $lng_file;
@@ -138,11 +166,9 @@ class page_action extends tform_actions {
$app->db->query("DELETE FROM sys_user WHERE client_id = ?", $client_id);
// Delete all records (sub-clients, mail, web, etc....) of this client.
- $tables = 'cron,client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_database_user,web_domain,web_folder,web_folder_user,domain,mail_mailinglist,spamfilter_wblist';
- $tables_array = explode(',', $tables);
$client_group_id = $app->functions->intval($client_group['groupid']);
if($client_group_id > 1) {
- foreach($tables_array as $table) {
+ foreach($this->tables as $table => $field) {
if($table != '') {
//* find the primary ID of the table
$table_info = $app->db->tableInfo($table);
@@ -150,6 +176,7 @@ class page_action extends tform_actions {
foreach($table_info as $tmp) {
if($tmp['option'] == 'primary') $index_field = $tmp['name'];
}
+
//* Delete the records
if($index_field != '') {
$records = $app->db->queryAllRecords("SELECT * FROM ?? WHERE sys_groupid = ? ORDER BY ?? DESC", $table, $client_group_id, $index_field);
diff --git a/interface/web/client/lib/lang/ar_client_del.lng b/interface/web/client/lib/lang/ar_client_del.lng
index 0932e9568a..21ddcb9ea4 100644
--- a/interface/web/client/lib/lang/ar_client_del.lng
+++ b/interface/web/client/lib/lang/ar_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'This action will delete the following number of rec
$wb['btn_save_txt'] = 'Delete the client';
$wb['btn_cancel_txt'] = 'Cancel without deleting the client';
$wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/bg_client_del.lng b/interface/web/client/lib/lang/bg_client_del.lng
index 54d4831d77..418abdc20c 100644
--- a/interface/web/client/lib/lang/bg_client_del.lng
+++ b/interface/web/client/lib/lang/bg_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'This action will delete the following number of rec
$wb['btn_save_txt'] = 'Изтрии клиента';
$wb['btn_cancel_txt'] = 'Отказ, без изтриване на клиента';
$wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/br_client_del.lng b/interface/web/client/lib/lang/br_client_del.lng
index 880c12c36a..fbea0a66a0 100644
--- a/interface/web/client/lib/lang/br_client_del.lng
+++ b/interface/web/client/lib/lang/br_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'Esta ação removerá os seguintes registros associ
$wb['btn_save_txt'] = 'Remover o cliente';
$wb['btn_cancel_txt'] = 'Cancelar sem remover o cliente';
$wb['confirm_client_delete_txt'] = 'Você tem certeza que deseja remover este cliente?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/ca_client_del.lng b/interface/web/client/lib/lang/ca_client_del.lng
index 2ec2d877bf..4c4506c99b 100644
--- a/interface/web/client/lib/lang/ca_client_del.lng
+++ b/interface/web/client/lib/lang/ca_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'Cette action va supprimer le nombre d\'enregistreme
$wb['btn_save_txt'] = 'Effacer le client';
$wb['btn_cancel_txt'] = 'Annuler sans effacer le client';
$wb['confirm_client_delete_txt'] = 'Confirmez-vous la suppression de ce client ?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/cz_client_del.lng b/interface/web/client/lib/lang/cz_client_del.lng
index 5374ea6f75..d19949fec5 100644
--- a/interface/web/client/lib/lang/cz_client_del.lng
+++ b/interface/web/client/lib/lang/cz_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'Tato akce smaže následujÃcà poÄet záznamů p
$wb['btn_save_txt'] = 'Smazat klienta';
$wb['btn_cancel_txt'] = 'Zrušit bez smazánà klienta';
$wb['confirm_client_delete_txt'] = 'Jste si jisti, že chcete smazat tohoto klienta ?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/de_client_del.lng b/interface/web/client/lib/lang/de_client_del.lng
index d13fcfa8fc..53aa0973c4 100644
--- a/interface/web/client/lib/lang/de_client_del.lng
+++ b/interface/web/client/lib/lang/de_client_del.lng
@@ -3,5 +3,8 @@ $wb['confirm_action_txt'] = 'Aktion bestätigen';
$wb['delete_explanation'] = 'Diese Aktion wird folgende Anzahl an Datensätzen des Kunden löschen';
$wb['btn_save_txt'] = 'Kunden löschen';
$wb['btn_cancel_txt'] = 'Abbrechen, ohne den Kunden zu löschen';
-$wb['confirm_client_delete_txt'] = 'Sind Sie sicher, daß Sie den Kunden löschen möchten?';
+$wb['confirm_client_delete_txt'] = 'Sind Sie sicher, dass Sie den Kunden löschen möchte';
+$wb['table_txt'] = 'Tabelle';
+$wb['data_txt'] = 'Daten';
+$wb['list_head_txt'] = 'Kunde löschen';
?>
diff --git a/interface/web/client/lib/lang/dk_client_del.lng b/interface/web/client/lib/lang/dk_client_del.lng
index ba5f592219..9bb157cdf4 100644
--- a/interface/web/client/lib/lang/dk_client_del.lng
+++ b/interface/web/client/lib/lang/dk_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'Denne handling vil slette følgende antal poster fo
$wb['btn_save_txt'] = 'Slet kunden';
$wb['btn_cancel_txt'] = 'Annullere uden at slette kunden';
$wb['confirm_client_delete_txt'] = 'Er du sikker på at du vil slette denne kunde?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/el_client_del.lng b/interface/web/client/lib/lang/el_client_del.lng
index 60ebd617d0..3f91a5c2b0 100644
--- a/interface/web/client/lib/lang/el_client_del.lng
+++ b/interface/web/client/lib/lang/el_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'Η ενÎÏγεια θα διαγÏάψει τις
$wb['btn_save_txt'] = 'ΔιαγÏαφή πελάτη';
$wb['btn_cancel_txt'] = 'ΑκÏÏωση χωÏίς διαγÏαφή πελάτη';
$wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/en_client_del.lng b/interface/web/client/lib/lang/en_client_del.lng
index 7b1bbf9d70..5e2a00b929 100644
--- a/interface/web/client/lib/lang/en_client_del.lng
+++ b/interface/web/client/lib/lang/en_client_del.lng
@@ -4,4 +4,7 @@ $wb["delete_explanation"] = 'This action will delete the following number of rec
$wb["btn_save_txt"] = 'Delete the client';
$wb["btn_cancel_txt"] = 'Cancel without deleting the client';
$wb["confirm_client_delete_txt"] = 'Are you sure you want to delete this client?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/es_client_del.lng b/interface/web/client/lib/lang/es_client_del.lng
index ff7c09c191..9496eb8146 100644
--- a/interface/web/client/lib/lang/es_client_del.lng
+++ b/interface/web/client/lib/lang/es_client_del.lng
@@ -4,4 +4,7 @@ $wb['btn_save_txt'] = 'Borrar el cliente';
$wb['confirm_action_txt'] = 'Confirmar acción';
$wb['confirm_client_delete_txt'] = '¿Está seguro de que desea borrar el cliente?';
$wb['delete_explanation'] = 'Esta acción eliminará el siguiente número de registros asociados con este cliente';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/fi_client_del.lng b/interface/web/client/lib/lang/fi_client_del.lng
index b87895b8c0..4336b765d3 100644
--- a/interface/web/client/lib/lang/fi_client_del.lng
+++ b/interface/web/client/lib/lang/fi_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'Tämä toiminto alla olevan määrän tämän asiak
$wb['btn_save_txt'] = 'Poista käyttäjä';
$wb['btn_cancel_txt'] = 'Keskeytä poistamatta asiakasta';
$wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/fr_client_del.lng b/interface/web/client/lib/lang/fr_client_del.lng
index 4fdb5dac77..051c840fb2 100644
--- a/interface/web/client/lib/lang/fr_client_del.lng
+++ b/interface/web/client/lib/lang/fr_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'Cette action va supprimer le nombre d’enregistrem
$wb['btn_save_txt'] = 'Effacer le client';
$wb['btn_cancel_txt'] = 'Annuler sans effacer le client';
$wb['confirm_client_delete_txt'] = 'Confirmez-vous la suppression de ce client ?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/hr_client_del.lng b/interface/web/client/lib/lang/hr_client_del.lng
index 939cc59fb6..5f06b87008 100644
--- a/interface/web/client/lib/lang/hr_client_del.lng
+++ b/interface/web/client/lib/lang/hr_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'Ukoliko potvrdite izbrisati će se svi zapisi povez
$wb['btn_save_txt'] = 'Obriši klijenta';
$wb['btn_cancel_txt'] = 'Prekini i ne briši klijenta';
$wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/hu_client_del.lng b/interface/web/client/lib/lang/hu_client_del.lng
index 0932e9568a..21ddcb9ea4 100644
--- a/interface/web/client/lib/lang/hu_client_del.lng
+++ b/interface/web/client/lib/lang/hu_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'This action will delete the following number of rec
$wb['btn_save_txt'] = 'Delete the client';
$wb['btn_cancel_txt'] = 'Cancel without deleting the client';
$wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/id_client_del.lng b/interface/web/client/lib/lang/id_client_del.lng
index 1adf18bd7d..2a8c6e32a1 100644
--- a/interface/web/client/lib/lang/id_client_del.lng
+++ b/interface/web/client/lib/lang/id_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'Tindakan ini akan menghapus sejumlah record yang te
$wb['btn_save_txt'] = 'Hapus Klien';
$wb['btn_cancel_txt'] = 'Batalkan Tanpa Menghapus Klien';
$wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/it_client_del.lng b/interface/web/client/lib/lang/it_client_del.lng
index 49811c377e..a17dc6a7ff 100644
--- a/interface/web/client/lib/lang/it_client_del.lng
+++ b/interface/web/client/lib/lang/it_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'Questa operazione cancellerà i seguenti record ass
$wb['btn_save_txt'] = 'Cancella cliente';
$wb['btn_cancel_txt'] = 'Annulla senza cancellare il cliente';
$wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/ja_client_del.lng b/interface/web/client/lib/lang/ja_client_del.lng
index 0932e9568a..21ddcb9ea4 100644
--- a/interface/web/client/lib/lang/ja_client_del.lng
+++ b/interface/web/client/lib/lang/ja_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'This action will delete the following number of rec
$wb['btn_save_txt'] = 'Delete the client';
$wb['btn_cancel_txt'] = 'Cancel without deleting the client';
$wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/nl_client_del.lng b/interface/web/client/lib/lang/nl_client_del.lng
index 294fb5011b..9b9e5d5bc3 100644
--- a/interface/web/client/lib/lang/nl_client_del.lng
+++ b/interface/web/client/lib/lang/nl_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'Deze actie verwijderd het volgende aantal aan recor
$wb['btn_save_txt'] = 'Verwijder de klant';
$wb['btn_cancel_txt'] = 'Annuleren zonder de klant te verwijderen';
$wb['confirm_client_delete_txt'] = 'Weet je zeker dat je deze klant wil verwijderen ?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/pl_client_del.lng b/interface/web/client/lib/lang/pl_client_del.lng
index 429c61b4c7..4e5a2386f9 100644
--- a/interface/web/client/lib/lang/pl_client_del.lng
+++ b/interface/web/client/lib/lang/pl_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'Ta akcja usunie następującą liczbę rekordów po
$wb['btn_save_txt'] = 'Usuń klienta';
$wb['btn_cancel_txt'] = 'Anuluj bez usuwania klienta';
$wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/pt_client_del.lng b/interface/web/client/lib/lang/pt_client_del.lng
index ef71fa91e5..7b56473550 100644
--- a/interface/web/client/lib/lang/pt_client_del.lng
+++ b/interface/web/client/lib/lang/pt_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'Atenção: está acção ira remover todos os objec
$wb['btn_save_txt'] = 'Remover o cliente';
$wb['btn_cancel_txt'] = 'Cancelar sem remover o cliente';
$wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/ro_client_del.lng b/interface/web/client/lib/lang/ro_client_del.lng
index 0932e9568a..21ddcb9ea4 100644
--- a/interface/web/client/lib/lang/ro_client_del.lng
+++ b/interface/web/client/lib/lang/ro_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'This action will delete the following number of rec
$wb['btn_save_txt'] = 'Delete the client';
$wb['btn_cancel_txt'] = 'Cancel without deleting the client';
$wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/ru_client_del.lng b/interface/web/client/lib/lang/ru_client_del.lng
index 94a05acca0..cf371efeb9 100644
--- a/interface/web/client/lib/lang/ru_client_del.lng
+++ b/interface/web/client/lib/lang/ru_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'Ðто дейÑтвие удалит Ñледующ
$wb['btn_save_txt'] = 'Удалить клиента';
$wb['btn_cancel_txt'] = 'Отменить без удалениÑ';
$wb['confirm_client_delete_txt'] = 'Ð’Ñ‹ уверены, что хотите удалить Ñтот клиента?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/se_client_del.lng b/interface/web/client/lib/lang/se_client_del.lng
index 99aa9d8a42..56f2f0d9d7 100644
--- a/interface/web/client/lib/lang/se_client_del.lng
+++ b/interface/web/client/lib/lang/se_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'This action will delete the following number of rec
$wb['btn_save_txt'] = 'Radera kunden';
$wb['btn_cancel_txt'] = 'Avbryt utan att radera kunden';
$wb['confirm_client_delete_txt'] = 'Är du säker på att du vill radera den här kunden?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/sk_client_del.lng b/interface/web/client/lib/lang/sk_client_del.lng
index 0932e9568a..21ddcb9ea4 100644
--- a/interface/web/client/lib/lang/sk_client_del.lng
+++ b/interface/web/client/lib/lang/sk_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'This action will delete the following number of rec
$wb['btn_save_txt'] = 'Delete the client';
$wb['btn_cancel_txt'] = 'Cancel without deleting the client';
$wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/lib/lang/tr_client_del.lng b/interface/web/client/lib/lang/tr_client_del.lng
index b93579998b..82f00ba9d5 100644
--- a/interface/web/client/lib/lang/tr_client_del.lng
+++ b/interface/web/client/lib/lang/tr_client_del.lng
@@ -4,4 +4,7 @@ $wb['delete_explanation'] = 'Bu işlem bu müşteri ile ilgili şu kayıtları s
$wb['btn_save_txt'] = 'Müşteriyi sil';
$wb['btn_cancel_txt'] = 'Müşteriyi silmeden iptal et';
$wb['confirm_client_delete_txt'] = 'Bu müşteriyi silmek istediğinize emin misiniz?';
+$wb['list_head_txt'] = 'Delete Client';
+$wb['table_txt'] = 'Table';
+$wb['data_txt'] = 'Data';
?>
diff --git a/interface/web/client/templates/client_del.htm b/interface/web/client/templates/client_del.htm
index e24ca768c2..5e7201ce5c 100644
--- a/interface/web/client/templates/client_del.htm
+++ b/interface/web/client/templates/client_del.htm
@@ -1,24 +1,32 @@
-<div class='page-header'>
- <h1><tmpl_var name="list_head_txt"></h1>
-</div>
-<p><tmpl_var name="list_desc_txt"></p>
-
- <div id="OKMsg">
- <tmpl_if name='number_records'>
- <tmpl_var name="delete_explanation">:<br /><br />
- <tmpl_loop name="records">
- <tmpl_var name="table">,
- </tmpl_loop>
- </tmpl_else>
- <h3><tmpl_var name="confirm_client_delete_txt"></h3>
- </tmpl_if>
- </div>
-
- <div> <input type="checkbox" name="confirm" value="yes" /> <b><tmpl_var name="confirm_action_txt"></b></div>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="clear"><div class="left">
- <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="client/client_del.php">{tmpl_var name='btn_save_txt'}</button>
- <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/client_list.php">{tmpl_var name='btn_cancel_txt'}</button>
- </div></div>
\ No newline at end of file
+<div class='page-header'><h1><tmpl_var name="list_head_txt"></h1></div>
+<tmpl_if name='number_records'>
+ <tmpl_var name="delete_explanation">:<br /><br />
+ <div class="table-wrapper marginTop15">
+ <table class="table">
+ <thead class="dark form-group-sm">
+ <tr>
+ <th class="tiny-col"><tmpl_var name="table_txt"></th>
+ <th class="tiny-col"><tmpl_var name="data_txt"></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tmpl_loop name="records">
+ <tr>
+ <td>{tmpl_var name="table"} ({tmpl_var name="count"})</td>
+ <td>{tmpl_var name="data"}</td>
+ </tr>
+ </tmpl_loop>
+ </tbody>
+ </table>
+ </div>
+</tmpl_else>
+ <h3><tmpl_var name="confirm_client_delete_txt"></h3>
+</tmpl_if>
+
+<div> <input type="checkbox" name="confirm" value="yes" /> <b><tmpl_var name="confirm_action_txt"></b></div>
+
+<input type="hidden" name="id" value="{tmpl_var name='id'}">
+<div class="clear"><div class="left">
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="client/client_del.php">{tmpl_var name='btn_save_txt'}</button>
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="client/client_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+</div></div>
--
GitLab