synchronize with master

Author: TamaroWalter

.github/workflows/moodle-ci.yml

@@ -50,7 +50,7 @@ jobs:
 
       - name: Initialise moodle-plugin-ci
         run: |
-          composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3
+          composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci 4.5.4
           echo $(cd ci/bin; pwd) >> $GITHUB_PATH
           echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH
           sudo locale-gen en_AU.UTF-8
@@ -173,7 +173,7 @@ jobs:
 
       - name: Initialise moodle-plugin-ci
         run: |
-          composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3
+          composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci 4.5.4
           echo $(cd ci/bin; pwd) >> $GITHUB_PATH
           echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH
           sudo locale-gen en_AU.UTF-8
@@ -192,4 +192,4 @@ jobs:
 
       - name: Behat features
         if: ${{ always() }}
-        run: moodle-plugin-ci behat --auto-rerun 0
+        run: moodle-plugin-ci behat --auto-rerun 0

classes/capabilities.php

@@ -94,11 +94,11 @@ public static function has(string $capability, context $context, $userid = null)
 
         $key = "$userid:$context->id:$capability";
 
-        if (!isset($cache[$key])) {
-            $cache[$key] = has_capability($capability, $context, $userid);
+        if (!isset(self::$cache[$key])) {
+            self::$cache[$key] = has_capability($capability, $context, $userid);
         }
 
-        return $cache[$key];
+        return self::$cache[$key];
     }
 
 }

classes/manager/mail_manager.php

