From fa29e02ac31a3461ed002e32ec04b650b0ba1479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Loguercio?= Date: Thu, 24 Sep 2015 10:39:39 -0500 Subject: [PATCH] Remove chat button from elfinder popup file selector for 1.10.x - Refs #7841 --- main/inc/ajax/chat.ajax.php | 3 +++ main/inc/lib/chat.lib.php | 29 ++++++++++++++++++++++++++- main/inc/lib/elfinder/filemanager.php | 2 +- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/main/inc/ajax/chat.ajax.php b/main/inc/ajax/chat.ajax.php index 1b927b5728..b64e637d74 100755 --- a/main/inc/ajax/chat.ajax.php +++ b/main/inc/ajax/chat.ajax.php @@ -46,6 +46,9 @@ if (!isset($_SESSION['openChatBoxes'])) { } $chat = new Chat(); +if (chat::disableChat()){ + exit; +} if ($chat->is_chat_blocked_by_exercises()) { // Disconnecting the user $chat->setUserStatus(0); diff --git a/main/inc/lib/chat.lib.php b/main/inc/lib/chat.lib.php index 2ab4ba69d3..8f845c8ee1 100755 --- a/main/inc/lib/chat.lib.php +++ b/main/inc/lib/chat.lib.php @@ -272,7 +272,34 @@ class Chat extends Model return $text; } - + + /** + * SET Disable Chat + * @param boolean status to disable chat + * @return void + */ + public static function setDisableChat($status = true) + { + $_SESSION['disable_chat'] = $status; + } + + /** + * Disable Chat - disable the chat + * @return boolean - return true if setDisableChat status is true + */ + public static function disableChat() + { + if (!empty($_SESSION['disable_chat'])){ + $status = $_SESSION['disable_chat']; + if ($status == true){ + $_SESSION['disable_chat'] = null; + return true; + } + } + + return false; + } + public function is_chat_blocked_by_exercises() { if (isset($_SESSION['current_exercises'])) { diff --git a/main/inc/lib/elfinder/filemanager.php b/main/inc/lib/elfinder/filemanager.php index f42dc9346e..412112c955 100644 --- a/main/inc/lib/elfinder/filemanager.php +++ b/main/inc/lib/elfinder/filemanager.php @@ -2,6 +2,6 @@ /* For licensing terms, see /license.txt */ require_once '../../global.inc.php'; - +Chat::setDisableChat(); $template = new Template(); $template->display('default/javascript/editor/ckeditor/elfinder.tpl');