From 1d1960a47687490b2b1450fc1dc543a587369802 Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Tue, 11 Jun 2019 21:03:39 +0100 Subject: [PATCH] if CONF['generate_password'] == 'YES' then do not display password fields Given we autogenerate a password .... --- model/MailboxHandler.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/model/MailboxHandler.php b/model/MailboxHandler.php index 9f68af7e..9f2d4192 100644 --- a/model/MailboxHandler.php +++ b/model/MailboxHandler.php @@ -18,6 +18,8 @@ class MailboxHandler extends PFAHandler { $reset_by_sms = 1; } + $show_password_fields = !Config::bool('generate_password'); + $this->struct=array( # field name allow display in... type $PALANG label $PALANG description default / options / ... # editing? form list @@ -28,8 +30,8 @@ class MailboxHandler extends PFAHandler { # 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?) 'maildir' => pacol($this->new, 0, 1, 'text', '' , '' , '' ), - 'password' => pacol(1, 1, 0, 'pass', 'password' , 'pCreate_mailbox_password_text' , '' ), - 'password2' => pacol(1, 1, 0, 'pass', 'password_again' , '' , '', + 'password' => pacol(1, $show_password_fields, 0, 'pass', 'password' , 'pCreate_mailbox_password_text' , '' ), + 'password2' => pacol(1, $show_password_fields, 0, 'pass', 'password_again' , '' , '', /*options*/ array(), /*not_in_db*/ 0, /*dont_write_to_db*/ 1,