Commit 6ac26d69 authored by tbrehm's avatar tbrehm

Implemented: FS#2059 - Extend Traffic quota system

parent 441dca4c
...@@ -282,7 +282,7 @@ class listform_actions { ...@@ -282,7 +282,7 @@ class listform_actions {
$this->onShowEnd(); $this->onShowEnd();
} }
private function onShowEnd() public function onShowEnd()
{ {
global $app; global $app;
$app->tpl_defaults(); $app->tpl_defaults();
......
...@@ -5,4 +5,5 @@ $wb["this_month_txt"] = 'This month'; ...@@ -5,4 +5,5 @@ $wb["this_month_txt"] = 'This month';
$wb["last_month_txt"] = 'Last month'; $wb["last_month_txt"] = 'Last month';
$wb["this_year_txt"] = 'This year'; $wb["this_year_txt"] = 'This year';
$wb["last_year_txt"] = 'Last year'; $wb["last_year_txt"] = 'Last year';
$wb["sum_txt"] = 'Sum';
?> ?>
\ No newline at end of file
...@@ -38,6 +38,17 @@ ...@@ -38,6 +38,17 @@
</td> </td>
</tr> </tr>
</tmpl_loop> </tmpl_loop>
<tr class="tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>">
<td class="tbl_col_domain"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');" style="font-weight:bold;">{tmpl_var name="sum_txt"}</a></td>
<td class="tbl_col_this_month"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');" style="font-weight:bold;">{tmpl_var name="sum_this_month"} MB</a></td>
<td class="tbl_col_last_month"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');" style="font-weight:bold;">{tmpl_var name="sum_last_month"} MB</a></td>
<td class="tbl_col_this_year"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');" style="font-weight:bold;">{tmpl_var name="sum_this_year"} MB</a></td>
<td class="tbl_col_last_year"><a href="#" onClick="loadContent('sites/web_domain_edit.php?id={tmpl_var name='id'}');" style="font-weight:bold;">{tmpl_var name="sum_last_year"} MB</a></td>
<td class="tbl_col_buttons">
<div class="buttons icons16">
</div>
</td>
</tr>
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr>
......
...@@ -19,6 +19,11 @@ $app->load('listform_actions'); ...@@ -19,6 +19,11 @@ $app->load('listform_actions');
class list_action extends 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) function prepareDataRow($rec)
{ {
global $app; global $app;
...@@ -35,26 +40,45 @@ class list_action extends listform_actions { ...@@ -35,26 +40,45 @@ class list_action extends listform_actions {
$tmp_month = date('m'); $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'"); $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, '.', ' '); $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 //** 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'"); $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, '.', ' '); $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 //** Traffic of the last month
$tmp_year = date('Y',mktime(0, 0, 0, date("m")-1, date("d"), date("Y"))); $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_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'"); $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, '.', ' '); $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 //** Traffic of the last year
$tmp_year = date('Y',mktime(0, 0, 0, date("m"), date("d"), date("Y")-1)); $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'"); $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, '.', ' '); $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 //* The variable "id" contains always the index variable
$rec['id'] = $rec[$this->idx_key]; $rec['id'] = $rec[$this->idx_key];
return $rec; 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; $list = new list_action;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment