diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties index a071e467ff5e600ba69d952cfbb4f8923d4eb330..9c5f4dcafa3e831a303720b9b27d0d14c4fdeb4c 100755 --- a/bigbluebutton-client/locale/en_US/bbbResources.properties +++ b/bigbluebutton-client/locale/en_US/bbbResources.properties @@ -369,6 +369,7 @@ bbb.video.publish.closeBtn.accessName = Close the webcam settings dialog box bbb.video.publish.closeBtn.label = Cancel bbb.video.publish.titleBar = Publish Webcam Window bbb.video.streamClose.toolTip = Close stream for: {0} +bbb.video.message.browserhttp = This server is not configured with SSL. As a result, {0} disables sharing of your webcam. bbb.screensharePublish.title = Screen Sharing: Presenter's Preview bbb.screensharePublish.pause.tooltip = Pause screen share bbb.screensharePublish.pause.label = Pause diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml index bcfa0b19b9986c2e5dfa05bd93e524dc0d89089b..84b20d8289b0336cea6e7946a6b7d3b0ac36dfc8 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml @@ -42,25 +42,31 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. <fx:Script> <![CDATA[ - import com.asfusion.mate.events.Dispatcher; + import com.asfusion.mate.events.Dispatcher; + + import mx.controls.Alert; + import mx.controls.Menu; + import mx.events.MenuEvent; + import mx.styles.IStyleManager2; + import mx.styles.StyleManager; + + import org.as3commons.logging.api.ILogger; + import org.as3commons.logging.api.getClassLogger; + import org.bigbluebutton.common.Media; + import org.bigbluebutton.core.events.LockControlEvent; + import org.bigbluebutton.core.model.LiveMeeting; + import org.bigbluebutton.main.events.BBBEvent; + import org.bigbluebutton.main.events.ShortcutEvent; + import org.bigbluebutton.main.model.users.events.ChangeMyRole; + import org.bigbluebutton.main.views.MainToolbar; + import org.bigbluebutton.modules.videoconf.events.ShareCameraRequestEvent; + import org.bigbluebutton.modules.videoconf.events.StopShareCameraRequestEvent; + import org.bigbluebutton.util.browser.BrowserCheck; + import org.bigbluebutton.util.i18n.ResourceUtil; + + - import mx.controls.Menu; - import mx.events.MenuEvent; - import mx.styles.IStyleManager2; - import mx.styles.StyleManager; - import org.as3commons.logging.api.ILogger; - import org.as3commons.logging.api.getClassLogger; - import org.bigbluebutton.common.Media; - import org.bigbluebutton.core.events.LockControlEvent; - import org.bigbluebutton.core.model.LiveMeeting; - import org.bigbluebutton.main.events.BBBEvent; - import org.bigbluebutton.main.events.ShortcutEvent; - import org.bigbluebutton.main.model.users.events.ChangeMyRole; - import org.bigbluebutton.main.views.MainToolbar; - import org.bigbluebutton.modules.videoconf.events.ShareCameraRequestEvent; - import org.bigbluebutton.modules.videoconf.events.StopShareCameraRequestEvent; - import org.bigbluebutton.util.i18n.ResourceUtil; private static const LOGGER:ILogger = getClassLogger(ToolbarPopupButton); @@ -177,6 +183,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. private function openPublishWindow():void{ + if (!BrowserCheck.isHttps() && ((BrowserCheck.isChrome() && BrowserCheck.browserMajorVersion >= "60") || (BrowserCheck.isOpera() && BrowserCheck.browserMajorVersion >= "47"))) { + Alert.show(ResourceUtil.getInstance().getString("bbb.video.message.browserhttp", [BrowserCheck.browserName])); + return; + } this.enabled = false; if(_currentState == ON_STATE) { LOGGER.debug("[ToolbarPopupButton:openPublishWindow] Close window");