From 102d4c8c324d20ff32b9442398674707042df2bd Mon Sep 17 00:00:00 2001
From: Christian Boltz <postfixadmin@cboltz.de>
Date: Sat, 29 Oct 2011 23:48:18 +0000
Subject: [PATCH] DomainHandler.php: - whitespace fixes

git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1250 a1433add-5e2c-0410-b055-b7f2511e0802
---
 model/DomainHandler.php | 55 +++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/model/DomainHandler.php b/model/DomainHandler.php
index 87efdf5c..433960cd 100644
--- a/model/DomainHandler.php
+++ b/model/DomainHandler.php
@@ -100,22 +100,22 @@ class DomainHandler extends PFAHandler {
            'domain'          => pacol(  $this->new, 1,      1,      'text', 'pAdminEdit_domain_domain'     , ''                                 ),
            'description'     => pacol(  1,          1,      1,      'text', 'pAdminEdit_domain_description', ''                                 ),
            'aliases'         => pacol(  1,          1,      1,      'num' , 'pAdminEdit_domain_aliases'    , 'pAdminEdit_domain_aliases_text'   , Config::read('aliases')   ),
-           'alias_count'     => pacol(  0,          0,      1,      'vnum', ''                             , ''                                 , '', '', 
-               /*not_in_db*/ 0, 
+           'alias_count'     => pacol(  0,          0,      1,      'vnum', ''                             , ''                                 , '', '',
+               /*not_in_db*/ 0,
                /*dont_write_to_db*/ 1,
                /*select*/ 'coalesce(__alias_count,0) - coalesce(__mailbox_count,0)  as alias_count',
-               /*extrafrom*/ 'left join ( select count(*) as __alias_count, domain as __alias_domain from ' . table_by_key('alias') . 
+               /*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'),
            'mailboxes'       => pacol(  1,          1,      1,      'num' , 'pAdminEdit_domain_mailboxes'  , 'pAdminEdit_domain_mailboxes_text' , Config::read('mailboxes') ),
-           'mailbox_count'   => pacol(  0,          0,      1,      'vnum', ''                             , ''                                 , '', '', 
-               /*not_in_db*/ 0, 
+           'mailbox_count'   => pacol(  0,          0,      1,      'vnum', ''                             , ''                                 , '', '',
+               /*not_in_db*/ 0,
                /*dont_write_to_db*/ 1,
-               /*select*/ 'coalesce(__mailbox_count,0) as mailbox_count', 
-               /*extrafrom*/ 'left join ( select count(*) as __mailbox_count, sum(quota) as __total_quota, domain as __mailbox_domain from ' . table_by_key('mailbox') . 
+               /*select*/ 'coalesce(__mailbox_count,0) as mailbox_count',
+               /*extrafrom*/ 'left join ( select count(*) as __mailbox_count, sum(quota) as __total_quota, domain as __mailbox_domain from ' . table_by_key('mailbox') .
                              ' group by domain) as __mailbox on domain = __mailbox_domain'),
            'maxquota'        => pacol(  $quota,     $quota, $quota, 'num' , 'pAdminEdit_domain_maxquota'   , 'pAdminEdit_domain_maxquota_text'  , Config::read('maxquota')  ),
-           'total_quota'     => pacol(  0,          0,      1,      'vnum', ''                             , ''                                 , '', '', 
-               /*not_in_db*/ 0, 
+           'total_quota'     => pacol(  0,          0,      1,      'vnum', ''                             , ''                                 , '', '',
+               /*not_in_db*/ 0,
                /*dont_write_to_db*/ 1,
                /*select*/ 'round(coalesce(__total_quota/' . intval(Config::read('quota_multiplier')) . ',0)) as total_quota' /*extrafrom*//* already in mailbox_count */ ),
            'quota'           => pacol(  $dom_q,     $dom_q, $dom_q, 'num' , 'pAdminEdit_domain_quota'      , 'pAdminEdit_domain_maxquota_text'  , Config::read('domain_quota_default') ),
@@ -262,27 +262,24 @@ class DomainHandler extends PFAHandler {
      * can be used to update additional tables, call scripts etc.
      */
     protected function storemore() {
-# TODO: whitespace fix
-            if ($this->new && $this->values['default_aliases']) {
-                foreach (Config::read('default_aliases') as $address=>$goto) {
-                    $address = $address . "@" . $this->username;
-                    # TODO: use AliasHandler->add instead of writing directly to the alias table
-                    $arr = array(
-                        'address' => $address,
-                        'goto' => $goto,
-                        'domain' => $this->username,
-                    );
-                    $result = db_insert ('alias', $arr);
-                    # TODO: error checking
-                }
-            }
-            if ($this->new) {
-                $tMessage = Lang::read('pAdminCreate_domain_result_success') . " (" . $this->username . ")"; # TODO: tMessage is not used/returned anywhere
-            } else {
-                # TODO: success message for edit
+        if ($this->new && $this->values['default_aliases']) {
+            foreach (Config::read('default_aliases') as $address=>$goto) {
+                $address = $address . "@" . $this->username;
+                # TODO: use AliasHandler->add instead of writing directly to the alias table
+                $arr = array(
+                    'address' => $address,
+                    'goto' => $goto,
+                    'domain' => $this->username,
+                );
+                $result = db_insert ('alias', $arr);
+                # TODO: error checking
             }
-# TODO: END whitespace fix
- 
+        }
+        if ($this->new) {
+            $tMessage = Lang::read('pAdminCreate_domain_result_success') . " (" . $this->username . ")"; # TODO: tMessage is not used/returned anywhere
+        } else {
+            # TODO: success message for edit
+        }
 
         if ($this->new) {
             if (!domain_postcreation($this->username)) {