extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-26 01:43:47 +01:00
Code Issues 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 b3f146c246
commit fb1b32aec8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -933,7 +933,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,
@ -951,7 +951,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,
@ -2180,8 +2180,8 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
} }
} }
//error_log(__METHOD__.__LINE__.array2string($attachments)); //error_log(__METHOD__.__LINE__.array2string($attachments));
$attachmentHTMLBlock = self::createAttachmentBlock($attachments, $rowID, $uid, $mailbox); $attachmentHTMLBlock = self::createAttachmentBlock($attachments, $rowID, $uid, $mailbox);
$nonDisplayAbleCharacters = array('[\016]','[\017]', $nonDisplayAbleCharacters = array('[\016]','[\017]',
'[\020]','[\021]','[\022]','[\023]','[\024]','[\025]','[\026]','[\027]', '[\020]','[\021]','[\022]','[\023]','[\024]','[\025]','[\026]','[\027]',