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

* Mail/Sieve: check capability if VACATION is supported by SIEVE Server before trying to set an serverside vacation absent notice

Browse Source 
code clean up in hooks and conditional debug for sendMDN
This commit is contained in:
Klaus Leithoff 2015-02-06 12:35:51 +00:00
parent 303b10377f
commit 2e02b05d4e
2 changed files with 140 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
mail/inc/class.mail_hooks.inc.php
View File

@ -337,39 +337,6 @@ class mail_hooks
'default'=> 0, 'default'=> 0,
'admin' => False, 'admin' => False,
), ),
/*
// option requested by customer, removed for the new client
'prefaskformultipleforward' => array(
'type' => 'select',
'label' => 'Confirm attach message',
'help' => 'Do you want to be asked for confirmation before attaching selected messages to new mail?',
'name' => 'prefaskformultipleforward',
'values' => $no_yes,
'xmlrpc' => True,
'admin' => False,
'forced' => '1',
),
*/
/*
'mainscreen_showmail' => array(
'type' => 'select',
'label' => 'show new messages on home page',
'help' => 'Should new messages show up on the Home page',
'name' => 'mainscreen_showmail',
'values' => $selectOptions,
'xmlrpc' => True,
'admin' => False,
),
'mainscreen_showfolders' => array(
'type' => 'multiselect',
'label' => 'home page folders',
'help' => 'if shown, which folders should appear on the Home page',
'name' => 'mainscreen_showfolders',
'values' => $folderList,
'xmlrpc' => True,
'admin' => False,
),
*/
array( array(
'type' => 'section', 'type' => 'section',
'title' => lang('Configuration settings'), 'title' => lang('Configuration settings'),
@ -417,57 +384,6 @@ class mail_hooks
'default'=> 0, 'default'=> 0,
'admin' => False, 'admin' => False,
), ),
/*'prefpreventmanagefolders' => array(
'type' => 'select',
'label' => 'Prevent managing folders',
'help' => 'Do you want to prevent the managing of folders (creation, accessrights AND subscribtion)?',
'name' => 'prefpreventmanagefolders',
'values' => $prefAllowManageFolders,
'xmlrpc' => True,
'admin' => False,
'forced' => '0',
),
'prefpreventforwarding' => array(
'type' => 'select',
'label' => 'Prevent managing forwards',
'help' => 'Do you want to prevent the editing/setup for forwarding of mails via settings (, even if SIEVE is enabled)?',
'name' => 'prefpreventforwarding',
'values' => $no_yes,
'xmlrpc' => True,
'admin' => False,
'forced' => '0',
),
'prefpreventnotificationformailviaemail' => array(
'type' => 'select',
'label' => 'Prevent managing notifications',
'help' => 'Do you want to prevent the editing/setup of notification by mail to other emailadresses if emails arrive (, even if SIEVE is enabled)?',
'name' => 'prefpreventnotificationformailviaemail',
'values' => $no_yes,
'xmlrpc' => True,
'admin' => False,
'forced' => '1',
),
'prefpreventeditfilterrules' => array(
'type' => 'select',
'label' => 'Prevent managing filters',
'help' => 'Do you want to prevent the editing/setup of filter rules (, even if SIEVE is enabled)?',
'name' => 'prefpreventeditfilterrules',
'values' => $no_yes,
'xmlrpc' => True,
'admin' => False,
'forced' => '0',
),
'prefpreventabsentnotice' => array(
'type' => 'select',
'label' => 'Prevent managing vacation notice',
'help' => 'Do you want to prevent the editing/setup of the absent/vacation notice (, even if SIEVE is enabled)?',
'name' => 'prefpreventabsentnotice',
'values' => $no_yes,
'xmlrpc' => True,
'admin' => False,
'forced' => '0',
),
*/
'prefaskformove' => array( 'prefaskformove' => array(
'type' => 'select', 'type' => 'select',
'label' => 'Confirm move to folder', 'label' => 'Confirm move to folder',

270
mail/inc/class.mail_sieve.inc.php
View File

@ -69,6 +69,8 @@ class mail_sieve
if ($acc_id > 0) if ($acc_id > 0)
{ {
$this->account = emailadmin_account::read($acc_id); $this->account = emailadmin_account::read($acc_id);
$identity = emailadmin_account::read_identity($acc_id,true);
$this->currentIdentity = mail_bo::generateIdentityString($identity,false);
} }
$this->restoreSessionData(); $this->restoreSessionData();
@ -111,7 +113,7 @@ class mail_sieve
} }
else else
{ {
$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity['identity_string'],$this->mailbo->profileID); $content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity,$this->account->acc_id);
$content['hideIfSieveDisabled']='mail_DisplayNone'; $content['hideIfSieveDisabled']='mail_DisplayNone';
} }
$tmpl->exec('mail.mail_sieve.index',$content,$sel_options,array()); $tmpl->exec('mail.mail_sieve.index',$content,$sel_options,array());
@ -208,7 +210,7 @@ class mail_sieve
} }
else else
{ {
$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity['identity_string'],$this->mailbo->profileID); $content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity,$this->account->acc_id);
$content['hideIfSieveDisabled']='mail_DisplayNone'; $content['hideIfSieveDisabled']='mail_DisplayNone';
} }
$eNotitmpl->exec('mail.mail_sieve.editEmailNotification', $content,$sel_options); $eNotitmpl->exec('mail.mail_sieve.editEmailNotification', $content,$sel_options);
@ -524,167 +526,175 @@ class mail_sieve
if ($icServer->acc_sieve_enabled) if ($icServer->acc_sieve_enabled)
{ {
$vacRules = $this->getVacation($account_id); $vacRules = $this->getVacation($account_id);
if ($vacRules['vacation']===false)
if ($icServer->acc_imap_administration)
{ {
$ByDate = array('by_date' => lang('By date')); $content['msg'] = lang('error').':'.lang('Serverside Vacationnotice (via Sieve) are not activated').'. '.
lang('Please contact your Administrator to validate if your Server supports Serverside Vacationmessages, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity,$icServer->ImapServerId);
$content['hideIfSieveDisabled']='mail_DisplayNone';
} }
if (!is_array($content) || ($content['acc_id'] && !isset($content['button']))) else
{ {
$content = $vacation = $vacRules['vacation']; if ($icServer->acc_imap_administration)
if (!empty($profileID)) $content['acc_id'] = $profileID;
if (empty($vacation['addresses']) || implode('',$vacation['addresses']) == '')
{ {
$content['addresses'] = $vacRules['aliases']; $ByDate = array('by_date' => lang('By date'));
} }
if (!empty($vacation['forwards'])) if (!is_array($content) || ($content['acc_id'] && !isset($content['button'])))
{ {
$content['forwards'] = explode(",",$vacation['forwards']); $content = $vacation = $vacRules['vacation'];
if (!empty($profileID)) $content['acc_id'] = $profileID;
if (empty($vacation['addresses']) || implode('',$vacation['addresses']) == '')
{
$content['addresses'] = $vacRules['aliases'];
}
if (!empty($vacation['forwards']))
{
$content['forwards'] = explode(",",$vacation['forwards']);
}
else
{
$content['forwards'] = '';
}
if (empty($vacation['text']) && $this->mailConfig['default_vacation_text']) $content['text'] = $this->mailConfig['default_vacation_text'];
//Set default value for days new entry
if (empty($content['days']))
{
$content['days'] = '3';
}
$preserv['is_admin_vac'] = $content['is_admin_vac'] = $this->is_admin_vac;
} }
else else
{ {
$content['forwards'] = ''; $this->restoreSessionData();
} list($button) = @each($content['button']);
if (empty($vacation['text']) && $this->mailConfig['default_vacation_text']) $content['text'] = $this->mailConfig['default_vacation_text']; unset ($content['button']);
//Set default value for days new entry
if (empty($content['days']))
{
$content['days'] = '3';
}
$preserv['is_admin_vac'] = $content['is_admin_vac'] = $this->is_admin_vac;
}
else
{
$this->restoreSessionData();
list($button) = @each($content['button']);
unset ($content['button']);
switch($button) switch($button)
{ {
case 'save': case 'save':
case 'apply': case 'apply':
if ($GLOBALS['egw_info']['user']['apps']['admin']) if ($GLOBALS['egw_info']['user']['apps']['admin'])
{
// store text as default
if ($content['set_as_default'] == 1)
{ {
config::save_value('default_vacation_text', $content['text'], 'mail'); // store text as default
} if ($content['set_as_default'] == 1)
}
if (isset($content['status']))
{
//error_log(__METHOD__. 'content:' . array2string($content));
$newVacation = $content;
if (empty($this->mailConfig['prefpreventforwarding']) ||
$this->mailConfig['prefpreventforwarding'] == 0 )
{
if (is_array($content['forwards']) && !empty($content['forwards']))
{ {
config::save_value('default_vacation_text', $content['text'], 'mail');
}
}
if (isset($content['status']))
{
//error_log(__METHOD__. 'content:' . array2string($content));
$newVacation = $content;
$newVacation['forwards'] = implode(",",$content['forwards']); if (empty($this->mailConfig['prefpreventforwarding']) ||
$this->mailConfig['prefpreventforwarding'] == 0 )
{
if (is_array($content['forwards']) && !empty($content['forwards']))
{
$newVacation['forwards'] = implode(",",$content['forwards']);
}
else
{
$newVacation ['forwards'] = '';
}
} }
else else
{ {
$newVacation ['forwards'] = ''; unset($newVacation ['forwards']);
} }
}
else
{
unset($newVacation ['forwards']);
}
if (!in_array($newVacation['status'],array('on','off','by_date'))) if (!in_array($newVacation['status'],array('on','off','by_date')))
{
$newVacation['status'] = 'off';
}
$checkAddresses = isset($content['check_mail_sent_to']) && $content['check_mail_sent_to'] != 0;
if ($content['addresses'])
{
$newVacation ['addresses'] = $content['addresses'];
}
if($this->checkRule($newVacation,$checkAddresses))
{
if (isset($account_id) && $this->mail_admin)
{ {
$resSetvac = $icServer->setVacationUser($account_id, $newVacation, $this->scriptName); $newVacation['status'] = 'off';
}
$checkAddresses = isset($content['check_mail_sent_to']) && $content['check_mail_sent_to'] != 0;
if ($content['addresses'])
{
$newVacation ['addresses'] = $content['addresses'];
}
if($this->checkRule($newVacation,$checkAddresses))
{
if (isset($account_id) && $this->mail_admin)
{
$resSetvac = $icServer->setVacationUser($account_id, $newVacation, $this->scriptName);
}
else
{
$resSetvac = $icServer->setVacation($newVacation);
}
if (!$resSetvac)
{
$msg = lang('vacation update failed') . "\n" . lang('Vacation notice update failed') . ":" . $this->account->imapServer()->error;
break;
}
// schedule job to switch message on/off, if request and not already in past
else
{
if ($newVacation['status'] == 'by_date' && $newVacation['end_date']+24*3600 > time() ||
$vacRules && $vacRules['vacation']['status'] == 'by_date')
{
self::setAsyncJob($newVacation);
}
//Reset vacationNotice cache which is used in mail_ui get_rows
$cachedVacations = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid']);
$cachedVacations = array($icServer->acc_id => $newVacation) + (array)$cachedVacations;
egw_cache::setCache(egw_cache::INSTANCE,'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations);
$msg = lang('Vacation notice sucessfully updated.');
}
} }
else else
{ {
$resSetvac = $icServer->setVacation($newVacation); $msg .= implode("\n",$this->errorStack);
} }
// refresh vacationNotice on index
if (!$resSetvac) $response = egw_json_response::get();
$response->call('app.mail.mail_callRefreshVacationNotice',$icServer->ImapServerId);
egw_framework::refresh_opener($msg, 'mail');
if ($button === 'apply' || $icServer->error !=="")
{ {
$msg = lang('vacation update failed') . "\n" . lang('Vacation notice update failed') . ":" . $this->account->imapServer()->error;
break; break;
} }
// schedule job to switch message on/off, if request and not already in past }
else
{
if ($newVacation['status'] == 'by_date' && $newVacation['end_date']+24*3600 > time() ||
$vacRules && $vacRules['vacation']['status'] == 'by_date')
{
self::setAsyncJob($newVacation);
}
//Reset vacationNotice cache which is used in mail_ui get_rows
$cachedVacations = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid']);
$cachedVacations = array($icServer->acc_id => $newVacation) + (array)$cachedVacations;
egw_cache::setCache(egw_cache::INSTANCE,'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations);
$msg = lang('Vacation notice sucessfully updated.'); case 'cancel':
} egw_framework::window_close();
} }
else
{
$msg .= implode("\n",$this->errorStack);
}
// refresh vacationNotice on index
$response = egw_json_response::get();
$response->call('app.mail.mail_callRefreshVacationNotice',$this->mailbo->profileID);
egw_framework::refresh_opener($msg, 'mail');
if ($button === 'apply' || $icServer->error !=="")
{
break;
}
}
case 'cancel':
egw_framework::window_close();
} }
}
$sel_options = array( $sel_options = array(
'status' => array( 'status' => array(
'on' => lang('Active'), 'on' => lang('Active'),
'off' => lang('Deactive'), 'off' => lang('Deactive'),
), ),
'addresses' => array_combine($vacRules['aliases'],$vacRules['aliases']), 'addresses' => array_combine($vacRules['aliases'],$vacRules['aliases']),
); );
if (!isset($account_id)) if (!isset($account_id))
{ {
$readonlys['acc_id'] = true; $readonlys['acc_id'] = true;
}
else
{
$sel_options['acc_id'] = $allAccounts;
}
if (!empty($ByDate))
{
$sel_options['status'] += $ByDate;
}
if (!isset($GLOBALS['egw_info']['user']['apps']['admin']))
{
$content['is_not_admin_user'] = true;
$readonlys['set_as_default'] = true;
}
$content['msg'] = $msg;
} }
else
{
$sel_options['acc_id'] = $allAccounts;
}
if (!empty($ByDate))
{
$sel_options['status'] += $ByDate;
}
if (!isset($GLOBALS['egw_info']['user']['apps']['admin']))
{
$content['is_not_admin_user'] = true;
$readonlys['set_as_default'] = true;
}
$content['msg'] = $msg;
} }
else else
{ {
$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity['identity_string'],$this->mailbo->profileID); $content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity,$icServer->ImapServerId);
$content['hideIfSieveDisabled']='mail_DisplayNone'; $content['hideIfSieveDisabled']='mail_DisplayNone';
} }
$vtmpl->exec('mail.mail_sieve.editVacation',$content,$sel_options,$readonlys,$preserv,2); $vtmpl->exec('mail.mail_sieve.editVacation',$content,$sel_options,$readonlys,$preserv,2);