extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 00:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP SpamTitan integration:

Browse Source 
- Implement add whitelist & blacklist actions
- Fix spamtitan actions error result
This commit is contained in:
Hadi Nategh 2017-06-01 13:09:44 +02:00
parent 77a285bbea
commit ce5ce37c4f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/inc/class.mail_ui.inc.php
View File

@ -895,7 +895,7 @@ class mail_ui
$this->changeProfile($id_parts['profileID']); $this->changeProfile($id_parts['profileID']);
} }
$_params['mailbody'] = $this->get_load_email_data($_params['data']['uid'], null, $id_parts['folder']); $_params['mailbody'] = $this->get_load_email_data($_params['data']['uid'], null, $id_parts['folder']);
$msg[] = stylite_mail_spamtitan::execSpamTitanAction($_action, $_params, array( $msg[] = stylite_mail_spamtitan::execAction($_action, $_params, array(
'userpwd' => $this->mail_bo->icServer->acc_imap_password, 'userpwd' => $this->mail_bo->icServer->acc_imap_password,
'user' => $this->mail_bo->icServer->acc_imap_username, 'user' => $this->mail_bo->icServer->acc_imap_username,
'api_url' => $this->mail_bo->icServer->acc_spam_api 'api_url' => $this->mail_bo->icServer->acc_spam_api
@ -940,7 +940,7 @@ class mail_ui
); );
$account = Mail\Account::read($this->mail_bo->profileID); $account = Mail\Account::read($this->mail_bo->profileID);
// spamTitan actions // spamTitan actions
if ($GLOBALS['egw_info']['apps']['stylite'] && $account['params']['acc_spam_api']) if ($GLOBALS['egw_info']['apps']['stylite'] && $account->acc_spam_api)
{ {
$actions['spamfilter']['children'] = array_merge($actions['spamfilter']['children'], stylite_mail_spamtitan::getActions()); $actions['spamfilter']['children'] = array_merge($actions['spamfilter']['children'], stylite_mail_spamtitan::getActions());
} }