From 0f7357bffd676483ee089fb94313fab6a0ed1738 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 30 Oct 2012 15:51:14 -0400
Subject: [PATCH] Fixed: Follow-up to previous commit  - entered some more german language entries  - excluded some (one for now) datalog dbtables from results

---
 interface/lib/lang/de.lng              |   18 ++++++++++++++++++
 interface/lib/classes/db_mysql.inc.php |    4 ++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php
index 5b50efe..1967297 100644
--- a/interface/lib/classes/db_mysql.inc.php
+++ b/interface/lib/classes/db_mysql.inc.php
@@ -331,9 +331,9 @@
         
         $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']) continue;
+            if(!$row['dbtable'] || in_array($row['dbtable'], array('spamfilter_users', ''))) 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'] += 1;
+            $return['count'] += $row['cnt'];
         }
         unset($result);
         
diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng
index 3fe857d..04fc921 100644
--- a/interface/lib/lang/de.lng
+++ b/interface/lib/lang/de.lng
@@ -83,6 +83,9 @@
 
 $wb['datalog_changes_txt'] = 'Folgende &Auml;nderungen wurden noch nicht auf alle Server &uuml;bernommen:';
 $wb['datalog_changes_end_txt'] = 'Die &Uuml;bernahme der &Auml;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 &auml;ndern';
+$wb['datalog_status_d_ftp_user'] = 'FTP-Benutzer l&ouml;schen';
 $wb['datalog_status_i_web_database'] = 'Neue Datenbank anlegen';
 $wb['datalog_status_u_web_database'] = 'Datenbank &auml;ndern';
 $wb['datalog_status_d_web_database'] = 'Datenbank l&ouml;schen';
@@ -92,6 +95,21 @@
 $wb['datalog_status_i_web_domain'] = 'Neue Webseite anlegen';
 $wb['datalog_status_u_web_domain'] = 'Webseiten-Einstellungen &auml;ndern';
 $wb['datalog_status_d_web_domain'] = 'Webseite l&ouml;schen';
+$wb['datalog_status_i_mail_domain'] = 'Neue E-Mail Domain anlegen';
+$wb['datalog_status_u_mail_domain'] = 'E-Mail Domain &auml;ndern';
+$wb['datalog_status_d_mail_domain'] = 'E-Mail Domain l&ouml;schen';
+$wb['datalog_status_i_mail_user'] = 'Neues E-Mail Konto anlegen';
+$wb['datalog_status_u_mail_user'] = 'E-Mail Konto &auml;ndern';
+$wb['datalog_status_d_mail_user'] = 'E-Mail Konto l&ouml;schen';
+$wb['datalog_status_i_mail_forwarding'] = 'Neue E-Mail Adresse anlegen';
+$wb['datalog_status_u_mail_forwarding'] = 'E-Mail Adresse &auml;ndern';
+$wb['datalog_status_d_mail_forwarding'] = 'E-Mail Adresse l&ouml;schen';
+$wb['datalog_status_i_dns_rr'] = 'DNS Record anlegen';
+$wb['datalog_status_u_dns_rr'] = 'DNS Record &auml;ndern';
+$wb['datalog_status_d_dns_rr'] = 'DNS Record l&ouml;schen';
+$wb['datalog_status_i_dns_soa'] = 'DNS Zone anlegen';
+$wb['datalog_status_u_dns_soa'] = 'DNS Zone &auml;ndern';
+$wb['datalog_status_d_dns_soa'] = 'DNS Zone l&ouml;schen';
 
 ?>
 

--
Gitblit v1.9.1