From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/sites/web_sites_stats.php | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/interface/web/sites/web_sites_stats.php b/interface/web/sites/web_sites_stats.php
index 34c7718..16c40d4 100644
--- a/interface/web/sites/web_sites_stats.php
+++ b/interface/web/sites/web_sites_stats.php
@@ -15,6 +15,8 @@
//* Check permissions for module
$app->auth->check_module_permissions('sites');
+$app->uses('functions');
+
$app->load('listform_actions');
class list_action extends listform_actions {
@@ -38,27 +40,28 @@
//** Traffic of the current month
$tmp_year = date('Y');
$tmp_month = date('m');
- $tmp_rec = $app->db->queryOneRecord("SELECT SUM(traffic_bytes) as t FROM web_traffic WHERE hostname = '".$app->db->quote($rec['domain'])."' AND YEAR(traffic_date) = '$tmp_year' AND MONTH(traffic_date) = '$tmp_month'");
- $rec['this_month'] = number_format($tmp_rec['t']/1024/1024, 0, '.', ' ');
- $this->sum_this_month += ($tmp_rec['t']/1024/1024);
+ $tmp_rec = $app->db->queryOneRecord("SELECT SUM(traffic_bytes) as t FROM web_traffic WHERE hostname = ? AND YEAR(traffic_date) = ? AND MONTH(traffic_date) = ?", $rec['domain'], $tmp_year, $tmp_month);
+ $rec['this_month'] = $app->functions->formatBytes($tmp_rec['t']);
+ $this->sum_this_month += $tmp_rec['t'];
+
//** Traffic of the current year
- $tmp_rec = $app->db->queryOneRecord("SELECT sum(traffic_bytes) as t FROM web_traffic WHERE hostname = '".$app->db->quote($rec['domain'])."' AND YEAR(traffic_date) = '$tmp_year'");
- $rec['this_year'] = number_format($tmp_rec['t']/1024/1024, 0, '.', ' ');
- $this->sum_this_year += ($tmp_rec['t']/1024/1024);
+ $tmp_rec = $app->db->queryOneRecord("SELECT sum(traffic_bytes) as t FROM web_traffic WHERE hostname = ? AND YEAR(traffic_date) = ?", $rec['domain'], $tmp_year);
+ $rec['this_year'] = $app->functions->formatBytes($tmp_rec['t']);
+ $this->sum_this_year += $tmp_rec['t'];
//** Traffic of the last month
$tmp_year = date('Y', mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
$tmp_month = date('m', mktime(0, 0, 0, date("m")-1, date("d"), date("Y")));
- $tmp_rec = $app->db->queryOneRecord("SELECT sum(traffic_bytes) as t FROM web_traffic WHERE hostname = '".$app->db->quote($rec['domain'])."' AND YEAR(traffic_date) = '$tmp_year' AND MONTH(traffic_date) = '$tmp_month'");
- $rec['last_month'] = number_format($tmp_rec['t']/1024/1024, 0, '.', ' ');
- $this->sum_last_month += ($tmp_rec['t']/1024/1024);
+ $tmp_rec = $app->db->queryOneRecord("SELECT sum(traffic_bytes) as t FROM web_traffic WHERE hostname = ? AND YEAR(traffic_date) = ? AND MONTH(traffic_date) = ?", $rec['domain'], $tmp_year, $tmp_month);
+ $rec['last_month'] = $app->functions->formatBytes($tmp_rec['t']);
+ $this->sum_last_month += $tmp_rec['t'];
//** Traffic of the last year
$tmp_year = date('Y', mktime(0, 0, 0, date("m"), date("d"), date("Y")-1));
- $tmp_rec = $app->db->queryOneRecord("SELECT sum(traffic_bytes) as t FROM web_traffic WHERE hostname = '".$app->db->quote($rec['domain'])."' AND YEAR(traffic_date) = '$tmp_year'");
- $rec['last_year'] = number_format($tmp_rec['t']/1024/1024, 0, '.', ' ');
- $this->sum_last_year += ($tmp_rec['t']/1024/1024);
+ $tmp_rec = $app->db->queryOneRecord("SELECT sum(traffic_bytes) as t FROM web_traffic WHERE hostname = ? AND YEAR(traffic_date) = ?", $rec['domain'], $tmp_year);
+ $rec['last_year'] = $app->functions->formatBytes($tmp_rec['t']);
+ $this->sum_last_year += $tmp_rec['t'];
//* The variable "id" contains always the index variable
$rec['id'] = $rec[$this->idx_key];
@@ -70,10 +73,10 @@
{
global $app;
- $app->tpl->setVar('sum_this_month', number_format($app->functions->intval($this->sum_this_month), 0, '.', ' '));
- $app->tpl->setVar('sum_this_year', number_format($app->functions->intval($this->sum_this_year), 0, '.', ' '));
- $app->tpl->setVar('sum_last_month', number_format($app->functions->intval($this->sum_last_month), 0, '.', ' '));
- $app->tpl->setVar('sum_last_year', number_format($app->functions->intval($this->sum_last_year), 0, '.', ' '));
+ $app->tpl->setVar('sum_this_month', $app->functions->formatBytes($this->sum_this_month));
+ $app->tpl->setVar('sum_this_year', $app->functions->formatBytes($this->sum_this_year));
+ $app->tpl->setVar('sum_last_month', $app->functions->formatBytes($this->sum_last_month));
+ $app->tpl->setVar('sum_last_year', $app->functions->formatBytes($this->sum_last_year));
$app->tpl->setVar('sum_txt', $app->listform->lng('sum_txt'));
$app->tpl_defaults();
@@ -169,7 +172,7 @@
}
$list = new list_action;
-$list->SQLExtWhere = "(web_domain.type = 'vhost' or web_domain.type = 'vhostsubdomain')";
+$list->SQLExtWhere = "(web_domain.type = 'vhost' or web_domain.type = 'vhostsubdomain' or web_domain.type = 'vhostalias')";
$list->SQLOrderBy = 'ORDER BY web_domain.domain';
$list->onLoad();
--
Gitblit v1.9.1