bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-06-12 23:57:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

accounting fixes + restrict it to admin user only

Browse Source
This commit is contained in:
SJ
2013-03-12 10:26:21 +01:00
parent 7a096bceb7
commit 625087b082
4 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
webui/model/accounting/accounting.php
View File

@ -90,7 +90,7 @@ class ModelAccountingAccounting extends Model
return $return;
}
public function get_accounting($item = 'email',$page=0,$pagelen=0,$sort='item',$order=0 ) {
public function get_accounting($item = 'email',$search='',$page=0,$pagelen=0,$sort='item',$order=0 ) {
// item can be either email or domain, maybe folder in the future??
@ -116,18 +116,24 @@ class ModelAccountingAccounting extends Model
$account_for_emails = $this->__getEmails();
$account_for_domains = $this->__getDomains();
$search = preg_replace("/\s{1,}/", "", $search);
if ($item == 'email') {
$account_for_emails = $this->__getEmails();
$account_for_domains = $this->__getDomains();
$query = "SELECT `email` AS `item`,MIN(`date`) as `oldest`,MAX(`date`) as `newest`,sum(`sent`) as `sent`,sum(`recd`) as `recd`,SUM(`sentsize`) as `sentsize`,AVG(`sentsize`) as `sentavg`,SUM(`recdsize`) as `recdsize`,AVG(`recdsize`) as `recdavg` FROM " . TABLE_STAT_COUNTER;
$where = "WHERE `email` IN ('".implode("','",$account_for_emails)."') OR `domain` IN ('".implode("','",$account_for_domains)."')";
$where = "WHERE ( `email` IN ('".implode("','",$account_for_emails)."') OR `domain` IN ('".implode("','",$account_for_domains)."') )";
if($search){
$where .= " AND ( `email` like '%".$search."%' OR `domain` like '%".$search."%' )";
}
$group = "GROUP BY `email`";
} elseif ($item == 'domain') {
$account_for_domains = $this->__getDomains();
$query = "SELECT `domain` AS `item`,MIN(`date`) as `oldest`,MAX(`date`) as `newest`,sum(`sent`) as `sent`,sum(`recd`) as `recd`,SUM(`sentsize`) as `sentsize`,AVG(`sentsize`) as `sentavg`,SUM(`recdsize`) as `recdsize`,AVG(`recdsize`) as `recdavg` FROM " . TABLE_STAT_COUNTER;
$where = "WHERE `domain` IN ('".implode("','",$account_for_domains)."')";
$where = "WHERE ( `domain` IN ('".implode("','",$account_for_domains)."') )";
if($search){
$where .= " AND `domain` like '%".$search."%'";
}
$group = "GROUP BY `domain`";
} else {
return false;
@ -154,18 +160,30 @@ class ModelAccountingAccounting extends Model
}
public function count_accounting($item = 'email') {
public function count_accounting($item = 'email',$search='') {
$account_for_emails = $this->__getEmails();
$account_for_domains = $this->__getDomains();
$search = preg_replace("/\s{1,}/", "", $search);
if($search){
$search_cond .= " AND ( `email` like '%".$search."%' OR `domain` like '%".$search."%' )";
}
$query = "SELECT `email` AS `item`,MIN(`date`) as `oldest`,MAX(`date`) as `newest`,sum(`sent`) as `sent`,sum(`recd`) as `recd`,sum(`sentsize`) as `sentsize`,sum(`recdsize`) as `recdsize` FROM " . TABLE_STAT_COUNTER;
if ($item == 'email') {
$where = "WHERE `email` IN ('".implode("','",$account_for_emails)."') OR `domain` IN ('".implode("','",$account_for_domains)."')";
if($search){
$where .= " AND ( `email` like '%".$search."%' OR `domain` like '%".$search."%' )";
}
$group = "GROUP BY `email`";
} elseif ($item == 'domain') {
$where = "WHERE `domain` IN ('".implode("','",$account_for_domains)."')";
if($search){
$where .= " AND `domain` like '%".$search."%'";
}
$group = "GROUP BY `domain`";
} else {
return false;