From 7a0a1dae6095382539001920abbcb76e53eeb5a3 Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Thu, 23 Apr 2015 15:46:52 +0000
Subject: [PATCH] revert server side permission change
---
.../app/client/lib/bbb_api_bridge.coffee | 2 ++
bigbluebutton-html5/app/server/user_permissions.coffee | 10 ++++------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee b/bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
index 7193786106..26aa86c2ca 100755
--- a/bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
+++ b/bigbluebutton-html5/app/client/lib/bbb_api_bridge.coffee
@@ -221,6 +221,8 @@ https://github.com/bigbluebutton/bigbluebutton/blob/master/bigbluebutton-client/
isListenOnly: signifies whether the user joining the conference audio requests to join the listen only stream
###
BBB.joinVoiceConference = (callback, isListenOnly) ->
+ if BBB.isMyMicLocked()
+ callIntoConference(BBB.getMyVoiceBridge(), callback, true) #true because we force isListenOnly mode
callIntoConference(BBB.getMyVoiceBridge(), callback, isListenOnly)
###
diff --git a/bigbluebutton-html5/app/server/user_permissions.coffee b/bigbluebutton-html5/app/server/user_permissions.coffee
index 4fa41864fb..3c3f44de32 100755
--- a/bigbluebutton-html5/app/server/user_permissions.coffee
+++ b/bigbluebutton-html5/app/server/user_permissions.coffee
@@ -8,9 +8,8 @@ moderator =
joinListenOnly: true
leaveListenOnly: true
- # audio listen and speak
- joinAudioWithMic: true
- leaveAudioWithMic: true
+ # join audio with mic cannot be controlled on the server side as it is
+ # a client side only functionality
# raising/lowering hand
raiseOwnHand : true
@@ -39,9 +38,8 @@ viewer = (meetingId, userId) ->
joinListenOnly: true
leaveListenOnly: true
- # audio listen and speak
- joinAudioWithMic: false
- leaveAudioWithMic: false
+ # join audio with mic cannot be controlled on the server side as it is
+ # a client side only functionality
# raising/lowering hand
raiseOwnHand : true
--
GitLab