Use config option email_tail to define msgid domain

This commit is contained in:
Retro_Guy 2021-04-15 12:25:23 -07:00
parent 6522c37d84
commit 5c7c5e2396
1 changed files with 7 additions and 2 deletions

View File

@ -117,14 +117,19 @@ function quoted_printable_encode($line) {
* returns: a complete message-id * returns: a complete message-id
*/ */
function generate_msgid($identity) { function generate_msgid($identity) {
global $msgid_generate,$msgid_fqdn; global $CONFIG, $msgid_generate,$msgid_fqdn;
switch($msgid_generate) { switch($msgid_generate) {
case "no": case "no":
// no, we don't want to generate a message-id. // no, we don't want to generate a message-id.
return false; return false;
break; break;
case "md5": case "md5":
return '<'.md5($identity).'$1@'.$msgid_fqdn.'>'; if($CONFIG['email_tail'][0] !== '@') {
$mymsgid = '@'.$CONFIG['email_tail'];
} else {
$mymsgid = $CONFIG['email_tail'];
}
return '<'.md5($identity).$mymsgid.'>';
break; break;
default: default:
return false; return false;