Merge pull request #106 from NinaHerrmann/fix/sendreviewnotification

Fix/sendreviewnotification

Author: Laur0r

classes/review.php

@@ -93,7 +93,8 @@ public static function get_first_review_post($moodleoverflowid, $afterpostid = n
             $afterdiscussionid = $DB->get_field('moodleoverflow_posts', 'discussion', ['id' => $afterpostid],
                 MUST_EXIST);
 
-            $orderby = 'CASE WHEN (p.discussion > :afterdiscussionid OR (p.discussion = :afterdiscussionid2 AND p.id > :afterpostid)) THEN 0 ELSE 1 END, ';
+            $orderby = 'CASE WHEN (p.discussion > :afterdiscussionid OR (p.discussion = :afterdiscussionid2 AND p.id
+             > :afterpostid)) THEN 0 ELSE 1 END, ';
             $params['afterdiscussionid'] = $afterdiscussionid;
             $params['afterdiscussionid2'] = $afterdiscussionid;
             $params['afterpostid'] = $afterpostid;

classes/task/send_mails.php

@@ -106,7 +106,16 @@ public function send_review_notifications() {
             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);
-                $usersto = get_users_by_capability($modulecontext, 'mod/moodleoverflow:reviewpost');
+                $userswithcapability = get_users_by_capability($modulecontext, 'mod/moodleoverflow:reviewpost');
+                $coursecontext = \context_course::instance($course->id);
+                $usersenrolled = get_enrolled_users($coursecontext);
+                $usersto = array();
+                foreach ($userswithcapability as $user) {
+                    if (in_array($user, $usersenrolled)) {
+                        array_push($usersto, $user);
+                    }
+                }
+
                 $moodleoverflow = $DB->get_record('moodleoverflow', ['id' => $postinfo->mid], '*', MUST_EXIST);
             }
 

grade.php

@@ -22,7 +22,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 require_once(__DIR__ . "/../../config.php");
-
+require_login();
 $id = required_param('id', PARAM_INT);
 
 $cm = get_coursemodule_from_id('moodleoverflow', $id, 0, false, MUST_EXIST);

lang/en/moodleoverflow.php

@@ -405,7 +405,7 @@
 $string['gradesupdated'] = 'Grades updated';
 $string['taskupdategrades'] = 'Moodleoverflow maintenance job to update grades';
 
-// Anonymous Feature
+// Anonymous Feature.
 $string['anonymous'] = 'Anonymous';
 $string['anonymous_help'] = 'This will hide username from all question (and answers).<br>WARNING: Once the questions (and answers) are anonymized, this cannot be reversed.<br>The setting can only be changed to a higher degree of anonymity.';
 $string['anonymous:only_questions'] = 'Only questioners (Irreversible!)';
@@ -419,8 +419,9 @@
 $string['desc:anonymous'] = 'No names will be displayed.';
 $string['resetanonymous_warning'] = 'Are you sure? If you are in production, <b>this is most certainly a bad decision</b> because your students and teachers posted their questions and answers, believing they would remain anonymous. <br><br><b>{$a->fullanoncount}</b> forums are currently fully anonymized, and in <b>{$a->questionanoncount}</b> additional forums the questioners are anonymized.<br><br><b>In all these forums, the real names of posters will be displayed again, even in already existing posts!</b><br><br>There is no way of reverting those changes!</br>';
 
-// Review feature
+// Review feature.
 $string['review'] = 'Review';
+$string['reviewpost'] = 'Review a post';
 $string['review_help'] = 'Select what has to be approved by a teacher before being shown to students.';
 $string['nothing'] = 'Nothing';
 $string['questions'] = 'Questions';

locallib.php

@@ -907,7 +907,8 @@ function moodleoverflow_print_discussion($course, $cm, $moodleoverflow, $discuss
     echo '<div id="moodleoverflow-posts">';
 
     // Print the other posts.
-    echo moodleoverflow_print_posts_nested($course, $cm, $moodleoverflow, $discussion, $post, $istracked, $posts, null, $usermapping);
+    echo moodleoverflow_print_posts_nested($course, $cm, $moodleoverflow, $discussion, $post, $istracked, $posts,
+        null, $usermapping);
 
     echo '</div>';
 }
