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

WIP SpamTitan integration:

Browse Source 
- Take acc_spam_api into account for showing spam actions
This commit is contained in:
Hadi Nategh 2017-05-31 17:38:09 +02:00
parent a9e750c8b2
commit b099ba8a5e
2 changed files with 73 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -877,6 +877,70 @@ class mail_ui
} }
} }
/**
* Method to execute spam actions
*
* @param type $_action action id
* @param type $_params
*/
public function ajax_spamAction($_action, $_params)
{
$msg = array();
$response = Api\Json\Response::get();
if ($GLOBALS['egw_info']['apps']['stylite'])
{
$data = array_merge($_params, array(
'userpwd' => $this->mail_bo->icServer['params']['acc_imap_password'],
'user' => $this->mail_bo->icServer['params']['acc_imap_username'],
'api_url' => $this->mail_bo->icServer['params']['acc_spam_api']
));
$msg[] = stylite_mail_spamtitan::execSpamTitanAction($_action, $_params, $data);
}
switch ($_action)
{
case 'spam':
// Move to spam from Inbox
break;
case 'ham':
// copy to Ham and move from Spam to Inbox
break;
}
$response->apply('egw.message',[implode('\n',$msg)]);
}
/**
* Build spam actions
*
* @return array actions
*/
public function getSpamActions ()
{
$actions = array (
'spamfilter' => array (
'caption' => 'spam',
'icon' => 'dhtmlxtree/MailFolderJunk',
'children' => array (
'spam' => array (
'caption' => 'Report as Spam',
'icon' => 'dhtmlxtree/MailFolderJunk',
'onExecute' => 'javaScript:app.mail.spam_actions',
),
'ham' => array (
'caption' => 'Not a Spam',
'icon' => 'ham',
'onExecute' => 'javaScript:app.mail.spam_actions',
)
)
)
);
$account = Mail\Account::read($this->mail_bo->profileID);
// spamTitan actions
if ($GLOBALS['egw_info']['apps']['stylite'] && $account['params']['acc_spam_api'])
{
$actions['spamfilter']['children'] = array_merge($actions['spamfilter']['children'], stylite_mail_spamtitan::getActions());
}
return $actions;
}
/** /**
* Get actions / context menu for index * Get actions / context menu for index
@ -1305,17 +1369,14 @@ class mail_ui
{ {
unset($actions['save']['children']['save2filemanager']); unset($actions['save']['children']['save2filemanager']);
} }
if ($GLOBALS['egw_info']['apps']['stylite'])
{ $spam_actions = $this->getSpamActions();
$spamtitan_actions = stylite_mail_spamtitan::getActions();
$group++; $group++;
foreach ($spamtitan_actions as &$action) foreach ($spam_actions as &$action)
{ {
$action['group'] = $group; $action['group'] = $group;
} }
$actions = array_merge($actions, $spamtitan_actions); return array_merge($actions, $spam_actions);
}
return $actions;
} }
/** /**

6
mail/js/app.js
View File

@ -5479,16 +5479,16 @@ app.classes.mail = AppJS.extend(
}, },
/** /**
* Actions handler * Spam Actions handler
* *
* @param {object} _action egw action * @param {object} _action egw action
* @param {object} _sender nm row * @param {object} _sender nm row
*/ */
spamtitan_actions: function (_action, _sender) spam_actions: function (_action, _sender)
{ {
var id = _sender[0].id; var id = _sender[0].id;
var data = egw.dataGetUIDdata(id); var data = egw.dataGetUIDdata(id);
this.egw.json('stylite.stylite_mail_spamtitan.ajax_action', [_action.id, {}]).sendRequest(true); this.egw.json('mail.mail_ui.ajax_spamAction', [_action.id, {'acc_id':id.split('::')[2], data:data.data}]).sendRequest(true);
}, },
/** /**