Merge branch 'master' of github.com:Froxlor/Froxlor

lib/classes/mail/class.mailLogParser.php

@@ -189,7 +189,7 @@ class MailLogParser {
 
 			$timestamp = $this->_getLogTimestamp($line);
 			if ($this->startTime < $timestamp) {
-				if (preg_match("/dovecot.*(?::|\]) imap\(.*@([a-z0-9\.\-]+)\):.*in=(\d+) out=(\d+)/i", $line, $matches)) {
+				if (preg_match("/dovecot.*(?::|\]) imap\(.*@([a-z0-9\.\-]+)\):.*(?:in=(\d+) out=(\d+)|bytes=(\d+)\/(\d+))/i", $line, $matches)) {
 					// Dovecot IMAP
 					$this->_addDomainTraffic($matches[1], (int)$matches[2] + (int)$matches[3], $timestamp);
 				} elseif (preg_match("/dovecot.*(?::|\]) pop3\(.*@([a-z0-9\.\-]+)\):.*size=(\d+)/i", $line, $matches)) {

templates/Sparkle/assets/css/main.css

@@ -168,14 +168,13 @@ ul.topheadernav li ul li a:hover {
 	display:block;
 	font-size:9px;
 	color:#fff;
-	background-color:#d00;
+	background-color:#d90000;
 	position:absolute;
 	padding:3px;
-	font-weight:700;
 	line-height:9px;
 	border-radius:3px;
 	right:-6px;
-	bottom:-1px;
+	bottom:-4px;
 }
 
 /* FOOTER */