Skip to content

Commit 534a6dc

Browse files
florian030florian030
committed
improve datalog-viewer
1 parent ba50713 commit 534a6dc

File tree

4 files changed

+103
-2
lines changed

4 files changed

+103
-2
lines changed

‎interface/web/monitor/dataloghistory_view.php‎

Lines changed: 63 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']);
@@ -75,6 +73,7 @@
7573
$app->tpl->setLoop('inserts', $inserts);
7674
break;
7775
case 'u':
76+
$out = describe($record['dbtable'], $data, $out);
7877
$updates = array();
7978
foreach ($data['new'] as $key=>$value) {
8079
if ($value != $data['old'][$key]) {
@@ -128,4 +127,66 @@ function show_diff_if_needed($old, $new) {
128127
}
129128
}
130129

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

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,21 @@ $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_directive_snippets'] = 'Direktiven Schnippsel';
28+
$wb['describe_domain'] = 'Domain';
29+
$wb['describe_ftp_user'] = 'FTP-User';
30+
$wb['describe_mail_domain'] = 'Email-Domain';
31+
$wb['describe_mail_forwarding'] = 'Quelle';
32+
$wb['describe_mail_user'] = 'Email';
33+
$wb['describe_mail_user_filter'] = 'Mailuser-Filter';
34+
$wb['describe_remote_user'] = 'Remote-User';
35+
$wb['describe_server_php'] = 'PHP Version';
36+
$wb['describe_shell_user'] = 'Shell-User';
37+
$wb['describe_spamfilter_policy'] = 'Spam-Richtlinie';
38+
$wb['describe_spamfilter_users'] = 'Spam-User';
39+
$wb['describe_web_database'] = 'Datenbank';
40+
$wb['describe_web_database_user'] = 'Datenbank-User';
41+
$wb['describe_web_domain'] = 'Webseite';
42+
$wb['describe_web_folder_user'] = 'Web-Ordner User';
2643
?>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,21 @@ $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_directive_snippets'] = 'Direktive Snippet';
28+
$wb['describe_domain'] = 'Domain';
29+
$wb['describe_ftp_user'] = 'FTP-User';
30+
$wb['describe_mail_domain'] = 'Email-Domain';
31+
$wb['describe_mail_forwarding'] = 'Source';
32+
$wb['describe_mail_user'] = 'Email';
33+
$wb['describe_mail_user_filter'] = 'Mailuser-Filter';
34+
$wb['describe_remote_user'] = 'Remote-User';
35+
$wb['describe_shell_user'] = 'Shell-User';
36+
$wb['describe_server_php'] = 'PHP Version';
37+
$wb['describe_spamfilter_policy'] = 'Spam-Policy';
38+
$wb['describe_spamfilter_users'] = 'Spam-User';
39+
$wb['describe_web_database'] = 'Database';
40+
$wb['describe_web_database_user'] = 'Database-User';
41+
$wb['describe_web_domain'] = 'Website';
42+
$wb['describe_web_folder_user'] = 'Web-Folder User';
2643
?>

‎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)