@@ -65,7 +65,7 @@ class mail_manager {
      * @return bool
      */
     public static function moodleoverflow_send_mails(): bool {
-        global $DB, $CFG, $PAGE;
+        global $CFG, $DB, $PAGE;
 
         // Get the course object of the top level site.
         $site = get_site();
@@ -86,10 +86,8 @@ public static function moodleoverflow_send_mails(): bool {
         $moodleoverflows = [];
         $courses = [];
         $coursemodules = [];
-        $subscribedusers = [];
 
-        // Posts older than x days will not be mailed.
-        // This will avoid problems with the cron not ran for a long time.
+        // Posts older than x days will not be mailed. This will avoid problems with the cron not ran for a long time.
         $timenow = time();
         $endtime = $timenow - get_config('moodleoverflow', 'maxeditingtime');
         $starttime = $endtime - (get_config('moodleoverflow', 'maxmailingtime') * 60 * 60);
@@ -102,7 +100,6 @@ public static function moodleoverflow_send_mails(): bool {
                 mtrace('Errors occurred while trying to mark some posts as being mailed.');
                 return false;
             }
-
             // Loop through all posts to be mailed.
             foreach ($posts as $postid => $post) {
                 self::check_post($post, $mailcount, $users, $discussions, $errorcount, $posts, $postid,
@@ -126,18 +123,17 @@ public static function moodleoverflow_send_mails(): bool {
                 $userto->markposts = [];
 
                 // Cache the capabilities of the user.
-                cron_setup_user($userto);
+                $CFG->branch >= 402 ? \core\cron::setup_user($userto) : cron_setup_user($userto);
 
                 // Reset the caches.
-                foreach ($coursemodules as $moodleoverflowid => $unused) {
+                foreach ($coursemodules as $moodleoverflowid) {
                     $coursemodules[$moodleoverflowid]->cache = new stdClass();
                     $coursemodules[$moodleoverflowid]->cache->caps = [];
                     unset($coursemodules[$moodleoverflowid]->uservisible);
                 }
 
                 // Loop through all posts of this users.
                 foreach ($posts as $post) {
-
                     self::send_post($userto, $post, $coursemodules, $errorcount,
                         $discussions, $moodleoverflows, $courses, $mailcount, $users, $site, $textout, $htmlout);
                 }
@@ -148,18 +144,13 @@ public static function moodleoverflow_send_mails(): bool {
         }
 
         // Check for all posts whether errors occurred.
-        if ($posts) {
-
-            // Loop through all posts.
-            foreach ($posts as $post) {
-
-                // Tracing information.
-                mtrace($mailcount[$post->id] . " users were sent post $post->id");
+        foreach ($posts as $post) {
+            // Tracing information.
+            mtrace($mailcount[$post->id] . " users were sent post $post->id");
 
-                // Mark the posts with errors in the database.
-                if ($errorcount[$post->id]) {
-                    $DB->set_field('moodleoverflow_posts', 'mailed', self::MOODLEOVERFLOW_MAILED_ERROR, ['id' => $post->id]);
-                }
+            // Mark the posts with errors in the database.
+            if ($errorcount[$post->id]) {
+                $DB->set_field('moodleoverflow_posts', 'mailed', self::MOODLEOVERFLOW_MAILED_ERROR, ['id' => $post->id]);
             }
         }
 
@@ -232,7 +223,6 @@ public static function moodleoverflow_mark_old_posts_as_mailed($endtime) {
      * @param stdClass $user
      */
     public static function moodleoverflow_minimise_user_record(stdClass $user) {
-
         // Remove all information for the mail generation that are not needed.
         unset($user->institution);
         unset($user->department);
@@ -268,61 +258,31 @@ public static function moodleoverflow_minimise_user_record(stdClass $user) {
     private static function check_post($post, array &$mailcount, array &$users, array &$discussions, array &$errorcount,
                                        array &$posts, int $postid, array &$moodleoverflows, array &$courses,
                                        array &$coursemodules) {
-        global $DB;
         // Check the cache if the discussion exists.
         $discussionid = $post->discussion;
-        if (!isset($discussions[$discussionid])) {
-            // Retrieve the discussion from the database.
-            $discussion = $DB->get_record('moodleoverflow_discussions', ['id' => $post->discussion]);
-
-            // If there is a record, update the cache. Else ignore the post.
-            if ($discussion) {
-                $discussions[$discussionid] = $discussion;
-                subscriptions::fill_subscription_cache($discussion->moodleoverflow);
-                subscriptions::fill_discussion_subscription_cache($discussion->moodleoverflow);
-            } else {
-                mtrace('Could not find discussion ' . $discussionid);
-                unset($posts[$postid]);
-                return;
-            }
+        if (!self::cache_record('moodleoverflow_discussions', $discussionid, $discussions,
+                                'Could not find discussion ', $posts, $postid, true)) {
+            return;
         }
 
         // Retrieve the connected moodleoverflow instance from the database.
         $moodleoverflowid = $discussions[$discussionid]->moodleoverflow;
-        if (!isset($moodleoverflows[$moodleoverflowid])) {
-
-            // Retrieve the record from the database and update the cache.
-            $moodleoverflow = $DB->get_record('moodleoverflow', ['id' => $moodleoverflowid]);
-            if ($moodleoverflow) {
-                $moodleoverflows[$moodleoverflowid] = $moodleoverflow;
-            } else {
-                mtrace('Could not find moodleoverflow ' . $moodleoverflowid);
-                unset($posts[$postid]);
-                return;
-            }
+        if (!self::cache_record('moodleoverflow', $moodleoverflowid, $moodleoverflows,
+                          'Could not find moodleoverflow ', $posts, $postid, false)) {
+            return;
         }
 
         // Retrieve the connected courses from the database.
         $courseid = $moodleoverflows[$moodleoverflowid]->course;
-        if (!isset($courses[$courseid])) {
-
-            // Retrieve the record from the database and update the cache.
-            $course = $DB->get_record('course', ['id' => $courseid]);
-            if ($course) {
-                $courses[$courseid] = $course;
-            } else {
-                mtrace('Could not find course ' . $courseid);
-                unset($posts[$postid]);
-                return;
-            }
+        if (!self::cache_record('course', $courseid, $courses,
+                                'Could not find course ', $posts, $postid, false)) {
+            return;
         }
 
         // Retrieve the connected course modules from the database.
         if (!isset($coursemodules[$moodleoverflowid])) {
-
             // Retrieve the coursemodule and update the cache.
-            $cm = get_coursemodule_from_instance('moodleoverflow', $moodleoverflowid, $courseid);
-            if ($cm) {
+            if ($cm = get_coursemodule_from_instance('moodleoverflow', $moodleoverflowid, $courseid)) {
                 $coursemodules[$moodleoverflowid] = $cm;
             } else {
                 mtrace('Could not find course module for moodleoverflow ' . $moodleoverflowid);
@@ -333,14 +293,12 @@ private static function check_post($post, array &$mailcount, array &$users, arra
 
         // Cache subscribed users of each moodleoverflow.
         if (!isset($subscribedusers[$moodleoverflowid])) {
-
             // Retrieve the context module.
             $modulecontext = context_module::instance($coursemodules[$moodleoverflowid]->id);
 
             // Retrieve all subscribed users.
             $mid = $moodleoverflows[$moodleoverflowid];
-            $subusers = subscriptions::get_subscribed_users($mid, $modulecontext, 'u.*', true);
-            if ($subusers) {
+            if ($subusers = subscriptions::get_subscribed_users($mid, $modulecontext, 'u.*', true)) {
                 // Loop through all subscribed users.
                 foreach ($subusers as $postuser) {
                     // Save the user into the cache.
@@ -361,6 +319,39 @@ private static function check_post($post, array &$mailcount, array &$users, arra
         $errorcount[$postid] = 0;
     }
 
+    /**
+     * Helper function for check_post(). Caches the a record exists in the database and caches the record if needed.
+     * @param string $table
+     * @param int $id
+     * @param array $cache
+     * @param string $errorMessage
+     * @param array $posts
+     * @param int $postid
+     * @param bool $fillsubscache    If the subscription cache is being filled (only when checking discussion cache)
+     * @return bool
+     * @throws \dml_exception
+     */
+    private static function cache_record($table, $id, &$cache, $errormessage, &$posts, $postid, $fillsubscache) {
+        global $DB;
+        // Check if cache if an record exists already in the cache.
+        if (!isset($cache[$id])) {
+            // If there is a record in the database, update the cache. Else ignore the post.
+            if ($record = $DB->get_record($table, ['id' => $id])) {
+                $cache[$id] = $record;
+                if ($fillsubscache) {
+                    subscriptions::fill_subscription_cache($record->moodleoverflow);
+                    subscriptions::fill_discussion_subscription_cache($record->moodleoverflow);
+                }
+            } else {
+                mtrace($errormessage . $id);
+                unset($posts[$postid]);
+                return false;
+            }
+        }
+        return true;
+    }
+
+
     /**
      * Send the Mail with information of the post depending on theinformation available.
      * E.g. anonymous post do not include names, users who want resumes do not get single mails.
@@ -427,11 +418,8 @@ private static function send_post($userto, $post, array &$coursemodules, array &
         }
 
         // Check whether the user is subscribed to the discussion.
-        $iscm = $coursemodules[$moodleoverflow->id];
         $uid = $userto->id;
-        $did = $post->discussion;
-        $issubscribed = subscriptions::is_subscribed($uid, $moodleoverflow, $modulecontext, $did);
-        if (!$issubscribed) {
+        if (!subscriptions::is_subscribed($uid, $moodleoverflow, $modulecontext, $post->discussion)) {
             return;
         }
 
@@ -464,7 +452,7 @@ private static function send_post($userto, $post, array &$coursemodules, array &
         }
 
         // Setup roles and languages.
-        cron_setup_user($userto, $course);
+        $CFG->branch >= 402 ? \core\cron::setup_user($userto, $course) : cron_setup_user($userto, $course);
 
         // Cache the users capability to view full names.
         if (!isset($userto->viewfullnames[$moodleoverflow->id])) {
@@ -522,16 +510,7 @@ private static function send_post($userto, $post, array &$coursemodules, array &
         }
 
         // Format the data.
-        $data = new moodleoverflow_email(
-            $course,
-            $cm,
-            $moodleoverflow,
-            $discussion,
-            $post,
-            $userfrom,
-            $userto,
-            $canreply
-        );
+        $data = new moodleoverflow_email($course, $cm, $moodleoverflow, $discussion, $post, $userfrom, $userto, $canreply);
 
         // Retrieve the unsubscribe-link.
         $userfrom->customheaders[] = sprintf('List-Unsubscribe: <%s>', $data->get_unsubscribediscussionlink());
@@ -557,7 +536,6 @@ private static function send_post($userto, $post, array &$coursemodules, array &
 
         // Check whether the post is a reply.
         if ($post->parent) {
-
             // Add a reply header.
             $parentid = generate_email_messageid(hash('sha256', $post->parent . 'to' . $userto->id));
             $userfrom->customheaders[] = "In-Reply-To: $parentid";

classes/post_form.php

@@ -58,7 +58,8 @@ public function definition() {
         $modform->addRule('subject', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
 
         // The message.
-        $modform->addElement('editor', 'message', get_string('message', 'moodleoverflow'), null);
+        $modform->addElement('editor', 'message', get_string('message', 'moodleoverflow'), null,
+                             self::editor_options($modcontext, (empty($post->id) ? null : $post->id)));
         $modform->setType('message', PARAM_RAW);
         $modform->addRule('message', get_string('required'), 'required', null, 'client');
 
@@ -141,6 +142,25 @@ public static function attachment_options($moodleoverflow) {
             'return_types' => FILE_INTERNAL | FILE_CONTROLLED_LINK,
         ];
     }
+
+    /**
+     * Returns the options array to use in forum text editor
+     *
+     * @param context_module $context
+     * @param int $postid post id, use null when adding new post
+     * @return array
+     */
+    public static function editor_options(context_module $context, $postid) {
+        global $COURSE, $PAGE, $CFG;
+        $maxbytes = get_user_max_upload_file_size($PAGE->context, $CFG->maxbytes, $COURSE->maxbytes);
+        return [
+            'maxfiles' => EDITOR_UNLIMITED_FILES,
+            'maxbytes' => $maxbytes,
+            'trusttext' => true,
+            'return_types' => FILE_INTERNAL | FILE_EXTERNAL,
+            'subdirs' => file_area_contains_subdirs($context, 'mod_forum', 'post', $postid),
+        ];
+    }
 }
 
 

classes/privacy/data_export_helper.php

@@ -13,6 +13,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
 /**
  * Privacy Subsystem implementation for mod_moodleoverflow.
  *