Fix allowforcesubscribe capability on subscription manage page (index.php)

Author: justusdieckmann

classes/output/moodleoverflow_email.php

@@ -251,7 +251,8 @@ public function __set($name, $value) {
     public function get_unsubscribediscussionlink() {
 
         // Check whether the moodleoverflow is subscribable.
-        $subscribable = \mod_moodleoverflow\subscriptions::is_subscribable($this->moodleoverflow);
+        $subscribable = \mod_moodleoverflow\subscriptions::is_subscribable($this->moodleoverflow,
+                \context_module::instance($this->cm->id));
         if (!$subscribable) {
             return null;
         }
@@ -431,7 +432,8 @@ public function get_replylink() {
      * @return string
      */
     public function get_unsubscribemoodleoverflowlink() {
-        if (!\mod_moodleoverflow\subscriptions::is_subscribable($this->moodleoverflow)) {
+        if (!\mod_moodleoverflow\subscriptions::is_subscribable($this->moodleoverflow,
+                \context_module::instance($this->cm->id))) {
             return null;
         }
         $link = new \moodle_url(

classes/subscriptions.php

@@ -355,10 +355,11 @@ public static function subscription_disabled($moodleoverflow) {
      * Checks wheter the specified moodleoverflow can be subscribed to.
      *
      * @param object $moodleoverflow The moodleoverflow ID
+     * @param \context_module $context The module context.
      *
      * @return boolean
      */
-    public static function is_subscribable($moodleoverflow) {
+    public static function is_subscribable($moodleoverflow, $context) {
 
         // Check if the user is an authenticated user.
         $authenticated = (isloggedin() AND !isguestuser());
@@ -367,7 +368,8 @@ public static function is_subscribable($moodleoverflow) {
         $disabled = self::subscription_disabled($moodleoverflow);
 
         // Check if the moodleoverflow forces the user to be subscribed.
-        $forced = self::is_forcesubscribed($moodleoverflow);
+        $forced = self::is_forcesubscribed($moodleoverflow) &&
+                has_capability('mod/moodleoverflow:allowforcesubscribe', $context);
 
         // Return the result.
         return ($authenticated AND !$forced AND !$disabled);
@@ -938,7 +940,7 @@ public static function moodleoverflow_get_subscribe_link($moodleoverflow, $conte
         $messages = $messages + $defaultmessages;
 
         // Check whether the user is forced to be subscribed to the moodleoverflow.
-        $isforced   = self::is_forcesubscribed($moodleoverflow);
+        $isforced   = self::is_forcesubscribed($moodleoverflow) && has_capability('mod/moodleoverflow:allowforcesubscribe', $context);
         $isdisabled = self::subscription_disabled($moodleoverflow);
 
         // Return messages depending on the subscription state.

index.php

@@ -139,7 +139,7 @@
     }
 
     // Get information about the subscription state.
-    $cansubscribe                 = \mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow);
+    $cansubscribe                 = \mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow, $modulecontext);
     $moodleoverflow->cansubscribe = $cansubscribe || has_capability('mod/moodleoverflow:managesubscriptions', $modulecontext);
     $moodleoverflow->issubscribed = \mod_moodleoverflow\subscriptions::is_subscribed($USER->id, $moodleoverflow, $modulecontext);
     $showsubscriptioncolumns      = $showsubscriptioncolumns || $moodleoverflow->issubscribed || $moodleoverflow->cansubscribe;
@@ -192,12 +192,13 @@
         }
 
         // Check the subscription state.
-        $forcesubscribed = \mod_moodleoverflow\subscriptions::is_forcesubscribed($moodleoverflow);
+        $forcesubscribed = \mod_moodleoverflow\subscriptions::is_forcesubscribed($moodleoverflow) &&
+                has_capability('mod/moodleoverflow:allowforcesubscribe', $modulecontext);
         if (!$forcesubscribed) {
 
             // Check the current state.
             $subscribed   = \mod_moodleoverflow\subscriptions::is_subscribed($USER->id, $moodleoverflow, $modulecontext);
-            $subscribable = \mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow);
+            $subscribable = \mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow, $modulecontext);
 
             // Check whether to subscribe or unsubscribe the user.
             if ($cap['manageactivities'] OR $subscribable AND $subscribe AND !$subscribed AND $cansub) {

locallib.php

@@ -332,7 +332,7 @@ function moodleoverflow_print_latest_discussions($moodleoverflow, $cm, $page = -
         $preparedarray[$i]['discussionsubicon'] = false;
         if ((!is_guest($context, $USER) && isloggedin()) && has_capability('mod/moodleoverflow:viewdiscussion', $context)) {
             // Discussion subscription.
-            if (\mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow)) {
+            if (\mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow, $context)) {
                 $preparedarray[$i]['discussionsubicon'] = \mod_moodleoverflow\subscriptions::get_discussion_subscription_icon(
                     $moodleoverflow, $context, $discussion->discussion);
             }

tests/subscriptions_test.php

@@ -116,6 +116,7 @@ public function test_subscription_modes() {
         $course = $this->getDataGenerator()->create_course();
         $options = array('course' => $course->id);
         $moodleoverflow = $this->getDataGenerator()->create_module('moodleoverflow', $options);
+        $modulecontext = context_module::instance($moodleoverflow->cmid);
 
         // Create a user enrolled in the course as a student.
         list ($user) = $this->helper_create_users($course, 1);
@@ -129,27 +130,27 @@ public function test_subscription_modes() {
         $this->assertEquals(MOODLEOVERFLOW_FORCESUBSCRIBE,
             \mod_moodleoverflow\subscriptions::get_subscription_mode($moodleoverflow));
         $this->assertTrue(\mod_moodleoverflow\subscriptions::is_forcesubscribed($moodleoverflow));
-        $this->assertFalse(\mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow));
+        $this->assertFalse(\mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow, $modulecontext));
         $this->assertFalse(\mod_moodleoverflow\subscriptions::subscription_disabled($moodleoverflow));
 
         // Test the disallowed subscription.
         \mod_moodleoverflow\subscriptions::set_subscription_mode($moodleoverflow->id, MOODLEOVERFLOW_DISALLOWSUBSCRIBE);
         $moodleoverflow = $DB->get_record('moodleoverflow', array('id' => $moodleoverflow->id));
         $this->assertTrue(\mod_moodleoverflow\subscriptions::subscription_disabled($moodleoverflow));
-        $this->assertFalse(\mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow));
+        $this->assertFalse(\mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow, $modulecontext));
         $this->assertFalse(\mod_moodleoverflow\subscriptions::is_forcesubscribed($moodleoverflow));
 
         // Test the initial subscription.
         \mod_moodleoverflow\subscriptions::set_subscription_mode($moodleoverflow->id, MOODLEOVERFLOW_INITIALSUBSCRIBE);
         $moodleoverflow = $DB->get_record('moodleoverflow', array('id' => $moodleoverflow->id));
-        $this->assertTrue(\mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow));
+        $this->assertTrue(\mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow, $modulecontext));
         $this->assertFalse(\mod_moodleoverflow\subscriptions::subscription_disabled($moodleoverflow));
         $this->assertFalse(\mod_moodleoverflow\subscriptions::is_forcesubscribed($moodleoverflow));
 
         // Test the choose subscription.
         \mod_moodleoverflow\subscriptions::set_subscription_mode($moodleoverflow->id, MOODLEOVERFLOW_CHOOSESUBSCRIBE);
         $moodleoverflow = $DB->get_record('moodleoverflow', array('id' => $moodleoverflow->id));
-        $this->assertTrue(\mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow));
+        $this->assertTrue(\mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow, $modulecontext));
         $this->assertFalse(\mod_moodleoverflow\subscriptions::subscription_disabled($moodleoverflow));
         $this->assertFalse(\mod_moodleoverflow\subscriptions::is_forcesubscribed($moodleoverflow));
     }
@@ -1376,7 +1377,8 @@ public function test_is_subscribable_logged_out($options) {
         $options['course'] = $course->id;
         $moodleoverflow = $this->getDataGenerator()->create_module('moodleoverflow', $options);
 
-        $this->assertFalse(\mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow));
+        $this->assertFalse(\mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow,
+                context_module::instance($moodleoverflow->cmid)));
     }
 
     /**
@@ -1399,7 +1401,8 @@ public function test_is_subscribable_is_guest($options) {
         $options['course'] = $course->id;
         $moodleoverflow = $this->getDataGenerator()->create_module('moodleoverflow', $options);
 
-        $this->assertFalse(\mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow));
+        $this->assertFalse(\mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow,
+                context_module::instance($moodleoverflow->cmid)));
     }
 
     /**
@@ -1449,6 +1452,7 @@ public function test_is_subscribable_loggedin($options, $expect) {
         $this->getDataGenerator()->enrol_user($user->id, $course->id);
         $this->setUser($user);
 
-        $this->assertEquals($expect, \mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow));
+        $this->assertEquals($expect, \mod_moodleoverflow\subscriptions::is_subscribable($moodleoverflow,
+                context_module::instance($moodleoverflow->cmid)));
     }
 }