BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed unmuteUsers to allowModsToUnmuteUsers

Browse Source
This commit is contained in:
Pedro Beschorner Marin 2019-04-23 12:30:55 -03:00
parent 50afb24653
commit 324681d5b2
21 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/MuteUserCmdMsgHdlr.scala
View File

@ -14,7 +14,7 @@ trait MuteUserCmdMsgHdlr extends RightsManagementTrait {
val outGW: OutMsgRouter
def handleMuteUserCmdMsg(msg: MuteUserCmdMsg) {
val unmuteDisabled = !liveMeeting.props.usersProp.unmuteUsers && msg.body.mute == false
val unmuteDisabled = !liveMeeting.props.usersProp.allowModsToUnmuteUsers && msg.body.mute == false
if (msg.body.userId != msg.header.userId && (unmuteDisabled || permissionFailed(
PermissionCheck.MOD_LEVEL,
PermissionCheck.VIEWER_LEVEL, liveMeeting.users2x, msg.header.userId

4
akka-bbb-apps/src/test/scala/org/bigbluebutton/core/AppsTestFixtures.scala
View File

@ -40,7 +40,7 @@ trait AppsTestFixtures {
val dialNumber = "613-555-1234"
val maxUsers = 25
val guestPolicy = "ALWAYS_ASK"
val unmuteUsers = false
val allowModsToUnmuteUsers = false
val red5DeskShareIPTestFixture = "127.0.0.1"
val red5DeskShareAppTestFixtures = "red5App"
@ -60,7 +60,7 @@ trait AppsTestFixtures {
modOnlyMessage = modOnlyMessage)
val voiceProp = VoiceProp(telVoice = voiceConfId, voiceConf = voiceConfId, dialNumber = dialNumber, muteOnStart = muteOnStart)
val usersProp = UsersProp(maxUsers = maxUsers, webcamsOnlyForModerator = webcamsOnlyForModerator,
guestPolicy = guestPolicy, unmuteUsers = unmuteUsers)
guestPolicy = guestPolicy, allowModsToUnmuteUsers = allowModsToUnmuteUsers)
val metadataProp = new MetadataProp(metadata)
val defaultProps = DefaultProps(meetingProp, breakoutProps, durationProps, password, recordProp, welcomeProp, voiceProp,

2
bbb-common-message/src/main/scala/org/bigbluebutton/common2/domain/Meeting2x.scala
View File

@ -19,7 +19,7 @@ case class WelcomeProp(welcomeMsgTemplate: String, welcomeMsg: String, modOnlyMe
case class VoiceProp(telVoice: String, voiceConf: String, dialNumber: String, muteOnStart: Boolean)
case class UsersProp(maxUsers: Int, webcamsOnlyForModerator: Boolean, guestPolicy: String, unmuteUsers: Boolean)
case class UsersProp(maxUsers: Int, webcamsOnlyForModerator: Boolean, guestPolicy: String, allowModsToUnmuteUsers: Boolean)
case class MetadataProp(metadata: collection.immutable.Map[String, String])

4
bbb-common-message/src/test/scala/org/bigbluebutton/common2/TestFixtures.scala
View File

@ -34,7 +34,7 @@ trait TestFixtures {
val dialNumber = "613-555-1234"
val maxUsers = 25
val muteOnStart = false
val unmuteUsers = false
val allowModsToUnmuteUsers = false
val keepEvents = false
val guestPolicy = "ALWAYS_ASK"
val metadata: collection.immutable.Map[String, String] = Map("foo" -> "bar", "bar" -> "baz", "baz" -> "foo")
@ -53,7 +53,7 @@ trait TestFixtures {
modOnlyMessage = modOnlyMessage)
val voiceProp = VoiceProp(telVoice = voiceConfId, voiceConf = voiceConfId, dialNumber = dialNumber, muteOnStart = muteOnStart)
val usersProp = UsersProp(maxUsers = maxUsers, webcamsOnlyForModerator = webcamsOnlyForModerator,
guestPolicy = guestPolicy, unmuteUsers = unmuteUsers)
guestPolicy = guestPolicy, allowModsToUnmuteUsers = allowModsToUnmuteUsers)
val metadataProp = new MetadataProp(metadata)
val screenshareProps = ScreenshareProps(screenshareConf = "FixMe!", red5ScreenshareIp = "fixMe!",
red5ScreenshareApp = "fixMe!")

2
bbb-common-web/src/main/java/org/bigbluebutton/api/ApiParams.java
View File

@ -43,7 +43,7 @@ public class ApiParams {
public static final String MODERATOR_ONLY_MESSAGE = "moderatorOnlyMessage";
public static final String MODERATOR_PW = "moderatorPW";
public static final String MUTE_ON_START = "muteOnStart";
public static final String UNMUTE_USERS = "unmuteUsers";
public static final String ALLOW_MODS_TO_UNMUTE_USERS = "allowModsToUnmuteUsers";
public static final String NAME = "name";
public static final String PARENT_MEETING_ID = "parentMeetingID";
public static final String PASSWORD = "password";

2
bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
View File

@ -315,7 +315,7 @@ public class MeetingService implements MessageListener {
m.getDialNumber(), m.getMaxUsers(), m.getMaxInactivityTimeoutMinutes(), m.getWarnMinutesBeforeMax(),
m.getMeetingExpireIfNoUserJoinedInMinutes(), m.getmeetingExpireWhenLastUserLeftInMinutes(),
m.getUserInactivityInspectTimerInMinutes(), m.getUserInactivityThresholdInMinutes(),
m.getUserActivitySignResponseDelayInMinutes(), m.getMuteOnStart(), m.getUnmuteUsers(), keepEvents);
m.getUserActivitySignResponseDelayInMinutes(), m.getMuteOnStart(), m.getAllowModsToUnmuteUsers(), keepEvents);
}
private String formatPrettyDate(Long timestamp) {

18
bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
View File

@ -90,7 +90,7 @@ public class ParamsProcessorUtil {
private boolean allowStartStopRecording;
private boolean webcamsOnlyForModerator;
private boolean defaultMuteOnStart = false;
private boolean defaultUnmuteUsers = false;
private boolean defaultAllowModsToUnmuteUsers = false;
private String defaultConfigXML = null;
@ -393,11 +393,11 @@ public class ParamsProcessorUtil {
meeting.setMuteOnStart(muteOnStart);
Boolean unmuteUsers = defaultUnmuteUsers;
if (!StringUtils.isEmpty(params.get(ApiParams.UNMUTE_USERS))) {
unmuteUsers = Boolean.parseBoolean(params.get(ApiParams.UNMUTE_USERS));
Boolean allowModsToUnmuteUsers = defaultAllowModsToUnmuteUsers;
if (!StringUtils.isEmpty(params.get(ApiParams.ALLOW_MODS_TO_UNMUTE_USERS))) {
allowModsToUnmuteUsers = Boolean.parseBoolean(params.get(ApiParams.ALLOW_MODS_TO_UNMUTE_USERS));
}
meeting.setUnmuteUsers(unmuteUsers);
meeting.setAllowModsToUnmuteUsers(allowModsToUnmuteUsers);
return meeting;
}
@ -896,12 +896,12 @@ public class ParamsProcessorUtil {
return defaultMuteOnStart;
}
public void setUnmuteUsers(Boolean value) {
defaultUnmuteUsers = value;
public void setAllowModsToUnmuteUsers(Boolean value) {
defaultAllowModsToUnmuteUsers = value;
}
public Boolean getUnmuteUsers() {
return defaultUnmuteUsers;
public Boolean getAllowModsToUnmuteUsers() {
return defaultAllowModsToUnmuteUsers;
}
public List<String> decodeIds(String encodeid) {

10
bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java
View File

@ -78,7 +78,7 @@ public class Meeting {
private String customLogoURL = "";
private String customCopyright = "";
private Boolean muteOnStart = false;
private Boolean unmuteUsers = false;
private Boolean allowModsToUnmuteUsers = false;
private Integer maxInactivityTimeoutMinutes = 120;
private Integer warnMinutesBeforeMax = 5;
@ -425,12 +425,12 @@ public class Meeting {
return muteOnStart;
}
public void setUnmuteUsers(Boolean value) {
unmuteUsers = value;
public void setAllowModsToUnmuteUsers(Boolean value) {
allowModsToUnmuteUsers = value;
}
public Boolean getUnmuteUsers() {
return unmuteUsers;
public Boolean getAllowModsToUnmuteUsers() {
return allowModsToUnmuteUsers;
}
public void userJoined(User user) {

2
bbb-common-web/src/main/java/org/bigbluebutton/api2/IBbbWebApiGWApp.java
View File

@ -26,7 +26,7 @@ public interface IBbbWebApiGWApp {
Integer userInactivityThresholdInMinutes,
Integer userActivitySignResponseDelayInMinutes,
Boolean muteOnStart,
Boolean unmuteUsers,
Boolean allowModsToUnmuteUsers,
Boolean keepEvents);
void registerUser(String meetingID, String internalUserId, String fullname, String role,

4
bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
View File

@ -97,7 +97,7 @@ class BbbWebApiGWApp(
userInactivityThresholdInMinutes: java.lang.Integer,
userActivitySignResponseDelayInMinutes: java.lang.Integer,
muteOnStart: java.lang.Boolean,
unmuteUsers: java.lang.Boolean,
allowModsToUnmuteUsers: java.lang.Boolean,
keepEvents: java.lang.Boolean): Unit = {
val meetingProp = MeetingProp(name = meetingName, extId = extMeetingId, intId = meetingId,
@ -122,7 +122,7 @@ class BbbWebApiGWApp(
modOnlyMessage = modOnlyMessage)
val voiceProp = VoiceProp(telVoice = voiceBridge, voiceConf = voiceBridge, dialNumber = dialNumber, muteOnStart = muteOnStart.booleanValue())
val usersProp = UsersProp(maxUsers = maxUsers.intValue(), webcamsOnlyForModerator = webcamsOnlyForModerator.booleanValue(),
guestPolicy = guestPolicy, unmuteUsers = unmuteUsers.booleanValue())
guestPolicy = guestPolicy, allowModsToUnmuteUsers = allowModsToUnmuteUsers.booleanValue())
val metadataProp = MetadataProp(mapAsScalaMap(metadata).toMap)
val screenshareProps = ScreenshareProps(
screenshareConf = voiceBridge + screenshareConfSuffix,

2
bigbluebutton-client/src/org/bigbluebutton/core/model/Meeting.as
View File

@ -16,7 +16,7 @@ package org.bigbluebutton.core.model
public var allowStartStopRecording:Boolean = true;
public var webcamsOnlyForModerator:Boolean = false;
public var metadata:Object = null;
public var unmuteUsers:Boolean = false;
public var allowModsToUnmuteUsers:Boolean = false;
public var muteOnStart:Boolean = false;
public var logoutTimer:int=0;
public var bannerColor:String = "";

6
bigbluebutton-client/src/org/bigbluebutton/core/model/MeetingBuilder.as
View File

@ -15,7 +15,7 @@ package org.bigbluebutton.core.model
internal var modOnlyMessage:String;
internal var allowStartStopRecording: Boolean;
internal var metadata: Object;
internal var unmuteUsers: Boolean;
internal var allowModsToUnmuteUsers: Boolean;
internal var muteOnStart:Boolean;
public function MeetingBuilder(id: String, name: String) {
@ -78,8 +78,8 @@ package org.bigbluebutton.core.model
return this;
}
public function withUnmuteUsers(value: Boolean):MeetingBuilder {
unmuteUsers = value;
public function withAllowModsToUnmuteUsers(value: Boolean):MeetingBuilder {
allowModsToUnmuteUsers = value;
return this;
}

2
bigbluebutton-client/src/org/bigbluebutton/main/model/users/EnterApiResponse.as
View File

@ -30,7 +30,7 @@ package org.bigbluebutton.main.model.users
public var allowStartStopRecording: Boolean;
public var metadata: Object = new Object();
public var modOnlyMessage: String;
public var unmuteUsers:Boolean = false;
public var allowModsToUnmuteUsers:Boolean = false;
public var muteOnStart:Boolean = false;
}
}

2
bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
View File

@ -179,7 +179,7 @@ package org.bigbluebutton.main.model.users
apiResponse.bannerColor = result.response.bannerColor;
apiResponse.bannerText = result.response.bannerText;
apiResponse.unmuteUsers = result.response.unmuteUsers as Boolean;
apiResponse.allowModsToUnmuteUsers = result.response.allowModsToUnmuteUsers as Boolean;
apiResponse.muteOnStart = result.response.muteOnStart as Boolean;
apiResponse.customLogo = result.response.customLogoURL;
apiResponse.customCopyright = result.response.customCopyright;

2
bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
View File

@ -140,7 +140,7 @@ package org.bigbluebutton.main.model.users
LiveMeeting.inst().meeting.bannerColor = result.bannerColor;
LiveMeeting.inst().meeting.bannerText = result.bannerText;
LiveMeeting.inst().meeting.unmuteUsers = result.unmuteUsers;
LiveMeeting.inst().meeting.allowModsToUnmuteUsers = result.allowModsToUnmuteUsers;
LiveMeeting.inst().meeting.muteOnStart = result.muteOnStart;
LiveMeeting.inst().meetingStatus.isMeetingMuted = result.muteOnStart;
LiveMeeting.inst().meeting.customLogo = result.customLogo;

10
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
View File

@ -67,7 +67,7 @@
[Bindable]
private var webcamsOnlyForModerator:Boolean;
private var unmuteUsers:Boolean = false;
private var allowModsToUnmuteUsers:Boolean = false;
private var moderator:Boolean = false;
@ -94,7 +94,7 @@
BindingUtils.bindSetter(updateButtons, hasStreamInd, "visible");
BindingUtils.bindSetter(updateButtons, viewingStreamInd, "visible");
unmuteUsers = LiveMeeting.inst().meeting.unmuteUsers;
allowModsToUnmuteUsers = LiveMeeting.inst().meeting.allowModsToUnmuteUsers;
}
override public function set data(value:Object):void {
@ -197,7 +197,7 @@
var e:VoiceConfEvent = new VoiceConfEvent(VoiceConfEvent.MUTE_USER);
e.userid = data.userId;
e.mute = (data.me || unmuteUsers) ? !data.muted : true;
e.mute = (data.me || allowModsToUnmuteUsers) ? !data.muted : true;
dispatchEvent(e);
}
@ -250,8 +250,8 @@
muteImg.filters = [];
}
} else {
// moderators can only unmute users when unmuteUsers is set on create
var unmute:Boolean = unmuteUsers && amIMod;
// moderators can only unmute users when allowModsToUnmuteUsers is set on create
var unmute:Boolean = allowModsToUnmuteUsers && amIMod;
var showMuteBtn:Boolean = rolledOver && (data.me || (amIMod && (!data.muted || unmute)));
muteImg.visible = !showMuteBtn;
muteImg.includeInLayout = !showMuteBtn;

2
bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js
View File

@ -24,7 +24,7 @@ export default function addMeeting(meeting) {
webcamsOnlyForModerator: Boolean,
guestPolicy: String,
maxUsers: Number,
unmuteUsers: Boolean,
allowModsToUnmuteUsers: Boolean,
},
durationProps: {
createdTime: Number,

2
bigbluebutton-html5/imports/ui/components/user-list/service.js
View File

@ -284,7 +284,7 @@ const isMeetingLocked = (id) => {
const areUsersUnmutable = () => {
const meeting = Meetings.findOne({ meetingId: Auth.meetingID });
if (meeting.usersProp) {
return meeting.usersProp.unmuteUsers;
return meeting.usersProp.allowModsToUnmuteUsers;
}
return false;
}

2
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
View File

@ -193,7 +193,7 @@ muteOnStart=false
# Unmute users
# Gives moderators permisson to unmute other users
unmuteUsers=false
allowModsToUnmuteUsers=false
# Saves meeting events even if the meeting is not recorded
keepEvents=false

2
bigbluebutton-web/grails-app/conf/spring/resources.xml
View File

@ -131,7 +131,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<property name="maxPresentationFileUpload" value="${maxFileSizeUpload}"/>
<property name="clientLogoutTimerInMinutes" value="${clientLogoutTimerInMinutes}"/>
<property name="muteOnStart" value="${muteOnStart}"/>
<property name="unmuteUsers" value="${unmuteUsers}"/>
<property name="allowModsToUnmuteUsers" value="${allowModsToUnmuteUsers}"/>
</bean>
<import resource="doc-conversion.xml"/>

2
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
View File

@ -1514,7 +1514,7 @@ class ApiController {
customLogoURL meeting.getCustomLogoURL()
customCopyright meeting.getCustomCopyright()
muteOnStart meeting.getMuteOnStart()
unmuteUsers meeting.getUnmuteUsers()
allowModsToUnmuteUsers meeting.getAllowModsToUnmuteUsers()
logoutUrl us.logoutUrl
defaultLayout us.defaultLayout
avatarURL us.avatarURL