Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

web: add option to use Unix 'mail' command to send emails 

Define('EMAIL_USE_CMD', true) in your html/project/project.inc

I recently configured our server to use DKIM (email authentication).
This can avoid spam classification.
For some reason, this didn't work with PHPMailer,
but it worked with the Unix 'mail' command.
This commit is contained in:
David Anderson 2024-01-12 01:52:03 -08:00
parent 60c6d6bfc3
commit 1d4e525a52
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
html/inc/email.inc
View File

@ -27,7 +27,16 @@ require_once("../inc/token.inc");
// send an email, using PHPMailer or not.
//
function send_email($user, $subject, $body, $body_html=null, $email_addr=null) {
if (function_exists("make_php_mailer")) {
if (!$email_addr) {
$email_addr = $user->email_addr;
}
if (defined('EMAIL_USE_CMD')) {
$cmd = "mail -s \"$subject\" $email_addr";
$pipe = popen($cmd, "w");
fwrite($pipe, $body);
pclose($pipe);
return true;
} else if (function_exists("make_php_mailer")) {
if (file_exists("../inc/PHPMailer/src/PHPMailer.php") && file_exists("../inc/PHPMailer/src/SMTP.php")) {
require_once("../inc/PHPMailer/src/PHPMailer.php");
require_once("../inc/PHPMailer/src/SMTP.php");
@ -38,11 +47,7 @@ function send_email($user, $subject, $body, $body_html=null, $email_addr=null) {
return false;
}
$mail = make_php_mailer();
if ($email_addr) {
$mail->AddAddress($email_addr, $user->name);
} else {
$mail->AddAddress($user->email_addr, $user->name);
}
$mail->AddAddress($email_addr, $user->name);
$mail->Subject = $subject;
if ($body_html) {
$mail->AltBody = $body;
@ -64,9 +69,6 @@ function send_email($user, $subject, $body, $body_html=null, $email_addr=null) {
} else if (defined('EMAIL_FROM')) {
$headers = "From: ". EMAIL_FROM;
}
if (!$email_addr) {
$email_addr = $user->email_addr;
}
if ($body_html) {
$body = "<html><body>\n";
$body .= $body_html;