@@ -1599,7 +1600,7 @@ function moodleoverflow_add_new_post($post) {
 
     // Add the post to the database.
     $post->id = $DB->insert_record('moodleoverflow_posts', $post);
-    $DB->set_field('moodleoverflow_posts', 'message', $post->message, array('id' => $post->id)); // ??
+    $DB->set_field('moodleoverflow_posts', 'message', $post->message, array('id' => $post->id));
     moodleoverflow_add_attachment($post, $moodleoverflow, $cm);
 
     if ($post->reviewed) {
@@ -1819,7 +1820,7 @@ function moodleoverflow_discussion_update_last_post($discussionid) {
         return false;
     }
 
-    // Find the last reviewed post of the discussion. (even if user has review capability, because it is written to DB)
+    // Find the last reviewed post of the discussion. (even if user has review capability, because it is written to DB).
     $sql = "SELECT id, userid, modified
               FROM {moodleoverflow_posts}
              WHERE discussion = ?

markposts.php

@@ -106,7 +106,8 @@
     }
 
     // Mark all the discussions read.
-    if (!\mod_moodleoverflow\readtracking::moodleoverflow_mark_discussion_read($discussionid, context_module::instance($cm->id), $user->id)) {
+    if (!\mod_moodleoverflow\readtracking::moodleoverflow_mark_discussion_read($discussionid,
+        context_module::instance($cm->id), $user->id)) {
 
         // Display an error, if something failes.
         $message = get_string('markreadfailed', 'moodleoverflow');

settings.php

@@ -97,8 +97,9 @@
     $settings->add(new admin_setting_configcheckbox('moodleoverflow/allowreview',
         get_string('allowreview', 'moodleoverflow'), get_string('allowreview_desc', 'moodleoverflow'), 1));
 
-    $settings->add(new admin_setting_configtext('moodleoverflow/reviewpossibleaftertime', get_string('reviewpossibleaftertime', 'moodleoverflow'),
-            get_string('reviewpossibleaftertime_desc', 'moodleoverflow'), 3600, PARAM_INT));
+    $settings->add(new admin_setting_configtext('moodleoverflow/reviewpossibleaftertime',
+        get_string('reviewpossibleaftertime', 'moodleoverflow'),
+        get_string('reviewpossibleaftertime_desc', 'moodleoverflow'), 1800, PARAM_INT));
 
     // Set scales for the reputation.
     $votesettings = [];

tests/locallib_test.php

@@ -44,6 +44,7 @@ public function tearDown(): void {
 
     /**
      * Test subscription using automatic subscription on create.
+     * @covers \mod_moodleoverflow\subscriptions Subscription of users as default.
      */
     public function test_moodleoverflow_auto_subscribe_on_create() {
         global $DB;
@@ -76,6 +77,7 @@ public function test_moodleoverflow_auto_subscribe_on_create() {
 
     /**
      * Test subscription using forced subscription on create.
+     * @covers \mod_moodleoverflow\subscriptions sorced Subscription of users.
      */
     public function test_moodleoverflow_forced_subscribe_on_create() {
         global $DB;
@@ -107,6 +109,7 @@ public function test_moodleoverflow_forced_subscribe_on_create() {
 
     /**
      * Test subscription using optional subscription on create.
+     * @covers \mod_moodleoverflow\subscriptions optional subscription.
      */
     public function test_moodleoverflow_optional_subscribe_on_create() {
         global $DB;
@@ -137,6 +140,7 @@ public function test_moodleoverflow_optional_subscribe_on_create() {
 
     /**
      * Test subscription using disallow subscription on create.
+     * @covers \mod_moodleoverflow\subscriptions prohibit Subscription of users.
      */
     public function test_moodleoverflow_disallow_subscribe_on_create() {
         global $DB;