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

clean up

Browse Source
This commit is contained in:
Anton Georgiev 2017-02-01 14:27:25 -05:00
parent 48a4b180fb
commit fc27dc9a5c
2 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bigbluebutton-html5/imports/startup/server/userPermissions.js
View File

@ -78,9 +78,9 @@ const viewer = function (meetingId, userId) {
// muting
muteSelf: true,
unmuteSelf:
!((meeting = Meetings.findOne({ meetingId: meetingId })) != null &&
!((meeting = Meetings.findOne({ meetingId })) != null &&
meeting.roomLockSettings.disableMic) ||
!((user = Users.findOne({ meetingId: meetingId, userId: userId })) != null &&
!((user = Users.findOne({ meetingId, userId })) != null &&
user.user.locked),
logoutSelf: true,
@ -90,15 +90,15 @@ const viewer = function (meetingId, userId) {
subscribeChat: true,
//chat
chatPublic: !((meeting = Meetings.findOne({ meetingId: meetingId })) != null &&
chatPublic: !((meeting = Meetings.findOne({ meetingId })) != null &&
meeting.roomLockSettings.disablePublicChat) ||
!((user = Users.findOne({ meetingId: meetingId, userId: userId })) != null &&
!((user = Users.findOne({ meetingId, userId })) != null &&
user.user.locked) ||
(user != null && user.user.presenter),
chatPrivate: !((meeting = Meetings.findOne({ meetingId: meetingId })) != null &&
chatPrivate: !((meeting = Meetings.findOne({ meetingId })) != null &&
meeting.roomLockSettings.disablePrivateChat) ||
!((user = Users.findOne({ meetingId: meetingId, userId: userId })) != null &&
!((user = Users.findOne({ meetingId, userId })) != null &&
user.user.locked) ||
(user != null && user.user.presenter),
@ -122,13 +122,13 @@ export function isAllowedTo(action, credentials) {
const userId = credentials.requesterUserId;
const authToken = credentials.requesterToken;
let user;
let validated;
user = Users.findOne({
meetingId: meetingId,
userId: userId,
let user = Users.findOne({
meetingId,
userId,
});
if (user != null) {
validated = user.validated;
}
@ -137,10 +137,6 @@ export function isAllowedTo(action, credentials) {
`in isAllowedTo: action-${action}, userId=${userId}, ` +
`authToken=${authToken} validated:${validated}`
);
user = Users.findOne({
meetingId: meetingId,
userId: userId,
});
// logger.info "user=" + JSON.stringify user
if ((user != null) && authToken === user.authToken) { // check if the user is who he claims to be
@ -170,10 +166,7 @@ export function isAllowedTo(action, credentials) {
// user was not validated
if (action === 'logoutSelf') {
// on unsuccessful sign-in
logger.warn(
'a user was successfully removed from the ' +
'meeting following an unsuccessful login'
);
logger.warn('a user was successfully removed from the meeting after failed login');
return true;
}

3
bigbluebutton-html5/imports/ui/components/settings/submenus/application/component.jsx
View File

@ -32,7 +32,8 @@ export default class ApplicationMenu extends BaseMenu {
onChange={this.checkBoxHandler.bind(this, "audioNotifChat")}
checked={this.state.audioNotifChat}
aria-labelledby='audioNotifLabel'
aria-describedby='audioNotifDesc' />
aria-describedby='audioNotifDesc'
/>
Audio notifications for chat
</label>
<div id='audioNotifLabel' hidden>Audio notifications</div>