From d9a5f052a1bf3886fc9d2d43d0b2f4e15ed2ed1f Mon Sep 17 00:00:00 2001
From: "Roman Schmerold (BNoiZe)" <bnoize@froxlor.org>
Date: Sun, 5 Jan 2014 18:16:55 +0100
Subject: [PATCH] Fixed mailparser ignoring last day of year

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
---
 lib/classes/mail/class.mailLogParser.php | 27 ++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/lib/classes/mail/class.mailLogParser.php b/lib/classes/mail/class.mailLogParser.php
index 64e3044e..d9930bd2 100644
--- a/lib/classes/mail/class.mailLogParser.php
+++ b/lib/classes/mail/class.mailLogParser.php
@@ -249,21 +249,17 @@ class MailLogParser {
 	 * @param int traffic
 	 */
 	private function _addDomainTraffic($domain, $traffic, $timestamp) {
-		if ($timestamp < ($this->startTime + 60 * 60 * 24)) {
-			// Only add traffic if it's not in the future!
-			$date = date("Y-m-d", $timestamp);
-			if (in_array($domain, $this->myDomains)) {
-				if (array_key_exists($domain, $this->domainTraffic) && array_key_exists($date, $this->domainTraffic[$domain])) {
-					$this->domainTraffic[$domain][$date] += (int)$traffic;
-				} else {
-					if (!array_key_exists($domain, $this->domainTraffic)) {
-						$this->domainTraffic[$domain] = array();
-					}
-					$this->domainTraffic[$domain][$date] = (int)$traffic;
+		$date = date("Y-m-d", $timestamp);
+		if (in_array($domain, $this->myDomains)) {
+			if (array_key_exists($domain, $this->domainTraffic) && array_key_exists($date, $this->domainTraffic[$domain])) {
+				$this->domainTraffic[$domain][$date] += (int)$traffic;
+			} else {
+				if (!array_key_exists($domain, $this->domainTraffic)) {
+					$this->domainTraffic[$domain] = array();
 				}
+				$this->domainTraffic[$domain][$date] = (int)$traffic;
 			}
 		}
-
 	}
 
 
@@ -274,7 +270,12 @@ class MailLogParser {
 	 */
 	private function _getLogTimestamp($line) {
 		if (preg_match("/((?:[A-Z]{3}\s{1,2}\d{1,2}|\d{4}-\d{2}-\d{2}) \d{2}:\d{2}:\d{2})/i", $line, $matches)) {
-			return strtotime($matches[1]);
+			$timestamp = strtotime($matches[1]);
+			if ($timestamp > ($this->startTime + 60 * 60 * 24)) {
+				return strtotime($matches[1] . " -1 year");
+			} else {
+				return strtotime($matches[1]);
+			}
 		} else {
 			return 0;
 		}