$envelopefrom = ereg_replace("[[:space:]]",'', $envelopefrom);
$envelopefrom = ereg_replace("[[:cntrl:]]",'', $envelopefrom);
- // open pipe to sendmail
- $fp = popen (escapeshellcmd("$sendmail_path -t -f$envelopefrom"), 'w');
-
+ // open pipe to sendmail or qmail-inject (qmail-inject doesn't accept -t param)
+ if (strstr($sendmail_path, "qmail-inject")) {
+ $fp = popen (escapeshellcmd("$sendmail_path -f$envelopefrom"), "w");
+ } else {
+ $fp = popen (escapeshellcmd("$sendmail_path -t -f$envelopefrom"), "w");
+ }
+
$headerlength = write822Header ($fp, $t, $c, $b, $subject, $more_headers);
$bodylength = writeBody($fp, $body);
return $err_num;
}
- function sendMessage($t, $c, $b, $subject, $body, $reply_id) {
+ function sendMessage($t, $c, $b, $subject, $body, $reply_id, $prio = 3) {
global $useSendmail, $msg_id, $is_reply, $mailbox, $onetimepad;
global $data_dir, $username, $domain, $key, $version, $sent_folder, $imapServerAddress, $imapPort;
+ global $default_use_priority;
global $more_headers;
$more_headers = Array();
$more_headers['References'] = $hdr->message_id;
}
}
+ if ($default_use_priority) {
+ $more_headers = array_merge($more_headers, createPriorityHeaders($prio));
+ }
// In order to remove the problem of users not able to create
// messages with "." on a blank line, RFC821 has made provision
return $length;
}
-
-?>
\ No newline at end of file
+
+ function createPriorityHeaders($prio) {
+ $prio_headers = Array();
+ $prio_headers["X-Priority"] = $prio;
+
+ switch($prio) {
+ case 1: $prio_headers["Importance"] = "High";
+ $prio_headers["X-MSMail-Priority"] = "High";
+ break;
+
+ case 3: $prio_headers["Importance"] = "Normal";
+ $prio_headers["X-MSMail-Priority"] = "Normal";
+ break;
+
+ case 5:
+ $prio_headers["Importance"] = "Low";
+ $prio_headers["X-MSMail-Priority"] = "Low";
+ break;
+ }
+ return $prio_headers;
+ }
+?>