From e0676c0895968f8a17a9f62906b5cbf794d9df31 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 1 Jun 2017 13:09:44 +0200 Subject: [PATCH] WIP SpamTitan integration: - Implement add whitelist & blacklist actions - Fix spamtitan actions error result --- mail/inc/class.mail_ui.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index 18b958c2f5..f9ad35a88c 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -895,7 +895,7 @@ class mail_ui $this->changeProfile($id_parts['profileID']); } $_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, 'user' => $this->mail_bo->icServer->acc_imap_username, 'api_url' => $this->mail_bo->icServer->acc_spam_api @@ -940,7 +940,7 @@ class mail_ui ); $account = Mail\Account::read($this->mail_bo->profileID); // 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()); }