diff options
| -rw-r--r-- | it.class | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -273,10 +273,12 @@ static function error($p = array(), $extra = null) $p['body'] = " See " . getenv('HOSTNAME') . ":$datafn"; } + $mailid = "mail" . (crc32($p['title'] . $url) % 10000); + $body = ($p['omitdebuginfo'] >= 2 ? "" : ($url && !$toscreen? "Title: {$p['title']}\nUrl: $url\n" : "") . ($trace ? ($sendmail ? "" : " ") . "Trace: $trace\n" : "")) . - (!$sendmail || $p['omitdebuginfo'] >= 2 ? "" : "Host: " . getenv('HOSTNAME') . " at " . date("Y-m-d H:i:s") . (($t = time() - $_SERVER['REQUEST_TIME']) ? " (invoked {$t}s before)" : "") . "\n") . # no it::date() due to time- debug param + (!$sendmail || $p['omitdebuginfo'] >= 2 ? "" : "Host: " . getenv('HOSTNAME') . " at " . date("Y-m-d H:i:s") . (($t = time() - $_SERVER['REQUEST_TIME']) ? " (invoked {$t}s before)" : "") . " id $mailid\n") . # no it::date() due to time- debug param ($sendmail ? $p['head'] : "") . ($p['id'] && !$toscreen ? "Filter: timewindow=" . $p['graceperiod'] . "-" . ($p['graceperiod'] + $p['timewindow']) . " (previous err: " . it::date('', $errstamp) . ")\n" : "") . (!$origp['blockmail'] || $p['omitdebuginfo'] || $toscreen ? "" : "Block-resend: " . $origp['blockmail'] . " seconds\n") . @@ -316,7 +318,7 @@ static function error($p = array(), $extra = null) if ($sendmail) it::mail([ - 'From' => "\"$user@" . gethostname() . "\" <$user>", + 'From' => "\"$user@" . gethostname() . " $mailid\" <$user>", 'To' => $p['to'], 'Reply-To' => $p['to'], 'Cc' => $GLOBALS['it_defaultconfig']['error_cc'], |