7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added SENDER_ADDRESS and SENDER_NAME as variables for messages

Browse Source
This commit is contained in:
bluewalk
2022-11-17 14:30:06 +01:00
committed by DerLinkman
parent e82f3b3975
commit 65c74c75c7
8 changed files with 81 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
data/conf/rspamd/meta_exporter/pushover.php
View File

@@ -67,10 +67,12 @@ if (is_array($symbols_array)) {
$json = json_decode(file_get_contents('php://input'));
$sender_address = $json->header_from ;
if (preg_match('/[a-zA-Z0-9.!#$%&’*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)/i', $sender, $matches))
$sender_address = $json->header_from[0];
$sender_name = '-';
if (preg_match('/[a-zA-Z0-9.!#$%&’*+\/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)/i', $sender_address, $matches)) {
$sender_address = $matches[0];
$sender_name = trim(str_replace('<' . $email . '>', '', $from));
$sender_name = trim(str_replace('<' . $sender_address . '>', '', $json->header_from[0]));
}
$rcpt_final_mailboxes = array();
@@ -238,7 +240,8 @@ foreach ($rcpt_final_mailboxes as $rcpt_final) {
"user" => $api_data['key'],
"title" => sprintf("%s", str_replace(array('{SUBJECT}', '{SENDER}', '{SENDER_NAME}', '{SENDER_ADDRESS}'), array($subject, $sender, $sender_name, $sender_address), $title)),
"priority" => $priority,
"message" => sprintf("%s", str_replace(array('{SUBJECT}', '{SENDER}', '{SENDER_NAME}', '{SENDER_ADDRESS}'), array($subject, $sender, $sender_name, $sender_address), $text))
"message" => sprintf("%s", str_replace(array('{SUBJECT}', '{SENDER}', '{SENDER_NAME}', '{SENDER_ADDRESS}'), array($subject, $sender, $sender_name, $sender_address), $text)),
"sound" => $attributes['sound'] ?? "pushover"
);
if ($attributes['evaluate_x_prio'] == "1" && $priority == 1) {
$post_fields['expire'] = 600;