MDL-35385 mod_chat: made sure no message popups display within the ch…

…at window
moodle · Apr 30, 2013 · fa15dda · fa15dda
1 parent 5e00b9a
commit fa15dda
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/mod/chat/gui_basic/index.php b/mod/chat/gui_basic/index.php
@@ -44,7 +44,7 @@
 require_login($course, false, $cm);
 require_capability('mod/chat:chat', $context);
 $PAGE->set_pagelayout('base');
-$PAGE->set_popup_notification_allowed(false); // No popup notifications in the chat window
+$PAGE->set_popup_notification_allowed(false);
 
 /// Check to see if groups are being used here
  if ($groupmode = groups_get_activity_groupmode($cm)) {   // Groups are being used

diff --git a/mod/chat/gui_header_js/chatinput.php b/mod/chat/gui_header_js/chatinput.php
@@ -24,6 +24,7 @@
 }
 
 $PAGE->set_url('/mod/chat/gui_header_js/chatinput.php', array('chat_sid'=>$chat_sid, 'chat_id'=>$chatid));
+$PAGE->set_popup_notification_allowed(false);
 
 $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 

diff --git a/mod/chat/gui_header_js/users.php b/mod/chat/gui_header_js/users.php
@@ -9,6 +9,7 @@
 $beep       = optional_param('beep', 0, PARAM_INT);  // beep target
 
 $PAGE->set_url('/mod/chat/gui_header_js/users.php', array('chat_sid'=>$chat_sid));
+$PAGE->set_popup_notification_allowed(false);
 
 if (!$chatuser = $DB->get_record('chat_users', array('sid'=>$chat_sid))) {
     print_error('notlogged', 'chat');

diff --git a/mod/chat/gui_sockets/chatinput.php b/mod/chat/gui_sockets/chatinput.php
@@ -8,6 +8,7 @@
 $chat_sid = required_param('chat_sid', PARAM_ALPHANUM);
 
 $PAGE->set_url('/mod/chat/gui_sockets/chatinput.php', array('chat_sid'=>$chat_sid));
+$PAGE->set_popup_notification_allowed(false);
 
 if (!$chatuser = $DB->get_record('chat_users', array('sid'=>$chat_sid))) {
     print_error('notlogged', 'chat');