From 1822c0a9dea4900bc8a794cb6cc1efaa4e1a8b4d Mon Sep 17 00:00:00 2001
From: Ghazi Triki <ghazi.triki@riadvice.tn>
Date: Sun, 4 Sep 2016 12:21:54 +0100
Subject: [PATCH] User in not redirected automatically to the logoutURL.
---
.../locale/en_US/bbbResources.properties | 1 +
.../main/views/LoggedOutWindow.mxml | 19 +++++++------------
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index 64d8fc6cb6..959898afa8 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -424,6 +424,7 @@ bbb.logout.rejected = The connection to the server has been rejected
bbb.logout.invalidapp = The red5 app does not exist
bbb.logout.unknown = Your client has lost connection with the server
bbb.logout.usercommand = You have logged out of the conference
+bbb.logour.breakoutRoomClose = Your browser window will be closed
bbb.logout.ejectedFromMeeting = A moderator has kicked you out of the meeting.
bbb.logout.refresh.message = If this logout was unexpected click the button below to reconnect.
bbb.logout.refresh.label = Reconnect
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
index dc2f27c6c9..0b5b37b17c 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
@@ -40,14 +40,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private static const LOGGER:ILogger = getClassLogger(LoggedOutWindow);
[Bindable]
- private var message:String = "You have logged out of the conference";
+ private var message:String;
private var urlLoader:URLLoader;
- private var isBreakouRoom:Boolean;
-
private function init():void {
- isBreakouRoom = UserManager.getInstance().getConference().isBreakout;
addEventListener(Event.CLOSE, onUserLoggedOutWindowClose);
}
@@ -63,12 +60,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
urlLoader.load(request);
}
- private function okBtnClickHandler(event:MouseEvent):void {
- callSignOut();
- }
-
private function exitApplication():void {
- if (!isBreakouRoom) {
+ if (!UserManager.getInstance().getConference().isBreakout) {
navigateToURL(new URLRequest(BBB.getLogoutURL()), "_self");
} else {
ExternalInterface.call("window.close");
@@ -120,14 +113,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
break;
case ConnectionFailedEvent.USER_LOGGED_OUT:
message = ResourceUtil.getInstance().getString('bbb.logout.usercommand');
- callSignOut(); // we know that the disconnect was requested so automatically redirect
break;
}
+ if (message && UserManager.getInstance().getConference().isBreakout) {
+ message += "\n" + ResourceUtil.getInstance().getString('bbb.logour.breakoutRoomClose');
+ }
}
]]>
</mx:Script>
<mx:VBox width="100%" height="100%" horizontalAlign="center">
- <mx:Text text="{message}"/>
- <mx:Button id="okBtn" label="{ResourceUtil.getInstance().getString('bbb.logout.button.label')}" click="okBtnClickHandler(event)"/>
+ <mx:Text text="{message}" textAlign="center"/>
+ <mx:Button id="okBtn" label="{ResourceUtil.getInstance().getString('bbb.logout.button.label')}" click="callSignOut()"/>
</mx:VBox>
</mx:TitleWindow>
--
GitLab