Fixing mailtraffic cron, fixes traffic graph sorting

Signed-off-by: Roman Schmerold (BNoiZe) <bnoize@froxlor.org>
froxlor · Dec 22, 2013 · 429f748 · 429f748
1 parent 82f3d8d
commit 429f748
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/customer_traffic.php b/customer_traffic.php
@@ -55,7 +55,7 @@
 		AND `month` = :month
 		AND `year` = :year
 		GROUP BY `day`
-		ORDER BY `day` ASC"
+		ORDER BY `day` DESC"
 	);
 	$params = array(
 		"customerid" => $userinfo['customerid'],

diff --git a/lib/classes/mail/class.mailLogParser.php b/lib/classes/mail/class.mailLogParser.php
@@ -156,6 +156,8 @@ private function _parseExim4Log($logFile) {
 				}
 			}
 		}
+		fclose($file_handle);
+		return true;
 	}
 
 
@@ -196,6 +198,8 @@ private function _parseDovecotLog($logFile) {
 				}
 			}
 		}
+		fclose($file_handle);
+		return true;
 	}
 
 
@@ -233,6 +237,8 @@ private function _parseCourierLog($logFile) {
 				}
 			}
 		}
+		fclose($file_handle);
+		return true;
 	}
 
 

diff --git a/scripts/jobs/cron_traffic.php b/scripts/jobs/cron_traffic.php
@@ -151,9 +151,7 @@
  * MAIL-Traffic
  */
 if (Settings::Get("system.mailtraffic_enabled")) {
-	$stmt = Database::prepare("SELECT lastrun FROM `" . TABLE_PANEL_CRONRUNS . "` WHERE `cronfile` = 'cron_traffic.php'");
-	$lastRunResult = Database::pexecute_first($stmt, array());
-	$mailTrafficCalc = new MailLogParser($lastRunResult['lastrun']);
+	$mailTrafficCalc = new MailLogParser(Settings::Get("system.last_traffic_run"));
 }
 
 $result_stmt = Database::query("SELECT * FROM `" . TABLE_PANEL_CUSTOMERS . "` ORDER BY `customerid` ASC");

diff --git a/templates/Froxlor/assets/js/traffic.js b/templates/Froxlor/assets/js/traffic.js
@@ -12,7 +12,7 @@ $(document).ready(function(){
 	var i = 1;
 	var links = [];
 	$('#datalegend').remove();
-	$('#datatable tr').each(function() {
+	$('#datatable tr').reverse().each(function() {
 		var row = $(this);
 		var day = $(row).children().first().text();
 		var ftpd = $(row).children().first().next().text();

diff --git a/templates/Sparkle/assets/js/traffic.js b/templates/Sparkle/assets/js/traffic.js
@@ -12,7 +12,7 @@ $(document).ready(function(){
 	var i = 1;
 	var links = [];
 	$('#datalegend').remove();
-	$('#datatable tr').each(function() {
+	$('#datatable tr').reverse().each(function() {
 		var row = $(this);
 		var day = $(row).children().first().text();
 		var ftpd = $(row).children().first().next().text();