From 761ddde9f0c146a2cdd539c679f7c3e0451eedc4 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Fri, 29 Jul 2022 16:22:12 +0200 Subject: [PATCH 1/2] update branch --- .../web/monitor/lib/lang/ar_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/bg_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/br_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/br_dataloghistory_list.lng.orig | 7 +++++++ .../web/monitor/lib/lang/ca_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/cz_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/de_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/dk_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/el_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/en_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/es_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/fi_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/fr_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/hr_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/hu_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/id_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/it_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/it_dataloghistory_list.lng.orig | 8 ++++++++ .../web/monitor/lib/lang/ja_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/nl_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/pl_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/pt_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/ro_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/ru_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/se_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/sk_dataloghistory_list.lng | 1 + .../web/monitor/lib/lang/tr_dataloghistory_list.lng | 1 + interface/web/monitor/list/dataloghistory.list.php | 9 ++++++++- interface/web/monitor/templates/dataloghistory_list.htm | 8 ++++++-- 29 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 interface/web/monitor/lib/lang/br_dataloghistory_list.lng.orig create mode 100644 interface/web/monitor/lib/lang/it_dataloghistory_list.lng.orig diff --git a/interface/web/monitor/lib/lang/ar_dataloghistory_list.lng b/interface/web/monitor/lib/lang/ar_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/ar_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/ar_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/bg_dataloghistory_list.lng b/interface/web/monitor/lib/lang/bg_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/bg_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/bg_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/br_dataloghistory_list.lng b/interface/web/monitor/lib/lang/br_dataloghistory_list.lng index 894670052f..6034c94ac6 100644 --- a/interface/web/monitor/lib/lang/br_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/br_dataloghistory_list.lng @@ -5,3 +5,4 @@ $wb['server_id_txt'] = 'Servidor'; $wb['dbtable_txt'] = 'Tabela do BD'; $wb['action_txt'] = 'Ação'; $wb['status_txt'] = 'Estado'; +$wb['user_txt'] = 'User'; diff --git a/interface/web/monitor/lib/lang/br_dataloghistory_list.lng.orig b/interface/web/monitor/lib/lang/br_dataloghistory_list.lng.orig new file mode 100644 index 0000000000..894670052f --- /dev/null +++ b/interface/web/monitor/lib/lang/br_dataloghistory_list.lng.orig @@ -0,0 +1,7 @@ + diff --git a/interface/web/monitor/lib/lang/cz_dataloghistory_list.lng b/interface/web/monitor/lib/lang/cz_dataloghistory_list.lng index c7600817bd..1ac39bb4ea 100644 --- a/interface/web/monitor/lib/lang/cz_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/cz_dataloghistory_list.lng @@ -5,3 +5,4 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Tabulka'; $wb['action_txt'] = 'Akce'; $wb['status_txt'] = 'Stav'; +$wb['user_txt'] = 'User'; diff --git a/interface/web/monitor/lib/lang/de_dataloghistory_list.lng b/interface/web/monitor/lib/lang/de_dataloghistory_list.lng index 2c2b6c9fc2..2fc3534b6b 100644 --- a/interface/web/monitor/lib/lang/de_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/de_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'Datenbanktabelle'; $wb['action_txt'] = 'Aktion'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'Benutzer'; ?> diff --git a/interface/web/monitor/lib/lang/dk_dataloghistory_list.lng b/interface/web/monitor/lib/lang/dk_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/dk_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/dk_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/el_dataloghistory_list.lng b/interface/web/monitor/lib/lang/el_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/el_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/el_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/en_dataloghistory_list.lng b/interface/web/monitor/lib/lang/en_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/en_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/en_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/es_dataloghistory_list.lng b/interface/web/monitor/lib/lang/es_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/es_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/es_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/fi_dataloghistory_list.lng b/interface/web/monitor/lib/lang/fi_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/fi_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/fi_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/fr_dataloghistory_list.lng b/interface/web/monitor/lib/lang/fr_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/fr_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/fr_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/hr_dataloghistory_list.lng b/interface/web/monitor/lib/lang/hr_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/hr_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/hr_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/hu_dataloghistory_list.lng b/interface/web/monitor/lib/lang/hu_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/hu_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/hu_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/id_dataloghistory_list.lng b/interface/web/monitor/lib/lang/id_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/id_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/id_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/it_dataloghistory_list.lng b/interface/web/monitor/lib/lang/it_dataloghistory_list.lng index 26138fba25..69f31abac9 100644 --- a/interface/web/monitor/lib/lang/it_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/it_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'Tabella DB'; $wb['action_txt'] = 'Azione'; $wb['status_txt'] = 'Stato'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/it_dataloghistory_list.lng.orig b/interface/web/monitor/lib/lang/it_dataloghistory_list.lng.orig new file mode 100644 index 0000000000..26138fba25 --- /dev/null +++ b/interface/web/monitor/lib/lang/it_dataloghistory_list.lng.orig @@ -0,0 +1,8 @@ + diff --git a/interface/web/monitor/lib/lang/ja_dataloghistory_list.lng b/interface/web/monitor/lib/lang/ja_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/ja_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/ja_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/nl_dataloghistory_list.lng b/interface/web/monitor/lib/lang/nl_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/nl_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/nl_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/pl_dataloghistory_list.lng b/interface/web/monitor/lib/lang/pl_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/pl_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/pl_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/pt_dataloghistory_list.lng b/interface/web/monitor/lib/lang/pt_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/pt_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/pt_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/ro_dataloghistory_list.lng b/interface/web/monitor/lib/lang/ro_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/ro_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/ro_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/ru_dataloghistory_list.lng b/interface/web/monitor/lib/lang/ru_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/ru_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/ru_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/se_dataloghistory_list.lng b/interface/web/monitor/lib/lang/se_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/se_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/se_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/sk_dataloghistory_list.lng b/interface/web/monitor/lib/lang/sk_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/sk_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/sk_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/lib/lang/tr_dataloghistory_list.lng b/interface/web/monitor/lib/lang/tr_dataloghistory_list.lng index f1ba8c67b8..1fd0a318cb 100644 --- a/interface/web/monitor/lib/lang/tr_dataloghistory_list.lng +++ b/interface/web/monitor/lib/lang/tr_dataloghistory_list.lng @@ -5,4 +5,5 @@ $wb['server_id_txt'] = 'Server'; $wb['dbtable_txt'] = 'DB Table'; $wb['action_txt'] = 'Action'; $wb['status_txt'] = 'Status'; +$wb['user_txt'] = 'User'; ?> diff --git a/interface/web/monitor/list/dataloghistory.list.php b/interface/web/monitor/list/dataloghistory.list.php index 1757125e8d..7679f397db 100644 --- a/interface/web/monitor/list/dataloghistory.list.php +++ b/interface/web/monitor/list/dataloghistory.list.php @@ -77,7 +77,6 @@ $liste["item"][] = array( 'field' => "action", 'width' => "", 'value' => array('i' => "Insert", 'u' => "Update", 'd' => "Delete")); - $liste["item"][] = array( 'field' => "dbtable", 'datatype' => "VARCHAR", 'formtype' => "TEXT", @@ -87,5 +86,13 @@ $liste["item"][] = array( 'field' => "dbtable", 'width' => "", 'value' => ""); +$liste["item"][] = array( 'field' => "user", + 'datatype' => "VARCHAR", + 'formtype' => "TEXT", + 'op' => "like", + 'prefix' => "%", + 'suffix' => "%", + 'width' => "", + 'value' => ""); ?> diff --git a/interface/web/monitor/templates/dataloghistory_list.htm b/interface/web/monitor/templates/dataloghistory_list.htm index 0cd3c4f4d2..61bf042993 100644 --- a/interface/web/monitor/templates/dataloghistory_list.htm +++ b/interface/web/monitor/templates/dataloghistory_list.htm @@ -15,6 +15,7 @@ + {tmpl_var name='search_limit'} @@ -22,6 +23,8 @@ + + @@ -34,18 +37,19 @@ {tmpl_var name="server_id"} {tmpl_var name="action"} {tmpl_var name="dbtable"} + {tmpl_var name="user"} - {tmpl_var name='globalsearch_noresults_text_txt'} + {tmpl_var name='globalsearch_noresults_text_txt'} - + -- GitLab From 1a6acb2a5f68e043214285c81ef2c8da8b8c7b80 Mon Sep 17 00:00:00 2001 From: Michael Seevogel Date: Fri, 29 Jul 2022 16:35:31 +0200 Subject: [PATCH 2/2] clean up lng files --- .../web/monitor/lib/lang/br_dataloghistory_list.lng.orig | 7 ------- .../web/monitor/lib/lang/it_dataloghistory_list.lng.orig | 8 -------- 2 files changed, 15 deletions(-) delete mode 100644 interface/web/monitor/lib/lang/br_dataloghistory_list.lng.orig delete mode 100644 interface/web/monitor/lib/lang/it_dataloghistory_list.lng.orig diff --git a/interface/web/monitor/lib/lang/br_dataloghistory_list.lng.orig b/interface/web/monitor/lib/lang/br_dataloghistory_list.lng.orig deleted file mode 100644 index 894670052f..0000000000 --- a/interface/web/monitor/lib/lang/br_dataloghistory_list.lng.orig +++ /dev/null @@ -1,7 +0,0 @@ - -- GitLab