extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 09:05:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

also strip personal part from vacation notice addresses, cleaning up code and IDE warnings

Browse Source
This commit is contained in:
Ralf Becker 2015-07-20 13:00:48 +00:00
parent 84052c1600
commit 696dd8d6a7
1 changed files with 30 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,23 +288,8 @@ class mail_sieve
$newRule['action_arg'] = implode($content['action_folder_text']); $newRule['action_arg'] = implode($content['action_folder_text']);
break; break;
case 'address': case 'address':
//error_log(__METHOD__. '() newRules_address '. array2string($newRule['action_arg'])); $content['action_address_text'] = self::strip_rfc882_addresses($content['action_address_text']);
//error_log(__METHOD__.__LINE__.array2string($content['action_address_text'])); $newRule['action_arg'] = implode(',', $content['action_address_text']);
$forwards = array();
foreach($content['action_address_text'] as $email) {
// avoid wrong addresses, if an rfc822 encoded address is in addressbook
//$email = preg_replace("/(^.*<)([a-zA-Z0-9_\-]+@[a-zA-Z0-9_\-\.]+)(.*)/",'$2',$email);
$rfcAddr = emailadmin_imapbase::parseAddressList($email);
$_rfcAddr=$rfcAddr->first();
//error_log(__METHOD__.__LINE__.$_rfcAddr->mailbox.'@'.$_rfcAddr->host);
if (!$_rfcAddr->valid)
{
break; // skip address if we encounter an error here
}
$forwards[] = $_rfcAddr->mailbox.'@'.$_rfcAddr->host;
}
//$newRule['action_arg'] = implode(',',$content['action_address_text']);
$newRule['action_arg'] = implode(',',$forwards);
break; break;
case 'reject': case 'reject':
$newRule['action_arg'] = $content['action_reject_text']; $newRule['action_arg'] = $content['action_reject_text'];
@ -608,29 +593,8 @@ class mail_sieve
if (empty($this->mailConfig['prefpreventforwarding']) || if (empty($this->mailConfig['prefpreventforwarding']) ||
$this->mailConfig['prefpreventforwarding'] == 0 ) $this->mailConfig['prefpreventforwarding'] == 0 )
{ {
if (is_array($content['forwards']) && !empty($content['forwards'])) $content['forwards'] = self::strip_rfc882_addresses($content['forwards']);
{ $newVacation['forwards'] = implode(',', $content['forwards']);
//error_log(__METHOD__.__LINE__.array2string($content['forwards']));
$forwards = array();
foreach($content['forwards'] as $email) {
// avoid wrong addresses, if an rfc822 encoded address is in addressbook
//$email = preg_replace("/(^.*<)([a-zA-Z0-9_\-]+@[a-zA-Z0-9_\-\.]+)(.*)/",'$2',$email);
$rfcAddr = emailadmin_imapbase::parseAddressList($email);
$_rfcAddr=$rfcAddr->first();
//error_log(__METHOD__.__LINE__.$_rfcAddr->mailbox.'@'.$_rfcAddr->host);
if (!$_rfcAddr->valid)
{
break; // skip address if we encounter an error here
}
$forwards[] = $_rfcAddr->mailbox.'@'.$_rfcAddr->host;
}
//$newVacation['forwards'] = implode(",",$content['forwards']);
$newVacation['forwards'] = implode(",",$forwards);
}
else
{
$newVacation ['forwards'] = '';
}
} }
else else
{ {
@ -645,7 +609,8 @@ class mail_sieve
$checkAddresses = isset($content['check_mail_sent_to']) && $content['check_mail_sent_to'] != 0; $checkAddresses = isset($content['check_mail_sent_to']) && $content['check_mail_sent_to'] != 0;
if ($content['addresses']) if ($content['addresses'])
{ {
$newVacation ['addresses'] = $content['addresses']; $newVacation ['addresses'] = $content['addresses'] =
self::strip_rfc882_addresses($content['addresses']);
} }
if($this->checkRule($newVacation,$checkAddresses)) if($this->checkRule($newVacation,$checkAddresses))
@ -673,8 +638,7 @@ class mail_sieve
self::setAsyncJob($newVacation); self::setAsyncJob($newVacation);
} }
//Reset vacationNotice cache which is used in mail_ui get_rows //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)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); egw_cache::setCache(egw_cache::INSTANCE,'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations);
$msg = lang('Vacation notice sucessfully updated.'); $msg = lang('Vacation notice sucessfully updated.');
@ -734,6 +698,27 @@ class mail_sieve
$vtmpl->exec('mail.mail_sieve.editVacation',$content,$sel_options,$readonlys,$preserv,2); $vtmpl->exec('mail.mail_sieve.editVacation',$content,$sel_options,$readonlys,$preserv,2);
} }
/**
* Strip personal part from rfc822 addresses: "Ralf Becker <rb@stylite.de>" --> rb@stylite.de
*
* Sieve only allows email-addresses, without angle brakets and personal parts.
*
* @param array|string $_addresses
* @return array of email-addresses without personal part
*/
static function strip_rfc882_addresses($_addresses)
{
$addresses = array();
foreach(emailadmin_imapbase::parseAddressList($_addresses) as $addr)
{
if ($addr->valid)
{
$addresses[] = $addr->mailbox.'@'.$addr->host;
}
}
return $addresses;
}
/** /**
* set the asyncjob for a timed vacation * set the asyncjob for a timed vacation
* *
@ -1286,8 +1271,8 @@ class mail_sieve
function ajax_getFolders ($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false) function ajax_getFolders ($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false)
{ {
$mailCompose = new mail_compose(); $mailCompose = new mail_compose();
if ($_REQUEST['noPrefixId']) $_noPrefixID = $_REQUEST['noPrefixId']; if ($_REQUEST['noPrefixId']) $_noPrefixId = $_REQUEST['noPrefixId'];
$mailCompose->ajax_searchFolder($_searchStringLength,$_returnList,$_mailaccountToSearch,$_noPrefixID); $mailCompose->ajax_searchFolder($_searchStringLength, $_returnList, $_mailaccountToSearch, $_noPrefixId);
} }
} }