From 7bf5b74a470b5a357ea7ffece80174a68ef4c61d Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Wed, 7 Jan 2015 21:25:20 +0000 Subject: [PATCH] MailboxHandler, AliasHandler: - initStruct: set "display in list" to 1 to allow searching for domain with list.php (nevertheless, the domain won't be displayed because it doesn't have a column label set) git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1735 a1433add-5e2c-0410-b055-b7f2511e0802 --- model/AliasHandler.php | 2 +- model/MailboxHandler.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/model/AliasHandler.php b/model/AliasHandler.php index ec71127f..8bc65001 100644 --- a/model/AliasHandler.php +++ b/model/AliasHandler.php @@ -30,7 +30,7 @@ class AliasHandler extends PFAHandler { 'localpart' => pacol( $this->new, 0, 0, 'text', 'alias' , 'pCreate_alias_catchall_text' , '', /*options*/ '', /*not_in_db*/ 1 ), - 'domain' => pacol( $this->new, 0, 0, 'enum', '' , '' , '', + 'domain' => pacol( $this->new, 0, 1, 'enum', '' , '' , '', /*options*/ $this->allowed_domains ), 'goto' => pacol( 1, 1, 1, 'txtl', 'to' , 'pEdit_alias_help' , array() ), 'is_mailbox' => pacol( 0, 0, 1, 'int', '' , '' , 0 , diff --git a/model/MailboxHandler.php b/model/MailboxHandler.php index 2cce7521..740b6b2b 100644 --- a/model/MailboxHandler.php +++ b/model/MailboxHandler.php @@ -17,7 +17,7 @@ class MailboxHandler extends PFAHandler { # editing? form list 'username' => pacol( $this->new, 1, 1, 'mail', 'pEdit_mailbox_username' , '' , '' ), 'local_part' => pacol( $this->new, 0, 0, 'text', 'pEdit_mailbox_username' , '' , '' ), - 'domain' => pacol( $this->new, 0, 0, 'enum', '' , '' , '', + 'domain' => pacol( $this->new, 0, 1, 'enum', '' , '' , '', /*options*/ $this->allowed_domains ), # TODO: maildir: display in list is needed to include maildir in SQL result (for post_edit hook) # TODO: (not a perfect solution, but works for now - maybe we need a separate "include in SELECT query" field?)