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

Copy to ham folder if only ham folder is set and spamTitan is not configured

Browse Source
This commit is contained in:
Hadi Nategh 2017-06-07 12:09:33 +02:00
parent fcbb31edb0
commit d06dcc6770
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -921,7 +921,7 @@ class mail_ui
), 'move'); ), 'move');
break; break;
case 'ham': case 'ham':
if ($ham) if (isset($this->mail_bo->icServer->acc_folder_ham) && !isset($this->mail_bo->icServer->acc_spam_api))
{ {
$this->ajax_copyMessages($ham, array( $this->ajax_copyMessages($ham, array(
'all' => false, 'all' => false,

4
mail/js/app.js
View File

@ -5498,7 +5498,7 @@ app.classes.mail = AppJS.extend(
} }
var data = egw.dataGetUIDdata(id); var data = egw.dataGetUIDdata(id);
var fromaddress = data.data.fromaddress.match(/<([^\'\" <>]+)>$/); var fromaddress = data.data.fromaddress.match(/<([^\'\" <>]+)>$/);
var email = fromaddress[1]?fromaddress[1]:fromaddress; var email = (fromaddress && fromaddress[1])?fromaddress[1]:data.data.fromaddress;
var domain = '@'+email.split('@')[1]; var domain = '@'+email.split('@')[1];
this.egw.json('mail.mail_ui.ajax_spamAction', [ this.egw.json('mail.mail_ui.ajax_spamAction', [
_action.id, _action.id,
@ -5516,7 +5516,7 @@ app.classes.mail = AppJS.extend(
var id = _sender[0].id; var id = _sender[0].id;
var data = egw.dataGetUIDdata(id); var data = egw.dataGetUIDdata(id);
var fromaddress = data.data.fromaddress.match(/<([^\'\" <>]+)>$/); var fromaddress = data.data.fromaddress.match(/<([^\'\" <>]+)>$/);
var email = fromaddress[1]?fromaddress[1]:fromaddress; var email = (fromaddress && fromaddress[1]) ?fromaddress[1]:data.data.fromaddress;
var domain = email.split('@')[1]; var domain = email.split('@')[1];
switch (_action.id) switch (_action.id)
{ {