diff --git a/interface/lib/classes/listform_actions.inc.php b/interface/lib/classes/listform_actions.inc.php index 8b99abd985a2b48a082ff0377fac9f74383e69b9..c8956580b9008bb1781c2a2bf0f94796593d1d6a 100644 --- a/interface/lib/classes/listform_actions.inc.php +++ b/interface/lib/classes/listform_actions.inc.php @@ -282,7 +282,7 @@ class listform_actions { $this->onShowEnd(); } - private function onShowEnd() + public function onShowEnd() { global $app; $app->tpl_defaults(); diff --git a/interface/web/sites/lib/lang/en_web_sites_stats_list.lng b/interface/web/sites/lib/lang/en_web_sites_stats_list.lng index 20f018b82623f4e8de0a6a3ec2bab3e8569971ef..5afde57f6dd05c10c148aec4d6526d0c101f4623 100644 --- a/interface/web/sites/lib/lang/en_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/en_web_sites_stats_list.lng @@ -5,4 +5,5 @@ $wb["this_month_txt"] = 'This month'; $wb["last_month_txt"] = 'Last month'; $wb["this_year_txt"] = 'This year'; $wb["last_year_txt"] = 'Last year'; +$wb["sum_txt"] = 'Sum'; ?> \ No newline at end of file diff --git a/interface/web/sites/templates/web_sites_stats_list.htm b/interface/web/sites/templates/web_sites_stats_list.htm index a0814ad23ad33fcbddd05e0c9a5b6b9028178c65..d51e0e2b812ca2d0f672a004fb90946d2f5a5234 100644 --- a/interface/web/sites/templates/web_sites_stats_list.htm +++ b/interface/web/sites/templates/web_sites_stats_list.htm @@ -38,6 +38,17 @@ + + {tmpl_var name="sum_txt"} + {tmpl_var name="sum_this_month"} MB + {tmpl_var name="sum_last_month"} MB + {tmpl_var name="sum_this_year"} MB + {tmpl_var name="sum_last_year"} MB + +
+
+ + diff --git a/interface/web/sites/web_sites_stats.php b/interface/web/sites/web_sites_stats.php index e9a6c8dd0a78a9f16e8c499b8333384b7589c172..98c4865fde0621db38275c0ee92290afd88feb92 100644 --- a/interface/web/sites/web_sites_stats.php +++ b/interface/web/sites/web_sites_stats.php @@ -19,6 +19,11 @@ $app->load('listform_actions'); class list_action extends listform_actions { + private $sum_this_month = 0; + private $sum_this_year = 0; + private $sum_last_month = 0; + private $sum_last_year = 0; + function prepareDataRow($rec) { global $app; @@ -35,26 +40,45 @@ class list_action extends listform_actions { $tmp_month = date('m'); $tmp_rec = $app->db->queryOneRecord("SELECT SUM(traffic_bytes) as t FROM web_traffic WHERE hostname = '".$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); //** Traffic of the current year $tmp_rec = $app->db->queryOneRecord("SELECT sum(traffic_bytes) as t FROM web_traffic WHERE hostname = '".$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); //** 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 = '".$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); //** 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 = '".$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); //* The variable "id" contains always the index variable $rec['id'] = $rec[$this->idx_key]; + return $rec; } + + function onShowEnd() + { + global $app; + + $app->tpl->setVar('sum_this_month',number_format(intval($this->sum_this_month), 0, '.', ' ')); + $app->tpl->setVar('sum_this_year',number_format(intval($this->sum_this_year), 0, '.', ' ')); + $app->tpl->setVar('sum_last_month',number_format(intval($this->sum_last_month), 0, '.', ' ')); + $app->tpl->setVar('sum_last_year',number_format(intval($this->sum_last_year), 0, '.', ' ')); + $app->tpl->setVar('sum_txt',$app->listform->lng('sum_txt')); + + $app->tpl_defaults(); + $app->tpl->pparse(); + } } $list = new list_action;