From 534a6dc06eec9b5eeaf5eea89499db1b9d3c999f Mon Sep 17 00:00:00 2001
From: Florian Schaal <info@schaal-24.de>
Date: Fri, 24 May 2019 12:15:51 +0200
Subject: [PATCH] improve datalog-viewer

---
 interface/web/monitor/dataloghistory_view.php | 65 ++++++++++++++++++-
 .../lib/lang/de_dataloghistory_view.lng       | 17 +++++
 .../lib/lang/en_dataloghistory_view.lng       | 17 +++++
 .../monitor/templates/dataloghistory_view.htm |  6 ++
 4 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/interface/web/monitor/dataloghistory_view.php b/interface/web/monitor/dataloghistory_view.php
index 2b5ea1e032..78d4db0451 100644
--- a/interface/web/monitor/dataloghistory_view.php
+++ b/interface/web/monitor/dataloghistory_view.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
 Copyright (c) 2007-2008, Till Brehm, projektfarm Gmbh and Oliver Vogel www.muv.com
 All rights reserved.
@@ -48,7 +47,6 @@ $app->tpl->setvar($wb);
 $id = intval($_GET['id']);
 
 $record = $app->db->queryOneRecord('SELECT * FROM sys_datalog WHERE datalog_id = ?', $id);
-
 $out['id'] = $id;
 
 $out['timestamp'] = date($app->lng('conf_format_datetime'), $record['tstamp']);
