* Univention/Setup: allow to set Ham folder and automatically do so for Univention installation

This commit is contained in:
Ralf Becker 2017-06-13 13:52:31 +02:00
parent f8839a488a
commit c0de73db1f
2 changed files with 2 additions and 2 deletions

View File

@ -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;

View File

@ -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'),