Merge branch 'datalog-list-add-user-field' into 'develop'

Marius Burkard · Marius Burkard · commit 52348ef9aa42 · 2022-08-15T22:05:09.000Z
Added user field to datalog list view

Closes #6370

See merge request ispconfig/ispconfig3!1621
diff --git 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
@@ -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
@@ -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/ca_dataloghistory_list.lng b/interface/web/monitor/lib/lang/ca_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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -77,7 +77,6 @@
 	'width'  => "",
 	'value'  => array('i' => "Insert", 'u' => "Update", 'd' => "Delete"));
 
-
 $liste["item"][] = array( 'field'  => "dbtable",
 	'datatype' => "VARCHAR",
 	'formtype' => "TEXT",
@@ -87,5 +86,13 @@
 	'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
@@ -15,13 +15,16 @@ <h1><tmpl_var name="list_head_txt"></h1>
                         <th data-column="server_id"><tmpl_var name="server_id_txt"></th>
                         <th data-column="action"><tmpl_var name="action_txt"></th>
                         <th data-column="dbtable"><tmpl_var name="dbtable_txt"></th>
+                        <th data-column="user"><tmpl_var name="user_txt"></th>
                         <th class="small-col text-right">{tmpl_var name='search_limit'}</th>
                     </tr>
                     <tr>
                         <td>&nbsp;</td>
                         <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td>
                         <td><select class="form-control" name="search_action">{tmpl_var name='search_action'}</select></td>
                         <td><input class="form-control" type="text" name="search_dbtable" value="{tmpl_var name='search_dbtable'}" /></td>
+                        <td><input class="form-control" type="text" name="search_user" value="{tmpl_var name='search_user'}" /></td>
+                        
                         <td class="text-right">
                             <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="monitor/dataloghistory_list.php"><span class="icon icon-filter"></span></button>
                         </td>
@@ -34,18 +37,19 @@ <h1><tmpl_var name="list_head_txt"></h1>
                             <td><a href="#" data-load-content="monitor/dataloghistory_view.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td>
                             <td><a href="#" data-load-content="monitor/dataloghistory_view.php?id={tmpl_var name='id'}">{tmpl_var name="action"}</a></td>
                             <td><a href="#" data-load-content="monitor/dataloghistory_view.php?id={tmpl_var name='id'}">{tmpl_var name="dbtable"}</a></td>
+                            <td><a href="#" data-load-content="monitor/dataloghistory_view.php?id={tmpl_var name='id'}">{tmpl_var name="user"}</a></td>
                             <td class="text-right"></td>
                         </tr>
                     </tmpl_loop>
                     <tmpl_unless name="records">
                         <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
-                            <td colspan="5">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
+                            <td colspan="6">{tmpl_var name='globalsearch_noresults_text_txt'}</td>
                         </tr>
                     </tmpl_unless>
                 </tbody>
                 <tfoot>
                     <tr>
-                        <td colspan="5"><tmpl_var name="paging"></td>
+                        <td colspan="6"><tmpl_var name="paging"></td>
                     </tr>
                 </tfoot>
             </table>
