From 569c550a69f45b0105d2bdb79401f27e8101d7c5 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Fri, 9 Feb 2024 23:21:27 +0100 Subject: [PATCH 1/2] Make the client domain searchable --- interface/web/client/form/domain.tform.php | 3 ++- interface/web/client/lib/lang/en_domain.lng | 1 + interface/web/dashboard/ajax_get_json.php | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/interface/web/client/form/domain.tform.php b/interface/web/client/form/domain.tform.php index c96af934d7..0e8d3ffa1c 100644 --- a/interface/web/client/form/domain.tform.php +++ b/interface/web/client/form/domain.tform.php @@ -107,7 +107,8 @@ $form["tabs"]['domain'] = array ( 'default' => '', 'value' => '', 'width' => '30', - 'maxlength' => '255' + 'maxlength' => '255', + 'searchable' => 1, ), //################################# // END Datatable fields diff --git a/interface/web/client/lib/lang/en_domain.lng b/interface/web/client/lib/lang/en_domain.lng index a66a2258af..50dc79323a 100644 --- a/interface/web/client/lib/lang/en_domain.lng +++ b/interface/web/client/lib/lang/en_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'The domain-name is empty'; $wb['domain_error_unique'] = 'The domain already exists'; $wb['domain_error_regex'] = 'This domain-name is not allowed'; $wb['Domain'] = 'Domain'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/dashboard/ajax_get_json.php b/interface/web/dashboard/ajax_get_json.php index 4c6612888d..0bd587ce01 100644 --- a/interface/web/dashboard/ajax_get_json.php +++ b/interface/web/dashboard/ajax_get_json.php @@ -54,6 +54,9 @@ if($type == 'globalsearch'){ // resellers $result[] = _search('client', 'reseller', "AND limit_client != 0"); + // client domains + $result[] = _search('client', 'domain'); + // web sites $result[] = _search('sites', 'web_vhost_domain', "AND type = 'vhost'"); -- GitLab From e5a43f7eddf2a471852d5eedd4a5461121ddfb46 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Fri, 9 Feb 2024 23:40:49 +0100 Subject: [PATCH 2/2] Add translation strings --- interface/web/client/lib/lang/ar_domain.lng | 1 + interface/web/client/lib/lang/bg_domain.lng | 1 + interface/web/client/lib/lang/br_domain.lng | 1 + interface/web/client/lib/lang/ca_domain.lng | 1 + interface/web/client/lib/lang/cn_domain.lng | 1 + interface/web/client/lib/lang/cz_domain.lng | 1 + interface/web/client/lib/lang/de_domain.lng | 1 + interface/web/client/lib/lang/dk_domain.lng | 1 + interface/web/client/lib/lang/el_domain.lng | 1 + interface/web/client/lib/lang/es_domain.lng | 1 + interface/web/client/lib/lang/fi_domain.lng | 1 + interface/web/client/lib/lang/fr_domain.lng | 1 + interface/web/client/lib/lang/hr_domain.lng | 1 + interface/web/client/lib/lang/hu_domain.lng | 1 + interface/web/client/lib/lang/id_domain.lng | 1 + interface/web/client/lib/lang/it_domain.lng | 1 + interface/web/client/lib/lang/ja_domain.lng | 1 + interface/web/client/lib/lang/nl_domain.lng | 1 + interface/web/client/lib/lang/pl_domain.lng | 1 + interface/web/client/lib/lang/pt_domain.lng | 1 + interface/web/client/lib/lang/ro_domain.lng | 1 + interface/web/client/lib/lang/ru_domain.lng | 1 + interface/web/client/lib/lang/se_domain.lng | 1 + interface/web/client/lib/lang/sk_domain.lng | 1 + interface/web/client/lib/lang/tr_domain.lng | 1 + 25 files changed, 25 insertions(+) diff --git a/interface/web/client/lib/lang/ar_domain.lng b/interface/web/client/lib/lang/ar_domain.lng index a66a2258af..50dc79323a 100644 --- a/interface/web/client/lib/lang/ar_domain.lng +++ b/interface/web/client/lib/lang/ar_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'The domain-name is empty'; $wb['domain_error_unique'] = 'The domain already exists'; $wb['domain_error_regex'] = 'This domain-name is not allowed'; $wb['Domain'] = 'Domain'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/bg_domain.lng b/interface/web/client/lib/lang/bg_domain.lng index c60ae56045..fdffdcd26a 100644 --- a/interface/web/client/lib/lang/bg_domain.lng +++ b/interface/web/client/lib/lang/bg_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'Името на домейна е празно'; $wb['domain_error_unique'] = 'Домейна съществува'; $wb['domain_error_regex'] = 'Това име на домейн не е разрешен.'; $wb['Domain'] = 'Домейн'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/br_domain.lng b/interface/web/client/lib/lang/br_domain.lng index 0ebd82d63c..cafdc79358 100644 --- a/interface/web/client/lib/lang/br_domain.lng +++ b/interface/web/client/lib/lang/br_domain.lng @@ -3,3 +3,4 @@ $wb['domain_error_empty'] = 'O domínio está vazio.'; $wb['domain_error_unique'] = 'O domínio já existe.'; $wb['domain_error_regex'] = 'O nome do domínio não é permitido.'; $wb['Domain'] = 'Domínio'; +$wb['domain_txt'] = 'Domain'; diff --git a/interface/web/client/lib/lang/ca_domain.lng b/interface/web/client/lib/lang/ca_domain.lng index f94d21bbe5..7ca7e894a1 100644 --- a/interface/web/client/lib/lang/ca_domain.lng +++ b/interface/web/client/lib/lang/ca_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'Le nom de domaine est vide'; $wb['domain_error_unique'] = 'Ce nom de domaine existe déjà'; $wb['domain_error_regex'] = 'Ce nom de domaine n\'est pas autorisé'; $wb['Domain'] = 'Domaine'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/cn_domain.lng b/interface/web/client/lib/lang/cn_domain.lng index dbdac298a6..022feb4ba4 100644 --- a/interface/web/client/lib/lang/cn_domain.lng +++ b/interface/web/client/lib/lang/cn_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = '域名为空'; $wb['domain_error_unique'] = '域名已存在'; $wb['domain_error_regex'] = '该域名不被允许'; $wb['Domain'] = '域名'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/cz_domain.lng b/interface/web/client/lib/lang/cz_domain.lng index 33d634d8e3..c40ae34ce2 100644 --- a/interface/web/client/lib/lang/cz_domain.lng +++ b/interface/web/client/lib/lang/cz_domain.lng @@ -3,3 +3,4 @@ $wb['domain_error_empty'] = 'Doménové jméno je prázdné'; $wb['domain_error_unique'] = 'Doména již existuje'; $wb['domain_error_regex'] = 'Toto doménové jméno je zakázáno'; $wb['Domain'] = 'Doména'; +$wb['domain_txt'] = 'Domain'; diff --git a/interface/web/client/lib/lang/de_domain.lng b/interface/web/client/lib/lang/de_domain.lng index eb4276a3f8..3b0ab87a4b 100644 --- a/interface/web/client/lib/lang/de_domain.lng +++ b/interface/web/client/lib/lang/de_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'Der Domain Name darf nicht leer sein'; $wb['domain_error_unique'] = 'Die Domain existiert bereits'; $wb['domain_error_regex'] = 'Dieser Domain Name ist nicht gültig'; $wb['Domain'] = 'Domain'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/dk_domain.lng b/interface/web/client/lib/lang/dk_domain.lng index cd9c60de58..240c9e9f29 100644 --- a/interface/web/client/lib/lang/dk_domain.lng +++ b/interface/web/client/lib/lang/dk_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'Domæne-navn er tomt'; $wb['domain_error_unique'] = 'Domænet findes allerede'; $wb['domain_error_regex'] = 'Dette domæne-navn er ikke tilladt'; $wb['Domain'] = 'Domæne'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/el_domain.lng b/interface/web/client/lib/lang/el_domain.lng index 696d10da42..624c72cd1d 100644 --- a/interface/web/client/lib/lang/el_domain.lng +++ b/interface/web/client/lib/lang/el_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'Το όνομα domain δεν έχει οριστε $wb['domain_error_unique'] = 'Το όνομα domain υπάρχει'; $wb['domain_error_regex'] = 'Το όνομα domain δεν επιτρέπεται'; $wb['Domain'] = 'Domain'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/es_domain.lng b/interface/web/client/lib/lang/es_domain.lng index 95ccf9ae23..525eee7a87 100644 --- a/interface/web/client/lib/lang/es_domain.lng +++ b/interface/web/client/lib/lang/es_domain.lng @@ -3,4 +3,5 @@ $wb['Domain'] = 'Dominio'; $wb['domain_error_empty'] = 'El nombre de dominio está vacío'; $wb['domain_error_regex'] = 'Este nombre de dominio no esta permitido'; $wb['domain_error_unique'] = 'El dominio ya existe'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/fi_domain.lng b/interface/web/client/lib/lang/fi_domain.lng index a66a2258af..50dc79323a 100644 --- a/interface/web/client/lib/lang/fi_domain.lng +++ b/interface/web/client/lib/lang/fi_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'The domain-name is empty'; $wb['domain_error_unique'] = 'The domain already exists'; $wb['domain_error_regex'] = 'This domain-name is not allowed'; $wb['Domain'] = 'Domain'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/fr_domain.lng b/interface/web/client/lib/lang/fr_domain.lng index 03b7c14c28..d0b489518f 100644 --- a/interface/web/client/lib/lang/fr_domain.lng +++ b/interface/web/client/lib/lang/fr_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'Le nom de domaine est vide'; $wb['domain_error_unique'] = 'Ce nom de domaine existe déjà'; $wb['domain_error_regex'] = 'Ce nom de domaine n’est pas autorisé'; $wb['Domain'] = 'Domaine'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/hr_domain.lng b/interface/web/client/lib/lang/hr_domain.lng index 784ccc63b7..d557bfa631 100644 --- a/interface/web/client/lib/lang/hr_domain.lng +++ b/interface/web/client/lib/lang/hr_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'Ime domene je prazno'; $wb['domain_error_unique'] = 'Domena već postoji'; $wb['domain_error_regex'] = 'Ovo ime domene ne možete upotrijebiti'; $wb['Domain'] = 'Domain'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/hu_domain.lng b/interface/web/client/lib/lang/hu_domain.lng index a66a2258af..50dc79323a 100644 --- a/interface/web/client/lib/lang/hu_domain.lng +++ b/interface/web/client/lib/lang/hu_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'The domain-name is empty'; $wb['domain_error_unique'] = 'The domain already exists'; $wb['domain_error_regex'] = 'This domain-name is not allowed'; $wb['Domain'] = 'Domain'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/id_domain.lng b/interface/web/client/lib/lang/id_domain.lng index 2091e872f9..73ea445c79 100644 --- a/interface/web/client/lib/lang/id_domain.lng +++ b/interface/web/client/lib/lang/id_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'Nama Domain kosong'; $wb['domain_error_unique'] = 'Domain sudah ada'; $wb['domain_error_regex'] = 'Nama Domain ini tidak diperbolehkan'; $wb['Domain'] = 'Domain'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/it_domain.lng b/interface/web/client/lib/lang/it_domain.lng index dba372981a..bb7c9e6640 100644 --- a/interface/web/client/lib/lang/it_domain.lng +++ b/interface/web/client/lib/lang/it_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'Nome dominio è vuoto'; $wb['domain_error_unique'] = 'Dominio già esistente'; $wb['domain_error_regex'] = 'Questo nome di dominio non è permesso'; $wb['Domain'] = 'Dominio'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/ja_domain.lng b/interface/web/client/lib/lang/ja_domain.lng index a66a2258af..50dc79323a 100644 --- a/interface/web/client/lib/lang/ja_domain.lng +++ b/interface/web/client/lib/lang/ja_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'The domain-name is empty'; $wb['domain_error_unique'] = 'The domain already exists'; $wb['domain_error_regex'] = 'This domain-name is not allowed'; $wb['Domain'] = 'Domain'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/nl_domain.lng b/interface/web/client/lib/lang/nl_domain.lng index c1da1b741d..78c728bc47 100644 --- a/interface/web/client/lib/lang/nl_domain.lng +++ b/interface/web/client/lib/lang/nl_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'De domein naam is niet ingevuld'; $wb['domain_error_unique'] = 'Het domein bestaat reeds'; $wb['domain_error_regex'] = 'Deze domein naam is niet toegestaan'; $wb['Domain'] = 'Domein'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/pl_domain.lng b/interface/web/client/lib/lang/pl_domain.lng index 9f3e80ff64..f80dea959f 100644 --- a/interface/web/client/lib/lang/pl_domain.lng +++ b/interface/web/client/lib/lang/pl_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'Nazwa domeny jest pusta'; $wb['domain_error_unique'] = 'Domena o podanej nazwie już istnieje'; $wb['domain_error_regex'] = 'Nazwa domeny jest niedopuszczalna'; $wb['Domain'] = 'Domena'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/pt_domain.lng b/interface/web/client/lib/lang/pt_domain.lng index a66a2258af..50dc79323a 100644 --- a/interface/web/client/lib/lang/pt_domain.lng +++ b/interface/web/client/lib/lang/pt_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'The domain-name is empty'; $wb['domain_error_unique'] = 'The domain already exists'; $wb['domain_error_regex'] = 'This domain-name is not allowed'; $wb['Domain'] = 'Domain'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/ro_domain.lng b/interface/web/client/lib/lang/ro_domain.lng index a66a2258af..50dc79323a 100644 --- a/interface/web/client/lib/lang/ro_domain.lng +++ b/interface/web/client/lib/lang/ro_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'The domain-name is empty'; $wb['domain_error_unique'] = 'The domain already exists'; $wb['domain_error_regex'] = 'This domain-name is not allowed'; $wb['Domain'] = 'Domain'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/ru_domain.lng b/interface/web/client/lib/lang/ru_domain.lng index 50f0d3f2fc..a387fb970e 100644 --- a/interface/web/client/lib/lang/ru_domain.lng +++ b/interface/web/client/lib/lang/ru_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'Домен пустой.'; $wb['domain_error_unique'] = 'Имя должно быть уникальным.'; $wb['domain_error_regex'] = 'Некорректное имя домена.'; $wb['Domain'] = 'Домен'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/se_domain.lng b/interface/web/client/lib/lang/se_domain.lng index df60bbeca2..b300fb890a 100644 --- a/interface/web/client/lib/lang/se_domain.lng +++ b/interface/web/client/lib/lang/se_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'Domännamnet är tomt'; $wb['domain_error_unique'] = 'Domänen finns redan'; $wb['domain_error_regex'] = 'Denna domän är ogiltig'; $wb['Domain'] = 'Domän'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/sk_domain.lng b/interface/web/client/lib/lang/sk_domain.lng index a66a2258af..50dc79323a 100644 --- a/interface/web/client/lib/lang/sk_domain.lng +++ b/interface/web/client/lib/lang/sk_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'The domain-name is empty'; $wb['domain_error_unique'] = 'The domain already exists'; $wb['domain_error_regex'] = 'This domain-name is not allowed'; $wb['Domain'] = 'Domain'; +$wb['domain_txt'] = 'Domain'; ?> diff --git a/interface/web/client/lib/lang/tr_domain.lng b/interface/web/client/lib/lang/tr_domain.lng index d0b4e228da..3f7312bf8a 100644 --- a/interface/web/client/lib/lang/tr_domain.lng +++ b/interface/web/client/lib/lang/tr_domain.lng @@ -3,4 +3,5 @@ $wb['domain_error_empty'] = 'Etki alanı boş olamaz'; $wb['domain_error_unique'] = 'Aynı etki alanı zaten var'; $wb['domain_error_regex'] = 'Bu etki alanına izin verilmiyor'; $wb['Domain'] = 'Etki Alanı'; +$wb['domain_txt'] = 'Domain'; ?> -- GitLab