From c837eac20a130db211489369728294f610cc48bd Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Mon, 6 Apr 2015 23:30:44 +0000 Subject: [PATCH] DomainHandler: - initStruct(): in 'aliases_quot' and '_aliases_quot_percent', use coalesce(__mailbox_count,0) - without, we always get _0_ aliases if a domain doesn't have mailboxes git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1783 a1433add-5e2c-0410-b055-b7f2511e0802 --- model/DomainHandler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/model/DomainHandler.php b/model/DomainHandler.php index 39b2c4fe..67a929ec 100644 --- a/model/DomainHandler.php +++ b/model/DomainHandler.php @@ -60,9 +60,9 @@ class DomainHandler extends PFAHandler { /*extrafrom*/ 'left join ( select count(*) as __alias_count, domain as __alias_domain from ' . table_by_key('alias') . ' group by domain) as __alias on domain = __alias_domain'), 'aliases_quot' => pacol( 0, 0, 1, 'quot', 'aliases' , '' , 0, '', - array('select' => db_quota_text( '__alias_count - __mailbox_count', 'aliases', 'aliases_quot')) ), + array('select' => db_quota_text( '__alias_count - coalesce(__mailbox_count,0)', 'aliases', 'aliases_quot')) ), '_aliases_quot_percent' => pacol( 0, 0, 1, 'vnum', '' ,'' , 0, '', - array('select' => db_quota_percent('__alias_count - __mailbox_count', 'aliases', '_aliases_quot_percent')) ), + array('select' => db_quota_percent('__alias_count - coalesce(__mailbox_count,0)', 'aliases', '_aliases_quot_percent')) ), # Mailboxes 'mailboxes' => pacol( $super, $super, 0, 'num' , 'mailboxes' , 'pAdminEdit_domain_aliases_text' , Config::read('mailboxes') ),