mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 06:30:59 +01:00
Copy to ham folder if only ham folder is set and spamTitan is not configured
This commit is contained in:
parent
fcbb31edb0
commit
d06dcc6770
@ -921,7 +921,7 @@ class mail_ui
|
||||
), 'move');
|
||||
break;
|
||||
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(
|
||||
'all' => false,
|
||||
|
@ -5498,7 +5498,7 @@ app.classes.mail = AppJS.extend(
|
||||
}
|
||||
var data = egw.dataGetUIDdata(id);
|
||||
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];
|
||||
this.egw.json('mail.mail_ui.ajax_spamAction', [
|
||||
_action.id,
|
||||
@ -5516,7 +5516,7 @@ app.classes.mail = AppJS.extend(
|
||||
var id = _sender[0].id;
|
||||
var data = egw.dataGetUIDdata(id);
|
||||
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];
|
||||
switch (_action.id)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user