'.get_string("postaddedsuccess", "forum") . '
'; $message .= ''.get_string("postaddedtimeleft", "forum", format_time($CFG->maxeditingtime)) . '
'; @@ -843,7 +830,12 @@ if ($mform_post->is_cancelled()) { $completion->update_state($cm,COMPLETION_COMPLETE); } - redirect(forum_go_back_to($discussionurl), $message.$subscribemessage, $timemessage); + redirect( + forum_go_back_to($discussionurl), + $message . $subscribemessage, + null, + \core\output\notification::NOTIFY_SUCCESS + ); } else { print_error("couldnotadd", "forum", $errordestination); @@ -924,22 +916,14 @@ if ($mform_post->is_cancelled()) { $event->add_record_snapshot('forum_discussions', $discussion); $event->trigger(); - $timemessage = 2; - if (!empty($message)) { // If we're printing stuff about the file upload. - $timemessage = 4; - } - if ($fromform->mailnow) { $message .= get_string("postmailnow", "forum"); - $timemessage = 4; } else { $message .= ''.get_string("postaddedsuccess", "forum") . '
'; $message .= ''.get_string("postaddedtimeleft", "forum", format_time($CFG->maxeditingtime)) . '
'; } - if ($subscribemessage = forum_post_subscription($fromform, $forum, $discussion)) { - $timemessage = 6; - } + $subscribemessage = forum_post_subscription($fromform, $forum, $discussion); } else { print_error("couldnotadd", "forum", $errordestination); } @@ -953,7 +937,12 @@ if ($mform_post->is_cancelled()) { } // Redirect back to the discussion. - redirect(forum_go_back_to($redirectto->out()), $message . $subscribemessage, $timemessage); + redirect( + forum_go_back_to($redirectto->out()), + $message . $subscribemessage, + null, + \core\output\notification::NOTIFY_SUCCESS + ); } } diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php index 7bd84140459..ab209b02644 100644 --- a/mod/forum/subscribe.php +++ b/mod/forum/subscribe.php @@ -99,8 +99,13 @@ if (is_null($mode) and !is_enrolled($context, $USER, '', true)) { // Guests an echo $OUTPUT->footer(); exit; } else { - // there should not be any links leading to this place, just redirect - redirect(new moodle_url('/mod/forum/view.php', array('f'=>$id)), get_string('subscribeenrolledonly', 'forum')); + // There should not be any links leading to this place, just redirect. + redirect( + new moodle_url('/mod/forum/view.php', array('f'=>$id)), + get_string('subscribeenrolledonly', 'forum'), + null, + \core\output\notification::NOTIFY_ERROR + ); } } @@ -117,11 +122,21 @@ if (!is_null($mode) and has_capability('mod/forum:managesubscriptions', $context switch ($mode) { case FORUM_CHOOSESUBSCRIBE : // 0 \mod_forum\subscriptions::set_subscription_mode($forum->id, FORUM_CHOOSESUBSCRIBE); - redirect($returnto, get_string("everyonecannowchoose", "forum"), 1); + redirect( + $returnto, + get_string('everyonecannowchoose', 'forum'), + null, + \core\output\notification::NOTIFY_SUCCESS + ); break; case FORUM_FORCESUBSCRIBE : // 1 \mod_forum\subscriptions::set_subscription_mode($forum->id, FORUM_FORCESUBSCRIBE); - redirect($returnto, get_string("everyoneisnowsubscribed", "forum"), 1); + redirect( + $returnto, + get_string('everyoneisnowsubscribed', 'forum'), + null, + \core\output\notification::NOTIFY_SUCCESS + ); break; case FORUM_INITIALSUBSCRIBE : // 2 if ($forum->forcesubscribe <> FORUM_INITIALSUBSCRIBE) { @@ -131,11 +146,21 @@ if (!is_null($mode) and has_capability('mod/forum:managesubscriptions', $context } } \mod_forum\subscriptions::set_subscription_mode($forum->id, FORUM_INITIALSUBSCRIBE); - redirect($returnto, get_string("everyoneisnowsubscribed", "forum"), 1); + redirect( + $returnto, + get_string('everyoneisnowsubscribed', 'forum'), + null, + \core\output\notification::NOTIFY_SUCCESS + ); break; case FORUM_DISALLOWSUBSCRIBE : // 3 \mod_forum\subscriptions::set_subscription_mode($forum->id, FORUM_DISALLOWSUBSCRIBE); - redirect($returnto, get_string("noonecansubscribenow", "forum"), 1); + redirect( + $returnto, + get_string('noonecansubscribenow', 'forum'), + null, + \core\output\notification::NOTIFY_SUCCESS + ); break; default: print_error(get_string('invalidforcesubscribe', 'forum')); @@ -143,7 +168,12 @@ if (!is_null($mode) and has_capability('mod/forum:managesubscriptions', $context } if (\mod_forum\subscriptions::is_forcesubscribed($forum)) { - redirect($returnto, get_string("everyoneisnowsubscribed", "forum"), 1); + redirect( + $returnto, + get_string('everyoneisnowsubscribed', 'forum'), + null, + \core\output\notification::NOTIFY_SUCCESS + ); } $info = new stdClass(); @@ -174,14 +204,24 @@ if ($issubscribed) { require_sesskey(); if ($discussionid === null) { if (\mod_forum\subscriptions::unsubscribe_user($user->id, $forum, $context, true)) { - redirect($returnto, get_string("nownotsubscribed", "forum", $info), 1); + redirect( + $returnto, + get_string('nownotsubscribed', 'forum', $info), + null, + \core\output\notification::NOTIFY_SUCCESS + ); } else { print_error('cannotunsubscribe', 'forum', get_local_referer(false)); } } else { if (\mod_forum\subscriptions::unsubscribe_user_from_discussion($user->id, $discussion, $context)) { $info->discussion = $discussion->name; - redirect($returnto, get_string("discussionnownotsubscribed", "forum", $info), 1); + redirect( + $returnto, + get_string('discussionnownotsubscribed', 'forum', $info), + null, + \core\output\notification::NOTIFY_SUCCESS + ); } else { print_error('cannotunsubscribe', 'forum', get_local_referer(false)); } @@ -217,10 +257,20 @@ if ($issubscribed) { require_sesskey(); if ($discussionid == null) { \mod_forum\subscriptions::subscribe_user($user->id, $forum, $context, true); - redirect($returnto, get_string("nowsubscribed", "forum", $info), 1); + redirect( + $returnto, + get_string('nowsubscribed', 'forum', $info), + null, + \core\output\notification::NOTIFY_SUCCESS + ); } else { $info->discussion = $discussion->name; \mod_forum\subscriptions::subscribe_user_to_discussion($user->id, $discussion, $context); - redirect($returnto, get_string("discussionnowsubscribed", "forum", $info), 1); + redirect( + $returnto, + get_string('discussionnowsubscribed', 'forum', $info), + null, + \core\output\notification::NOTIFY_SUCCESS + ); } } diff --git a/mod/forum/tests/behat/discussion_subscriptions.feature b/mod/forum/tests/behat/discussion_subscriptions.feature index 760bfcf1a42..e3cb9314ce5 100644 --- a/mod/forum/tests/behat/discussion_subscriptions.feature +++ b/mod/forum/tests/behat/discussion_subscriptions.feature @@ -39,27 +39,27 @@ Feature: A user can control their own subscription preferences for a discussion And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject one" "table_row" And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject two" "table_row" And I click on "You are not subscribed to this discussion. Click to subscribe." "link" in the "Test post subject one" "table_row" - And I follow "Continue" + And I should see "Student One will be notified of new posts in 'Test post subject one' of 'Test forum name'" And I should see "Subscribe to this forum" And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject one" "table_row" And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject two" "table_row" And I click on "You are subscribed to this discussion. Click to unsubscribe." "link" in the "Test post subject one" "table_row" - And I follow "Continue" + And I should see "Student One will NOT be notified of new posts in 'Test post subject one' of 'Test forum name'" And I should see "Subscribe to this forum" And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject one" "table_row" And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject two" "table_row" And I click on "You are not subscribed to this discussion. Click to subscribe." "link" in the "Test post subject one" "table_row" - And I follow "Continue" + And I should see "Student One will be notified of new posts in 'Test post subject one' of 'Test forum name'" And I should see "Subscribe to this forum" And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject one" "table_row" And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject two" "table_row" And I follow "Subscribe to this forum" - And I follow "Continue" + And I should see "Student One will be notified of new posts in 'Test forum name'" And I should see "Unsubscribe from this forum" And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject one" "table_row" And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject two" "table_row" And I follow "Unsubscribe from this forum" - And I follow "Continue" + And I should see "Student One will NOT be notified of new posts in 'Test forum name'" And I should see "Subscribe to this forum" And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject one" "table_row" And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject two" "table_row" @@ -84,27 +84,27 @@ Feature: A user can control their own subscription preferences for a discussion And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject one" "table_row" And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject two" "table_row" And I click on "You are subscribed to this discussion. Click to unsubscribe." "link" in the "Test post subject one" "table_row" - And I follow "Continue" + And I should see "Student One will NOT be notified of new posts in 'Test post subject one' of 'Test forum name'" And I should see "Unsubscribe from this forum" And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject one" "table_row" And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject two" "table_row" And I click on "You are not subscribed to this discussion. Click to subscribe." "link" in the "Test post subject one" "table_row" - And I follow "Continue" + And I should see "Student One will be notified of new posts in 'Test post subject one' of 'Test forum name'" And I should see "Unsubscribe from this forum" And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject one" "table_row" And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject two" "table_row" And I click on "You are subscribed to this discussion. Click to unsubscribe." "link" in the "Test post subject one" "table_row" - And I follow "Continue" + And I should see "Student One will NOT be notified of new posts in 'Test post subject one' of 'Test forum name'" And I should see "Unsubscribe from this forum" And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject one" "table_row" And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject two" "table_row" And I follow "Unsubscribe from this forum" - And I follow "Continue" + And I should see "Student One will NOT be notified of new posts in 'Test forum name'" And I should see "Subscribe to this forum" And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject one" "table_row" And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject two" "table_row" And I follow "Subscribe to this forum" - And I follow "Continue" + And I should see "Student One will be notified of new posts in 'Test forum name'" And I should see "Unsubscribe from this forum" And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject one" "table_row" And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject two" "table_row" @@ -129,7 +129,7 @@ Feature: A user can control their own subscription preferences for a discussion And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject one" "table_row" And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject two" "table_row" And I click on "You are not subscribed to this discussion. Click to subscribe." "link" in the "Test post subject one" "table_row" - And I follow "Continue" + And I should see "Student One will be notified of new posts in 'Test post subject one' of 'Test forum name'" And I should see "Subscribe to this forum" And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject one" "table_row" And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject two" "table_row" @@ -150,8 +150,8 @@ Feature: A user can control their own subscription preferences for a discussion And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject one" "table_row" And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject two" "table_row" When I follow "Unsubscribe from this forum" - And I follow "Continue" - Then I should see "Subscribe to this forum" + Then I should see "Student One will NOT be notified of new posts in 'Test forum name'" + And I should see "Subscribe to this forum" And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject one" "table_row" And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject two" "table_row" @@ -175,7 +175,7 @@ Feature: A user can control their own subscription preferences for a discussion And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject one" "table_row" And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject two" "table_row" And I click on "You are not subscribed to this discussion. Click to subscribe." "link" in the "Test post subject one" "table_row" - And I follow "Continue" + And I should see "Student One will be notified of new posts in 'Test post subject one' of 'Test forum name'" And I should see "Subscribe to this forum" And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject one" "table_row" And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject two" "table_row" @@ -196,7 +196,7 @@ Feature: A user can control their own subscription preferences for a discussion And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject one" "table_row" And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject two" "table_row" When I follow "Unsubscribe from this forum" - And I follow "Continue" + And I should see "Student One will NOT be notified of new posts in 'Test forum name'" Then I should see "Subscribe to this forum" And "You are subscribed to this discussion. Click to unsubscribe." "link" should exist in the "Test post subject one" "table_row" And "You are not subscribed to this discussion. Click to subscribe." "link" should exist in the "Test post subject two" "table_row" @@ -325,31 +325,31 @@ Feature: A user can control their own subscription preferences for a discussion Then I should see "Subscribe to this forum" And I should see "Subscribe to this discussion" And I follow "Subscribe to this forum" - And I follow "Continue" + And I should see "Student One will be notified of new posts in 'Test forum name'" And I follow "Test post subject one" And I should see "Unsubscribe from this forum" And I should see "Unsubscribe from this discussion" And I follow "Unsubscribe from this discussion" - And I follow "Continue" + And I should see "Student One will NOT be notified of new posts in 'Test post subject one' of 'Test forum name'" And I follow "Test post subject one" And I should see "Unsubscribe from this forum" And I should see "Subscribe to this discussion" And I follow "Unsubscribe from this forum" - And I follow "Continue" + And I should see "Student One will NOT be notified of new posts in 'Test forum name'" And I follow "Test post subject one" And I should see "Subscribe to this forum" And I should see "Subscribe to this discussion" And I follow "Subscribe to this discussion" - And I follow "Continue" + And I should see "Student One will be notified of new posts in 'Test post subject one' of 'Test forum name'" And I should see "Subscribe to this forum" And I should see "Unsubscribe from this discussion" And I follow "Subscribe to this forum" - And I follow "Continue" + And I should see "Student One will be notified of new posts in 'Test forum name'" And I follow "Test post subject one" And I should see "Unsubscribe from this forum" And I should see "Unsubscribe from this discussion" And I follow "Unsubscribe from this forum" - And I follow "Continue" + And I should see "Student One will NOT be notified of new posts in 'Test forum name'" And I follow "Test post subject one" And I should see "Subscribe to this forum" And I should see "Subscribe to this discussion" diff --git a/mod/forum/tests/behat/forum_subscriptions.feature b/mod/forum/tests/behat/forum_subscriptions.feature index acab5cdc043..f1551183905 100644 --- a/mod/forum/tests/behat/forum_subscriptions.feature +++ b/mod/forum/tests/behat/forum_subscriptions.feature @@ -71,7 +71,7 @@ Feature: A user can control their own subscription preferences for a forum Then I should see "Subscribe to this forum" And I should not see "Unsubscribe from this forum" And I follow "Subscribe to this forum" - And I follow "Continue" + And I should see "Student One will be notified of new posts in 'Test forum name'" And I should see "Unsubscribe from this forum" And I should not see "Subscribe to this forum" @@ -91,6 +91,6 @@ Feature: A user can control their own subscription preferences for a forum Then I should see "Unsubscribe from this forum" And I should not see "Subscribe to this forum" And I follow "Unsubscribe from this forum" - And I follow "Continue" + And I should see "Student One will NOT be notified of new posts in 'Test forum name'" And I should see "Subscribe to this forum" And I should not see "Unsubscribe from this forum" diff --git a/mod/forum/tests/behat/forum_subscriptions_default.feature b/mod/forum/tests/behat/forum_subscriptions_default.feature index d5da6b6c10f..e40e7b2d683 100644 --- a/mod/forum/tests/behat/forum_subscriptions_default.feature +++ b/mod/forum/tests/behat/forum_subscriptions_default.feature @@ -121,7 +121,7 @@ Feature: A user can control their default discussion subscription settings And I follow "Course 1" And I follow "Test forum name" And I click on "You are subscribed to this discussion. Click to unsubscribe." "link" in the "Test post subject" "table_row" - And I follow "Continue" + And I should see "Student One will NOT be notified of new posts in 'Test post subject' of 'Test forum name'" And I follow "Test post subject" When I follow "Reply" And "input[name=discussionsubscribe][checked=checked]" "css_element" should exist @@ -130,7 +130,7 @@ Feature: A user can control their default discussion subscription settings And I follow "Course 1" And I follow "Test forum name" And I click on "You are subscribed to this discussion. Click to unsubscribe." "link" in the "Test post subject" "table_row" - And I follow "Continue" + And I should see "Student Two will NOT be notified of new posts in 'Test post subject' of 'Test forum name'" And I follow "Test post subject" And I follow "Reply" And "input[name=discussionsubscribe]:not([checked=checked])" "css_element" should exist