MDL-21535 hidden activities now handled in require_login(), removing duplicate code

diff --git a/mod/chat/gui_ajax/index.php b/mod/chat/gui_ajax/index.php
index e3af3de..2f51c23 100644 (file)
--- a/mod/chat/gui_ajax/index.php
+++ b/mod/chat/gui_ajax/index.php
@@ -20,11 +20,6 @@ $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 require_login($course->id, false, $cm);
 require_capability('mod/chat:chat',$context);
 
-if (!$cm->visible and !has_capability('moodle/course:viewhiddenactivities', get_context_instance(CONTEXT_MODULE, $cm->id))) {
-    notice(get_string("activityiscurrentlyhidden"));
-    exit;
-}
-
 /// Check to see if groups are being used here
  if ($groupmode = groups_get_activity_groupmode($cm)) {   // Groups are being used
     if ($groupid = groups_get_activity_group($cm)) {

diff --git a/mod/chat/gui_header_js/index.php b/mod/chat/gui_header_js/index.php
index 40008cb..e6cd0b5 100644 (file)
--- a/mod/chat/gui_header_js/index.php
+++ b/mod/chat/gui_header_js/index.php
@@ -30,11 +30,6 @@ require_login($course->id, false, $cm);
 
 require_capability('mod/chat:chat',$context);
 
-if (!$cm->visible and !has_capability('moodle/course:viewhiddenactivities', get_context_instance(CONTEXT_MODULE, $cm->id))) {
-    echo $OUTPUT->header();
-    notice(get_string("activityiscurrentlyhidden"));
-}
-
 /// Check to see if groups are being used here
  if ($groupmode = groups_get_activity_groupmode($cm)) {   // Groups are being used
     if ($groupid = groups_get_activity_group($cm)) {

diff --git a/mod/chat/gui_sockets/index.php b/mod/chat/gui_sockets/index.php
index 20d4a6e..19314b4 100644 (file)
--- a/mod/chat/gui_sockets/index.php
+++ b/mod/chat/gui_sockets/index.php
@@ -30,11 +30,6 @@ if (has_capability('moodle/legacy:guest', get_context_instance(CONTEXT_SYSTEM),
     print_error('noguests', 'chat');
 }
 
-if (!$cm->visible and !has_capability('moodle/course:viewhiddenactivities', get_context_instance(CONTEXT_MODULE, $cm->id))) {
-    echo $OUTPUT->header();
-    notice(get_string("activityiscurrentlyhidden"));
-}
-
 /// Check to see if groups are being used here
  if ($groupmode = groups_get_activity_groupmode($cm)) {   // Groups are being used
     if ($groupid = groups_get_activity_group($cm)) {