From 19a25d392d8f8bfe76ac55a7a84112335e794260 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 20 Aug 2010 11:15:59 +0000 Subject: [PATCH] some more adapting to current emailadmin: sieve host is not yet used, but defaulting to NULL is what emailadmin does too --- setup/inc/class.setup_cmd_config.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/inc/class.setup_cmd_config.inc.php b/setup/inc/class.setup_cmd_config.inc.php index 9ff6da5f28..8e96c8df47 100644 --- a/setup/inc/class.setup_cmd_config.inc.php +++ b/setup/inc/class.setup_cmd_config.inc.php @@ -151,7 +151,7 @@ class setup_cmd_config extends setup_cmd array('name' => 'imapEnableCyrusAdmin','default' => 'yes'), ), '--sieve' => array( - array('name' => 'imapSieveServer','default' => 'localhost'), + array('name' => 'imapSieveServer'), array('name' => 'imapSievePort','default' => 2000), array('name' => 'imapEnableSieve','default' => 'yes'), // null or yes ), @@ -365,8 +365,8 @@ class setup_cmd_config extends setup_cmd $defaults['mail_suffix'] = '$domain'; $defaults['imapAdminUsername'] = 'cyrus@$domain'; $defaults['imapAdminPW'] = self::randomstring(); - $defaults['imapType'] = 2; // standard IMAP - $defaults['smtpType'] = 1; // standard SMTP + $defaults['imapType'] = 'defaultimap'; // standard IMAP + $defaults['smtpType'] = 'defaultsmtp'; // standard SMTP return $defaults; }