From aa9d02d41fd5e85f2d41c79d4657eb25231219ce Mon Sep 17 00:00:00 2001
From: Roman Kelesidis <roman25052006.kelesh@gmail.com>
Date: Sat, 18 Mar 2023 22:07:20 +0700
Subject: [PATCH] Added ability to select email type in mass email (#624)

* Added ability to select email type in mass email

* Added text / html type selector.

* Return back constants
---
 admin/admin_mass_email.php                  |  3 ++-
 library/language/source/main.php            |  2 ++
 src/Legacy/Emailer.php                      |  2 +-
 styles/templates/admin/admin_mass_email.tpl | 11 ++++++++++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/admin/admin_mass_email.php b/admin/admin_mass_email.php
index 2eaa1c1a9..2338e57eb 100644
--- a/admin/admin_mass_email.php
+++ b/admin/admin_mass_email.php
@@ -23,6 +23,7 @@ set_time_limit(1200);
 $subject = (string)trim(request_var('subject', ''));
 $message = (string)request_var('message', '');
 $group_id = (int)request_var(POST_GROUPS_URL, 0);
+$message_type = (string)request_var('message_type', '');
 
 $errors = $user_id_sql = [];
 
@@ -78,7 +79,7 @@ if (isset($_POST['submit'])) {
                 'MESSAGE' => html_entity_decode($message),
             ));
 
-            $emailer->send();
+            $emailer->send($message_type);
         }
     }
 }
diff --git a/library/language/source/main.php b/library/language/source/main.php
index f946a749b..0ba24ecdd 100644
--- a/library/language/source/main.php
+++ b/library/language/source/main.php
@@ -1966,6 +1966,8 @@ $lang['COMPOSE'] = 'Compose';
 $lang['RECIPIENTS'] = 'Recipients';
 $lang['ALL_USERS'] = 'All Users';
 
+$lang['MASS_EMAIL_MESSAGE_TYPE'] = 'Email type';
+
 $lang['EMAIL_SUCCESSFULL'] = 'Your message has been sent';
 $lang['CLICK_RETURN_MASSEMAIL'] = 'Click %sHere%s to return to the Mass Email form';
 
diff --git a/src/Legacy/Emailer.php b/src/Legacy/Emailer.php
index d05c0ada2..3655fd244 100644
--- a/src/Legacy/Emailer.php
+++ b/src/Legacy/Emailer.php
@@ -160,7 +160,7 @@ class Emailer
      * @param string $email_format
      * @return bool
      */
-    public function send($email_format = self::FORMAT_TEXT)
+    public function send(string $email_format = self::FORMAT_TEXT)
     {
         global $bb_cfg, $lang, $userdata;
 
diff --git a/styles/templates/admin/admin_mass_email.tpl b/styles/templates/admin/admin_mass_email.tpl
index 23b6cad32..a4cf0b6e9 100644
--- a/styles/templates/admin/admin_mass_email.tpl
+++ b/styles/templates/admin/admin_mass_email.tpl
@@ -1,4 +1,4 @@
-<h1>{L_EMAIL}</h1>
+<h1>{L_MASS_EMAIL}</h1>
 
 <p>{L_MASS_EMAIL_EXPLAIN}</p>
 <br />
@@ -13,6 +13,15 @@
 	<td class="row1" align="right"><b>{L_RECIPIENTS}</b></td>
 	<td class="row2">{S_GROUP_SELECT}</td>
 </tr>
+<tr>
+  <td class="row1" align="right"><b>{L_MASS_EMAIL_MESSAGE_TYPE}</b></td>
+  <td class="row2">
+    <select name="message_type">
+      <option value="text/plain" selected="selected">text/plain</option>
+      <option value="text/html">text/html</option>
+    </select>
+  </td>
+</tr>
 <tr>
 	<td class="row1" align="right"><b>{L_SUBJECT}</b></td>
 	<td class="row2"><input type="text" name="subject" size="45" maxlength="100" style="width:98%" tabindex="2" class="post" value="{SUBJECT}" /></td>