Redesign of the mail functionality

classes/output/moodleoverflow_email.php

@@ -25,6 +25,7 @@
 namespace mod_moodleoverflow\output;
 
 use mod_moodleoverflow\anonymous;
+use mod_moodleoverflow\subscriptions;
 
 /**
  * Moodleoverflow email renderable for use in e-mail.
@@ -251,8 +252,7 @@ public function __set($name, $value) {
     public function get_unsubscribediscussionlink() {
 
         // Check whether the moodleoverflow is subscribable.
-        $subscribable = \mod_moodleoverflow\subscriptions::is_subscribable($this->moodleoverflow,
-                \context_module::instance($this->cm->id));
+        $subscribable = subscriptions::is_subscribable($this->moodleoverflow, \context_module::instance($this->cm->id));
         if (!$subscribable) {
             return null;
         }
@@ -432,7 +432,7 @@ public function get_replylink() {
      * @return string
      */
     public function get_unsubscribemoodleoverflowlink() {
-        if (!\mod_moodleoverflow\subscriptions::is_subscribable($this->moodleoverflow,
+        if (!subscriptions::is_subscribable($this->moodleoverflow,
                 \context_module::instance($this->cm->id))) {
             return null;
         }

classes/subscriptions.php

@@ -536,11 +536,8 @@ public static function get_subscribed_users($moodleoverflow, $context, $fields =
 
         // Default fields if none are submitted.
         if (empty($fields)) {
-            if ($CFG->branch >= 311) {
-                $allnames = \core_user\fields::for_name()->get_sql('u', false, '', '', false)->selects;
-            } else {
-                $allnames = get_all_user_name_fields(true, 'u');
-            }
+            $allnames = \core_user\fields::for_name()->get_sql('u', false, '', '', false)->selects;
+
             $fields = "u.id, u.username, $allnames, u.maildisplay, u.mailformat, u.maildigest,
                 u.imagealt, u.email, u.emailstop, u.city, u.country, u.lastaccess, u.lastlogin,
                 u.picture, u.timezone, u.theme, u.lang, u.trackforums, u.mnethostid";

classes/task/send_daily_mail.php → classes/task/send_daily_mails.php

@@ -26,15 +26,15 @@
 /**
  * This task sends a daily mail of unread posts
  */
-class send_daily_mail extends \core\task\scheduled_task {
+class send_daily_mails extends \core\task\scheduled_task {
 
     /**
      * Return the task's name as shown in admin screens.
      *
      * @return string
      */
     public function get_name() {
-        return get_string('tasksenddailymail', 'mod_moodleoverflow');
+        return get_string('tasksenddailymails', 'mod_moodleoverflow');
     }
 
     /**
@@ -88,7 +88,7 @@ public function execute() {
             $message = implode('<br>', $mail);
             $userto = $DB->get_record('user', ['id' => $user->userid]);
             $from = \core_user::get_noreply_user();
-            $subject = get_string('tasksenddailymail', 'mod_moodleoverflow');
+            $subject = get_string('tasksenddailymails', 'mod_moodleoverflow');
             email_to_user($userto, $from, $subject, $message);
             $DB->delete_records('moodleoverflow_mail_info', ['userid' => $user->userid]);
         }

classes/task/send_mails.php

@@ -18,151 +18,49 @@
  * A scheduled task for moodleoverflow cron.
  *
  * @package   mod_moodleoverflow
- * @copyright 2017 Kennet Winter <[email protected]>
+ * @copyright 2025 Tamaro Walter
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 namespace mod_moodleoverflow\task;
 
-use core\session\exception;
-use mod_moodleoverflow\anonymous;
-use mod_moodleoverflow\output\moodleoverflow_email;
-
-defined('MOODLE_INTERNAL') || die();
-require_once(__DIR__ . '/../../locallib.php');
+use coding_exception;
+use core\notification;
+use Exception;
+use lang_string;
+use mod_moodleoverflow\manager\mail_manager;
 
 /**
- * Class for sending mails to users who have subscribed a moodleoverflow.
+ * Class for sending mails to users that need to review a moodleoverflow post.
  *
  * @package   mod_moodleoverflow
- * @copyright 2017 Kennet Winter <[email protected]>
+ * @copyright 2025 Tamaro Walter
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class send_mails extends \core\task\scheduled_task {
 
     /**
-     * Get a descriptive name for this task (shown to admins).
+     * Get a descriptive name for this task (shwon to admins).
      *
-     * @return string
+     * @return lang_string|string
+     * @throws coding_exception
      */
-    public function get_name() {
+    public function get_name(): lang_string|string {
         return get_string('tasksendmails', 'mod_moodleoverflow');
     }
 
     /**
      * Runs moodleoverflow cron.
+     *
+     * @return bool
      */
-    public function execute() {
-
-        // Send mail notifications.
-        moodleoverflow_send_mails();
-
-        $this->send_review_notifications();
-
-        // The cron is finished.
-        return true;
-
-    }
-
-    /**
-     * Sends initial notifications for needed reviews to all users with review capability.
-     */
-    public function send_review_notifications() {
-        global $DB, $OUTPUT, $PAGE, $CFG;
-
-        $rendererhtml = $PAGE->get_renderer('mod_moodleoverflow', 'email', 'htmlemail');
-        $renderertext = $PAGE->get_renderer('mod_moodleoverflow', 'email', 'textemail');
-
-        $postinfos = $DB->get_records_sql(
-            'SELECT p.*, d.course as cid, d.moodleoverflow as mid, d.id as did FROM {moodleoverflow_posts} p ' .
-            'JOIN {moodleoverflow_discussions} d ON p.discussion = d.id ' .
-            "WHERE p.mailed = :mailpending AND p.reviewed = 0 AND p.created < :timecutoff " .
-            "ORDER BY d.course, d.moodleoverflow, d.id",
-            [
-                'mailpending' => MOODLEOVERFLOW_MAILED_PENDING,
-                'timecutoff' => time() - get_config('moodleoverflow', 'reviewpossibleaftertime'),
-            ]
-        );
-
-        if (empty($postinfos)) {
-            mtrace('No review notifications to send.');
-            return;
-        }
-
-        $course = null;
-        $moodleoverflow = null;
-        $usersto = null;
-        $cm = null;
-        $discussion = null;
-        $success = [];
-
-        foreach ($postinfos as $postinfo) {
-            if ($course == null || $course->id != $postinfo->cid) {
-                $course = get_course($postinfo->cid);
-            }
-
-            if ($moodleoverflow == null || $moodleoverflow->id != $postinfo->mid) {
-                $cm = get_coursemodule_from_instance('moodleoverflow', $postinfo->mid, 0, false, MUST_EXIST);
-                $modulecontext = \context_module::instance($cm->id);
-                $userswithcapability = get_users_by_capability($modulecontext, 'mod/moodleoverflow:reviewpost');
-                $coursecontext = \context_course::instance($course->id);
-                $usersenrolled = get_enrolled_users($coursecontext);
-                $usersto = [];
-                foreach ($userswithcapability as $user) {
-                    if (in_array($user, $usersenrolled)) {
-                        array_push($usersto, $user);
-                    }
-                }
-
-                $moodleoverflow = $DB->get_record('moodleoverflow', ['id' => $postinfo->mid], '*', MUST_EXIST);
-            }
-
-            if ($discussion == null || $discussion->id != $postinfo->did) {
-                $discussion = $DB->get_record('moodleoverflow_discussions', ['id' => $postinfo->did], '*', MUST_EXIST);
-            }
-
-            $post = $postinfo;
-            $userfrom = \core_user::get_user($postinfo->userid, '*', MUST_EXIST);
-            $userfrom->anonymous = anonymous::is_post_anonymous($discussion, $moodleoverflow, $postinfo->userid);
-
-            foreach ($usersto as $userto) {
-                try {
-                    // Check for moodle version. Version 401 supported until 8 December 2025.
-                    if ($CFG->branch >= 402) {
-                        \core\cron::setup_user($userto, $course);
-                    } else {
-                        cron_setup_user($userto, $course);
-                    }
-
-                    $maildata = new moodleoverflow_email($course, $cm, $moodleoverflow, $discussion,
-                                                         $post, $userfrom, $userto, false);
-
-                    $textcontext = $maildata->export_for_template($renderertext, true);
-                    $htmlcontext = $maildata->export_for_template($rendererhtml, false);
-
-                    email_to_user(
-                        $userto,
-                        \core_user::get_noreply_user(),
-                        get_string('email_review_needed_subject', 'moodleoverflow', $textcontext),
-                        $OUTPUT->render_from_template('mod_moodleoverflow/email_review_needed_text', $textcontext),
-                        $OUTPUT->render_from_template('mod_moodleoverflow/email_review_needed_html', $htmlcontext)
-                    );
-                } catch (exception $e) {
-                    mtrace("Error sending review notification for post $post->id to user $userto->id!");
-                }
-            }
-            $success[] = $post->id;
-        }
-
-        if (!empty($success)) {
-            list($insql, $inparams) = $DB->get_in_or_equal($success);
-            $DB->set_field_select(
-                'moodleoverflow_posts', 'mailed', MOODLEOVERFLOW_MAILED_REVIEW_SUCCESS,
-                    'id ' . $insql, $inparams
-                );
-            mtrace('Sent review notifications for ' . count($success) . ' posts successfully!');
+    public function execute(): bool {
+        try {
+            mail_manager::moodleoverflow_send_mails();
+        } catch (Exception $e) {
+            notification::error(get_string('error_sending_mails', 'mod_moodleoverflow', $e->getMessage()));
+            return false;
         }
+        return true;
     }
-
 }
-