From 38ca3dc582535bb918353a91ae345682546aa270 Mon Sep 17 00:00:00 2001 From: M Somerville Date: Mon, 18 Oct 2021 17:27:13 +0100 Subject: [PATCH] Add HTML email support to alert emails. --- scripts/alertmailer.php | 55 ++++-- .../templates/emails/alert_mailout.html | 162 ++++++++++++++++++ .../templates/emails/alert_mailout.txt | 2 +- .../emails/images/logo-mysociety.svg | 1 + .../emails/images/mySociety-logo.png | Bin 0 -> 14299 bytes .../emails/images/theyworkforyou-logo.png | Bin 0 -> 8387 bytes www/includes/utility.php | 53 ++++-- 7 files changed, 238 insertions(+), 35 deletions(-) create mode 100644 www/includes/easyparliament/templates/emails/alert_mailout.html create mode 100644 www/includes/easyparliament/templates/emails/images/logo-mysociety.svg create mode 100644 www/includes/easyparliament/templates/emails/images/mySociety-logo.png create mode 100644 www/includes/easyparliament/templates/emails/images/theyworkforyou-logo.png diff --git a/scripts/alertmailer.php b/scripts/alertmailer.php index a54d2b452f..6218e70a43 100644 --- a/scripts/alertmailer.php +++ b/scripts/alertmailer.php @@ -102,6 +102,7 @@ function mlog($message) { $current = array('email' => '', 'token' => ''); $email_text = ''; +$html_text = ''; $globalsuccess = 1; # Fetch all confirmed, non-deleted alerts @@ -178,11 +179,12 @@ function mlog($message) { if ($email != $current['email']) { if ($email_text) { - write_and_send_email($current, $email_text, $template); + write_and_send_email($current, $email_text, $html_text, $template); } $current['email'] = $email; $current['token'] = $alertitem['alert_id'] . '-' . $alertitem['registrationtoken']; $email_text = ''; + $html_text = ''; $q = $db->query('SELECT user_id FROM users WHERE email = :email', array( ':email' => $email ))->first(); @@ -253,7 +255,7 @@ function mlog($message) { } else { $text .= "$vote$teller"; } - $text .= " (division #$num; result was " . $row['yes_total'] . ' aye, ' . $row['no_total'] . ' no)'; + $text .= " (division #$num; result was " . $row['yes_total'] . ' aye, ' . $row['no_total'] . ' no)'; $data['rows'][] = [ 'parent' => [ 'body' => $row['division_title'], @@ -275,7 +277,7 @@ function mlog($message) { if ($major !== $row['major']) { $count[$major] = $total; $total = 0; $major = $row['major']; - $o[$major] = ''; + $o[$major] = ['text' => '', 'html' => '']; $k = 3; } #mlog($row['major'] . " " . $row['gid'] ."\n"); @@ -302,38 +304,52 @@ function mlog($message) { if ($major == 'V' || $k >= 0) { $any_content = true; $parentbody = text_html_to_email($row['parent']['body']); - $body = text_html_to_email($row['extract']); + $body_text = text_html_to_email($row['extract']); + $body_html = $row['extract']; if (isset($row['speaker']) && count($row['speaker'])) { - $body = $row['speaker']['name'] . ': ' . $body; + $body_text = $row['speaker']['name'] . ': ' . $body_text; + $body_html = '' . $row['speaker']['name'] . ': ' . $body_html; } + $body_html = '

' . $body_html . '

'; - $body = wordwrap($body, 72); - $o[$major] .= $parentbody . ' (' . format_date($row['hdate'], SHORTDATEFORMAT) . ")\nhttps://www.theyworkforyou.com" . $row['listurl'] . "\n"; - $o[$major] .= $body . "\n\n"; + $body_text = wordwrap($body_text, 72); + $o[$major]['text'] .= $parentbody . ' (' . format_date($row['hdate'], SHORTDATEFORMAT) . ")\nhttps://www.theyworkforyou.com" . $row['listurl'] . "\n"; + $o[$major]['text'] .= $body_text . "\n\n"; + $o[$major]['html'] .= '

' . $parentbody . '

 ' . format_date($row['hdate'], SHORTDATEFORMAT) . ''; + $o[$major]['html'] .= $body_html . "\n\n"; } $total++; } $count[$major] = $total; if ($any_content) { - # Add data to email_text + # Add data to email_text/html_text $desc = trim(html_entity_decode($data['searchdescription'])); $desc = trim(preg_replace(['#\(B\d+( OR B\d+)*\)#', '#B\d+( OR B\d+)*#'], '', $desc)); foreach ($o as $major => $body) { - if ($body) { - $heading = $desc . ' : ' . $count[$major] . ' ' . $sects[$major] . ($count[$major] != 1 ? 's' : ''); - $email_text .= "$heading\n" . str_repeat('=', strlen($heading)) . "\n\n"; + if ($body['text']) { + $heading_text = $desc . ' : ' . $count[$major] . ' ' . $sects[$major] . ($count[$major] != 1 ? 's' : ''); + $heading_html = $desc . ' : ' . $count[$major] . ' ' . $sects[$major] . ($count[$major] != 1 ? 's' : ''); + + $email_text .= "$heading_text\n" . str_repeat('=', strlen($heading_text)) . "\n\n"; if ($count[$major] > 3 && $major != 'V') { $email_text .= "There are more results than we have shown here. See more:\nhttps://www.theyworkforyou.com/search/?s=" . urlencode($criteria_raw) . "+section:" . $sects_search[$major] . "&o=d\n\n"; } - $email_text .= $body; + $email_text .= $body['text']; + + $html_text .= '
'; + $html_text .= '

' . $heading_html . '

'; + if ($count[$major] > 3 && $major != 'V') { + $html_text .= '

There are more results than we have shown here. See more

'; + } + $html_text .= $body['html']; } } } } } if ($email_text) { - write_and_send_email($current, $email_text, $template); + write_and_send_email($current, $email_text, $html_text, $template); } mlog("\n"); @@ -402,15 +418,16 @@ function sort_by_stuff($a, $b) { return ($a['hpos'] > $b['hpos']) ? 1 : -1; } -function write_and_send_email($current, $data, $template) { +function write_and_send_email($current, $text, $html, $template) { global $globalsuccess, $sentemails, $nomail, $start_time; - $data .= '===================='; + $text .= '===================='; $sentemails++; mlog("SEND $sentemails : Sending email to $current[email] ... "); $d = array('to' => $current['email'], 'template' => $template); $m = array( - 'DATA' => $data, + 'DATA' => $text, + '_HTML_' => $html, 'MANAGE' => 'https://www.theyworkforyou.com/D/' . $current['token'], ); if (!$nomail) { @@ -423,7 +440,7 @@ function write_and_send_email($current, $data, $template) { sleep(1); } } else { - mlog($data); + mlog($text); $success = 1; } mlog("done\n"); @@ -433,7 +450,7 @@ function write_and_send_email($current, $data, $template) { } function text_html_to_email($s) { - $s = preg_replace('##', '', $s); + $s = preg_replace('##', '', $s); $s = preg_replace('#]*>#', '*', $s); $s = str_replace( array('£', '–', '—', '’', '
'), diff --git a/www/includes/easyparliament/templates/emails/alert_mailout.html b/www/includes/easyparliament/templates/emails/alert_mailout.html new file mode 100644 index 0000000000..479ce32fa9 --- /dev/null +++ b/www/includes/easyparliament/templates/emails/alert_mailout.html @@ -0,0 +1,162 @@ + + + + Your TheyWorkForYou email alert + + + + + + + + + + +
+ +
+ + + +

Email alerts

+
+ +
+ + {_HTML_} + +
+ +

Best wishes,
TheyWorkForYou

+ +

+ mySociety,
+ 483 Green Lanes,
+ London,
+ N13 4BS,
+ United Kingdom +

+ +
+

Help keep TheyWorkForYou running

+

Please consider donating to mySociety to help us continue and expand:

+ +
+ Donate +
+
+ +
+ +
+ + + +
+ + + diff --git a/www/includes/easyparliament/templates/emails/alert_mailout.txt b/www/includes/easyparliament/templates/emails/alert_mailout.txt index b6325bf159..2c0ec7b071 100644 --- a/www/includes/easyparliament/templates/emails/alert_mailout.txt +++ b/www/includes/easyparliament/templates/emails/alert_mailout.txt @@ -22,5 +22,5 @@ continue and expand: https://www.mysociety.org/twfy-donate/ ------------------------------------------------------------------- -To manage, unsubscribe or add to your alerts, please visit the following link: +To unsubscribe, manage or add to your alerts, please visit the following link: {MANAGE} diff --git a/www/includes/easyparliament/templates/emails/images/logo-mysociety.svg b/www/includes/easyparliament/templates/emails/images/logo-mysociety.svg new file mode 100644 index 0000000000..eaa329c29e --- /dev/null +++ b/www/includes/easyparliament/templates/emails/images/logo-mysociety.svg @@ -0,0 +1 @@ +mysociety-logo-grey \ No newline at end of file diff --git a/www/includes/easyparliament/templates/emails/images/mySociety-logo.png b/www/includes/easyparliament/templates/emails/images/mySociety-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..4544be1b9138c9ec0dbf7743fc68223f8d8c0dfa GIT binary patch literal 14299 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 U(}(KAzaI#c0P1oTG8Uo#1?$`|+yDRo literal 0 HcmV?d00001 diff --git a/www/includes/utility.php b/www/includes/utility.php index 69a1c2642b..eba7d22043 100644 --- a/www/includes/utility.php +++ b/www/includes/utility.php @@ -7,6 +7,7 @@ include_once INCLUDESPATH . '../../commonlib/phplib/email.php'; include_once INCLUDESPATH . '../../commonlib/phplib/datetime.php'; +use PHPMailer\PHPMailer\PHPMailer; # Pass it a brief header word and some debug text and it'll be output. # If TEXT is an array, call the user function, assuming it's a class. @@ -701,6 +702,13 @@ function send_template_email($data, $merge, $bulk = false, $want_bounces = false $emailtext = fread($handle, filesize($filename)); fclose($handle); + $filename = INCLUDESPATH . "easyparliament/templates/emails/" . $data['template'] . ".html"; + if (file_exists($filename)) { + $htmltext = file_get_contents($filename); + } else { + $htmltext = ''; + } + // See if there's a default subject in the template. $firstline = substr($emailtext, 0, strpos($emailtext, "\n")); @@ -733,9 +741,10 @@ function send_template_email($data, $merge, $bulk = false, $want_bounces = false } $emailtext = preg_replace($search, $replace, $emailtext); + $htmltext = preg_replace($search, $replace, $htmltext); // Send it! - $success = send_email ($data['to'], $subject, $emailtext, $bulk, 'twfy-DO-NOT-REPLY@' . EMAILDOMAIN, $want_bounces); + $success = send_email ($data['to'], $subject, $emailtext, $bulk, 'twfy-DO-NOT-REPLY@' . EMAILDOMAIN, $want_bounces, $htmltext); return $success; @@ -750,30 +759,44 @@ function twfy_verp_envelope_sender($recipient) { return $envelope_sender; } -function send_email($to, $subject, $message, $bulk = false, $from = '', $want_bounces = false) { +function send_email($to, $subject, $message, $bulk = false, $from = '', $want_bounces = false, $html='') { // Use this rather than PHP's mail() direct, so we can make alterations // easily to all the emails we send out from the site. // eg, we might want to add a .sig to everything here... if (!$from) $from = CONTACTEMAIL; - $headers = - "From: TheyWorkForYou <$from>\r\n" . - "Content-Type: text/plain; charset=utf-8\r\n" . - "MIME-Version: 1.0\r\n" . - "Content-Transfer-Encoding: 8bit\r\n" . - ($bulk ? "Precedence: bulk\r\nAuto-Submitted: auto-generated\r\n" : "" ). - "X-Mailer: PHP/" . phpversion(); - twfy_debug('EMAIL', "Sending email to $to with subject of '$subject'"); + $mail = new PHPMailer(true); + $mail->isSMTP(); + $mail->SMTPAutoTLS = false; + $mail->setFrom($from, 'TheyWorkForYou'); + $mail->addAddress($to); + $mail->Subject = $subject; + $mail->CharSet = 'utf-8'; + + if ($html) { + $mail->msgHTML($html, INCLUDESPATH . 'easyparliament/templates/emails'); + $mail->AltBody = $message; + } else { + $mail->Body = $message; + } + + if ($bulk) { + $mail->addCustomHeader('Precedence', 'bulk'); + $mail->addCustomHeader('Auto-Submitted', 'auto-generated'); + } if ($want_bounces) { - $envelope_sender = twfy_verp_envelope_sender($to); - $success = mail ($to, $subject, $message, $headers, '-f ' . $envelope_sender); - } else { - $success = mail ($to, $subject, $message, $headers); + $mail->Sender = twfy_verp_envelope_sender($to); } - return $success; + twfy_debug('EMAIL', "Sending email to $to with subject of '$subject'"); + try { + $mail->send(); + return true; + } catch (Exception $e) { + return false; + } }