From de1ac5656d0a68f4d2be92539d11ad2e8bc33cde Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sat, 31 Oct 2020 21:17:08 +0100
Subject: [PATCH 1/2] Add extra links to datalog

---
 interface/web/monitor/dataloghistory_view.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/interface/web/monitor/dataloghistory_view.php b/interface/web/monitor/dataloghistory_view.php
index b86334b0af..6a268c4fa7 100644
--- a/interface/web/monitor/dataloghistory_view.php
+++ b/interface/web/monitor/dataloghistory_view.php
@@ -79,6 +79,15 @@ if (!empty($value)) {
 			case 'web_database_user':
 				$file = 'sites/database_user_edit.php';
 			break;
+                       case 'ftp_user':
+                               $file = 'sites/ftp_user_edit.php';
+                       break;
+                       case 'shell_user':
+                               $file = 'sites/shell_user_edit.php';
+                       break;
+                       case 'dns_soa':
+                               $file = 'dns/dns_soa_edit.php';
+                       break;
 
 			// TODO Add a link per content type
 			default:
-- 
GitLab


From 44ab3adcd1f6f07b47e299d40c4b1d96e1c8fc6e Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Thu, 17 Dec 2020 22:17:18 +0100
Subject: [PATCH 2/2] Correct mail_forwarding sub type links

---
 interface/web/monitor/dataloghistory_view.php | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/interface/web/monitor/dataloghistory_view.php b/interface/web/monitor/dataloghistory_view.php
index 6a268c4fa7..433f1e0ee9 100644
--- a/interface/web/monitor/dataloghistory_view.php
+++ b/interface/web/monitor/dataloghistory_view.php
@@ -52,6 +52,10 @@ $record = $app->db->queryOneRecord('SELECT * FROM sys_datalog WHERE datalog_id =
 $out['id'] = $id;
 $out['username'] = $record['user'];
 
+if(!$data = unserialize(stripslashes($record['data']))) {
+	$data = unserialize($record['data']);
+}
+
 $out['timestamp'] = date($app->lng('conf_format_datetime'), $record['tstamp']);
 $out['table'] = $record['dbtable'];
 list($key, $value) = explode(':', $record['dbidx']);
@@ -62,7 +66,20 @@ if (!empty($value)) {
 	} else {
 		switch ($out['table']) {
 			case 'mail_forwarding':
-				$file = 'mail/mail_forward_edit.php';
+				switch ($data['new']['type']) {
+					case 'alias':
+						$file = 'mail/mail_alias_edit.php';
+						break;
+					case 'aliasdomain':
+						$file = 'mail/mail_aliasdomain_edit.php';
+						break;
+					case 'forward':
+						$file = 'mail/mail_forward_edit.php';
+						break;
+					case 'catchall':
+						$file = 'mail/mail_domain_catchall_edit.php';
+						break;
+				}
 			break;
 			case 'mail_user':
 				$file = 'mail/mail_user_edit.php';
@@ -107,10 +124,6 @@ $out['action_name'] = $app->lng($record['action']);
 
 $out['session_id'] = $record['session_id'];
 
-if(!$data = unserialize(stripslashes($record['data']))) {
-	$data = unserialize($record['data']);
-}
-
 switch ($record['action']) {
 	case 'i':
 		$inserts = array();
-- 
GitLab