Commit 2ffd36ad authored by gngn's avatar gngn Committed by Bohdan Artemchuk
Browse files

Issue #3031743 by gngn, baikho, bohart: Reroute status to headers instead of header

parent f0f38703

reroute_email.module

+4 −4
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ function reroute_email_check(array &$message) { 
  // Check configured mail keys filters.

  $keys = reroute_email_split_string($config->get(REROUTE_EMAIL_MAILKEYS, ''));

  if (!empty($keys) && !(in_array($message['id'], $keys, TRUE) || in_array($message['module'], $keys, TRUE))) {

    $message['header']['X-Reroute-Status'] = 'MAILKEY-IGNORED';

    $message['headers']['X-Reroute-Status'] = 'MAILKEY-IGNORED';

    return FALSE;

  }
@@ -256,18 +256,18 @@ function reroute_email_check(array &$message) { 
    }



    // No need to continue if at least one address should be rerouted.

    $message['header']['X-Reroute-Status'] = 'REROUTED';

    $message['headers']['X-Reroute-Status'] = 'REROUTED';

    return TRUE;

  }



  // Reroute if all addresses are invalid.

  if (count($original_addresses) === $invalid) {

    $message['header']['X-Reroute-Status'] = 'INVALID-ADDRESSES';

    $message['headers']['X-Reroute-Status'] = 'INVALID-ADDRESSES';

    return TRUE;

  }



  // All addresses passes whitelist checks.

  $message['header']['X-Reroute-Status'] = 'WHITELISTED';

  $message['headers']['X-Reroute-Status'] = 'WHITELISTED';

  return FALSE;

}