From cd781c228c654a841c07b14d57b4ceda0dcd337c Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 14 Oct 2008 14:34:41 +0000 Subject: [PATCH] Only check for smtp server. As Klaus is going to create an emailadmin profile allowing the user to set there own profiles and signatures, if no default imap server is defined in setup. --- setup/inc/class.setup_detection.inc.php | 2 +- setup/inc/hook_config_validate.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/inc/class.setup_detection.inc.php b/setup/inc/class.setup_detection.inc.php index dd72da1bea..515d6347c7 100755 --- a/setup/inc/class.setup_detection.inc.php +++ b/setup/inc/class.setup_detection.inc.php @@ -366,7 +366,7 @@ class setup_detection { $config_errors[] = lang("Your backup directory '%1' %2",$config['backup_dir'],$error_msg); } - if (!$config['mail_server'] || !$config['mail_server_type'] || !$config['smtp_server']) + if (!$config['smtp_server']) { $config_errors[] = lang('Missing or uncomplete mailserver configuration'); } diff --git a/setup/inc/hook_config_validate.inc.php b/setup/inc/hook_config_validate.inc.php index 0708a3db9f..35e0d102ed 100644 --- a/setup/inc/hook_config_validate.inc.php +++ b/setup/inc/hook_config_validate.inc.php @@ -39,7 +39,7 @@ function vfs_storage_mode($settings) function mail_server($settings) { - if (!$settings['mail_server'] || !$settings['mail_server_type'] || !$settings['smtp_server']) + if (!$settings['smtp_server']) { $GLOBALS['config_error'] = lang('Missing or uncomplete mailserver configuration'); }