@@ -75,6 +73,7 @@ switch ($record['action']) {
 		$app->tpl->setLoop('inserts', $inserts);
 		break;
 	case 'u':
+		$out = describe($record['dbtable'], $data, $out);
 		$updates = array();
 		foreach ($data['new'] as $key=>$value) {
 			if ($value != $data['old'][$key]) {
@@ -128,4 +127,66 @@ function show_diff_if_needed($old, $new) {
 	}
 }
 
+function describe($dbtable, $data, $out) {
+	global $app;
+	$out['describe'] = $app->lng('describe_'.$dbtable);
+	switch ($dbtable) {
+		case 'client':
+			$check = 'username';
+		break;
+		case 'directive_snippets':
+			$check = 'name';
+		break;
+		case 'domain':
+			$check = 'domain';
+		break;
+		case 'ftp_user':
+			$check = 'username';
+		break;
+		case 'mail_domain':
+			$check = 'domain';
+		break;
+		case 'mail_forwarding':
+			$check = 'source';
+		break;
+		case 'mail_user':
+			$check = 'email';
+		break;
+		case 'mail_user_filter':
+			$check = 'rulename';
+		break;
+		case 'remote_user':
+			$check = 'remote_username';
+		break;
+		case 'server_php':
+			$check = 'name';
+		break;
+		case 'shell_user':
+			$check = 'username';
+		break;
+		case 'spamfilter_policy':
+			$check = 'policy_name';
+		break;
+		case 'spamfilter_users':
+			$check = 'email';
+		break;
+		case 'web_domain':
+			$check = 'domain';
+		break;
+		case 'web_database_user':
+			$check = 'database_user';
+		break;
+		case 'web_database':
+			$check = 'database_name';
+		break;
+		case 'web_folder_user':
+			$check = 'username';
+		break;
+	}
+
+	$out['describe_data'] = @(isset($data['old'][$check]) && $data['old'][$check] != $data['new'][$check])?$data['old'][$check].'/'.$data['new'][$check]:$data['new'][$check];
+
+	return $out;
+}
+
 ?>
diff --git a/interface/web/monitor/lib/lang/de_dataloghistory_view.lng b/interface/web/monitor/lib/lang/de_dataloghistory_view.lng
index 81123a69c0..0359f21e0d 100644
--- a/interface/web/monitor/lib/lang/de_dataloghistory_view.lng
+++ b/interface/web/monitor/lib/lang/de_dataloghistory_view.lng
@@ -23,4 +23,21 @@ $wb['new_txt'] = 'Neu';
 $wb['btn_cancel_txt'] = 'Zurück';
 $wb['undo_txt'] = 'Rückgängig machen';
 $wb['undo_confirmation_txt'] = 'Soll diese Änderung wirklich rückgängig gemacht werden?';
+$wb['describe_client'] = 'Username';
+$wb['describe_directive_snippets'] = 'Direktiven Schnippsel';
+$wb['describe_domain'] = 'Domain';
+$wb['describe_ftp_user'] = 'FTP-User';
+$wb['describe_mail_domain'] = 'Email-Domain';
+$wb['describe_mail_forwarding'] = 'Quelle';
+$wb['describe_mail_user'] = 'Email';
+$wb['describe_mail_user_filter'] = 'Mailuser-Filter';
+$wb['describe_remote_user'] = 'Remote-User';
+$wb['describe_server_php'] = 'PHP Version';
+$wb['describe_shell_user'] = 'Shell-User';
+$wb['describe_spamfilter_policy'] = 'Spam-Richtlinie';
+$wb['describe_spamfilter_users'] = 'Spam-User';
+$wb['describe_web_database'] = 'Datenbank';
+$wb['describe_web_database_user'] = 'Datenbank-User';
+$wb['describe_web_domain'] = 'Webseite';
+$wb['describe_web_folder_user'] = 'Web-Ordner User';
 ?>
diff --git a/interface/web/monitor/lib/lang/en_dataloghistory_view.lng b/interface/web/monitor/lib/lang/en_dataloghistory_view.lng
index df9ddd286f..523018aae3 100644
--- a/interface/web/monitor/lib/lang/en_dataloghistory_view.lng
+++ b/interface/web/monitor/lib/lang/en_dataloghistory_view.lng
@@ -23,4 +23,21 @@ $wb['new_txt'] = 'New';
 $wb['btn_cancel_txt'] = 'Back';
 $wb['undo_txt'] = 'Undo action';
 $wb['undo_confirmation_txt'] = 'Do you really want to undo this action?';
+$wb['describe_client'] = 'Username';
+$wb['describe_directive_snippets'] = 'Direktive Snippet';
+$wb['describe_domain'] = 'Domain';
+$wb['describe_ftp_user'] = 'FTP-User';
+$wb['describe_mail_domain'] = 'Email-Domain';
+$wb['describe_mail_forwarding'] = 'Source';
+$wb['describe_mail_user'] = 'Email';
+$wb['describe_mail_user_filter'] = 'Mailuser-Filter';
+$wb['describe_remote_user'] = 'Remote-User';
+$wb['describe_shell_user'] = 'Shell-User';
+$wb['describe_server_php'] = 'PHP Version';
+$wb['describe_spamfilter_policy'] = 'Spam-Policy';
+$wb['describe_spamfilter_users'] = 'Spam-User';
+$wb['describe_web_database'] = 'Database';
+$wb['describe_web_database_user'] = 'Database-User';
+$wb['describe_web_domain'] = 'Website';
+$wb['describe_web_folder_user'] = 'Web-Folder User';
 ?>
diff --git a/interface/web/monitor/templates/dataloghistory_view.htm b/interface/web/monitor/templates/dataloghistory_view.htm
index 4ba82bbf05..f92a9a1e49 100644
--- a/interface/web/monitor/templates/dataloghistory_view.htm
+++ b/interface/web/monitor/templates/dataloghistory_view.htm
@@ -20,6 +20,12 @@
 				<td><tmpl_var name="table_txt"></td>
 				<td><tmpl_var name="table"></td>
 			</tr>
+			<tmpl_if name="describe_data" op="!=" value="">
+				<tr>
+					<td><tmpl_var name="describe"></td>
+					<td><tmpl_var name="describe_data"></td>
+				</tr>
+			</tmpl_if>
 			<tr>
 				<td><tmpl_var name="action_txt"></td>
 				<td><tmpl_var name="action_name"></td>
-- 
GitLab