From 7e48bdf4e952f7b700e64e4cd8cb190bfc630ef9 Mon Sep 17 00:00:00 2001 From: mcramer Date: Wed, 31 Oct 2012 11:42:05 +0000 Subject: [PATCH] Fixed: Follow-up to commit r3623 - entered all missing german and english entries for datalog status - excluded some more tables from status display - inserted the info-display code to the relevant templates --- interface/lib/classes/db_mysql.inc.php | 2 +- interface/lib/lang/de.lng | 24 +++++++++++-- interface/lib/lang/en.lng | 36 +++++++++++++++++++ interface/web/dns/templates/dns_a_list.htm | 16 +++++++++ .../web/dns/templates/dns_slave_list.htm | 16 +++++++++ interface/web/dns/templates/dns_soa_list.htm | 16 +++++++++ .../web/mail/templates/mail_alias_list.htm | 16 +++++++++ .../mail/templates/mail_aliasdomain_list.htm | 16 +++++++++ .../mail/templates/mail_blacklist_list.htm | 16 +++++++++ .../templates/mail_content_filter_list.htm | 16 +++++++++ .../templates/mail_domain_catchall_list.htm | 16 +++++++++ .../web/mail/templates/mail_domain_list.htm | 16 +++++++++ .../web/mail/templates/mail_forward_list.htm | 16 +++++++++ .../web/mail/templates/mail_get_list.htm | 16 +++++++++ .../mail/templates/mail_mailinglist_list.htm | 16 +++++++++ .../templates/mail_relay_recipient_list.htm | 16 +++++++++ .../mail/templates/mail_transport_list.htm | 16 +++++++++ .../mail/templates/mail_user_filter_list.htm | 16 +++++++++ .../web/mail/templates/mail_user_list.htm | 16 +++++++++ .../sites/templates/database_user_list.htm | 16 +++++++++ .../web/sites/templates/ftp_user_list.htm | 16 +++++++++ .../web/sites/templates/shell_user_list.htm | 16 +++++++++ .../sites/templates/web_aliasdomain_list.htm | 16 +++++++++ .../web/sites/templates/web_domain_list.htm | 16 +++++++++ .../web/sites/templates/web_folder_list.htm | 16 +++++++++ .../sites/templates/web_folder_user_list.htm | 16 +++++++++ .../sites/templates/web_subdomain_list.htm | 16 +++++++++ .../templates/web_vhost_subdomain_list.htm | 16 +++++++++ .../web/sites/templates/webdav_user_list.htm | 16 +++++++++ 29 files changed, 474 insertions(+), 4 deletions(-) diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php index 196729742b..488897ca2f 100644 --- a/interface/lib/classes/db_mysql.inc.php +++ b/interface/lib/classes/db_mysql.inc.php @@ -331,7 +331,7 @@ public function toLower($record) { $result = $this->queryAllRecords("SELECT COUNT( * ) AS cnt, sys_datalog.action, sys_datalog.dbtable FROM sys_datalog, server WHERE server.server_id = sys_datalog.server_id AND sys_datalog.user = '" . $this->quote($login) . "' AND sys_datalog.datalog_id > server.updated GROUP BY sys_datalog.dbtable, sys_datalog.action"); foreach($result as $row) { - if(!$row['dbtable'] || in_array($row['dbtable'], array('spamfilter_users', ''))) continue; // ignore some entries, maybe more to come + if(!$row['dbtable'] || in_array($row['dbtable'], array('spamfilter_users', 'aps_instances', 'aps_instances_settings', 'mail_access', 'mail_content_filter'))) continue; // ignore some entries, maybe more to come $return['entries'][] = array('table' => $row['dbtable'], 'action' => $row['action'], 'count' => $row['cnt'], 'text' => $app->lng('datalog_status_' . $row['action'] . '_' . $row['dbtable'])); $return['count'] += $row['cnt']; } diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng index 04fc9214df..5c44045fcc 100644 --- a/interface/lib/lang/de.lng +++ b/interface/lib/lang/de.lng @@ -83,9 +83,6 @@ $wb['global_tabchange_discard_txt'] = "Achtung, Sie haben ungespeicherte Änderu $wb['datalog_changes_txt'] = 'Folgende Änderungen wurden noch nicht auf alle Server übernommen:'; $wb['datalog_changes_end_txt'] = 'Die Übernahme der Änderungen kann bis zu 1 Minute in Anspruch nehmen.'; -$wb['datalog_status_i_ftp_user'] = 'FTP-Benutzer anlegen'; -$wb['datalog_status_u_ftp_user'] = 'FTP-Benutzer ändern'; -$wb['datalog_status_d_ftp_user'] = 'FTP-Benutzer löschen'; $wb['datalog_status_i_web_database'] = 'Neue Datenbank anlegen'; $wb['datalog_status_u_web_database'] = 'Datenbank ändern'; $wb['datalog_status_d_web_database'] = 'Datenbank löschen'; @@ -95,6 +92,9 @@ $wb['datalog_status_d_web_database_user'] = 'Datenbank-Benutzer löschen'; $wb['datalog_status_i_web_domain'] = 'Neue Webseite anlegen'; $wb['datalog_status_u_web_domain'] = 'Webseiten-Einstellungen ändern'; $wb['datalog_status_d_web_domain'] = 'Webseite löschen'; +$wb['datalog_status_i_ftp_user'] = 'FTP-Benutzer anlegen'; +$wb['datalog_status_u_ftp_user'] = 'FTP-Benutzer ändern'; +$wb['datalog_status_d_ftp_user'] = 'FTP-Benutzer löschen'; $wb['datalog_status_i_mail_domain'] = 'Neue E-Mail Domain anlegen'; $wb['datalog_status_u_mail_domain'] = 'E-Mail Domain ändern'; $wb['datalog_status_d_mail_domain'] = 'E-Mail Domain löschen'; @@ -110,6 +110,24 @@ $wb['datalog_status_d_dns_rr'] = 'DNS Record löschen'; $wb['datalog_status_i_dns_soa'] = 'DNS Zone anlegen'; $wb['datalog_status_u_dns_soa'] = 'DNS Zone ändern'; $wb['datalog_status_d_dns_soa'] = 'DNS Zone löschen'; +$wb['datalog_status_i_cron'] = 'Cronjob anlegen'; +$wb['datalog_status_u_cron'] = 'Cronjob ändern'; +$wb['datalog_status_d_cron'] = 'Cronjob löschen'; +$wb['datalog_status_i_mail_get'] = 'Mailabruf anlegen'; +$wb['datalog_status_u_mail_get'] = 'Mailabruf ändern'; +$wb['datalog_status_d_mail_get'] = 'Mailabruf löschen'; +$wb['datalog_status_i_mail_mailinglist'] = 'Mailingliste anlegen'; +$wb['datalog_status_u_mail_mailinglist'] = 'Mailingliste ändern'; +$wb['datalog_status_d_mail_mailinglist'] = 'Mailingliste löschen'; +$wb['datalog_status_i_shell_user'] = 'Shell User anlegen'; +$wb['datalog_status_u_shell_user'] = 'Shell User ändern'; +$wb['datalog_status_d_shell_user'] = 'Shell User löschen'; +$wb['datalog_status_i_web_folder'] = 'Verzeichnisschutz anlegen'; +$wb['datalog_status_u_web_folder'] = 'Verzeichnisschutz ändern'; +$wb['datalog_status_d_web_folder'] = 'Verzeichnisschutz löschen'; +$wb['datalog_status_i_web_folder_user'] = 'Verzeichnisschutz Benutzer anlegen'; +$wb['datalog_status_u_web_folder_user'] = 'Verzeichnisschutz Benutzer ändern'; +$wb['datalog_status_d_web_folder_user'] = 'Verzeichnisschutz Benutzer löschen'; ?> diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng index b2066ed2b6..76edaec219 100644 --- a/interface/lib/lang/en.lng +++ b/interface/lib/lang/en.lng @@ -92,4 +92,40 @@ $wb['datalog_status_d_web_database_user'] = 'Delete database user'; $wb['datalog_status_i_web_domain'] = 'Create new website'; $wb['datalog_status_u_web_domain'] = 'Update website settings'; $wb['datalog_status_d_web_domain'] = 'Delete website'; +$wb['datalog_status_i_ftp_user'] = 'Create FTP user'; +$wb['datalog_status_u_ftp_user'] = 'Update FTP user'; +$wb['datalog_status_d_ftp_user'] = 'Delete FTP user'; +$wb['datalog_status_i_mail_domain'] = 'Create email domain'; +$wb['datalog_status_u_mail_domain'] = 'Update email domain'; +$wb['datalog_status_d_mail_domain'] = 'Delete email domain'; +$wb['datalog_status_i_mail_user'] = 'Create email user'; +$wb['datalog_status_u_mail_user'] = 'Update email user'; +$wb['datalog_status_d_mail_user'] = 'Delete email user'; +$wb['datalog_status_i_mail_forwarding'] = 'Create email address'; +$wb['datalog_status_u_mail_forwarding'] = 'Update email address'; +$wb['datalog_status_d_mail_forwarding'] = 'Delete email address'; +$wb['datalog_status_i_dns_rr'] = 'Create DNS record'; +$wb['datalog_status_u_dns_rr'] = 'Update DNS record'; +$wb['datalog_status_d_dns_rr'] = 'Delete DNS record'; +$wb['datalog_status_i_dns_soa'] = 'Create DNS zone'; +$wb['datalog_status_u_dns_soa'] = 'Update DNS zone'; +$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone'; +$wb['datalog_status_i_cron'] = 'Create cron job'; +$wb['datalog_status_u_cron'] = 'Update cron job'; +$wb['datalog_status_d_cron'] = 'Delete cron job'; +$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account'; +$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account'; +$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account'; +$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list'; +$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list'; +$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list'; +$wb['datalog_status_i_shell_user'] = 'Create shell user'; +$wb['datalog_status_u_shell_user'] = 'Update shell user'; +$wb['datalog_status_d_shell_user'] = 'Delete shell user'; +$wb['datalog_status_i_web_folder'] = 'Create folder protection'; +$wb['datalog_status_u_web_folder'] = 'Update folder protection'; +$wb['datalog_status_d_web_folder'] = 'Delete folder protection'; +$wb['datalog_status_i_web_folder_user'] = 'Create folder protection user'; +$wb['datalog_status_u_web_folder_user'] = 'Update folder protection user'; +$wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user'; ?> diff --git a/interface/web/dns/templates/dns_a_list.htm b/interface/web/dns/templates/dns_a_list.htm index 37247f8b96..792b294f61 100644 --- a/interface/web/dns/templates/dns_a_list.htm +++ b/interface/web/dns/templates/dns_a_list.htm @@ -1,4 +1,20 @@
+ +
+
+
+
+ {tmpl_var name="datalog_changes_txt"} +
    + +
  • {tmpl_var name="text"}: {tmpl_var name="count"}
    • +     +
+ {tmpl_var name="datalog_changes_end_txt"} +
+

+
+
{tmpl_var name="toolsarea_head_txt"}
diff --git a/interface/web/dns/templates/dns_slave_list.htm b/interface/web/dns/templates/dns_slave_list.htm index 1c7046b817..edb980c6af 100644 --- a/interface/web/dns/templates/dns_slave_list.htm +++ b/interface/web/dns/templates/dns_slave_list.htm @@ -4,6 +4,22 @@
+ +
+
+
+
+ {tmpl_var name="datalog_changes_txt"} +
    + +
  • {tmpl_var name="text"}: {tmpl_var name="count"}
    • +     +
+ {tmpl_var name="datalog_changes_end_txt"} +
+

+
+
{tmpl_var name="toolsarea_head_txt"}
diff --git a/interface/web/mail/templates/mail_alias_list.htm b/interface/web/mail/templates/mail_alias_list.htm index 5761b50e3e..5ac6862fd2 100644 --- a/interface/web/mail/templates/mail_alias_list.htm +++ b/interface/web/mail/templates/mail_alias_list.htm @@ -4,6 +4,22 @@
+ +
+
+
+
+ {tmpl_var name="datalog_changes_txt"} +
    + +
  • {tmpl_var name="text"}: {tmpl_var name="count"}
    • +     +
+ {tmpl_var name="datalog_changes_end_txt"} +
+

+
+
{tmpl_var name="toolsarea_head_txt"}