holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Mail: try not talking to not configured (empty) SpamTitan URL

Browse Source
This commit is contained in:
Ralf Becker 2017-06-28 10:24:59 +02:00
parent 9a61c16181
commit 5a05d35861
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

@ -929,7 +929,7 @@ class mail_ui
$refresh = true; $refresh = true;
break; break;
case 'ham': case 'ham':
if (isset($this->mail_bo->icServer->acc_folder_ham) && !isset($this->mail_bo->icServer->acc_spam_api)) if (isset($this->mail_bo->icServer->acc_folder_ham) && empty($this->mail_bo->icServer->acc_spam_api))
{ {
$msg[] = $this->ajax_copyMessages($ham, array( $msg[] = $this->ajax_copyMessages($ham, array(
'all' => false, 'all' => false,
@ -947,7 +947,7 @@ class mail_ui
} }
break; break;
} }
if ($GLOBALS['egw_info']['apps']['stylite']) if ($GLOBALS['egw_info']['apps']['stylite'] && $this->mail_bo->icServer->acc_spam_api)
{ {
stylite_mail_spamtitan::setActionItems($_action, $_items, array( stylite_mail_spamtitan::setActionItems($_action, $_items, array(
'userpwd' => $this->mail_bo->icServer->acc_imap_password, 'userpwd' => $this->mail_bo->icServer->acc_imap_password,