From c0de73db1fe5296cf0d72ce6631875a21fa40229 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 13 Jun 2017 13:52:31 +0200 Subject: [PATCH] * Univention/Setup: allow to set Ham folder and automatically do so for Univention installation --- doc/rpm-build/post_install.php | 2 +- setup/inc/class.setup_cmd_config.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/rpm-build/post_install.php b/doc/rpm-build/post_install.php index 6af76760cf..a01a632769 100755 --- a/doc/rpm-build/post_install.php +++ b/doc/rpm-build/post_install.php @@ -695,7 +695,7 @@ function set_univention_defaults() if (!($sieve_port = _ucr_get('mail/cyrus/sieve/port'))) $sieve_port = 4190; } // set folders so mail creates them on first login, UCS does not automatic - $config['folder'] = 'INBOX/Sent,INBOX/Trash,INBOX/Drafts,INBOX/Templates,INBOX/Spam'; + $config['folder'] = 'INBOX/Sent,INBOX/Trash,INBOX/Drafts,INBOX/Templates,Spam,,Ham'; $config['sieve'] = "$mailserver,$sieve_port,starttls"; // set an email address for sysop user so mail works right away $config['admin_email'] = '$admin_user@'.$domain; diff --git a/setup/inc/class.setup_cmd_config.inc.php b/setup/inc/class.setup_cmd_config.inc.php index 50e00a0893..2f431989dd 100644 --- a/setup/inc/class.setup_cmd_config.inc.php +++ b/setup/inc/class.setup_cmd_config.inc.php @@ -173,7 +173,7 @@ class setup_cmd_config extends setup_cmd 'acc_imap_type', ), '--folder' => array( - 'acc_folder_sent','acc_folder_trash','acc_folder_draft','acc_folder_template','acc_folder_junk','acc_folder_archive' + 'acc_folder_sent','acc_folder_trash','acc_folder_draft','acc_folder_template','acc_folder_junk','acc_folder_archive','acc_folder_ham' ), '--sieve' => array( array('name' => 'acc_sieve_host'),