Merge pull request #2859 from antobinary/audio-fix

html5client: user join and lock settings changes

bigbluebutton-html5/app/server/collection_methods/meetings.coffee

@@ -13,12 +13,13 @@
       duration: duration
       roomLockSettings:
         # by default the lock settings will be disabled on meeting create
-        disablePrivChat: false
+        disablePrivateChat: false
         disableCam: false
         disableMic: false
         lockOnJoin: Meteor.config.lockOnJoin
         lockedLayout: false
-        disablePubChat: false
+        disablePublicChat: false
+        lockOnJoinConfigurable: false # TODO
 
     id = Meteor.Meetings.insert(entry)
     Meteor.log.info "added meeting _id=[#{id}]:meetingId=[#{meetingId}]:name=[#{name}]:duration=[#{duration}]:voiceConf=[#{voiceConf}]

bigbluebutton-html5/app/server/collection_methods/users.coffee

@@ -208,8 +208,8 @@ Meteor.methods
   u = Meteor.Users.findOne({userId:user.userid, meetingId: meetingId})
   # the collection already contains an entry for this user because
   # we added a dummy user on register_user_message (to save authToken)
-  if u?
-    Meteor.log.info "UPDATING USER #{user.userid}, authToken=#{u.authToken}, locked=#{user.locked}"
+  if u? and u.authToken?
+    Meteor.log.info "UPDATING USER #{user.userid}, authToken=#{u.authToken}, locked=#{user.locked}, username=#{user.name}"
     Meteor.Users.update({userId:user.userid, meetingId: meetingId}, {$set:{
       user:
         userid: user.userid

bigbluebutton-html5/app/server/redispubsub.coffee

@@ -65,7 +65,7 @@ class Meteor.RedisPubSub
       "get_presentation_info_reply"
       # "get_users_reply"
       "get_chat_history_reply"
-      "get_all_meetings_reply"
+      # "get_all_meetings_reply"
       "presentation_shared_message"
       "presentation_conversion_done_message"
       "presentation_conversion_progress_message"
@@ -73,6 +73,7 @@ class Meteor.RedisPubSub
       "presentation_page_changed_message"
       "BbbPubSubPongMessage"
       "bbb_apps_is_alive_message"
+      "user_voice_talking_message"
     ]
 
     if message?.header? and message?.payload?

bigbluebutton-html5/app/server/user_permissions.coffee

@@ -69,10 +69,10 @@ viewer = (meetingId, userId) ->
   subscribeChat: true
 
   #chat
-  chatPublic: !(Meteor.Meetings.findOne({meetingId:meetingId})?.roomLockSettings.disablePubChat) or
+  chatPublic: !(Meteor.Meetings.findOne({meetingId:meetingId})?.roomLockSettings.disablePublicChat) or
                 !(Meteor.Users.findOne({meetingId:meetingId, userId:userId})?.user.locked) or
                 Meteor.Users.findOne({meetingId:meetingId, userId:userId})?.user.presenter
-  chatPrivate: !(Meteor.Meetings.findOne({meetingId:meetingId})?.roomLockSettings.disablePrivChat) or
+  chatPrivate: !(Meteor.Meetings.findOne({meetingId:meetingId})?.roomLockSettings.disablePrivateChat) or
                 !(Meteor.Users.findOne({meetingId:meetingId, userId:userId})?.user.locked) or
                 Meteor.Users.findOne({meetingId:meetingId, userId:userId})?.user.presenter