bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-11-07 23:01:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactored accounting

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO 2022-11-29 18:20:17 +01:00
parent cbc852e735
commit a4175cfa11
4 changed files with 51 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,35 +85,44 @@ class ModelAccountingAccounting extends Model {
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??
$_order = 0;
$_order = "";
$limit = "";
$account_for_emails = $this->__getEmails();
$account_for_domains = $this->__getDomains();
if(!in_array($item, ['email', 'domain'])) { return []; }
$domains = $this->__getDomains();
$search = preg_replace("/\s{1,}/", "", $search);
$arr = array();
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)."') )";
$q1 = get_q_string($this->__getEmails());
$q2 = get_q_string($domains);
$where = "WHERE ( `email` IN ($q1) OR `domain` IN ($q2) )";
$arr = array_merge($arr, $this->__getEmails(), $domains);
if($search) {
$where .= " AND ( `email` like '%".$search."%' OR `domain` like '%".$search."%' )";
$where .= " AND (`email` LIKE ? OR `domain` LIKE ?)";
array_push($arr, "%$search%", "%$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)."') )";
$q = get_q_string($domains);
$where = "WHERE ( `domain` IN ($q) )";
$arr = array_merge($arr, $domains);
if($search) {
$where .= " AND `domain` like '%".$search."%'";
$where .= " AND `domain` LIKE ?";
array_push($arr, "%$search%");
}
$group = "GROUP BY `domain`";
} else {
return false;
}
@ -127,42 +136,47 @@ class ModelAccountingAccounting extends Model {
if($pagelen > 0) { $limit = " LIMIT " . (int)$from . ", " . (int)$pagelen; }
$query = $this->db->query($query.' '.$where.' '.$group.' '.$_order.' '.$limit.';');
$query = $this->db->query("$query $where GROUP BY `$item` ORDER BY `$sort` $order $limit", $arr);
if($query->num_rows >= 1) {
return $query->rows;
} else {
// no results found
return false;
}
}
public function count_accounting($item='email', $search='') {
$account_for_emails = $this->__getEmails();
$account_for_domains = $this->__getDomains();
if(!in_array($item, ['email', 'domain'])) { return []; }
$domains = $this->__getDomains();
$search = preg_replace("/\s{1,}/", "", $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;
$arr = array();
if($item == 'email') {
$where = "WHERE `email` IN ('".implode("','",$account_for_emails)."') OR `domain` IN ('".implode("','",$account_for_domains)."')";
$q1 = get_q_string($this->__getEmails());
$q2 = get_q_string($domains);
$where = "WHERE (`email` IN ($q1) OR `domain` IN ($q2))";
$arr = array_merge($arr, $this->__getEmails(), $domains);
if($search) {
$where .= " AND ( `email` LIKE '%".$search."%' OR `domain` LIKE '%".$search."%' )";
$where .= " AND (`email` LIKE ? OR `domain` LIKE ?)";
array_push($arr, "%$search%", "%$search%");
}
$group = "GROUP BY `email`";
} elseif ($item == 'domain') {
$where = "WHERE `domain` IN ('".implode("','",$account_for_domains)."')";
$where = sprintf("WHERE `domain` IN ('%s')", implode("','", $domains));
if($search) {
$where .= " AND `domain` LIKE '%".$search."%'";
$where .= " AND `domain` LIKE ?";
array_push($arr, "%$search%");
}
$group = "GROUP BY `domain`";
} else {
return false;
}
$query = $this->db->query($query.' '.$where.' '.$group);
$query = $this->db->query("$query $where GROUP BY `$item`", $arr);
return $query->num_rows;
}

3
webui/model/search/search.php
View File

@ -478,8 +478,7 @@ class ModelSearchSearch extends Model {
$session = Registry::get('session');
$q = str_repeat(",?", count($ids));
$q = substr($q, 1, strlen($q));
$q = get_q_string($ids);
$query = $this->db->query("SELECT `id`, `to` FROM `" . TABLE_RCPT . "` WHERE `id` IN ($q)", $ids);

3
webui/model/user/user.php
View File

@ -73,9 +73,8 @@ class ModelUserUser extends Model {
public function get_email_addresses_from_groups($emails = array()) {
$data = array();
$q = str_repeat("?,", count($emails));
$q = substr($q, 0, strlen($q)-1);
$q = get_q_string($emails);
$query = $this->db->query("SELECT g.email FROM `" . TABLE_GROUP_EMAIL . "` g WHERE g.id IN (SELECT u.id FROM `" . TABLE_GROUP_USER . "` u WHERE u.email IN ($q))", $emails);

8
webui/system/misc.php
View File

@ -618,3 +618,11 @@ function htmlentities_on_array($arr = []) {
function encrypt_password($password = '') {
return crypt($password, '$6$rounds=5000$' . generate_random_string() . '$');
}
function get_q_string($arr = []) {
$q = str_repeat("?,", count($arr));
$q = substr($q, 0, strlen($q)-1);
return $q;
}