diff --git a/customer_traffic.php b/customer_traffic.php index a28490e9..bbf42281 100644 --- a/customer_traffic.php +++ b/customer_traffic.php @@ -55,7 +55,7 @@ if (!is_null($month) && !is_null($year)) { 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 index 4b48c8fc..7c69ba98 100644 --- a/lib/classes/mail/class.mailLogParser.php +++ b/lib/classes/mail/class.mailLogParser.php @@ -156,6 +156,8 @@ class MailLogParser { } } } + fclose($file_handle); + return true; } @@ -196,6 +198,8 @@ class MailLogParser { } } } + fclose($file_handle); + return true; } @@ -233,6 +237,8 @@ class MailLogParser { } } } + fclose($file_handle); + return true; } diff --git a/scripts/jobs/cron_traffic.php b/scripts/jobs/cron_traffic.php index 4c59efad..01e02dfa 100644 --- a/scripts/jobs/cron_traffic.php +++ b/scripts/jobs/cron_traffic.php @@ -151,9 +151,7 @@ if (Settings::Get('system.diskquota_enabled')) { * 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 index 84702dfe..b956ed78 100644 --- 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 index 84702dfe..b956ed78 100644 --- 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();