Skip to content

Commit a6ce764

Browse files
author
Till Brehm
committed
Merge branch 'master' into 'master'
improve datalog-viewer See merge request ispconfig/ispconfig3!894
2 parents 72b955c + 46b7448 commit a6ce764

File tree

4 files changed

+112
-2
lines changed

4 files changed

+112
-2
lines changed

‎interface/web/monitor/dataloghistory_view.php‎

Lines changed: 70 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?php
2-
32
/*
43
Copyright (c) 2007-2008, Till Brehm, projektfarm Gmbh and Oliver Vogel www.muv.com
54
All rights reserved.
@@ -48,7 +47,6 @@
4847
$id = intval($_GET['id']);
4948

5049
$record = $app->db->queryOneRecord('SELECT * FROM sys_datalog WHERE datalog_id = ?', $id);
51-
5250
$out['id'] = $id;
5351

5452
$out['timestamp'] = date($app->lng('conf_format_datetime'), $record['tstamp']);
@@ -63,6 +61,8 @@
6361
$data = unserialize($record['data']);
6462
}
6563

64+
$out = describe($record['dbtable'], $data, $out);
65+
6666
switch ($record['action']) {
6767
case 'i':
6868
$inserts = array();
@@ -128,4 +128,72 @@ function show_diff_if_needed($old, $new) {
128128
}
129129
}
130130

131+
function describe($dbtable, $data, $out) {
132+
global $app;
133+
$out['describe'] = $app->lng('describe_'.$dbtable);
134+
switch ($dbtable) {
135+
case 'client':
136+
$check = 'username';
137+
break;
138+
case 'cron':
139+
$temp = $app->db->queryOneRecord("SELECT domain FROM web_domain WHERE domain_id = ?", $data['new']['parent_domain_id']);
140+
$out['describe_data'] = $temp['domain'];
141+
break;
142+
case 'directive_snippets':
143+
$check = 'name';
144+
break;
145+
case 'domain':
146+
$check = 'domain';
147+
break;
148+
case 'ftp_user':
149+
$check = 'username';
150+
break;
151+
case 'mail_domain':
152+
$check = 'domain';
153+
break;
154+
case 'mail_forwarding':
155+
$check = 'source';
156+
break;
157+
case 'mail_user':
158+
$check = 'email';
159+
break;
160+
case 'mail_user_filter':
161+
$check = 'rulename';
162+
break;
163+
case 'remote_user':
164+
$check = 'remote_username';
165+
break;
166+
case 'server_php':
167+
$check = 'name';
168+
break;
169+
case 'shell_user':
170+
$check = 'username';
171+
break;
172+
case 'spamfilter_policy':
173+
$check = 'policy_name';
174+
break;
175+
case 'spamfilter_users':
176+
$check = 'email';
177+
break;
178+
case 'web_domain':
179+
$check = 'domain';
180+
break;
181+
case 'web_database_user':
182+
$check = 'database_user';
183+
break;
184+
case 'web_database':
185+
$check = 'database_name';
186+
break;
187+
case 'web_folder_user':
188+
$check = 'username';
189+
break;
190+
}
191+
192+
if(!isset($out['describe_data'])) {
193+
$out['describe_data'] = @(isset($data['old'][$check]) && $data['old'][$check] != $data['new'][$check])?$data['old'][$check].'/'.$data['new'][$check]:$data['new'][$check];
194+
}
195+
196+
return $out;
197+
}
198+
131199
?>

‎interface/web/monitor/lib/lang/de_dataloghistory_view.lng‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,22 @@ $wb['new_txt'] = 'Neu';
2323
$wb['btn_cancel_txt'] = 'Zurück';
2424
$wb['undo_txt'] = 'Rückgängig machen';
2525
$wb['undo_confirmation_txt'] = 'Soll diese Änderung wirklich rückgängig gemacht werden?';
26+
$wb['describe_client'] = 'Username';
27+
$wb['describe_cron'] = 'Webseite';
28+
$wb['describe_directive_snippets'] = 'Direktiven Schnippsel';
29+
$wb['describe_domain'] = 'Domain';
30+
$wb['describe_ftp_user'] = 'FTP-User';
31+
$wb['describe_mail_domain'] = 'Email-Domain';
32+
$wb['describe_mail_forwarding'] = 'Quelle';
33+
$wb['describe_mail_user'] = 'Email';
34+
$wb['describe_mail_user_filter'] = 'Mailuser-Filter';
35+
$wb['describe_remote_user'] = 'Remote-User';
36+
$wb['describe_server_php'] = 'PHP Version';
37+
$wb['describe_shell_user'] = 'Shell-User';
38+
$wb['describe_spamfilter_policy'] = 'Spam-Richtlinie';
39+
$wb['describe_spamfilter_users'] = 'Spam-User';
40+
$wb['describe_web_database'] = 'Datenbank';
41+
$wb['describe_web_database_user'] = 'Datenbank-User';
42+
$wb['describe_web_domain'] = 'Webseite';
43+
$wb['describe_web_folder_user'] = 'Web-Ordner User';
2644
?>

‎interface/web/monitor/lib/lang/en_dataloghistory_view.lng‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,22 @@ $wb['new_txt'] = 'New';
2323
$wb['btn_cancel_txt'] = 'Back';
2424
$wb['undo_txt'] = 'Undo action';
2525
$wb['undo_confirmation_txt'] = 'Do you really want to undo this action?';
26+
$wb['describe_client'] = 'Username';
27+
$wb['describe_cron'] = 'Website';
28+
$wb['describe_directive_snippets'] = 'Direktive Snippet';
29+
$wb['describe_domain'] = 'Domain';
30+
$wb['describe_ftp_user'] = 'FTP-User';
31+
$wb['describe_mail_domain'] = 'Email-Domain';
32+
$wb['describe_mail_forwarding'] = 'Source';
33+
$wb['describe_mail_user'] = 'Email';
34+
$wb['describe_mail_user_filter'] = 'Mailuser-Filter';
35+
$wb['describe_remote_user'] = 'Remote-User';
36+
$wb['describe_shell_user'] = 'Shell-User';
37+
$wb['describe_server_php'] = 'PHP Version';
38+
$wb['describe_spamfilter_policy'] = 'Spam-Policy';
39+
$wb['describe_spamfilter_users'] = 'Spam-User';
40+
$wb['describe_web_database'] = 'Database';
41+
$wb['describe_web_database_user'] = 'Database-User';
42+
$wb['describe_web_domain'] = 'Website';
43+
$wb['describe_web_folder_user'] = 'Web-Folder User';
2644
?>

‎interface/web/monitor/templates/dataloghistory_view.htm‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ <h1><tmpl_var name="list_head_txt"></h1>
2020
<td><tmpl_var name="table_txt"></td>
2121
<td><tmpl_var name="table"></td>
2222
</tr>
23+
<tmpl_if name="describe_data" op="!=" value="">
24+
<tr>
25+
<td><tmpl_var name="describe"></td>
26+
<td><tmpl_var name="describe_data"></td>
27+
</tr>
28+
</tmpl_if>
2329
<tr>
2430
<td><tmpl_var name="action_txt"></td>
2531
<td><tmpl_var name="action_name"></td>

0 commit comments

Comments
 (0)