edekakam/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2025-03-05 22:49:48 +01:00
Code Issues Projects Releases Wiki Activity

Reimplemented ticket autoresponder blacklist

Browse Source
This commit is contained in:
OpenXE 2024-06-02 19:34:27 +02:00
parent ae4ceda258
commit 52b64ef8bc
1 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
classes/Modules/Ticket/Task/TicketImportHelper.php
View File

@ -850,9 +850,9 @@ class TicketImportHelper
if ( if (
$this->mailAccount->isAutoresponseEnabled() $this->mailAccount->isAutoresponseEnabled()
&& $this->mailAccount->getAutoresponseText() !== '' && $this->mailAccount->getAutoresponseText() !== ''
&& ( && !(
// $this->erpApi->AutoresponderBlacklist($from) !== 1 || $this->CheckAutoresponderBlacklist($from) &&
$this->mailAccount->isAutoresponseLimitEnabled() === false $this->mailAccount->isAutoresponseLimitEnabled()
) )
) { ) {
@ -867,20 +867,38 @@ class TicketImportHelper
$betreff = str_replace('{TICKET}', $ticketNumber, $betreff); $betreff = str_replace('{TICKET}', $ticketNumber, $betreff);
$betreff = str_replace('{BETREFF}', $subject, $betreff); $betreff = str_replace('{BETREFF}', $subject, $betreff);
if (!$this->erpApi->isHTML($text)) { if (!$this->erpApi->isHTML($text)) {
$text = str_replace("\r\n", '<br>', $text); $text = str_replace("\r\n", '<br>', $text);
} }
$this->SetAutoresponderBlacklist($from);
$this->erpApi->MailSend( $this->erpApi->MailSend(
$this->mailAccount->getSenderEmailAddress(), $this->mailAccount->getSenderEmailAddress(),
'', $this->mailAccount->getSenderName(),
$from,
$from, $from,
$name_sender,
$betreff, $betreff,
$text $text
); );
} }
return(true); return(true);
} }
// Check if the given address has already been autoresponded to
// True if blocked
function CheckAutoresponderBlacklist(string $mailaddress) : bool {
$blocked = $this->db->Select("SELECT * FROM autoresponder_blacklist WHERE mailaddress = '".$mailaddress."' AND cachetime > DATE_ADD(CURRENT_TIMESTAMP, INTERVAL -24 HOUR)");
$this->logger->debug('Blacklist',['address' => $mailaddress, 'result' => $blocked]);
return(!empty($blocked));
}
function SetAutoresponderBlacklist(string $mailaddress) {
$this->db->Insert("INSERT INTO autoresponder_blacklist (mailaddress) VALUES ('".$mailaddress."')");
$this->db->Delete("DELETE FROM autoresponder_blacklist WHERE cachetime < DATE_ADD(CURRENT_TIMESTAMP, INTERVAL -24 HOUR)");
}
} }