holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test sieve connection before saving mail account, if enabled and credentials available

Browse Source
This commit is contained in:
Ralf Becker 2014-07-21 15:04:16 +00:00
parent 59e76d78c5
commit 1b61cc04bb
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
emailadmin/inc/class.emailadmin_wizard.inc.php
View File

@ -967,10 +967,6 @@ class emailadmin_wizard
case 'save': case 'save':
case 'apply': case 'apply':
try { try {
// if admin username/password given, check if it is valid
$account = new emailadmin_account($content);
$imap = $account->imapServer();
if ($imap) $imap->checkAdminConnection();
// save none-standard identity for current user // save none-standard identity for current user
if ($content['acc_id'] && $content['acc_id'] !== 'new' && if ($content['acc_id'] && $content['acc_id'] !== 'new' &&
$content['acc_further_identities'] && $content['acc_further_identities'] &&
@ -985,6 +981,12 @@ class emailadmin_wizard
} }
elseif ($edit_access) elseif ($edit_access)
{ {
// if admin username/password given, check if it is valid
$account = new emailadmin_account($content);
$imap = $account->imapServer();
if ($imap) $imap->checkAdminConnection();
// test sieve connection, if enabled and credentials available
if ($account->acc_sieve_enabled && $account->acc_imap_username) $account->imapServer()->retrieveRules();
$new_account = !($content['acc_id'] > 0); $new_account = !($content['acc_id'] > 0);
// check for deliveryMode="forwardOnly", if a forwarding-address is given // check for deliveryMode="forwardOnly", if a forwarding-address is given
if ($content['acc_smtp_type'] != 'emailadmin_smtp' && if ($content['acc_smtp_type'] != 'emailadmin_smtp' &&
@ -1067,6 +1069,14 @@ class emailadmin_wizard
$content['tabs'] = 'emailadmin.account.imap'; // should happen automatic $content['tabs'] = 'emailadmin.account.imap'; // should happen automatic
break; break;
} }
catch (PEAR_Exception $e)
{
_egw_log_exception($e);
$tpl->set_validation_error('acc_sieve_port', $msg=lang($e->getMessage()));
$msg_type = 'error';
$content['tabs'] = 'emailadmin.account.sieve'; // should happen automatic
break;
}
catch (Exception $e) { catch (Exception $e) {
$msg = lang('Error saving account!')."\n".$e->getMessage(); $msg = lang('Error saving account!')."\n".$e->getMessage();
$button = 'apply'; $button = 'apply';