Skip to content

Commit bd69cb9

Browse files
author
Marius Burkard
committed
Merge branch 'patch-enrich-datalog' into 'develop'
Enrich datalog pages with links for more types See merge request ispconfig/ispconfig3!1363
2 parents f7a2aaa + 44ab3ad commit bd69cb9

File tree

1 file changed

+27
-5
lines changed

1 file changed

+27
-5
lines changed

interface/web/monitor/dataloghistory_view.php

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@
5252
$out['id'] = $id;
5353
$out['username'] = $record['user'];
5454

55+
if(!$data = unserialize(stripslashes($record['data']))) {
56+
$data = unserialize($record['data']);
57+
}
58+
5559
$out['timestamp'] = date($app->lng('conf_format_datetime'), $record['tstamp']);
5660
$out['table'] = $record['dbtable'];
5761
list($key, $value) = explode(':', $record['dbidx']);
@@ -62,7 +66,20 @@
6266
} else {
6367
switch ($out['table']) {
6468
case 'mail_forwarding':
65-
$file = 'mail/mail_forward_edit.php';
69+
switch ($data['new']['type']) {
70+
case 'alias':
71+
$file = 'mail/mail_alias_edit.php';
72+
break;
73+
case 'aliasdomain':
74+
$file = 'mail/mail_aliasdomain_edit.php';
75+
break;
76+
case 'forward':
77+
$file = 'mail/mail_forward_edit.php';
78+
break;
79+
case 'catchall':
80+
$file = 'mail/mail_domain_catchall_edit.php';
81+
break;
82+
}
6683
break;
6784
case 'mail_user':
6885
$file = 'mail/mail_user_edit.php';
@@ -79,6 +96,15 @@
7996
case 'web_database_user':
8097
$file = 'sites/database_user_edit.php';
8198
break;
99+
case 'ftp_user':
100+
$file = 'sites/ftp_user_edit.php';
101+
break;
102+
case 'shell_user':
103+
$file = 'sites/shell_user_edit.php';
104+
break;
105+
case 'dns_soa':
106+
$file = 'dns/dns_soa_edit.php';
107+
break;
82108

83109
// TODO Add a link per content type
84110
default:
@@ -98,10 +124,6 @@
98124

99125
$out['session_id'] = $record['session_id'];
100126

101-
if(!$data = unserialize(stripslashes($record['data']))) {
102-
$data = unserialize($record['data']);
103-
}
104-
105127
switch ($record['action']) {
106128
case 'i':
107129
$inserts = array();

0 commit comments

Comments
 (0)