- 
+
+
+
+
@@ -69,62 +77,62 @@
-
+
-
+
-
-
+
+
Features
-
+
-
+
Record and Playback
BigBlueButton can record your sessions for later playback by students.
-
+
-
+
Whiteboard
The whiteboard controls let you annotate key parts of your presentation.
-
+
Desktop Sharing
You can broadcast your desktop for all users to see (requires lastest version of Java for presenter only).
-
+
-
+
WebRTC Audio
Users of Chrome and FireFox browsers will benefit from high-quality, low-latency WebRTC audio. (Users of other browsers will seamlessly use Flash-based audio.)
-
+
-
+
Presentation
You can upload any PDF presentation or MS office document. BigBlueButton keeps everyone in sync with your current slide, zoom, pan, annotations, and mouse pointer.
-
+
-
+
-
+
-
+
@@ -203,11 +211,11 @@
diff --git a/bigbluebutton-config/web/js/bbb-errors.js b/bigbluebutton-config/web/js/bbb-errors.js
new file mode 100644
index 0000000000..ad6513fece
--- /dev/null
+++ b/bigbluebutton-config/web/js/bbb-errors.js
@@ -0,0 +1,23 @@
+function GetURLParameter(sParam) {
+ var sPageURL = decodeURIComponent(window.location.search.substring(1));
+ var sURLVariables = sPageURL.split('&');
+ for (var i = 0; i < sURLVariables.length; i++) {
+ var sParameterName = sURLVariables[i].split('=');
+ if (sParameterName[0] == sParam) {
+ return sParameterName[1];
+ }
+ }
+}
+
+$(document).ready(function() {
+ var sErrors = GetURLParameter('errors');
+ if (typeof sErrors != 'undefined') {
+ var errors = $.parseJSON(sErrors);
+
+ $.each(errors, function( index, error ) {
+ console.info(error.key);
+ $("#messages").append("");
+ });
+ $('#messages').removeClass('hidden');
+ }
+});
diff --git a/bigbluebutton-config/web/js/bootstrap.min.js b/bigbluebutton-config/web/js/bootstrap.min.js
new file mode 100644
index 0000000000..e79c065134
--- /dev/null
+++ b/bigbluebutton-config/web/js/bootstrap.min.js
@@ -0,0 +1,7 @@
+/*!
+ * Bootstrap v3.3.6 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under the MIT license
+ */
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1||b[0]>2)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 3")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one("bsTransitionEnd",function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b(),a.support.transition&&(a.event.special.bsTransitionEnd={bindType:a.support.transition.end,delegateType:a.support.transition.end,handle:function(b){return a(b.target).is(this)?b.handleObj.handler.apply(this,arguments):void 0}})})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var c=a(this),e=c.data("bs.alert");e||c.data("bs.alert",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var c='[data-dismiss="alert"]',d=function(b){a(b).on("click",c,this.close)};d.VERSION="3.3.6",d.TRANSITION_DURATION=150,d.prototype.close=function(b){function c(){g.detach().trigger("closed.bs.alert").remove()}var e=a(this),f=e.attr("data-target");f||(f=e.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,""));var g=a(f);b&&b.preventDefault(),g.length||(g=e.closest(".alert")),g.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(g.removeClass("in"),a.support.transition&&g.hasClass("fade")?g.one("bsTransitionEnd",c).emulateTransitionEnd(d.TRANSITION_DURATION):c())};var e=a.fn.alert;a.fn.alert=b,a.fn.alert.Constructor=d,a.fn.alert.noConflict=function(){return a.fn.alert=e,this},a(document).on("click.bs.alert.data-api",c,d.prototype.close)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof b&&b;e||d.data("bs.button",e=new c(this,f)),"toggle"==b?e.toggle():b&&e.setState(b)})}var c=function(b,d){this.$element=a(b),this.options=a.extend({},c.DEFAULTS,d),this.isLoading=!1};c.VERSION="3.3.6",c.DEFAULTS={loadingText:"loading..."},c.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",null==f.resetText&&d.data("resetText",d[e]()),setTimeout(a.proxy(function(){d[e](null==f[b]?this.options[b]:f[b]),"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},c.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")?(c.prop("checked")&&(a=!1),b.find(".active").removeClass("active"),this.$element.addClass("active")):"checkbox"==c.prop("type")&&(c.prop("checked")!==this.$element.hasClass("active")&&(a=!1),this.$element.toggleClass("active")),c.prop("checked",this.$element.hasClass("active")),a&&c.trigger("change")}else this.$element.attr("aria-pressed",!this.$element.hasClass("active")),this.$element.toggleClass("active")};var d=a.fn.button;a.fn.button=b,a.fn.button.Constructor=c,a.fn.button.noConflict=function(){return a.fn.button=d,this},a(document).on("click.bs.button.data-api",'[data-toggle^="button"]',function(c){var d=a(c.target);d.hasClass("btn")||(d=d.closest(".btn")),b.call(d,"toggle"),a(c.target).is('input[type="radio"]')||a(c.target).is('input[type="checkbox"]')||c.preventDefault()}).on("focus.bs.button.data-api blur.bs.button.data-api",'[data-toggle^="button"]',function(b){a(b.target).closest(".btn").toggleClass("focus",/^focus(in)?$/.test(b.type))})}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},c.DEFAULTS,d.data(),"object"==typeof b&&b),g="string"==typeof b?b:f.slide;e||d.data("bs.carousel",e=new c(this,f)),"number"==typeof b?e.to(b):g?e[g]():f.interval&&e.pause().cycle()})}var c=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=null,this.sliding=null,this.interval=null,this.$active=null,this.$items=null,this.options.keyboard&&this.$element.on("keydown.bs.carousel",a.proxy(this.keydown,this)),"hover"==this.options.pause&&!("ontouchstart"in document.documentElement)&&this.$element.on("mouseenter.bs.carousel",a.proxy(this.pause,this)).on("mouseleave.bs.carousel",a.proxy(this.cycle,this))};c.VERSION="3.3.6",c.TRANSITION_DURATION=600,c.DEFAULTS={interval:5e3,pause:"hover",wrap:!0,keyboard:!0},c.prototype.keydown=function(a){if(!/input|textarea/i.test(a.target.tagName)){switch(a.which){case 37:this.prev();break;case 39:this.next();break;default:return}a.preventDefault()}},c.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},c.prototype.getItemIndex=function(a){return this.$items=a.parent().children(".item"),this.$items.index(a||this.$active)},c.prototype.getItemForDirection=function(a,b){var c=this.getItemIndex(b),d="prev"==a&&0===c||"next"==a&&c==this.$items.length-1;if(d&&!this.options.wrap)return b;var e="prev"==a?-1:1,f=(c+e)%this.$items.length;return this.$items.eq(f)},c.prototype.to=function(a){var b=this,c=this.getItemIndex(this.$active=this.$element.find(".item.active"));return a>this.$items.length-1||0>a?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){b.to(a)}):c==a?this.pause().cycle():this.slide(a>c?"next":"prev",this.$items.eq(a))},c.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},c.prototype.next=function(){return this.sliding?void 0:this.slide("next")},c.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},c.prototype.slide=function(b,d){var e=this.$element.find(".item.active"),f=d||this.getItemForDirection(b,e),g=this.interval,h="next"==b?"left":"right",i=this;if(f.hasClass("active"))return this.sliding=!1;var j=f[0],k=a.Event("slide.bs.carousel",{relatedTarget:j,direction:h});if(this.$element.trigger(k),!k.isDefaultPrevented()){if(this.sliding=!0,g&&this.pause(),this.$indicators.length){this.$indicators.find(".active").removeClass("active");var l=a(this.$indicators.children()[this.getItemIndex(f)]);l&&l.addClass("active")}var m=a.Event("slid.bs.carousel",{relatedTarget:j,direction:h});return a.support.transition&&this.$element.hasClass("slide")?(f.addClass(b),f[0].offsetWidth,e.addClass(h),f.addClass(h),e.one("bsTransitionEnd",function(){f.removeClass([b,h].join(" ")).addClass("active"),e.removeClass(["active",h].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger(m)},0)}).emulateTransitionEnd(c.TRANSITION_DURATION)):(e.removeClass("active"),f.addClass("active"),this.sliding=!1,this.$element.trigger(m)),g&&this.cycle(),this}};var d=a.fn.carousel;a.fn.carousel=b,a.fn.carousel.Constructor=c,a.fn.carousel.noConflict=function(){return a.fn.carousel=d,this};var e=function(c){var d,e=a(this),f=a(e.attr("data-target")||(d=e.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""));if(f.hasClass("carousel")){var g=a.extend({},f.data(),e.data()),h=e.attr("data-slide-to");h&&(g.interval=!1),b.call(f,g),h&&f.data("bs.carousel").to(h),c.preventDefault()}};a(document).on("click.bs.carousel.data-api","[data-slide]",e).on("click.bs.carousel.data-api","[data-slide-to]",e),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var c=a(this);b.call(c,c.data())})})}(jQuery),+function(a){"use strict";function b(b){var c,d=b.attr("data-target")||(c=b.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"");return a(d)}function c(b){return this.each(function(){var c=a(this),e=c.data("bs.collapse"),f=a.extend({},d.DEFAULTS,c.data(),"object"==typeof b&&b);!e&&f.toggle&&/show|hide/.test(b)&&(f.toggle=!1),e||c.data("bs.collapse",e=new d(this,f)),"string"==typeof b&&e[b]()})}var d=function(b,c){this.$element=a(b),this.options=a.extend({},d.DEFAULTS,c),this.$trigger=a('[data-toggle="collapse"][href="#'+b.id+'"],[data-toggle="collapse"][data-target="#'+b.id+'"]'),this.transitioning=null,this.options.parent?this.$parent=this.getParent():this.addAriaAndCollapsedClass(this.$element,this.$trigger),this.options.toggle&&this.toggle()};d.VERSION="3.3.6",d.TRANSITION_DURATION=350,d.DEFAULTS={toggle:!0},d.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},d.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b,e=this.$parent&&this.$parent.children(".panel").children(".in, .collapsing");if(!(e&&e.length&&(b=e.data("bs.collapse"),b&&b.transitioning))){var f=a.Event("show.bs.collapse");if(this.$element.trigger(f),!f.isDefaultPrevented()){e&&e.length&&(c.call(e,"hide"),b||e.data("bs.collapse",null));var g=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[g](0).attr("aria-expanded",!0),this.$trigger.removeClass("collapsed").attr("aria-expanded",!0),this.transitioning=1;var h=function(){this.$element.removeClass("collapsing").addClass("collapse in")[g](""),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return h.call(this);var i=a.camelCase(["scroll",g].join("-"));this.$element.one("bsTransitionEnd",a.proxy(h,this)).emulateTransitionEnd(d.TRANSITION_DURATION)[g](this.$element[0][i])}}}},d.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse in").attr("aria-expanded",!1),this.$trigger.addClass("collapsed").attr("aria-expanded",!1),this.transitioning=1;var e=function(){this.transitioning=0,this.$element.removeClass("collapsing").addClass("collapse").trigger("hidden.bs.collapse")};return a.support.transition?void this.$element[c](0).one("bsTransitionEnd",a.proxy(e,this)).emulateTransitionEnd(d.TRANSITION_DURATION):e.call(this)}}},d.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()},d.prototype.getParent=function(){return a(this.options.parent).find('[data-toggle="collapse"][data-parent="'+this.options.parent+'"]').each(a.proxy(function(c,d){var e=a(d);this.addAriaAndCollapsedClass(b(e),e)},this)).end()},d.prototype.addAriaAndCollapsedClass=function(a,b){var c=a.hasClass("in");a.attr("aria-expanded",c),b.toggleClass("collapsed",!c).attr("aria-expanded",c)};var e=a.fn.collapse;a.fn.collapse=c,a.fn.collapse.Constructor=d,a.fn.collapse.noConflict=function(){return a.fn.collapse=e,this},a(document).on("click.bs.collapse.data-api",'[data-toggle="collapse"]',function(d){var e=a(this);e.attr("data-target")||d.preventDefault();var f=b(e),g=f.data("bs.collapse"),h=g?"toggle":e.data();c.call(f,h)})}(jQuery),+function(a){"use strict";function b(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function c(c){c&&3===c.which||(a(e).remove(),a(f).each(function(){var d=a(this),e=b(d),f={relatedTarget:this};e.hasClass("open")&&(c&&"click"==c.type&&/input|textarea/i.test(c.target.tagName)&&a.contains(e[0],c.target)||(e.trigger(c=a.Event("hide.bs.dropdown",f)),c.isDefaultPrevented()||(d.attr("aria-expanded","false"),e.removeClass("open").trigger(a.Event("hidden.bs.dropdown",f)))))}))}function d(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new g(this)),"string"==typeof b&&d[b].call(c)})}var e=".dropdown-backdrop",f='[data-toggle="dropdown"]',g=function(b){a(b).on("click.bs.dropdown",this.toggle)};g.VERSION="3.3.6",g.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=b(e),g=f.hasClass("open");if(c(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",c);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;e.trigger("focus").attr("aria-expanded","true"),f.toggleClass("open").trigger(a.Event("shown.bs.dropdown",h))}return!1}},g.prototype.keydown=function(c){if(/(38|40|27|32)/.test(c.which)&&!/input|textarea/i.test(c.target.tagName)){var d=a(this);if(c.preventDefault(),c.stopPropagation(),!d.is(".disabled, :disabled")){var e=b(d),g=e.hasClass("open");if(!g&&27!=c.which||g&&27==c.which)return 27==c.which&&e.find(f).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find(".dropdown-menu"+h);if(i.length){var j=i.index(c.target);38==c.which&&j>0&&j--,40==c.which&&jdocument.documentElement.clientHeight;this.$element.css({paddingLeft:!this.bodyIsOverflowing&&a?this.scrollbarWidth:"",paddingRight:this.bodyIsOverflowing&&!a?this.scrollbarWidth:""})},c.prototype.resetAdjustments=function(){this.$element.css({paddingLeft:"",paddingRight:""})},c.prototype.checkScrollbar=function(){var a=window.innerWidth;if(!a){var b=document.documentElement.getBoundingClientRect();a=b.right-Math.abs(b.left)}this.bodyIsOverflowing=document.body.clientWidth ',trigger:"hover focus",title:"",delay:0,html:!1,container:!1,viewport:{selector:"body",padding:0}},c.prototype.init=function(b,c,d){if(this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.$viewport=this.options.viewport&&a(a.isFunction(this.options.viewport)?this.options.viewport.call(this,this.$element):this.options.viewport.selector||this.options.viewport),this.inState={click:!1,hover:!1,focus:!1},this.$element[0]instanceof document.constructor&&!this.options.selector)throw new Error("`selector` option must be specified when initializing "+this.type+" on the window.document object!");for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},c.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},c.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusin"==b.type?"focus":"hover"]=!0),c.tip().hasClass("in")||"in"==c.hoverState?void(c.hoverState="in"):(clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show())},c.prototype.isInStateTrue=function(){for(var a in this.inState)if(this.inState[a])return!0;return!1},c.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget).data("bs."+this.type);return c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c)),b instanceof a.Event&&(c.inState["focusout"==b.type?"focus":"hover"]=!1),c.isInStateTrue()?void 0:(clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide())},c.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(b);var d=a.contains(this.$element[0].ownerDocument.documentElement,this.$element[0]);if(b.isDefaultPrevented()||!d)return;var e=this,f=this.tip(),g=this.getUID(this.type);this.setContent(),f.attr("id",g),this.$element.attr("aria-describedby",g),this.options.animation&&f.addClass("fade");var h="function"==typeof this.options.placement?this.options.placement.call(this,f[0],this.$element[0]):this.options.placement,i=/\s?auto?\s?/i,j=i.test(h);j&&(h=h.replace(i,"")||"top"),f.detach().css({top:0,left:0,display:"block"}).addClass(h).data("bs."+this.type,this),this.options.container?f.appendTo(this.options.container):f.insertAfter(this.$element),this.$element.trigger("inserted.bs."+this.type);var k=this.getPosition(),l=f[0].offsetWidth,m=f[0].offsetHeight;if(j){var n=h,o=this.getPosition(this.$viewport);h="bottom"==h&&k.bottom+m>o.bottom?"top":"top"==h&&k.top-mo.width?"left":"left"==h&&k.left-lg.top+g.height&&(e.top=g.top+g.height-i)}else{var j=b.left-f,k=b.left+f+c;jg.right&&(e.left=g.left+g.width-k)}return e},c.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},c.prototype.getUID=function(a){do a+=~~(1e6*Math.random());while(document.getElementById(a));return a},c.prototype.tip=function(){if(!this.$tip&&(this.$tip=a(this.options.template),1!=this.$tip.length))throw new Error(this.type+" `template` option must consist of exactly 1 top-level element!");return this.$tip},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},c.prototype.enable=function(){this.enabled=!0},c.prototype.disable=function(){this.enabled=!1},c.prototype.toggleEnabled=function(){this.enabled=!this.enabled},c.prototype.toggle=function(b){var c=this;b&&(c=a(b.currentTarget).data("bs."+this.type),c||(c=new this.constructor(b.currentTarget,this.getDelegateOptions()),a(b.currentTarget).data("bs."+this.type,c))),b?(c.inState.click=!c.inState.click,c.isInStateTrue()?c.enter(c):c.leave(c)):c.tip().hasClass("in")?c.leave(c):c.enter(c)},c.prototype.destroy=function(){var a=this;clearTimeout(this.timeout),this.hide(function(){a.$element.off("."+a.type).removeData("bs."+a.type),a.$tip&&a.$tip.detach(),a.$tip=null,a.$arrow=null,a.$viewport=null})};var d=a.fn.tooltip;a.fn.tooltip=b,a.fn.tooltip.Constructor=c,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=d,this}}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof b&&b;(e||!/destroy|hide/.test(b))&&(e||d.data("bs.popover",e=new c(this,f)),"string"==typeof b&&e[b]())})}var c=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");c.VERSION="3.3.6",c.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'=e[a]&&(void 0===e[a+1]||b .dropdown-menu > .active").removeClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!1),b.addClass("active").find('[data-toggle="tab"]').attr("aria-expanded",!0),h?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu").length&&b.closest("li.dropdown").addClass("active").end().find('[data-toggle="tab"]').attr("aria-expanded",!0),e&&e()}var g=d.find("> .active"),h=e&&a.support.transition&&(g.length&&g.hasClass("fade")||!!d.find("> .fade").length);g.length&&h?g.one("bsTransitionEnd",f).emulateTransitionEnd(c.TRANSITION_DURATION):f(),g.removeClass("in")};var d=a.fn.tab;a.fn.tab=b,a.fn.tab.Constructor=c,a.fn.tab.noConflict=function(){return a.fn.tab=d,this};var e=function(c){c.preventDefault(),b.call(a(this),"show")};a(document).on("click.bs.tab.data-api",'[data-toggle="tab"]',e).on("click.bs.tab.data-api",'[data-toggle="pill"]',e)}(jQuery),+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof b&&b;e||d.data("bs.affix",e=new c(this,f)),"string"==typeof b&&e[b]()})}var c=function(b,d){this.options=a.extend({},c.DEFAULTS,d),this.$target=a(this.options.target).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(b),this.affixed=null,this.unpin=null,this.pinnedOffset=null,this.checkPosition()};c.VERSION="3.3.6",c.RESET="affix affix-top affix-bottom",c.DEFAULTS={offset:0,target:window},c.prototype.getState=function(a,b,c,d){var e=this.$target.scrollTop(),f=this.$element.offset(),g=this.$target.height();if(null!=c&&"top"==this.affixed)return c>e?"top":!1;if("bottom"==this.affixed)return null!=c?e+this.unpin<=f.top?!1:"bottom":a-d>=e+g?!1:"bottom";var h=null==this.affixed,i=h?e:f.top,j=h?g:b;return null!=c&&c>=e?"top":null!=d&&i+j>=a-d?"bottom":!1},c.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(c.RESET).addClass("affix");var a=this.$target.scrollTop(),b=this.$element.offset();return this.pinnedOffset=b.top-a},c.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},c.prototype.checkPosition=function(){if(this.$element.is(":visible")){var b=this.$element.height(),d=this.options.offset,e=d.top,f=d.bottom,g=Math.max(a(document).height(),a(document.body).height());"object"!=typeof d&&(f=e=d),"function"==typeof e&&(e=d.top(this.$element)),"function"==typeof f&&(f=d.bottom(this.$element));var h=this.getState(g,b,e,f);if(this.affixed!=h){null!=this.unpin&&this.$element.css("top","");var i="affix"+(h?"-"+h:""),j=a.Event(i+".bs.affix");if(this.$element.trigger(j),j.isDefaultPrevented())return;this.affixed=h,this.unpin="bottom"==h?this.getPinnedOffset():null,this.$element.removeClass(c.RESET).addClass(i).trigger(i.replace("affix","affixed")+".bs.affix")}"bottom"==h&&this.$element.offset({top:g-b-f})}};var d=a.fn.affix;a.fn.affix=b,a.fn.affix.Constructor=c,a.fn.affix.noConflict=function(){return a.fn.affix=d,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var c=a(this),d=c.data();d.offset=d.offset||{},null!=d.offsetBottom&&(d.offset.bottom=d.offsetBottom),null!=d.offsetTop&&(d.offset.top=d.offsetTop),b.call(c,d)})})}(jQuery);
\ No newline at end of file
diff --git a/bigbluebutton-config/web/js/jquery.min.js b/bigbluebutton-config/web/js/jquery.min.js
new file mode 100644
index 0000000000..6c60672fc5
--- /dev/null
+++ b/bigbluebutton-config/web/js/jquery.min.js
@@ -0,0 +1,5 @@
+/*! jQuery v1.12.0 | (c) jQuery Foundation | jquery.org/license */
+!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="1.12.0",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(!l.ownFirst)for(b in a)return k.call(a,b);for(b in a);return void 0===b||k.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(h)return h.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=e.call(arguments,2),d=function(){return a.apply(b||this,c.concat(e.call(arguments)))},d.guid=a.guid=a.guid||n.guid++,d):void 0},now:function(){return+new Date},support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}if(f=d.getElementById(e[2]),f&&f.parentNode){if(f.id!==e[2])return A.find(a);this.length=1,this[0]=f}return this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||(e=n.uniqueSort(e)),D.test(a)&&(e=e.reverse())),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=!0,c||j.disable(),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.addEventListener?(d.removeEventListener("DOMContentLoaded",K),a.removeEventListener("load",K)):(d.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(d.addEventListener||"load"===a.event.type||"complete"===d.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===d.readyState)a.setTimeout(n.ready);else if(d.addEventListener)d.addEventListener("DOMContentLoaded",K),a.addEventListener("load",K);else{d.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&d.documentElement}catch(e){}c&&c.doScroll&&!function f(){if(!n.isReady){try{c.doScroll("left")}catch(b){return a.setTimeout(f,50)}J(),n.ready()}}()}return I.promise(b)},n.ready.promise();var L;for(L in n(l))break;l.ownFirst="0"===L,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c,e;c=d.getElementsByTagName("body")[0],c&&c.style&&(b=d.createElement("div"),e=d.createElement("div"),e.style.cssText="position:absolute;border:0;width:0;height:0;top:0;left:-9999px",c.appendChild(e).appendChild(b),"undefined"!=typeof b.style.zoom&&(b.style.cssText="display:inline;margin:0;border:0;padding:1px;width:1px;zoom:1",l.inlineBlockNeedsLayout=a=3===b.offsetWidth,a&&(c.style.zoom=1)),c.removeChild(e))}),function(){var a=d.createElement("div");l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}a=null}();var M=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b},N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;
+return!0}function R(a,b,d,e){if(M(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f}}function S(a,b,c){if(M(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=void 0)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},Z=/^(?:checkbox|radio)$/i,$=/<([\w:-]+)/,_=/^$|\/(?:java|ecma)script/i,aa=/^\s+/,ba="abbr|article|aside|audio|bdi|canvas|data|datalist|details|dialog|figcaption|figure|footer|header|hgroup|main|mark|meter|nav|output|picture|progress|section|summary|template|time|video";function ca(a){var b=ba.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}!function(){var a=d.createElement("div"),b=d.createDocumentFragment(),c=d.createElement("input");a.innerHTML="
a",l.leadingWhitespace=3===a.firstChild.nodeType,l.tbody=!a.getElementsByTagName("tbody").length,l.htmlSerialize=!!a.getElementsByTagName("link").length,l.html5Clone="<:nav>"!==d.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,b.appendChild(c),l.appendChecked=c.checked,a.innerHTML="",l.noCloneChecked=!!a.cloneNode(!0).lastChild.defaultValue,b.appendChild(a),c=d.createElement("input"),c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),a.appendChild(c),l.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!!a.addEventListener,a[n.expando]=1,l.attributes=!a.getAttribute(n.expando)}();var da={option:[1,""],legend:[1,""],area:[1,""],param:[1,""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"
"],td:[3,"
"],_default:l.htmlSerialize?[0,"",""]:[1,"X"!==m[1]||ha.test(g)?0:i:i.firstChild,f=g&&g.childNodes.length;while(f--)n.nodeName(k=g.childNodes[f],"tbody")&&!k.childNodes.length&&g.removeChild(k)}n.merge(q,i.childNodes),i.textContent="";while(i.firstChild)i.removeChild(i.firstChild);i=p.lastChild}else q.push(b.createTextNode(g));i&&p.removeChild(i),l.appendChecked||n.grep(ea(q,"input"),ia),r=0;while(g=q[r++])if(d&&n.inArray(g,d)>-1)e&&e.push(g);else if(h=n.contains(g.ownerDocument,g),i=ea(p.appendChild(g),"script"),h&&fa(i),c){f=0;while(g=i[f++])_.test(g.type||"")&&c.push(g)}return i=null,p}!function(){var b,c,e=d.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b]=c in a)||(e.setAttribute(c,"t"),l[b]=e.attributes[c].expando===!1);e=null}();var ka=/^(?:input|select|textarea)$/i,la=/^key/,ma=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,na=/^(?:focusinfocus|focusoutblur)$/,oa=/^([^.]*)(?:\.(.+)|)/;function pa(){return!0}function qa(){return!1}function ra(){try{return d.activeElement}catch(a){}}function sa(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)sa(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=qa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return"undefined"==typeof n||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(G)||[""],h=b.length;while(h--)f=oa.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=oa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(i=m=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!na.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),h=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),l=n.event.special[q]||{},f||!l.trigger||l.trigger.apply(e,c)!==!1)){if(!f&&!l.noBubble&&!n.isWindow(e)){for(j=l.delegateType||q,na.test(j+q)||(i=i.parentNode);i;i=i.parentNode)p.push(i),m=i;m===(e.ownerDocument||d)&&p.push(m.defaultView||m.parentWindow||a)}o=0;while((i=p[o++])&&!b.isPropagationStopped())b.type=o>1?j:l.bindType||q,g=(n._data(i,"events")||{})[b.type]&&n._data(i,"handle"),g&&g.apply(i,c),g=h&&i[h],g&&g.apply&&M(i)&&(b.result=g.apply(i,c),b.result===!1&&b.preventDefault());if(b.type=q,!f&&!b.isDefaultPrevented()&&(!l._default||l._default.apply(p.pop(),c)===!1)&&M(e)&&h&&e[q]&&!n.isWindow(e)){m=e[h],m&&(e[h]=null),n.event.triggered=q;try{e[q]()}catch(s){}n.event.triggered=void 0,m&&(e[h]=m)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.rnamespace||a.rnamespace.test(g.namespace))&&(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h
Web Cam
Multiple users can share their webcam at the same time. There is no built-in limit on the number of simultaneously active webcams.
@@ -170,7 +178,7 @@Getting Started Quickly
+ '}),c.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),c.prototype.constructor=c,c.prototype.getDefaults=function(){return c.DEFAULTS},c.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content").children().detach().end()[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},c.prototype.hasContent=function(){return this.getTitle()||this.getContent()},c.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},c.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")};var d=a.fn.popover;a.fn.popover=b,a.fn.popover.Constructor=c,a.fn.popover.noConflict=function(){return a.fn.popover=d,this}}(jQuery),+function(a){"use strict";function b(c,d){this.$body=a(document.body),this.$scrollElement=a(a(c).is(document.body)?window:c),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||"")+" .nav li > a",this.offsets=[],this.targets=[],this.activeTarget=null,this.scrollHeight=0,this.$scrollElement.on("scroll.bs.scrollspy",a.proxy(this.process,this)),this.refresh(),this.process()}function c(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})}b.VERSION="3.3.6",b.DEFAULTS={offset:10},b.prototype.getScrollHeight=function(){return this.$scrollElement[0].scrollHeight||Math.max(this.$body[0].scrollHeight,document.documentElement.scrollHeight)},b.prototype.refresh=function(){var b=this,c="offset",d=0;this.offsets=[],this.targets=[],this.scrollHeight=this.getScrollHeight(),a.isWindow(this.$scrollElement[0])||(c="position",d=this.$scrollElement.scrollTop()),this.$body.find(this.selector).map(function(){var b=a(this),e=b.data("target")||b.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[c]().top+d,e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.getScrollHeight(),d=this.options.offset+c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(this.scrollHeight!=c&&this.refresh(),b>=d)return g!=(a=f[f.length-1])&&this.activate(a);if(g&&b
","
"]};da.optgroup=da.option,da.tbody=da.tfoot=da.colgroup=da.caption=da.thead,da.th=da.td;function ea(a,b){var c,d,e=0,f="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,ea(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function fa(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}var ga=/<|&#?\w+;/,ha=/r;r++)if(g=a[r],g||0===g)if("object"===n.type(g))n.merge(q,g.nodeType?[g]:g);else if(ga.test(g)){i=i||p.appendChild(b.createElement("div")),j=($.exec(g)||["",""])[1].toLowerCase(),m=da[j]||da._default,i.innerHTML=m[1]+n.htmlPrefilter(g)+m[2],f=m[0];while(f--)i=i.lastChild;if(!l.leadingWhitespace&&aa.test(g)&&q.push(b.createTextNode(aa.exec(g)[0])),!l.tbody){g="table"!==j||ha.test(g)?"| t |
").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(g,f||[a.responseText,b,a])})}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};function lc(a){return n.isWindow(a)?a:9===a.nodeType?a.defaultView||a.parentWindow:!1}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&n.inArray("auto",[f,i])>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,n.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d={top:0,left:0},e=this[0],f=e&&e.ownerDocument;if(f)return b=f.documentElement,n.contains(b,e)?("undefined"!=typeof e.getBoundingClientRect&&(d=e.getBoundingClientRect()),c=lc(f),{top:d.top+(c.pageYOffset||b.scrollTop)-(b.clientTop||0),left:d.left+(c.pageXOffset||b.scrollLeft)-(b.clientLeft||0)}):d},position:function(){if(this[0]){var a,b,c={top:0,left:0},d=this[0];return"fixed"===n.css(d,"position")?b=d.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(c=a.offset()),c.top+=n.css(a[0],"borderTopWidth",!0)-a.scrollTop(),c.left+=n.css(a[0],"borderLeftWidth",!0)-a.scrollLeft()),{top:b.top-c.top-n.css(d,"marginTop",!0),left:b.left-c.left-n.css(d,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&!n.nodeName(a,"html")&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Qa})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c=/Y/.test(b);n.fn[a]=function(d){return Y(this,function(a,d,e){var f=lc(a);return void 0===e?f?b in f?f[b]:f.document.documentElement[d]:a[d]:void(f?f.scrollTo(c?n(f).scrollLeft():e,c?e:n(f).scrollTop()):a[d]=e)},a,d,arguments.length,null)}}),n.each(["top","left"],function(a,b){
+n.cssHooks[b]=Ua(l.pixelPosition,function(a,c){return c?(c=Sa(a,b),Oa.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return Y(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}}),n.fn.size=function(){return this.length},n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var mc=a.jQuery,nc=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=nc),b&&a.jQuery===n&&(a.jQuery=mc),n},b||(a.jQuery=a.$=n),n});
diff --git a/bigbluebutton-html5/.meteor/packages b/bigbluebutton-html5/.meteor/packages
index 3c6cc18fe7..b636238af1 100755
--- a/bigbluebutton-html5/.meteor/packages
+++ b/bigbluebutton-html5/.meteor/packages
@@ -6,25 +6,14 @@
standard-app-packages
mrt:redis@0.1.3
arunoda:npm@0.2.6
-underscore
amplify
-iron:router
blaze
-less
francocatena:status
-mizzao:jquery-ui
mrt:external-file-loader@0.1.4
brentjanderson:winston-client@0.0.4
duongthienduc:meteor-winston
mizzao:timesync
-agnito:raphael
clinical:nightwatch
-sanjo:jasmine
-pagebakers:ionicons
-ewall:foundation
-maibaum:foundation-icons
-chriswessels:hammer@3.1.1
-fastclick
cfs:power-queue
cfs:reactive-list
cfs:micro-queue
@@ -33,3 +22,4 @@ ecmascript
react-meteor-data
standard-minifier-css
standard-minifier-js
+nathantreid:css-modules
diff --git a/bigbluebutton-html5/.meteor/versions b/bigbluebutton-html5/.meteor/versions
index 8e2a429def..18e161c9b0 100644
--- a/bigbluebutton-html5/.meteor/versions
+++ b/bigbluebutton-html5/.meteor/versions
@@ -1,6 +1,4 @@
-agnito:raphael@0.1.0
aldeed:simple-schema@1.3.3
-aldeed:template-extension@3.4.3
allow-deny@1.0.4
amplify@1.0.0
arunoda:npm@0.2.6
@@ -22,7 +20,6 @@ cfs:power-queue@0.9.11
cfs:reactive-list@0.0.9
cfs:reactive-property@0.0.4
check@1.2.1
-chriswessels:hammer@3.1.1
clinical:nightwatch@2.0.1
coffeescript@1.0.17
ddp@1.2.5
@@ -35,7 +32,6 @@ duongthienduc:meteor-winston@1.0.0
ecmascript@0.4.3
ecmascript-runtime@0.2.10
ejson@1.0.11
-ewall:foundation@5.5.3
fastclick@1.0.11
francocatena:status@1.5.1
geojson-utils@1.0.8
@@ -44,28 +40,16 @@ htmljs@1.0.9
http@1.1.5
id-map@1.0.7
infinitedg:winston@0.7.3
-iron:controller@1.0.12
-iron:core@1.0.11
-iron:dynamic-template@1.0.12
-iron:layout@1.0.12
-iron:location@1.0.11
-iron:middleware-stack@1.0.11
-iron:router@1.0.12
-iron:url@1.0.11
jquery@1.11.8
launch-screen@1.0.11
-less@2.6.0
livedata@1.0.18
logging@1.0.12
-maibaum:foundation-icons@0.0.1
meteor@1.1.14
meteor-platform@1.2.6
meteorspark:util@0.2.0
minifier-css@1.1.11
minifier-js@1.1.11
minimongo@1.0.16
-mizzao:build-fetcher@0.2.0
-mizzao:jquery-ui@1.11.4
mizzao:timesync@0.3.4
mobile-status-bar@1.0.12
modules@0.6.1
@@ -74,15 +58,14 @@ mongo@1.1.7
mongo-id@1.0.4
mrt:external-file-loader@0.1.4
mrt:redis@0.1.3
+nathantreid:css-modules@1.1.1
+nathantreid:css-modules-import-path-helpers@0.1.2
npm-mongo@1.4.43
observe-sequence@1.0.11
ordered-dict@1.0.7
-package-version-parser@3.0.8
-pagebakers:ionicons@2.0.1_1
-practicalmeteor:chai@2.1.0_1
-practicalmeteor:loglevel@1.2.0_2
promise@0.6.7
raix:eventemitter@0.1.3
+ramda:ramda@0.19.0
random@1.0.9
react-meteor-data@0.2.9
reactive-dict@1.1.7
@@ -90,11 +73,6 @@ reactive-var@1.0.9
reload@1.1.8
retry@1.0.7
routepolicy@1.0.10
-sanjo:jasmine@0.21.0
-sanjo:karma@3.1.1
-sanjo:long-running-child-process@1.1.5
-sanjo:meteor-files-helpers@1.2.0_1
-sanjo:meteor-version@1.0.0
session@1.1.5
spacebars@1.0.11
spacebars-compiler@1.0.11
@@ -109,10 +87,5 @@ tracker@1.0.13
ui@1.0.11
underscore@1.0.8
url@1.0.9
-velocity:chokidar@1.2.0_1
-velocity:core@0.10.10
-velocity:meteor-internals@1.1.0_7
-velocity:meteor-stubs@1.1.1
-velocity:shim@0.1.0
webapp@1.2.8
webapp-hashing@1.0.9
diff --git a/bigbluebutton-html5/Gruntfile.js b/bigbluebutton-html5/Gruntfile.js
index 4ba47feb5e..dd8c80d47a 100755
--- a/bigbluebutton-html5/Gruntfile.js
+++ b/bigbluebutton-html5/Gruntfile.js
@@ -5,13 +5,29 @@ module.exports = function (grunt) {
require('load-grunt-tasks')(grunt);
+ // importing the Meteor settings:
+ var SETTINGS_DEV = require('./settings-development.json');
+ var SETTINGS_PROD = require('./settings-production.json');
+
+ // root URL in development/production:
+ var devRootURL = (SETTINGS_DEV.rootURL == undefined) ? 'http://127.0.0.1/html5client' : SETTINGS_DEV.rootURL;
+ var prodRootURL = (SETTINGS_PROD.rootURL == undefined) ? 'http://127.0.0.1/html5client' : SETTINGS_PROD.rootURL;
+
+ // command line string containing the Meteor's home directory in development/production:
+ var devHomeStr = (SETTINGS_DEV.home == undefined) ? '' : ('HOME=' + SETTINGS_DEV.home + ' ');
+ var prodHomeStr = (SETTINGS_PROD.home == undefined) ? '' : ('HOME=' + SETTINGS_PROD.home + ' ');
+
+ // final commands:
+ var METEOR_DEV_COMMAND = devHomeStr + 'ROOT_URL=' + devRootURL + ' meteor --settings settings-development.json';
+ var METEOR_PROD_COMMAND = prodHomeStr + 'ROOT_URL=' + prodRootURL + ' meteor --settings settings-production.json';
+
// configure Grunt
grunt.initConfig({
watch: {
scripts: {
files: ['**/*.js', '**/*.jsx'],
- tasks: ['force:jscs:check'],
+ tasks: ['force:newer:jscs:check'],
options: {
event: ['all'],
spawn: true,
@@ -40,8 +56,11 @@ module.exports = function (grunt) {
},
shell: {
- start_meteor: {
- command: 'HOME=/usr/share/meteor JASMINE_SERVER_UNIT=0 JASMINE_SERVER_INTEGRATION=0 JASMINE_CLIENT_INTEGRATION=0 JASMINE_BROWSER=PhantomJS JASMINE_MIRROR_PORT=3000 ROOT_URL=http://127.0.0.1/html5client meteor',
+ start_meteor_development: {
+ command: METEOR_DEV_COMMAND,
+ },
+ start_meteor_production: {
+ command: METEOR_DEV_COMMAND,
},
},
@@ -50,8 +69,11 @@ module.exports = function (grunt) {
logConcurrentOutput: true,
limit: 3,
},
- meteor_watch: {
- tasks: ['shell:start_meteor', 'watch'],
+ meteor_watch_development: {
+ tasks: ['shell:start_meteor_development', 'watch'],
+ },
+ meteor_watch_production: {
+ tasks: ['shell:start_meteor_production', 'watch'],
},
},
});
@@ -61,10 +83,19 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-shell');
grunt.loadNpmTasks('grunt-concurrent');
+ grunt.loadNpmTasks('grunt-newer');
+
+ var mode = (grunt.option('mode') == 'production') ? 'production' : 'development';
// sets the default task to run JSCS first (forcing our way past warnings) and then start Meteor:
- grunt.registerTask('default', ['force:jscs:check', 'concurrent:meteor_watch']);
+ grunt.registerTask('default', ['force:newer:jscs:check', 'concurrent:meteor_watch_' + mode]);
// sets the autofix task to fix JSCS warning when possible and then start Meteor:
- grunt.registerTask('autofix', ['force:jscs:autofix', 'concurrent:meteor_watch']);
+ grunt.registerTask('autofix', ['force:newer:jscs:autofix', 'concurrent:meteor_watch_' + mode]);
+
+ // runs the linter task:
+ grunt.registerTask('quicklint', ['force:jscs:check']);
+
+ // runs the linter task and autofixes errors when possible:
+ grunt.registerTask('quickfix', ['force:jscs:autofix']);
};
diff --git a/bigbluebutton-html5/client/MainContainer.jsx b/bigbluebutton-html5/client/MainContainer.jsx
deleted file mode 100755
index bd2d3ac9cb..0000000000
--- a/bigbluebutton-html5/client/MainContainer.jsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react';
-import {Header} from '/imports/ui/main/Header.jsx';
-import {Whiteboard} from '/imports/ui/whiteboard/Whiteboard.jsx';
-import {Chat} from '/imports/ui/chat/Chat.jsx';
-
-MainContainer = React.createClass({
- handleShield() {
- $('.tooltip').hide();
- toggleShield();
- return closeMenus();
- },
-
- render() {
- return (
-
' + (browserName !== 'settings' ? browserName : 'your browser') + " doesn't support WebRTC"}` - ); - return (new Raphael('browser-icon-container', 35, 35)).path(NotificationControl.icons[`${browserName}_IconPath`]).attr({ - fill: '#FFF', - stroke: 'none', - }); - } - }).display('webRTC_NotSupported'); -}; diff --git a/bigbluebutton-html5/client/globals.js b/bigbluebutton-html5/client/globals.js deleted file mode 100755 index 7ddded1d08..0000000000 --- a/bigbluebutton-html5/client/globals.js +++ /dev/null @@ -1,893 +0,0 @@ -this.getBuildInformation = function () { - let copyrightYear, defaultWelcomeMessage, defaultWelcomeMessageFooter, html5ClientBuild, link, ref, ref1, ref2, ref3; - copyrightYear = ((ref = Meteor.config) != null ? ref.copyrightYear : void 0) || 'DATE'; - html5ClientBuild = ((ref1 = Meteor.config) != null ? ref1.html5ClientBuild : void 0) || 'VERSION'; - defaultWelcomeMessage = ((ref2 = Meteor.config) != null ? ref2.defaultWelcomeMessage : void 0) || 'WELCOME MESSAGE'; - defaultWelcomeMessageFooter = ((ref3 = Meteor.config) != null ? ref3.defaultWelcomeMessageFooter : void 0) || 'WELCOME MESSAGE'; - link = "http://bigbluebutton.org"; - return { - copyrightYear: copyrightYear, - html5ClientBuild: html5ClientBuild, - defaultWelcomeMessage: defaultWelcomeMessage, - defaultWelcomeMessageFooter: defaultWelcomeMessageFooter, - link: link, - }; -}; - -// Convert a color `value` as integer to a hex color (e.g. 255 to #0000ff) -this.colourToHex = function (value) { - let hex; - hex = parseInt(value).toString(16); - while (hex.length < 6) { - hex = `0${hex}`; - } - - return `#${hex}`; -}; - -// color can be a number (a hex converted to int) or a string (e.g. "#ffff00") -this.formatColor = function (color) { - if (color == null) { - color = '0'; // default value - } - - if (!color.toString().match(/\#.*/)) { - color = colourToHex(color); - } - - return color; -}; - -this.getInSession = function (k) { - return SessionAmplify.get(k); -}; - -// returns epoch in ms -this.getTime = function () { - return (new Date).valueOf(); -}; - -// checks if the pan gesture is mostly horizontal -this.isPanHorizontal = function (event) { - return Math.abs(event.deltaX) > Math.abs(event.deltaY); -}; - -// helper to determine whether the user is in the listen only audio stream -Handlebars.registerHelper('isMyMicLocked', () => { - return BBB.isMyMicLocked(); -}); - -Handlebars.registerHelper('colourToHex', (_this => { - return function (value) { - return _this.window.colourToHex(value); - }; -})(this)); - -Handlebars.registerHelper('equals', (a, b) => { // equals operator was dropped in Meteor's migration from Handlebars to Spacebars - return a === b; -}); - -Handlebars.registerHelper('getCurrentMeeting', () => { - return Meteor.Meetings.findOne(); -}); - -Handlebars.registerHelper('getCurrentSlide', () => { - let result; - result = BBB.getCurrentSlide(); - - // console.log "result=#{JSON.stringify result}" - return result; -}); - -// Allow access through all templates -Handlebars.registerHelper('getInSession', k => { - return SessionAmplify.get(k); -}); - -Handlebars.registerHelper('getMeetingName', () => { - return BBB.getMeetingName(); -}); - -Handlebars.registerHelper('getShapesForSlide', () => { - let currentSlide, ref; - currentSlide = BBB.getCurrentSlide(); - - // try to reuse the lines above - return Meteor.Shapes.find({ - whiteboardId: currentSlide != null ? (ref = currentSlide.slide) != null ? ref.id : void 0 : void 0, - }); -}); - -// retrieves all users in the meeting -Handlebars.registerHelper('getUsersInMeeting', () => { - let users; - users = Meteor.Users.find().fetch(); - if ((users != null ? users.length : void 0) > 1) { - return getSortedUserList(users); - } else { - return users; - } -}); - -Handlebars.registerHelper('getCurrentUserEmojiStatus', () => { - let ref, ref1; - return (ref = BBB.getCurrentUser()) != null ? (ref1 = ref.user) != null ? ref1.emoji_status : void 0 : void 0; -}); - -Handlebars.registerHelper('isCurrentUser', userId => { - let ref; - return userId === null || userId === ((ref = BBB.getCurrentUser()) != null ? ref.userId : void 0); -}); - -//Retreives a username for a private chat tab from the database if it exists -Handlebars.registerHelper('privateChatName', () => { - let obj, ref; - obj = Meteor.Users.findOne({ - userId: getInSession('inChatWith'), - }); - if (obj != null) { - return obj != null ? (ref = obj.user) != null ? ref.name : void 0 : void 0; - } -}); - -Handlebars.registerHelper('isCurrentUserEmojiStatusSet', () => { - return BBB.isCurrentUserEmojiStatusSet(); -}); - -Handlebars.registerHelper('isCurrentUserSharingVideo', () => { - return BBB.amISharingVideo(); -}); - -Handlebars.registerHelper('isCurrentUserPresenter', () => { - return BBB.isUserPresenter(getInSession('userId')); -}); - -Handlebars.registerHelper('isCurrentUserModerator', () => { - return BBB.getMyRole() === 'MODERATOR'; -}); - -Handlebars.registerHelper('isDisconnected', () => { - return !Meteor.status().connected; -}); - -Handlebars.registerHelper('isUserInAudio', userId => { - return BBB.isUserInAudio(userId); -}); - -Handlebars.registerHelper('isUserListenOnlyAudio', userId => { - return BBB.isUserListenOnlyAudio(userId); -}); - -Handlebars.registerHelper('isUserMuted', userId => { - return BBB.isUserMuted(userId); -}); - -Handlebars.registerHelper('isUserSharingVideo', userId => { - return BBB.isUserSharingWebcam(userId); -}); - -Handlebars.registerHelper('isUserTalking', userId => { - return BBB.isUserTalking(userId); -}); - -Handlebars.registerHelper('isMobile', () => { - return isMobile(); -}); - -Handlebars.registerHelper('isPortraitMobile', () => { - return isPortraitMobile(); -}); - -Handlebars.registerHelper('isMobileChromeOrFirefox', () => { - return isMobile() && ((getBrowserName() === 'Chrome') || (getBrowserName() === 'Firefox')); -}); - -Handlebars.registerHelper('meetingIsRecording', () => { - return BBB.isMeetingRecording(); -}); - -Handlebars.registerHelper('messageFontSize', () => { - return { - style: `font-size: ${getInSession('messageFontSize')}px;`, - }; -}); - -//#TODO REMOVE -Handlebars.registerHelper('pointerLocation', () => { - let currentPresentation, currentSlideDoc, pointer, presentationId, ref; - currentPresentation = Meteor.Presentations.findOne({ - 'presentation.current': true, - }); - presentationId = currentPresentation != null ? (ref = currentPresentation.presentation) != null ? ref.id : void 0 : void 0; - currentSlideDoc = Meteor.Slides.findOne({ - presentationId: presentationId, - 'slide.current': true, - }); - pointer = Meteor.Cursor.findOne(); - pointer.x = (-currentSlideDoc.slide.x_offset * 2 + currentSlideDoc.slide.width_ratio * pointer.x) / 100; - pointer.y = (-currentSlideDoc.slide.y_offset * 2 + currentSlideDoc.slide.height_ratio * pointer.y) / 100; - return pointer; -}); - -Handlebars.registerHelper('safeName', str => { - return safeString(str); -}); - -Handlebars.registerHelper('canJoinWithMic', () => { - if ((BBB.isUserPresenter(getInSession('userId')) || !Meteor.config.app.listenOnly) && !BBB.isMyMicLocked()) { - return true; - } else { - return false; - } -}); - -Handlebars.registerHelper('containerPosition', section => { - if (getInSession('display_usersList')) { - return 'moved-to-right'; - } else if (getInSession('display_menu')) { - return 'moved-to-left'; - } else { - return ''; - } -}); - -Template.registerHelper('emojiIcons', function () { - return [ - { name: 'sad', icon: 'sad-face', title: '' }, - { name: 'happy', icon: 'happy-face', title: '' }, - { name: 'confused', icon: 'confused-face', title: '' }, - { name: 'neutral', icon: 'neutral-face', title: '' }, - { name: 'away', icon: 'clock', title: '' }, - { name: 'raiseHand', icon: 'hand', title: 'Lower your Hand' }, - ]; -}); - -// scale the whiteboard to adapt to the resized window -this.scaleWhiteboard = function (whiteboardPaperModel) { - let adjustedDimensions; - adjustedDimensions = scaleSlide(getInSession('slideOriginalWidth'), getInSession('slideOriginalHeight')); - if (typeof whiteboardPaperModel !== 'undefined' && whiteboardPaperModel !== null) { - whiteboardPaperModel.scale(adjustedDimensions.width, adjustedDimensions.height); - } - /* if(callback) { - callback(); - } */ -}; - -this.getSortedUserList = function (users) { - if ((users != null ? users.length : void 0) > 1) { - users.sort((a, b) => { - let aTime, bTime; - if (a.user.role === 'MODERATOR' && b.user.role === 'MODERATOR') { - if (a.user.set_emoji_time && b.user.set_emoji_time) { - aTime = a.user.set_emoji_time.getTime(); - bTime = b.user.set_emoji_time.getTime(); - if (aTime < bTime) { - return -1; - } else { - return 1; - } - } else if (a.user.set_emoji_time) { - return -1; - } else if (b.user.set_emoji_time) { - return 1; - } - } else if (a.user.role === 'MODERATOR') { - return -1; - } else if (b.user.role === 'MODERATOR') { - return 1; - } else if (a.user.set_emoji_time && b.user.set_emoji_time) { - aTime = a.user.set_emoji_time.getTime(); - bTime = b.user.set_emoji_time.getTime(); - if (aTime < bTime) { - return -1; - } else { - return 1; - } - } else if (a.user.set_emoji_time) { - return -1; - } else if (b.user.set_emoji_time) { - return 1; - } else if (!a.user.phone_user && !b.user.phone_user) { - - } else if (!a.user.phone_user) { - return -1; - } else if (!b.user.phone_user) { - return 1; - } - - //Check name (case-insensitive) in the event of a tie up above. If the name - //is the same then use userID which should be unique making the order the same - //across all clients. - - if (a.user._sort_name < b.user._sort_name) { - return -1; - } else if (a.user._sort_name > b.user._sort_name) { - return 1; - } else if (a.user.userid.toLowerCase() > b.user.userid.toLowerCase()) { - return -1; - } else if (a.user.userid.toLowerCase() < b.user.userid.toLowerCase()) { - return 1; - } - }); - } - - return users; -}; - -// transform plain text links into HTML tags compatible with Flash client -this.linkify = function (str) { - return str = str.replace(re_weburl, "$&"); -}; - -this.setInSession = function (k, v) { - return SessionAmplify.set(k, v); -}; - -this.safeString = function (str) { - if (typeof str === 'string') { - return str.replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"'); - } -}; - -this.toggleCam = function (event) { - // Meteor.Users.update {_id: context._id} , {$set:{"user.sharingVideo": !context.sharingVideo}} - // Meteor.call('userToggleCam', context._id, !context.sharingVideo) -}; - -this.toggleChatbar = function () { - setInSession('display_chatbar', !getInSession('display_chatbar')); - if (!getInSession('display_chatbar')) { - $('#whiteboard').css('width', '100%'); - $('#whiteboard .ui-resizable-handle').css('display', 'none'); - } else { - $('#whiteboard').css('width', ''); - $('#whiteboard .ui-resizable-handle').css('display', ''); - } - - return setTimeout(scaleWhiteboard, 0); -}; - -this.toggleMic = function (event) { - return BBB.toggleMyMic(); -}; - -this.toggleUsersList = function () { - if ($('.userlistMenu').hasClass('hiddenInLandscape')) { - $('.userlistMenu').removeClass('hiddenInLandscape'); - } else { - $('.userlistMenu').addClass('hiddenInLandscape'); - } - - return setTimeout(scaleWhiteboard, 0); -}; - -this.populateNotifications = function (msg) { - let chat, chats, initChats, j, l, len, len1, myPrivateChats, myUserId, new_msg_userid, results, u, uniqueArray, users; - myUserId = getInSession('userId'); - users = Meteor.Users.find().fetch(); - - // assuming that I only have access only to private messages where I am the sender or the recipient - myPrivateChats = Meteor.Chat.find({ - 'message.chat_type': 'PRIVATE_CHAT', - }).fetch(); - uniqueArray = []; - for (j = 0, len = myPrivateChats.length; j < len; j++) { - chat = myPrivateChats[j]; - if (chat.message.to_userid === myUserId) { - uniqueArray.push({ - userId: chat.message.from_userid, - username: chat.message.from_username, - }); - } - - if (chat.message.from_userid === myUserId) { - uniqueArray.push({ - userId: chat.message.to_userid, - username: chat.message.to_username, - }); - } - } - - //keep unique entries only - uniqueArray = uniqueArray.filter((itm, i, a) => { - return i === a.indexOf(itm); - }); - if (msg.message.to_userid === myUserId) { - new_msg_userid = msg.message.from_userid; - } - - if (msg.message.from_userid === myUserId) { - new_msg_userid = msg.message.to_userid; - } - - chats = getInSession('chats'); - if (chats === void 0) { - initChats = [ - { - userId: 'PUBLIC_CHAT', - gotMail: false, - number: 0, - }, - ]; - setInSession('chats', initChats); - } - - results = []; - - //insert the unique entries in the collection - for (l = 0, len1 = uniqueArray.length; l < len1; l++) { - u = uniqueArray[l]; - chats = getInSession('chats'); - if (chats.filter(chat => { - return chat.userId === u.userId; - }).length === 0 && u.userId === new_msg_userid) { - chats.push({ - userId: u.userId, - gotMail: false, - number: 0, - }); - results.push(setInSession('chats', chats)); - } else { - results.push(void 0); - } - } - - return results; -}; - -this.toggleShield = function () { - if (parseFloat($('.shield').css('opacity')) === 0.5) { - $('.shield').css('opacity', ''); - } - - if (!$('.shield').hasClass('darken') && !$('.shield').hasClass('animatedShield')) { - return $('.shield').addClass('darken'); - } else { - $('.shield').removeClass('darken'); - return $('.shield').removeClass('animatedShield'); - } -}; - -this.removeFullscreenStyles = function () { - $('#whiteboard-paper').removeClass('vertically-centered'); - $('#chat').removeClass('invisible'); - $('#users').removeClass('invisible'); - $('#navbar').removeClass('invisible'); - $('.FABTriggerButton').removeClass('invisible'); - $('.fullscreenButton').removeClass('exitFullscreenButton'); - $('.fullscreenButton').addClass('whiteboardFullscreenButton'); - $('.fullscreenButton i').removeClass('ion-arrow-shrink'); - return $('.fullscreenButton i').addClass('ion-arrow-expand'); -}; - -this.enterWhiteboardFullscreen = function () { - let element; - element = document.getElementById('whiteboard'); - if (element.requestFullscreen) { - element.requestFullscreen(); - } else if (element.mozRequestFullScreen) { - element.mozRequestFullScreen(); - $('.fullscreenButton').addClass('iconFirefox'); - } else if (element.webkitRequestFullscreen) { - element.webkitRequestFullscreen(); - $('.fullscreenButton').addClass('iconChrome'); - } else if (element.msRequestFullscreen) { - element.msRequestFullscreen(); - } - - $('#chat').addClass('invisible'); - $('#users').addClass('invisible'); - $('#navbar').addClass('invisible'); - $('.FABTriggerButton').addClass('invisible'); - $('.fullscreenButton').removeClass('whiteboardFullscreenButton'); - $('.fullscreenButton').addClass('exitFullscreenButton'); - $('.fullscreenButton i').removeClass('ion-arrow-expand'); - $('.fullscreenButton i').addClass('ion-arrow-shrink'); - $('#whiteboard-paper').addClass('vertically-centered'); - $('#whiteboard').bind('webkitfullscreenchange', e => { - if (document.webkitFullscreenElement === null) { - $('#whiteboard').unbind('webkitfullscreenchange'); - $('.fullscreenButton').removeClass('iconChrome'); - removeFullscreenStyles(); - return scaleWhiteboard(); - } - }); - return $(document).bind('mozfullscreenchange', e => { - if (document.mozFullScreenElement === null) { - $(document).unbind('mozfullscreenchange'); - $('.fullscreenButton').removeClass('iconFirefox'); - removeFullscreenStyles(); - return scaleWhiteboard(); - } - }); -}; - -this.closeMenus = function () { - if ($('.userlistMenu').hasClass('menuOut')) { - return toggleUserlistMenu(); - } else if ($('.settingsMenu').hasClass('menuOut')) { - return toggleSettingsMenu(); - } -}; - -// Periodically check the status of the WebRTC call, when a call has been established attempt to hangup, -// retry if a call is in progress, send the leave voice conference message to BBB -this.exitVoiceCall = function (event, afterExitCall) { - let checkToHangupCall, hangupCallback; - - // To be called when the hangup is initiated - hangupCallback = function () { - return console.log('Exiting Voice Conference'); - }; - - // Checks periodically until a call is established so we can successfully end the call - // clean state - getInSession('triedHangup', false); - - // function to initiate call - (checkToHangupCall = function (context) { - // if an attempt to hang up the call is made when the current session is not yet finished, the request has no effect - // keep track in the session if we haven't tried a hangup - if (BBB.getCallStatus() !== null && !getInSession('triedHangup')) { - console.log('Attempting to hangup on WebRTC call'); - if (BBB.amIListenOnlyAudio()) { - Meteor.call( - 'listenOnlyRequestToggle', - BBB.getMeetingId(), - getInSession('userId'), - getInSession('authToken'), - false - ); - } - - BBB.leaveVoiceConference(hangupCallback); - getInSession('triedHangup', true); - notification_WebRTCAudioExited(); - if (afterExitCall) { - return afterExitCall(this, Meteor.config.app.listenOnly); - } - } else { - console.log( - `RETRYING hangup on WebRTC call in ${Meteor.config.app.WebRTCHangupRetryInterval} ms` - ); - return setTimeout(checkToHangupCall, Meteor.config.app.WebRTCHangupRetryInterval); - } - })(this); // automatically run function - return false; -}; - -// close the daudio UI, then join the conference. If listen only send the request to the server -this.joinVoiceCall = function (event, arg) { - let isListenOnly, joinCallback; - isListenOnly = (arg != null ? arg : {}).isListenOnly; - if (!isWebRTCAvailable()) { - notification_WebRTCNotSupported(); - return; - } - - if (isListenOnly == null) { - isListenOnly = true; - } - - // create voice call params - joinCallback = function (message) { - return console.log('Beginning WebRTC Conference Call'); - }; - - notification_WebRTCAudioJoining(); - if (isListenOnly) { - Meteor.call( - 'listenOnlyRequestToggle', - BBB.getMeetingId(), - getInSession('userId'), - getInSession('authToken'), - true - ); - } - - BBB.joinVoiceConference(joinCallback, isListenOnly); // make the call //TODO should we apply role permissions to this action? - return false; -}; - -// Starts the entire logout procedure. -// meeting: the meeting the user is in -// the user's userId -this.userLogout = function (meeting, user) { - Meteor.call('userLogout', meeting, user, getInSession('authToken')); - console.log('logging out'); - return clearSessionVar(document.location = getInSession('logoutURL')); // navigate to logout -}; - -this.kickUser = function (meetingId, toKickUserId, requesterUserId, authToken) { - return Meteor.call('kickUser', meetingId, toKickUserId, requesterUserId, authToken); -}; - -this.setUserPresenter = function ( - meetingId, - newPresenterId, - requesterSetPresenter, - newPresenterName, - authToken) { - return Meteor.call('setUserPresenter', meetingId, newPresenterId, requesterSetPresenter, newPresenterName, authToken); -}; - -// Clear the local user session -this.clearSessionVar = function (callback) { - amplify.store('authToken', null); - amplify.store('bbbServerVersion', null); - amplify.store('chats', null); - amplify.store('dateOfBuild', null); - amplify.store('display_chatPane', null); - amplify.store('display_chatbar', null); - amplify.store('display_navbar', null); - amplify.store('display_usersList', null); - amplify.store('display_whiteboard', null); - amplify.store('inChatWith', null); - amplify.store('logoutURL', null); - amplify.store('meetingId', null); - amplify.store('messageFontSize', null); - amplify.store('tabsRenderedTime', null); - amplify.store('userId', null); - amplify.store('display_menu', null); - if (callback != null) { - return callback(); - } -}; - -// assign the default values for the Session vars -this.setDefaultSettings = function () { - let initChats; - setInSession('display_navbar', true); - setInSession('display_chatbar', true); - setInSession('display_whiteboard', true); - setInSession('display_chatPane', true); - - //if it is a desktop version of the client - if (isPortraitMobile() || isLandscapeMobile()) { - setInSession('messageFontSize', Meteor.config.app.mobileFont); - } else { //if this is a mobile version of the client - setInSession('messageFontSize', Meteor.config.app.desktopFont); - } - - setInSession('display_slidingMenu', false); - setInSession('display_hiddenNavbarSection', false); - if (isLandscape()) { - setInSession('display_usersList', true); - } else { - setInSession('display_usersList', false); - } - - setInSession('display_menu', false); - setInSession('chatInputMinHeight', 0); - - //keep notifications and an opened private chat tab if page was refreshed - //reset to default if that's a new user - if (loginOrRefresh()) { - initChats = [ - { - userId: 'PUBLIC_CHAT', - gotMail: false, - number: 0, - }, - ]; - setInSession('chats', initChats); - setInSession('inChatWith', 'PUBLIC_CHAT'); - } - - return TimeSync.loggingEnabled = false; // suppresses the log messages from timesync -}; - -//true if it is a new user, false if the client was just refreshed -this.loginOrRefresh = function () { - let checkId, userId; - userId = getInSession('userId'); - checkId = getInSession('checkId'); - if (checkId === void 0) { - setInSession('checkId', userId); - return true; - } else if (userId !== checkId) { - setInSession('checkId', userId); - return true; - } else { - return false; - } -}; - -this.onLoadComplete = function () { - let ref; - document.title = `BigBlueButton ${(ref = BBB.getMeetingName()) != null ? ref : 'HTML5'}`; - setDefaultSettings(); - Meteor.Users.find().observe({ - removed(oldDocument) { - if (oldDocument.userId === getInSession('userId')) { - return document.location = getInSession('logoutURL'); - } - }, - }); - return Meteor.Users.find().observe({ - changed(newUser, oldUser) { - if (Meteor.config.app.listenOnly === true && newUser.user.presenter === false && oldUser.user.presenter === true && BBB.getCurrentUser().userId === newUser.userId && oldUser.user.listenOnly === false) { - return exitVoiceCall(this, joinVoiceCall); - } - }, - }); -}; - -// Detects a mobile device -this.isMobile = function () { - return navigator.userAgent.match(/Android/i) || - navigator.userAgent.match(/iPhone|iPad|iPod/i) || - navigator.userAgent.match(/BlackBerry/i) || - navigator.userAgent.match(/Windows Phone/i) || - navigator.userAgent.match(/IEMobile/i) || - navigator.userAgent.match(/BlackBerry/i) || - navigator.userAgent.match(/webOS/i); -}; - -this.isLandscape = function () { - return !isMobile() && - window.matchMedia('(orientation: landscape)').matches && // browser is landscape - window.matchMedia('(min-device-aspect-ratio: 1/1)').matches; // device is landscape -}; - -this.isPortrait = function () { - return !isMobile() && - window.matchMedia('(orientation: portrait)').matches && // browser is portrait - window.matchMedia('(min-device-aspect-ratio: 1/1)').matches; // device is landscape -}; - -// Checks if the view is portrait and a mobile device is being used -this.isPortraitMobile = function () { - return isMobile() && - window.matchMedia('(orientation: portrait)').matches && // browser is portrait - window.matchMedia('(max-device-aspect-ratio: 1/1)').matches; // device is portrait -}; - -// Checks if the view is landscape and mobile device is being used -this.isLandscapeMobile = function () { - return isMobile() && - window.matchMedia('(orientation: landscape)').matches && // browser is landscape - window.matchMedia('(min-device-aspect-ratio: 1/1)').matches; // device is landscape -}; - -this.isLandscapePhone = function () { - // @phone-landscape media query: - return window.matchMedia('(orientation: landscape)').matches && - window.matchMedia('(min-device-aspect-ratio: 1/1)').matches && - window.matchMedia('(max-device-width: 959px)').matches; -}; - -this.isPortraitPhone = function () { - // @phone-portrait media query: - return (window.matchMedia('(orientation: portrait)').matches && - window.matchMedia('(max-device-aspect-ratio: 1/1)').matches && - window.matchMedia('(max-device-width: 480px)').matches) || - - // @phone-portrait-with-keyboard media query: - (window.matchMedia('(orientation: landscape)').matches && - window.matchMedia('(max-device-aspect-ratio: 1/1)').matches && - window.matchMedia('(max-device-width: 480px)').matches); -}; - -this.isPhone = function () { - return isLandscapePhone() || isPortraitPhone(); -}; - -// The webpage orientation is now landscape -this.orientationBecameLandscape = function () { - return adjustChatInputHeight(); -}; - -// The webpage orientation is now portrait -this.orientationBecamePortrait = function () { - return adjustChatInputHeight(); -}; - -// Checks if only one panel (userlist/whiteboard/chatbar) is currently open -this.isOnlyOnePanelOpen = function () { - //return (getInSession("display_usersList") ? 1 : 0) + (getInSession("display_whiteboard") ? 1 : 0) + (getInSession("display_chatbar") ? 1 : 0) === 1 - return getInSession('display_usersList') + getInSession('display_whiteboard') + getInSession('display_chatbar') === 1; -}; - -// determines which browser is being used -this.getBrowserName = function () { - if (navigator.userAgent.match(/Chrome/i)) { - return 'Chrome'; - } else if (navigator.userAgent.match(/Firefox/i)) { - return 'Firefox'; - } else if (navigator.userAgent.match(/Safari/i)) { - return 'Safari'; - } else if (navigator.userAgent.match(/Trident/i)) { - return 'IE'; - } else { - return null; - } -}; - -this.scrollChatDown = function () { - let ref; - return $('#chatbody').scrollTop((ref = $('#chatbody')[0]) != null ? ref.scrollHeight : void 0); -}; - -// changes the height of the chat input area if needed (based on the textarea content) -this.adjustChatInputHeight = function () { - let projectedHeight, ref; - if (isLandscape()) { - $('#newMessageInput').css('height', 'auto'); - projectedHeight = $('#newMessageInput')[0].scrollHeight + 23; - if (projectedHeight !== $('.panel-footer').height() && projectedHeight >= getInSession('chatInputMinHeight')) { - $('#newMessageInput').css('overflow', 'hidden'); // prevents a scroll bar - - // resizes the chat input area - $('.panel-footer').css('top', `${-(projectedHeight - 70)}px`); - $('.panel-footer').css('height', `${projectedHeight}px`); - - $('#newMessageInput').height($('#newMessageInput')[0].scrollHeight); - - // resizes the chat messages container - $('#chatbody').height($('#chat').height() - projectedHeight - 45); - $('#chatbody').scrollTop((ref = $('#chatbody')[0]) != null ? ref.scrollHeight : void 0); - } - - return $('#newMessageInput').css('height', ''); - } else if (isPortrait()) { - $('.panel-footer').attr('style', ''); - $('#chatbody').attr('style', ''); - return $('#newMessageInput').attr('style', ''); - } -}; - -this.toggleEmojisFAB = function () { - if ($('.FABContainer').hasClass('openedFAB')) { - $('.FABContainer > button:nth-child(2)').css('opacity', $('.FABContainer > button:nth-child(2)').css('opacity')); - $('.FABContainer > button:nth-child(3)').css('opacity', $('.FABContainer > button:nth-child(3)').css('opacity')); - $('.FABContainer > button:nth-child(4)').css('opacity', $('.FABContainer > button:nth-child(4)').css('opacity')); - $('.FABContainer > button:nth-child(5)').css('opacity', $('.FABContainer > button:nth-child(5)').css('opacity')); - $('.FABContainer > button:nth-child(6)').css('opacity', $('.FABContainer > button:nth-child(6)').css('opacity')); - $('.FABContainer > button:nth-child(7)').css('opacity', $('.FABContainer > button:nth-child(7)').css('opacity')); - $('.FABContainer').removeClass('openedFAB'); - return $('.FABContainer').addClass('closedFAB'); - } else { - $('.FABContainer > button:nth-child(2)').css('opacity', $('.FABContainer > button:nth-child(2)').css('opacity')); - $('.FABContainer > button:nth-child(3)').css('opacity', $('.FABContainer > button:nth-child(3)').css('opacity')); - $('.FABContainer > button:nth-child(4)').css('opacity', $('.FABContainer > button:nth-child(4)').css('opacity')); - $('.FABContainer > button:nth-child(5)').css('opacity', $('.FABContainer > button:nth-child(5)').css('opacity')); - $('.FABContainer > button:nth-child(6)').css('opacity', $('.FABContainer > button:nth-child(6)').css('opacity')); - $('.FABContainer > button:nth-child(7)').css('opacity', $('.FABContainer > button:nth-child(7)').css('opacity')); - $('.FABContainer').removeClass('closedFAB'); - return $('.FABContainer').addClass('openedFAB'); - } -}; - -this.toggleUserlistMenu = function () { - // menu - if ($('.userlistMenu').hasClass('menuOut')) { - $('.userlistMenu').removeClass('menuOut'); - } else { - $('.userlistMenu').addClass('menuOut'); - } - - // icon - if ($('.toggleUserlistButton').hasClass('menuToggledOn')) { - return $('.toggleUserlistButton').removeClass('menuToggledOn'); - } else { - return $('.toggleUserlistButton').addClass('menuToggledOn'); - } -}; - -this.toggleSettingsMenu = function () { - // menu - if ($('.settingsMenu').hasClass('menuOut')) { - $('.settingsMenu').removeClass('menuOut'); - } else { - $('.settingsMenu').addClass('menuOut'); - } - - // icon - if ($('.toggleMenuButton').hasClass('menuToggledOn')) { - return $('.toggleMenuButton').removeClass('menuToggledOn'); - } else { - return $('.toggleMenuButton').addClass('menuToggledOn'); - } -}; diff --git a/bigbluebutton-html5/client/lib/.gitignore b/bigbluebutton-html5/client/lib/.gitignore deleted file mode 100644 index 553695ee28..0000000000 --- a/bigbluebutton-html5/client/lib/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -custom.bootstrap.mixins.import.less -custom.bootstrap.less \ No newline at end of file diff --git a/bigbluebutton-html5/client/lib/bbb_api_bridge.js b/bigbluebutton-html5/client/lib/bbb_api_bridge.js deleted file mode 100755 index a7548379a4..0000000000 --- a/bigbluebutton-html5/client/lib/bbb_api_bridge.js +++ /dev/null @@ -1,579 +0,0 @@ -/* -This file contains the BigBlueButton client APIs that will allow 3rd-party applications -to embed the HTML5 client and interact with it through Javascript. - -HOW TO USE: -Some APIs allow synchronous and asynchronous calls. When using asynchronous, the 3rd-party -JS should register as listener for events listed at the bottom of this file. For synchronous, -3rd-party JS should pass in a callback function when calling the API. - -For an example on how to use these APIs, see: - -https://github.com/bigbluebutton/bigbluebutton/blob/master/bigbluebutton-client/resources/prod/lib/3rd-party.js -https://github.com/bigbluebutton/bigbluebutton/blob/master/bigbluebutton-client/resources/prod/3rd-party.html - */ - -this.BBB = (function () { - let BBB, listeners, returnOrCallback; - BBB = {}; - returnOrCallback = function (res, callback) { - if ((callback != null) && typeof callback === 'function') { - return callback(res); - } else { - return res; - } - }; - - BBB.isPollGoing = function (userId) { - if (userId !== void 0 && Meteor.Polls.findOne({ - 'poll_info.users': userId, - })) { - return true; - } else { - return false; - } - }; - - BBB.getCurrentPoll = function (userId) { - if (userId !== void 0 && Meteor.Polls.findOne({ - 'poll_info.users': userId, - })) { - return Meteor.Polls.findOne({ - 'poll_info.users': userId, - }); - } - }; - - BBB.sendPollResponseMessage = function (key, pollAnswerId) { - return Meteor.call('publishVoteMessage', BBB.getMeetingId(), pollAnswerId, getInSession('userId'), getInSession('authToken')); - }; - - BBB.getMeetingId = function () { - let ref; - return (ref = Meteor.Meetings.findOne()) != null ? ref.meetingId : void 0; - }; - - BBB.getInternalMeetingId = function (callback) {}; - - /* - Queryies the user object via it's id - */ - BBB.getUser = function (userId) { - return Meteor.Users.findOne({ - userId: userId, - }); - }; - - BBB.getCurrentUser = function () { - return BBB.getUser(getInSession('userId')); - }; - - /* - Query if the current user is sharing webcam. - - Param: - callback - function to return the result - - If you want to instead receive an event with the result, register a listener - for AM_I_SHARING_CAM_RESP (see below). - */ - BBB.amISharingWebcam = function (callback) { - // BBB.isUserSharingWebcam BBB.getCurrentUser()?.userId - return false; - }; - - /* - - Query if another user is sharing her camera. - - Param: - userID : the id of the user that may be sharing the camera - callback: function if you want to be informed synchronously. Don't pass a function - if you want to be informed through an event. You have to register for - IS_USER_PUBLISHING_CAM_RESP (see below). - */ - BBB.isUserSharingWebcam = function (userId, callback) { - // BBB.getUser(userId)?.user?.webcam_stream?.length isnt 0 - return false; - }; - - // returns whether the user has joined any type of audio - BBB.amIInAudio = function (callback) { - let ref, ref1, ref2, user; - user = BBB.getCurrentUser(); - return (user != null ? (ref = user.user) != null ? ref.listenOnly : void 0 : void 0) || (user != null ? (ref1 = user.user) != null ? (ref2 = ref1.voiceUser) != null ? ref2.joined : void 0 : void 0 : void 0); - }; - - // returns true if the user has joined the listen only audio stream - BBB.amIListenOnlyAudio = function (callback) { - let ref, ref1; - return (ref = BBB.getCurrentUser()) != null ? (ref1 = ref.user) != null ? ref1.listenOnly : void 0 : void 0; - }; - - // returns whether the user has joined the voice conference and is sharing audio through a microphone - BBB.amISharingAudio = function (callback) { - let ref; - return BBB.isUserSharingAudio((ref = BBB.getCurrentUser()) != null ? ref.userId : void 0); - }; - - // returns whether the user is currently talking - BBB.amITalking = function (callback) { - let ref; - return BBB.isUserTalking((ref = BBB.getCurrentUser()) != null ? ref.userId : void 0); - }; - - BBB.isUserInAudio = function (userId, callback) { - let ref, ref1, ref2, user; - user = BBB.getUser(userId); - return (user != null ? (ref = user.user) != null ? ref.listenOnly : void 0 : void 0) || (user != null ? (ref1 = user.user) != null ? (ref2 = ref1.voiceUser) != null ? ref2.joined : void 0 : void 0 : void 0); - }; - - BBB.isUserListenOnlyAudio = function (userId, callback) { - let ref, ref1; - return (ref = BBB.getUser(userId)) != null ? (ref1 = ref.user) != null ? ref1.listenOnly : void 0 : void 0; - }; - - BBB.isUserSharingAudio = function (userId, callback) { - let ref, ref1, ref2; - return (ref = BBB.getUser(userId)) != null ? (ref1 = ref.user) != null ? (ref2 = ref1.voiceUser) != null ? ref2.joined : void 0 : void 0 : void 0; - }; - - BBB.isUserTalking = function (userId, callback) { - let ref, ref1, ref2; - return (ref = BBB.getUser(userId)) != null ? (ref1 = ref.user) != null ? (ref2 = ref1.voiceUser) != null ? ref2.talking : void 0 : void 0 : void 0; - }; - - BBB.isUserPresenter = function (userId, callback) { - let ref, ref1; - return (ref = BBB.getUser(userId)) != null ? (ref1 = ref.user) != null ? ref1.presenter : void 0 : void 0; - }; - - // returns true if the current user is marked as locked - BBB.amILocked = function () { - let ref; - return (ref = BBB.getCurrentUser()) != null ? ref.user.locked : void 0; - }; - - // check whether the user is locked AND the current lock settings for the room - // includes locking the microphone of viewers (listenOnly is still alowed) - BBB.isMyMicLocked = function () { - let lockedMicForRoom, ref; - lockedMicForRoom = (ref = Meteor.Meetings.findOne()) != null ? ref.roomLockSettings.disableMic : void 0; - - // note that voiceUser.locked is not used in BigBlueButton at this stage (April 2015) - - return lockedMicForRoom && BBB.amILocked(); - }; - - BBB.getCurrentSlide = function () { - let currentPresentation, currentSlide, presentationId, ref; - currentPresentation = Meteor.Presentations.findOne({ - 'presentation.current': true, - }); - presentationId = currentPresentation != null ? (ref = currentPresentation.presentation) != null ? ref.id : void 0 : void 0; - currentSlide = Meteor.Slides.findOne({ - presentationId: presentationId, - 'slide.current': true, - }); - return currentSlide; - }; - - BBB.getMeetingName = function () { - let ref; - return ((ref = Meteor.Meetings.findOne()) != null ? ref.meetingName : void 0) || null; - }; - - BBB.getNumberOfUsers = function () { - return Meteor.Users.find().count(); - }; - - BBB.currentPresentationName = function () { - let ref, ref1; - return (ref = Meteor.Presentations.findOne({ - 'presentation.current': true, - })) != null ? (ref1 = ref.presentation) != null ? ref1.name : void 0 : void 0; - }; - - /* - Raise user's hand. - Param: - */ - BBB.lowerHand = function (meetingId, toUserId, byUserId, byAuthToken) { - return Meteor.call('userLowerHand', meetingId, toUserId, byUserId, byAuthToken); - }; - - BBB.raiseHand = function (meetingId, toUserId, byUserId, byAuthToken) { - return Meteor.call('userRaiseHand', meetingId, toUserId, byUserId, byAuthToken); - }; - - BBB.setEmojiStatus = function (meetingId, toUserId, byUserId, byAuthToken, status) { - return Meteor.call('userSetEmoji', meetingId, toUserId, byUserId, byAuthToken, status); - }; - - BBB.isUserEmojiStatusSet = function (userId) { - let ref, ref1, ref2, ref3; - return ((ref = BBB.getUser(userId)) != null ? (ref1 = ref.user) != null ? ref1.emoji_status : void 0 : void 0) !== 'none' && ((ref2 = BBB.getUser(userId)) != null ? (ref3 = ref2.user) != null ? ref3.emoji_status : void 0 : void 0) !== void 0; - }; - - BBB.isCurrentUserEmojiStatusSet = function () { - let ref; - return BBB.isUserEmojiStatusSet((ref = BBB.getCurrentUser()) != null ? ref.userId : void 0); - }; - - BBB.isMeetingRecording = function () { - let ref; - return (ref = MEteor.Meetings.findOne()) != null ? ref.recorded : void 0; - }; - - /* - Issue a switch presenter command. - - Param: - newPresenterUserID - the user id of the new presenter - - 3rd-party JS must listen for SWITCHED_PRESENTER (see below) to get notified - of switch presenter events. - */ - BBB.switchPresenter = function (newPresenterUserID) {}; - - /* - Query if current user is presenter. - - Params: - callback - function if you want a callback as response. Otherwise, you need to listen - for AM_I_PRESENTER_RESP (see below). - */ - BBB.amIPresenter = function (callback) { - return returnOrCallback(false, callback); - }; - - /* - Eject a user. - - Params: - userID - userID of the user you want to eject. - */ - BBB.ejectUser = function (userID) {}; - - /* - Query who is presenter. - - Params: - callback - function that gets executed for the response. - */ - BBB.getPresenterUserID = function (callback) {}; - - /* - Query the current user's role. - Params: - callback - function if you want a callback as response. Otherwise, you need to listen - for GET_MY_ROLE_RESP (see below). - */ - BBB.getMyRole = function (callback) { - return returnOrCallback('VIEWER', callback); - }; - - /* - Query the current user's id. - - Params: - callback - function that gets executed for the response. - */ - BBB.getMyUserID = function (callback) { - return returnOrCallback(getInSession('userId'), callback); - }; - - BBB.getMyDBID = function (callback) { - let ref; - return returnOrCallback((ref = Meteor.Users.findOne({ - userId: getInSession('userId'), - })) != null ? ref._id : void 0, callback); - }; - - BBB.getMyUserName = function (callback) { - let ref; - return BBB.getUserName((ref = BBB.getCurrentUser()) != null ? ref.userId : void 0); - }; - - BBB.getMyVoiceBridge = function (callback) { - let res; - res = Meteor.Meetings.findOne({}).voiceConf; - return returnOrCallback(res, callback); - }; - - BBB.getUserName = function (userId, callback) { - let ref, ref1; - return returnOrCallback((ref = BBB.getUser(userId)) != null ? (ref1 = ref.user) != null ? ref1.name : void 0 : void 0, callback); - }; - - /* - Query the current user's role. - Params: - callback - function if you want a callback as response. Otherwise, you need to listen - for GET_MY_ROLE_RESP (see below). - */ - BBB.getMyUserInfo = function (callback) { - let result; - result = { - myUserID: BBB.getMyUserID(), - myUsername: BBB.getMyUserName(), - myInternalUserID: BBB.getMyUserID(), - myAvatarURL: null, - myRole: BBB.getMyRole(), - amIPresenter: BBB.amIPresenter(), - voiceBridge: BBB.getMyVoiceBridge(), - dialNumber: null, - }; - return returnOrCallback(result, callback); - }; - - /* - Query the meeting id. - - Params: - callback - function that gets executed for the response. - */ - - /* - Join the voice conference. - isListenOnly: signifies whether the user joining the conference audio requests to join the listen only stream - */ - BBB.joinVoiceConference = function (callback, isListenOnly) { - if (BBB.isMyMicLocked()) { - callIntoConference(BBB.getMyVoiceBridge(), callback, true); - } - - return callIntoConference(BBB.getMyVoiceBridge(), callback, isListenOnly); - }; - - /* - Leave the voice conference. - */ - BBB.leaveVoiceConference = function (callback) { - return webrtc_hangup(callback); - }; - - /* - Get a hold of the object containing the call information - */ - BBB.getCallStatus = function () { - return getCallStatus(); - }; - - /* - Share user's webcam. - - Params: - publishInClient : (DO NOT USE - Unimplemented) - */ - BBB.shareVideoCamera = function (publishInClient) {}; - - /* - Stop share user's webcam. - */ - BBB.stopSharingCamera = function () {}; - - /* - Indicates if a user is muted - */ - BBB.isUserMuted = function (id) { - let ref, ref1, ref2; - return (ref = BBB.getUser(id)) != null ? (ref1 = ref.user) != null ? (ref2 = ref1.voiceUser) != null ? ref2.muted : void 0 : void 0 : void 0; - }; - - /* - Indicates if the current user is muted - */ - BBB.amIMuted = function () { - return BBB.isUserMuted(BBB.getCurrentUser().userId); - }; - - /* - Mute the current user. - */ - BBB.muteMe = function () { - return BBB.muteUser(getInSession('userId'), getInSession('userId'), getInSession('authToken')); - }; - - /* - Unmute the current user. - */ - BBB.unmuteMe = function () { - return BBB.unmuteUser(getInSession('userId'), getInSession('userId'), getInSession('authToken')); - }; - - BBB.muteUser = function (meetingId, userId, toMuteId, requesterId, requestToken) { - return Meteor.call('muteUser', meetingId, toMuteId, requesterId, getInSession('authToken')); - }; - - BBB.unmuteUser = function (meetingId, userId, toMuteId, requesterId, requestToken) { - return Meteor.call('unmuteUser', meetingId, toMuteId, requesterId, getInSession('authToken')); - }; - - BBB.toggleMyMic = function () { - let request; - request = BBB.amIMuted() ? 'unmuteUser' : 'muteUser'; - return Meteor.call(request, BBB.getMeetingId(), getInSession('userId'), getInSession('userId'), getInSession('authToken')); - }; - - /* - Mute all the users. - */ - BBB.muteAll = function () {}; - - /* - Unmute all the users. - */ - BBB.unmuteAll = function () {}; - - /* - Switch to a new layout. - - Param: - newLayout : name of the layout as defined in layout.xml (found in /var/www/bigbluebutton/client/conf/layout.xml) - */ - BBB.switchLayout = function (newLayout) {}; - - /* - Lock the layout. - - Locking the layout means that users will have the same layout with the moderator that issued the lock command. - Other users won't be able to move or resize the different windows. - */ - BBB.lockLayout = function (lock) {}; - - /* - Request to send a public chat - fromUserID - the external user id for the sender - fontColor - the color of the font to display the message - localeLang - the 2-char locale code (e.g. en) for the sender - message - the message to send - */ - BBB.sendPublicChatMessage = function (fontColor, localeLang, message) { - let messageForServer; - messageForServer = { - message: message, - chat_type: 'PUBLIC_CHAT', - from_userid: getInSession('userId'), - from_username: BBB.getMyUserName(), - from_tz_offset: '240', - to_username: 'public_chat_username', - to_userid: 'public_chat_userid', - from_lang: localeLang, - from_time: getTime(), - from_color: fontColor, - }; - return Meteor.call('sendChatMessagetoServer', BBB.getMeetingId(), messageForServer, getInSession('userId'), getInSession('authToken')); - }; - - /* - Request to send a private chat - fromUserID - the external user id for the sender - fontColor - the color of the font to display the message - localeLang - the 2-char locale code (e.g. en) for the sender - message - the message to send - toUserID - the external user id of the receiver - */ - BBB.sendPrivateChatMessage = function (fontColor, localeLang, message, toUserID, toUserName) { - let messageForServer; - messageForServer = { - message: message, - chat_type: 'PRIVATE_CHAT', - from_userid: getInSession('userId'), - from_username: BBB.getMyUserName(), - from_tz_offset: '240', - to_username: toUserName, - to_userid: toUserID, - from_lang: localeLang, - from_time: getTime(), - from_color: fontColor, - }; - return Meteor.call('sendChatMessagetoServer', BBB.getMeetingId(), messageForServer, getInSession('userId'), getInSession('authToken')); - }; - - /* - Request to display a presentation. - presentationID - the presentation to display - */ - BBB.displayPresentation = function (presentationID) {}; - - /* - Query the list of uploaded presentations. - */ - BBB.queryListOfPresentations = function () {}; - - /* - Request to delete a presentation. - presentationID - the presentation to delete - */ - BBB.deletePresentation = function (presentationID) {}; - - // Request to switch the presentation to the previous slide - BBB.goToPreviousPage = function () { - return Meteor.call('publishSwitchToPreviousSlideMessage', getInSession('meetingId'), getInSession('userId'), getInSession('authToken')); - }; - - // Request to switch the presentation to the next slide - BBB.goToNextPage = function () { - return Meteor.call('publishSwitchToNextSlideMessage', getInSession('meetingId'), getInSession('userId'), getInSession('authToken')); - }; - - BBB.webRTCConferenceCallStarted = function () {}; - - BBB.webRTCConferenceCallConnecting = function () {}; - - BBB.webRTCConferenceCallEnded = function () {}; - - BBB.webRTCConferenceCallFailed = function (errorcode) {}; - - BBB.webRTCConferenceCallWaitingForICE = function () {}; - - BBB.webRTCCallProgressCallback = function (progress) {}; - - BBB.webRTCEchoTestStarted = function () {}; - - BBB.webRTCEchoTestConnecting = function () {}; - - BBB.webRTCEchoTestFailed = function (reason) {}; - - BBB.webRTCEchoTestWaitingForICE = function () {}; - - BBB.webRTCEchoTestEnded = function () {}; - - BBB.webRTCMediaRequest = function () {}; - - BBB.webRTCMediaSuccess = function () {}; - - BBB.webRTCMediaFail = function () {}; - - BBB.webRTCWebcamRequest = function () {}; - - BBB.webRTCWebcamRequestSuccess = function () {}; - - BBB.webRTCWebcamRequestFail = function (reason) {}; - - // Third-party JS apps should use this to query if the BBB SWF file is ready to handle calls. - - // *********************************************************************************** - // * Broadcasting of events to 3rd-party apps. - // ************************************************************************************ - - /* - Stores the 3rd-party app event listeners ** - */ - listeners = {}; - - /* - 3rd-party apps should use this method to register to listen for events. - */ - BBB.listen = function (eventName, handler) {}; - - /* - 3rd-party app should use this method to unregister listener for a given event. - */ - BBB.unlisten = function (eventName, handler) {}; - - BBB.init = function (callback) {}; - - return BBB; -})(); diff --git a/bigbluebutton-html5/client/lib/regex-weburl.js b/bigbluebutton-html5/client/lib/regex-weburl.js deleted file mode 100755 index 2c8601236d..0000000000 --- a/bigbluebutton-html5/client/lib/regex-weburl.js +++ /dev/null @@ -1,110 +0,0 @@ -// -// Regular Expression for URL validation -// -// Author: Diego Perini -// Updated: 2010/12/05 -// License: MIT -// -// Copyright (c) 2010-2013 Diego Perini (http://www.iport.it) -// -// Permission is hereby granted, free of charge, to any person -// obtaining a copy of this software and associated documentation -// files (the "Software"), to deal in the Software without -// restriction, including without limitation the rights to use, -// copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following -// conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -// OTHER DEALINGS IN THE SOFTWARE. -// -// the regular expression composed & commented -// could be easily tweaked for RFC compliance, -// it was expressly modified to fit & satisfy -// these test for an URL shortener: -// -// http://mathiasbynens.be/demo/url-regex -// -// Notes on possible differences from a standard/generic validation: -// -// - utf-8 char class take in consideration the full Unicode range -// - TLDs have been made mandatory so single names like "localhost" fails -// - protocols have been restricted to ftp, http and https only as requested -// -// Changes: -// -// - IP address dotted notation validation, range: 1.0.0.0 - 223.255.255.255 -// first and last IP address of each class is considered invalid -// (since they are broadcast/network addresses) -// -// - Added exclusion of private, reserved and/or local networks ranges -// -// - Made starting path slash optional (http://example.com?foo=bar) -// -// - Allow a dot (.) at the end of hostnames (http://example.com.) -// -// Compressed one-line versions: -// -// Javascript version -// -// /^(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,}))\.?)(?::\d{2,5})?(?:[/?#]\S*)?$/i -// -// PHP version -// -// _^(?:(?:https?|ftp)://)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\x{00a1}-\x{ffff}0-9]-*)*[a-z\x{00a1}-\x{ffff}0-9]+)(?:\.(?:[a-z\x{00a1}-\x{ffff}0-9]-*)*[a-z\x{00a1}-\x{ffff}0-9]+)*(?:\.(?:[a-z\x{00a1}-\x{ffff}]{2,}))\.?)(?::\d{2,5})?(?:[/?#]\S*)?$_iuS -// - -re_weburl = new RegExp( - - // protocol identifier - '(?:(?:https?|ftp)://)' + - - // user:pass authentication - '(?:\\S+(?::\\S*)?@)?' + - '(?:' + - - // IP address exclusion - // private & local networks - '(?!(?:10|127)(?:\\.\\d{1,3}){3})' + - '(?!(?:169\\.254|192\\.168)(?:\\.\\d{1,3}){2})' + - '(?!172\\.(?:1[6-9]|2\\d|3[0-1])(?:\\.\\d{1,3}){2})' + - - // IP address dotted notation octets - // excludes loopback network 0.0.0.0 - // excludes reserved space >= 224.0.0.0 - // excludes network & broacast addresses - // (first & last IP address of each class) - '(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])' + - '(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}' + - '(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))' + - '|' + - - // host name - '(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)' + - - // domain name - '(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*' + - - // TLD identifier - '(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))' + - - // TLD may end with dot - '\\.?' + - ')' + - - // port number - '(?::\\d{2,5})?' + - - // resource path - '(?:[/?#]\\S*)?', 'img' -); diff --git a/bigbluebutton-html5/client/lib/scale.raphael.js b/bigbluebutton-html5/client/lib/scale.raphael.js deleted file mode 100644 index b2c4bf99df..0000000000 --- a/bigbluebutton-html5/client/lib/scale.raphael.js +++ /dev/null @@ -1,106 +0,0 @@ -/* - * ScaleRaphael 0.8 by Zevan Rosser 2010 - * For use with Raphael library : www.raphaeljs.com - * Licensed under the MIT license. - * - * www.shapevent.com/scaleraphael/ - */ -(function () { - window.ScaleRaphael = function (container, width, height) { - var wrapper = document.getElementById(container); - if (!wrapper.style.position) wrapper.style.position = 'relative'; - wrapper.style.width = width + 'px'; - wrapper.style.height = height + 'px'; - wrapper.style.overflow = 'hidden'; - var nestedWrapper; - - if (Raphael.type == 'VML') { - wrapper.innerHTML = "<\/rvml:group>";
- nestedWrapper = document.getElementById('vmlgroup');
- }else {
- wrapper.innerHTML = "
-
- );
- },
-});
diff --git a/bigbluebutton-html5/client/NotificationControl.js b/bigbluebutton-html5/client/NotificationControl.js
deleted file mode 100755
index adee2bef57..0000000000
--- a/bigbluebutton-html5/client/NotificationControl.js
+++ /dev/null
@@ -1,134 +0,0 @@
-// Methods return a reference to itself to allow chaining
-this.NotificationControl = (() => {
- let container, notifications;
-
- container = ''; // holds where the alerts will go
-
- notifications = {};
-
- class NotificationControl {
- constructor(c) {
- container = c[0] === '#' ? c.substr(1) : c; // prepend '#' to the identifier
- $('#whiteboard').prepend(// create container for notifications
- `${''}`
- );
- }
-
- // id: name of the notification
- // type: optional style classes
- // content: the notification's message
- // nDuration: how many milliseconds the notification will stay (less than 1 implies permanent)
- // nFadeTime: how many milliseconds it takes the notification to be removed
- create(id, type, content, nDuration, nFadeTime) {
- let elementId;
- elementId = id[0] === '#' ? id.substr(1) : id; // remove prepended '#' from the identifier
- notifications[elementId] = {};
- notifications[elementId].element = '';
- notifications[elementId].element += `
-
-
- `;
- notifications[elementId].element += `${content}`;
- notifications[elementId].element += '';
- notifications[elementId].element += '
';
- notifications[elementId].duration = nDuration || -1; // if no time is specified, it must be dismissed by the user
- notifications[elementId].fadeTime = nFadeTime || 1000;
- return this;
- }
-
- registerShow(elementId, nShowNotification) { // register the method to be called when showing the notification
- notifications[elementId].showNotification = nShowNotification;
- return this;
- }
-
- registerHide(elementId, nHideNotification) { // register the method called when hiding the notification
- notifications[elementId].hideNotification = nHideNotification;
- return this;
- }
-
- display(elementId) { // called the registered methods
- let base;
- $(`#${container}`).append(notifications[elementId].element); // display the notification
- if (typeof (base = notifications[elementId]).showNotification === 'function') {
- base.showNotification();
- }
-
- setTimeout((_this => {
- // remove the notification if the user selected to
- return function () {
- let base1;
- if (notifications[elementId].duration > 0) {
- _this.hideANotification(elementId);
- }
-
- if (typeof (base1 = notifications[elementId]).hideNotification === 'function') {
- base1.hideNotification();
- }
-
- return notifications[elementId] = {}; // delete all notification data
- };
- })(this), notifications[elementId].duration);
- return this;
- }
-
- // hides a notification that may have been left over
- hideANotification(elementId) {
- let base;
- $(`#${elementId}`).fadeOut(notifications[elementId].fadeTime, () => {
- return $(`#${elementId}`).remove();
- });
- if (typeof (base = notifications[elementId]).hideNotification === 'function') {
- base.hideNotification();
- }
-
- return notifications[elementId] = {};
- }
- }
-
- // static icon members
- NotificationControl.icons = {
- // RaphaelJS "settings" icon
- settings_IconPath: 'M17.41,20.395l-0.778-2.723c0.228-0.2,0.442-0.414,0.644-0.643l2.721,0.778c0.287-0.418,0.534-0.862,0.755-1.323l-2.025-1.96c0.097-0.288,0.181-0.581,0.241-0.883l2.729-0.684c0.02-0.252,0.039-0.505,0.039-0.763s-0.02-0.51-0.039-0.762l-2.729-0.684c-0.061-0.302-0.145-0.595-0.241-0.883l2.026-1.96c-0.222-0.46-0.469-0.905-0.756-1.323l-2.721,0.777c-0.201-0.228-0.416-0.442-0.644-0.643l0.778-2.722c-0.418-0.286-0.863-0.534-1.324-0.755l-1.96,2.026c-0.287-0.097-0.581-0.18-0.883-0.241l-0.683-2.73c-0.253-0.019-0.505-0.039-0.763-0.039s-0.51,0.02-0.762,0.039l-0.684,2.73c-0.302,0.061-0.595,0.144-0.883,0.241l-1.96-2.026C7.048,3.463,6.604,3.71,6.186,3.997l0.778,2.722C6.736,6.919,6.521,7.134,6.321,7.361L3.599,6.583C3.312,7.001,3.065,7.446,2.844,7.907l2.026,1.96c-0.096,0.288-0.18,0.581-0.241,0.883l-2.73,0.684c-0.019,0.252-0.039,0.505-0.039,0.762s0.02,0.51,0.039,0.763l2.73,0.684c0.061,0.302,0.145,0.595,0.241,0.883l-2.026,1.96c0.221,0.46,0.468,0.905,0.755,1.323l2.722-0.778c0.2,0.229,0.415,0.442,0.643,0.643l-0.778,2.723c0.418,0.286,0.863,0.533,1.323,0.755l1.96-2.026c0.288,0.097,0.581,0.181,0.883,0.241l0.684,2.729c0.252,0.02,0.505,0.039,0.763,0.039s0.51-0.02,0.763-0.039l0.683-2.729c0.302-0.061,0.596-0.145,0.883-0.241l1.96,2.026C16.547,20.928,16.992,20.681,17.41,20.395zM11.798,15.594c-1.877,0-3.399-1.522-3.399-3.399s1.522-3.398,3.399-3.398s3.398,1.521,3.398,3.398S13.675,15.594,11.798,15.594zM27.29,22.699c0.019-0.547-0.06-1.104-0.23-1.654l1.244-1.773c-0.188-0.35-0.4-0.682-0.641-0.984l-2.122,0.445c-0.428-0.364-0.915-0.648-1.436-0.851l-0.611-2.079c-0.386-0.068-0.777-0.105-1.173-0.106l-0.974,1.936c-0.279,0.054-0.558,0.128-0.832,0.233c-0.257,0.098-0.497,0.22-0.727,0.353L17.782,17.4c-0.297,0.262-0.568,0.545-0.813,0.852l0.907,1.968c-0.259,0.495-0.437,1.028-0.519,1.585l-1.891,1.06c0.019,0.388,0.076,0.776,0.164,1.165l2.104,0.519c0.231,0.524,0.541,0.993,0.916,1.393l-0.352,2.138c0.32,0.23,0.66,0.428,1.013,0.6l1.715-1.32c0.536,0.141,1.097,0.195,1.662,0.15l1.452,1.607c0.2-0.057,0.399-0.118,0.596-0.193c0.175-0.066,0.34-0.144,0.505-0.223l0.037-2.165c0.455-0.339,0.843-0.747,1.152-1.206l2.161-0.134c0.152-0.359,0.279-0.732,0.368-1.115L27.29,22.699zM23.127,24.706c-1.201,0.458-2.545-0.144-3.004-1.345s0.143-2.546,1.344-3.005c1.201-0.458,2.547,0.144,3.006,1.345C24.931,22.902,24.328,24.247,23.127,24.706z',
-
- // RaphaelJS "Safari" icon
- Safari_IconPath: 'M16.154,5.135c-0.504,0-1,0.031-1.488,0.089l-0.036-0.18c-0.021-0.104-0.06-0.198-0.112-0.283c0.381-0.308,0.625-0.778,0.625-1.306c0-0.927-0.751-1.678-1.678-1.678s-1.678,0.751-1.678,1.678c0,0.745,0.485,1.376,1.157,1.595c-0.021,0.105-0.021,0.216,0,0.328l0.033,0.167C7.645,6.95,3.712,11.804,3.712,17.578c0,6.871,5.571,12.441,12.442,12.441c6.871,0,12.441-5.57,12.441-12.441C28.596,10.706,23.025,5.135,16.154,5.135zM16.369,8.1c4.455,0,8.183,3.116,9.123,7.287l-0.576,0.234c-0.148-0.681-0.755-1.191-1.48-1.191c-0.837,0-1.516,0.679-1.516,1.516c0,0.075,0.008,0.148,0.018,0.221l-2.771-0.028c-0.054-0.115-0.114-0.226-0.182-0.333l3.399-5.11l0.055-0.083l-4.766,4.059c-0.352-0.157-0.74-0.248-1.148-0.256l0.086-0.018l-1.177-2.585c0.64-0.177,1.111-0.763,1.111-1.459c0-0.837-0.678-1.515-1.516-1.515c-0.075,0-0.147,0.007-0.219,0.018l0.058-0.634C15.357,8.141,15.858,8.1,16.369,8.1zM12.146,3.455c0-0.727,0.591-1.318,1.318-1.318c0.727,0,1.318,0.591,1.318,1.318c0,0.425-0.203,0.802-0.516,1.043c-0.183-0.123-0.413-0.176-0.647-0.13c-0.226,0.045-0.413,0.174-0.535,0.349C12.542,4.553,12.146,4.049,12.146,3.455zM7.017,17.452c0-4.443,3.098-8.163,7.252-9.116l0.297,0.573c-0.61,0.196-1.051,0.768-1.051,1.442c0,0.837,0.678,1.516,1.515,1.516c0.068,0,0.135-0.006,0.2-0.015l-0.058,2.845l0.052-0.011c-0.442,0.204-0.824,0.513-1.116,0.895l0.093-0.147l-1.574-0.603l1.172,1.239l0.026-0.042c-0.19,0.371-0.306,0.788-0.324,1.229l-0.003-0.016l-2.623,1.209c-0.199-0.604-0.767-1.041-1.438-1.041c-0.837,0-1.516,0.678-1.516,1.516c0,0.064,0.005,0.128,0.013,0.191l-0.783-0.076C7.063,18.524,7.017,17.994,7.017,17.452zM16.369,26.805c-4.429,0-8.138-3.078-9.106-7.211l0.691-0.353c0.146,0.686,0.753,1.2,1.482,1.2c0.837,0,1.515-0.679,1.515-1.516c0-0.105-0.011-0.207-0.031-0.307l2.858,0.03c0.045,0.095,0.096,0.187,0.15,0.276l-3.45,5.277l0.227-0.195l4.529-3.92c0.336,0.153,0.705,0.248,1.094,0.266l-0.019,0.004l1.226,2.627c-0.655,0.166-1.142,0.76-1.142,1.468c0,0.837,0.678,1.515,1.516,1.515c0.076,0,0.151-0.007,0.225-0.018l0.004,0.688C17.566,26.746,16.975,26.805,16.369,26.805zM18.662,26.521l-0.389-0.6c0.661-0.164,1.152-0.759,1.152-1.47c0-0.837-0.68-1.516-1.516-1.516c-0.066,0-0.13,0.005-0.193,0.014v-2.86l-0.025,0.004c0.409-0.185,0.77-0.459,1.055-0.798l1.516,0.659l-1.104-1.304c0.158-0.335,0.256-0.704,0.278-1.095l2.552-1.164c0.19,0.618,0.766,1.068,1.447,1.068c0.838,0,1.516-0.679,1.516-1.516c0-0.069-0.006-0.137-0.016-0.204l0.65,0.12c0.089,0.517,0.136,1.049,0.136,1.591C25.722,21.826,22.719,25.499,18.662,26.521z',
-
- // RaphaelJS "Internet Explorer" icon
- IE_IconPath: 'M27.998,2.266c-2.12-1.91-6.925,0.382-9.575,1.93c-0.76-0.12-1.557-0.185-2.388-0.185c-3.349,0-6.052,0.985-8.106,2.843c-2.336,2.139-3.631,4.94-3.631,8.177c0,0.028,0.001,0.056,0.001,0.084c3.287-5.15,8.342-7.79,9.682-8.487c0.212-0.099,0.338,0.155,0.141,0.253c-0.015,0.042-0.015,0,0,0c-2.254,1.35-6.434,5.259-9.146,10.886l-0.003-0.007c-1.717,3.547-3.167,8.529-0.267,10.358c2.197,1.382,6.13-0.248,9.295-2.318c0.764,0.108,1.567,0.165,2.415,0.165c5.84,0,9.937-3.223,11.399-7.924l-8.022-0.014c-0.337,1.661-1.464,2.548-3.223,2.548c-2.21,0-3.729-1.211-3.828-4.012l15.228-0.014c0.028-0.578-0.042-0.985-0.042-1.436c0-5.251-3.143-9.355-8.255-10.663c2.081-1.294,5.974-3.209,7.848-1.681c1.407,1.14,0.633,3.533,0.295,4.518c-0.056,0.254,0.24,0.296,0.296,0.057C28.814,5.573,29.026,3.194,27.998,2.266zM13.272,25.676c-2.469,1.475-5.873,2.539-7.539,1.289c-1.243-0.935-0.696-3.468,0.398-5.938c0.664,0.992,1.495,1.886,2.473,2.63C9.926,24.651,11.479,25.324,13.272,25.676zM12.714,13.046c0.042-2.435,1.787-3.49,3.617-3.49c1.928,0,3.49,1.112,3.49,3.49H12.714z',
- };
-
- return NotificationControl;
-})();
-
-this.notification_WebRTCAudioExited = function () { // used when the user can join audio
- return Meteor.NotificationControl.create('webRTC_AudioExited', ' ', 'You have exited audio', 2500).display('webRTC_AudioExited');
-};
-
-this.notification_WebRTCAudioJoining = function () { // used when the user can join audio
- // display joining notification
- Meteor.NotificationControl.create('webRTC_AudioJoining', '', 'Connecting to the audio call...', -1).registerShow('webRTC_AudioJoining', () => {}).display('webRTC_AudioJoining');
-
- // joined. Displayed joined notification and hide the joining notification
- return Tracker.autorun(comp => { // wait until user is in
- if (BBB.amIInAudio()) { // display notification when you are in audio
- comp.stop(); // prevents computation from running twice (which can happen occassionally)
- return Meteor.NotificationControl.create('webRTC_AudioJoined', 'success ', '', 2500).registerShow('webRTC_AudioJoined', () => {
- Meteor.NotificationControl.hideANotification('webRTC_AudioJoining');
- return $('#webRTC_AudioJoined').prepend(`You've joined the ${BBB.amIListenOnlyAudio() ? 'Listen Only' : ''} audio`);
- }).display('webRTC_AudioJoined');
- }
- });
-};
-
-this.notification_WebRTCNotSupported = function () { // shown when the user's browser does not support WebRTC
- // create a new notification at the audio button they clicked to trigger the event
- return Meteor.NotificationControl.create('webRTC_NotSupported', 'alert', '', -1).registerShow('webRTC_NotSupported', () => {
- let browserName, ref;
- if (((ref = (browserName = getBrowserName())) === 'Safari' || ref === 'IE') || (browserName = 'settings')) { // show either the browser icon or cog gears
- $('#webRTC_NotSupported').prepend(
- `${'Sorry,' + (browserName !== 'settings' ? browserName : 'your browser') + " doesn't support WebRTC"}` - ); - return (new Raphael('browser-icon-container', 35, 35)).path(NotificationControl.icons[`${browserName}_IconPath`]).attr({ - fill: '#FFF', - stroke: 'none', - }); - } - }).display('webRTC_NotSupported'); -}; diff --git a/bigbluebutton-html5/client/globals.js b/bigbluebutton-html5/client/globals.js deleted file mode 100755 index 7ddded1d08..0000000000 --- a/bigbluebutton-html5/client/globals.js +++ /dev/null @@ -1,893 +0,0 @@ -this.getBuildInformation = function () { - let copyrightYear, defaultWelcomeMessage, defaultWelcomeMessageFooter, html5ClientBuild, link, ref, ref1, ref2, ref3; - copyrightYear = ((ref = Meteor.config) != null ? ref.copyrightYear : void 0) || 'DATE'; - html5ClientBuild = ((ref1 = Meteor.config) != null ? ref1.html5ClientBuild : void 0) || 'VERSION'; - defaultWelcomeMessage = ((ref2 = Meteor.config) != null ? ref2.defaultWelcomeMessage : void 0) || 'WELCOME MESSAGE'; - defaultWelcomeMessageFooter = ((ref3 = Meteor.config) != null ? ref3.defaultWelcomeMessageFooter : void 0) || 'WELCOME MESSAGE'; - link = "http://bigbluebutton.org"; - return { - copyrightYear: copyrightYear, - html5ClientBuild: html5ClientBuild, - defaultWelcomeMessage: defaultWelcomeMessage, - defaultWelcomeMessageFooter: defaultWelcomeMessageFooter, - link: link, - }; -}; - -// Convert a color `value` as integer to a hex color (e.g. 255 to #0000ff) -this.colourToHex = function (value) { - let hex; - hex = parseInt(value).toString(16); - while (hex.length < 6) { - hex = `0${hex}`; - } - - return `#${hex}`; -}; - -// color can be a number (a hex converted to int) or a string (e.g. "#ffff00") -this.formatColor = function (color) { - if (color == null) { - color = '0'; // default value - } - - if (!color.toString().match(/\#.*/)) { - color = colourToHex(color); - } - - return color; -}; - -this.getInSession = function (k) { - return SessionAmplify.get(k); -}; - -// returns epoch in ms -this.getTime = function () { - return (new Date).valueOf(); -}; - -// checks if the pan gesture is mostly horizontal -this.isPanHorizontal = function (event) { - return Math.abs(event.deltaX) > Math.abs(event.deltaY); -}; - -// helper to determine whether the user is in the listen only audio stream -Handlebars.registerHelper('isMyMicLocked', () => { - return BBB.isMyMicLocked(); -}); - -Handlebars.registerHelper('colourToHex', (_this => { - return function (value) { - return _this.window.colourToHex(value); - }; -})(this)); - -Handlebars.registerHelper('equals', (a, b) => { // equals operator was dropped in Meteor's migration from Handlebars to Spacebars - return a === b; -}); - -Handlebars.registerHelper('getCurrentMeeting', () => { - return Meteor.Meetings.findOne(); -}); - -Handlebars.registerHelper('getCurrentSlide', () => { - let result; - result = BBB.getCurrentSlide(); - - // console.log "result=#{JSON.stringify result}" - return result; -}); - -// Allow access through all templates -Handlebars.registerHelper('getInSession', k => { - return SessionAmplify.get(k); -}); - -Handlebars.registerHelper('getMeetingName', () => { - return BBB.getMeetingName(); -}); - -Handlebars.registerHelper('getShapesForSlide', () => { - let currentSlide, ref; - currentSlide = BBB.getCurrentSlide(); - - // try to reuse the lines above - return Meteor.Shapes.find({ - whiteboardId: currentSlide != null ? (ref = currentSlide.slide) != null ? ref.id : void 0 : void 0, - }); -}); - -// retrieves all users in the meeting -Handlebars.registerHelper('getUsersInMeeting', () => { - let users; - users = Meteor.Users.find().fetch(); - if ((users != null ? users.length : void 0) > 1) { - return getSortedUserList(users); - } else { - return users; - } -}); - -Handlebars.registerHelper('getCurrentUserEmojiStatus', () => { - let ref, ref1; - return (ref = BBB.getCurrentUser()) != null ? (ref1 = ref.user) != null ? ref1.emoji_status : void 0 : void 0; -}); - -Handlebars.registerHelper('isCurrentUser', userId => { - let ref; - return userId === null || userId === ((ref = BBB.getCurrentUser()) != null ? ref.userId : void 0); -}); - -//Retreives a username for a private chat tab from the database if it exists -Handlebars.registerHelper('privateChatName', () => { - let obj, ref; - obj = Meteor.Users.findOne({ - userId: getInSession('inChatWith'), - }); - if (obj != null) { - return obj != null ? (ref = obj.user) != null ? ref.name : void 0 : void 0; - } -}); - -Handlebars.registerHelper('isCurrentUserEmojiStatusSet', () => { - return BBB.isCurrentUserEmojiStatusSet(); -}); - -Handlebars.registerHelper('isCurrentUserSharingVideo', () => { - return BBB.amISharingVideo(); -}); - -Handlebars.registerHelper('isCurrentUserPresenter', () => { - return BBB.isUserPresenter(getInSession('userId')); -}); - -Handlebars.registerHelper('isCurrentUserModerator', () => { - return BBB.getMyRole() === 'MODERATOR'; -}); - -Handlebars.registerHelper('isDisconnected', () => { - return !Meteor.status().connected; -}); - -Handlebars.registerHelper('isUserInAudio', userId => { - return BBB.isUserInAudio(userId); -}); - -Handlebars.registerHelper('isUserListenOnlyAudio', userId => { - return BBB.isUserListenOnlyAudio(userId); -}); - -Handlebars.registerHelper('isUserMuted', userId => { - return BBB.isUserMuted(userId); -}); - -Handlebars.registerHelper('isUserSharingVideo', userId => { - return BBB.isUserSharingWebcam(userId); -}); - -Handlebars.registerHelper('isUserTalking', userId => { - return BBB.isUserTalking(userId); -}); - -Handlebars.registerHelper('isMobile', () => { - return isMobile(); -}); - -Handlebars.registerHelper('isPortraitMobile', () => { - return isPortraitMobile(); -}); - -Handlebars.registerHelper('isMobileChromeOrFirefox', () => { - return isMobile() && ((getBrowserName() === 'Chrome') || (getBrowserName() === 'Firefox')); -}); - -Handlebars.registerHelper('meetingIsRecording', () => { - return BBB.isMeetingRecording(); -}); - -Handlebars.registerHelper('messageFontSize', () => { - return { - style: `font-size: ${getInSession('messageFontSize')}px;`, - }; -}); - -//#TODO REMOVE -Handlebars.registerHelper('pointerLocation', () => { - let currentPresentation, currentSlideDoc, pointer, presentationId, ref; - currentPresentation = Meteor.Presentations.findOne({ - 'presentation.current': true, - }); - presentationId = currentPresentation != null ? (ref = currentPresentation.presentation) != null ? ref.id : void 0 : void 0; - currentSlideDoc = Meteor.Slides.findOne({ - presentationId: presentationId, - 'slide.current': true, - }); - pointer = Meteor.Cursor.findOne(); - pointer.x = (-currentSlideDoc.slide.x_offset * 2 + currentSlideDoc.slide.width_ratio * pointer.x) / 100; - pointer.y = (-currentSlideDoc.slide.y_offset * 2 + currentSlideDoc.slide.height_ratio * pointer.y) / 100; - return pointer; -}); - -Handlebars.registerHelper('safeName', str => { - return safeString(str); -}); - -Handlebars.registerHelper('canJoinWithMic', () => { - if ((BBB.isUserPresenter(getInSession('userId')) || !Meteor.config.app.listenOnly) && !BBB.isMyMicLocked()) { - return true; - } else { - return false; - } -}); - -Handlebars.registerHelper('containerPosition', section => { - if (getInSession('display_usersList')) { - return 'moved-to-right'; - } else if (getInSession('display_menu')) { - return 'moved-to-left'; - } else { - return ''; - } -}); - -Template.registerHelper('emojiIcons', function () { - return [ - { name: 'sad', icon: 'sad-face', title: '' }, - { name: 'happy', icon: 'happy-face', title: '' }, - { name: 'confused', icon: 'confused-face', title: '' }, - { name: 'neutral', icon: 'neutral-face', title: '' }, - { name: 'away', icon: 'clock', title: '' }, - { name: 'raiseHand', icon: 'hand', title: 'Lower your Hand' }, - ]; -}); - -// scale the whiteboard to adapt to the resized window -this.scaleWhiteboard = function (whiteboardPaperModel) { - let adjustedDimensions; - adjustedDimensions = scaleSlide(getInSession('slideOriginalWidth'), getInSession('slideOriginalHeight')); - if (typeof whiteboardPaperModel !== 'undefined' && whiteboardPaperModel !== null) { - whiteboardPaperModel.scale(adjustedDimensions.width, adjustedDimensions.height); - } - /* if(callback) { - callback(); - } */ -}; - -this.getSortedUserList = function (users) { - if ((users != null ? users.length : void 0) > 1) { - users.sort((a, b) => { - let aTime, bTime; - if (a.user.role === 'MODERATOR' && b.user.role === 'MODERATOR') { - if (a.user.set_emoji_time && b.user.set_emoji_time) { - aTime = a.user.set_emoji_time.getTime(); - bTime = b.user.set_emoji_time.getTime(); - if (aTime < bTime) { - return -1; - } else { - return 1; - } - } else if (a.user.set_emoji_time) { - return -1; - } else if (b.user.set_emoji_time) { - return 1; - } - } else if (a.user.role === 'MODERATOR') { - return -1; - } else if (b.user.role === 'MODERATOR') { - return 1; - } else if (a.user.set_emoji_time && b.user.set_emoji_time) { - aTime = a.user.set_emoji_time.getTime(); - bTime = b.user.set_emoji_time.getTime(); - if (aTime < bTime) { - return -1; - } else { - return 1; - } - } else if (a.user.set_emoji_time) { - return -1; - } else if (b.user.set_emoji_time) { - return 1; - } else if (!a.user.phone_user && !b.user.phone_user) { - - } else if (!a.user.phone_user) { - return -1; - } else if (!b.user.phone_user) { - return 1; - } - - //Check name (case-insensitive) in the event of a tie up above. If the name - //is the same then use userID which should be unique making the order the same - //across all clients. - - if (a.user._sort_name < b.user._sort_name) { - return -1; - } else if (a.user._sort_name > b.user._sort_name) { - return 1; - } else if (a.user.userid.toLowerCase() > b.user.userid.toLowerCase()) { - return -1; - } else if (a.user.userid.toLowerCase() < b.user.userid.toLowerCase()) { - return 1; - } - }); - } - - return users; -}; - -// transform plain text links into HTML tags compatible with Flash client -this.linkify = function (str) { - return str = str.replace(re_weburl, "$&"); -}; - -this.setInSession = function (k, v) { - return SessionAmplify.set(k, v); -}; - -this.safeString = function (str) { - if (typeof str === 'string') { - return str.replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"'); - } -}; - -this.toggleCam = function (event) { - // Meteor.Users.update {_id: context._id} , {$set:{"user.sharingVideo": !context.sharingVideo}} - // Meteor.call('userToggleCam', context._id, !context.sharingVideo) -}; - -this.toggleChatbar = function () { - setInSession('display_chatbar', !getInSession('display_chatbar')); - if (!getInSession('display_chatbar')) { - $('#whiteboard').css('width', '100%'); - $('#whiteboard .ui-resizable-handle').css('display', 'none'); - } else { - $('#whiteboard').css('width', ''); - $('#whiteboard .ui-resizable-handle').css('display', ''); - } - - return setTimeout(scaleWhiteboard, 0); -}; - -this.toggleMic = function (event) { - return BBB.toggleMyMic(); -}; - -this.toggleUsersList = function () { - if ($('.userlistMenu').hasClass('hiddenInLandscape')) { - $('.userlistMenu').removeClass('hiddenInLandscape'); - } else { - $('.userlistMenu').addClass('hiddenInLandscape'); - } - - return setTimeout(scaleWhiteboard, 0); -}; - -this.populateNotifications = function (msg) { - let chat, chats, initChats, j, l, len, len1, myPrivateChats, myUserId, new_msg_userid, results, u, uniqueArray, users; - myUserId = getInSession('userId'); - users = Meteor.Users.find().fetch(); - - // assuming that I only have access only to private messages where I am the sender or the recipient - myPrivateChats = Meteor.Chat.find({ - 'message.chat_type': 'PRIVATE_CHAT', - }).fetch(); - uniqueArray = []; - for (j = 0, len = myPrivateChats.length; j < len; j++) { - chat = myPrivateChats[j]; - if (chat.message.to_userid === myUserId) { - uniqueArray.push({ - userId: chat.message.from_userid, - username: chat.message.from_username, - }); - } - - if (chat.message.from_userid === myUserId) { - uniqueArray.push({ - userId: chat.message.to_userid, - username: chat.message.to_username, - }); - } - } - - //keep unique entries only - uniqueArray = uniqueArray.filter((itm, i, a) => { - return i === a.indexOf(itm); - }); - if (msg.message.to_userid === myUserId) { - new_msg_userid = msg.message.from_userid; - } - - if (msg.message.from_userid === myUserId) { - new_msg_userid = msg.message.to_userid; - } - - chats = getInSession('chats'); - if (chats === void 0) { - initChats = [ - { - userId: 'PUBLIC_CHAT', - gotMail: false, - number: 0, - }, - ]; - setInSession('chats', initChats); - } - - results = []; - - //insert the unique entries in the collection - for (l = 0, len1 = uniqueArray.length; l < len1; l++) { - u = uniqueArray[l]; - chats = getInSession('chats'); - if (chats.filter(chat => { - return chat.userId === u.userId; - }).length === 0 && u.userId === new_msg_userid) { - chats.push({ - userId: u.userId, - gotMail: false, - number: 0, - }); - results.push(setInSession('chats', chats)); - } else { - results.push(void 0); - } - } - - return results; -}; - -this.toggleShield = function () { - if (parseFloat($('.shield').css('opacity')) === 0.5) { - $('.shield').css('opacity', ''); - } - - if (!$('.shield').hasClass('darken') && !$('.shield').hasClass('animatedShield')) { - return $('.shield').addClass('darken'); - } else { - $('.shield').removeClass('darken'); - return $('.shield').removeClass('animatedShield'); - } -}; - -this.removeFullscreenStyles = function () { - $('#whiteboard-paper').removeClass('vertically-centered'); - $('#chat').removeClass('invisible'); - $('#users').removeClass('invisible'); - $('#navbar').removeClass('invisible'); - $('.FABTriggerButton').removeClass('invisible'); - $('.fullscreenButton').removeClass('exitFullscreenButton'); - $('.fullscreenButton').addClass('whiteboardFullscreenButton'); - $('.fullscreenButton i').removeClass('ion-arrow-shrink'); - return $('.fullscreenButton i').addClass('ion-arrow-expand'); -}; - -this.enterWhiteboardFullscreen = function () { - let element; - element = document.getElementById('whiteboard'); - if (element.requestFullscreen) { - element.requestFullscreen(); - } else if (element.mozRequestFullScreen) { - element.mozRequestFullScreen(); - $('.fullscreenButton').addClass('iconFirefox'); - } else if (element.webkitRequestFullscreen) { - element.webkitRequestFullscreen(); - $('.fullscreenButton').addClass('iconChrome'); - } else if (element.msRequestFullscreen) { - element.msRequestFullscreen(); - } - - $('#chat').addClass('invisible'); - $('#users').addClass('invisible'); - $('#navbar').addClass('invisible'); - $('.FABTriggerButton').addClass('invisible'); - $('.fullscreenButton').removeClass('whiteboardFullscreenButton'); - $('.fullscreenButton').addClass('exitFullscreenButton'); - $('.fullscreenButton i').removeClass('ion-arrow-expand'); - $('.fullscreenButton i').addClass('ion-arrow-shrink'); - $('#whiteboard-paper').addClass('vertically-centered'); - $('#whiteboard').bind('webkitfullscreenchange', e => { - if (document.webkitFullscreenElement === null) { - $('#whiteboard').unbind('webkitfullscreenchange'); - $('.fullscreenButton').removeClass('iconChrome'); - removeFullscreenStyles(); - return scaleWhiteboard(); - } - }); - return $(document).bind('mozfullscreenchange', e => { - if (document.mozFullScreenElement === null) { - $(document).unbind('mozfullscreenchange'); - $('.fullscreenButton').removeClass('iconFirefox'); - removeFullscreenStyles(); - return scaleWhiteboard(); - } - }); -}; - -this.closeMenus = function () { - if ($('.userlistMenu').hasClass('menuOut')) { - return toggleUserlistMenu(); - } else if ($('.settingsMenu').hasClass('menuOut')) { - return toggleSettingsMenu(); - } -}; - -// Periodically check the status of the WebRTC call, when a call has been established attempt to hangup, -// retry if a call is in progress, send the leave voice conference message to BBB -this.exitVoiceCall = function (event, afterExitCall) { - let checkToHangupCall, hangupCallback; - - // To be called when the hangup is initiated - hangupCallback = function () { - return console.log('Exiting Voice Conference'); - }; - - // Checks periodically until a call is established so we can successfully end the call - // clean state - getInSession('triedHangup', false); - - // function to initiate call - (checkToHangupCall = function (context) { - // if an attempt to hang up the call is made when the current session is not yet finished, the request has no effect - // keep track in the session if we haven't tried a hangup - if (BBB.getCallStatus() !== null && !getInSession('triedHangup')) { - console.log('Attempting to hangup on WebRTC call'); - if (BBB.amIListenOnlyAudio()) { - Meteor.call( - 'listenOnlyRequestToggle', - BBB.getMeetingId(), - getInSession('userId'), - getInSession('authToken'), - false - ); - } - - BBB.leaveVoiceConference(hangupCallback); - getInSession('triedHangup', true); - notification_WebRTCAudioExited(); - if (afterExitCall) { - return afterExitCall(this, Meteor.config.app.listenOnly); - } - } else { - console.log( - `RETRYING hangup on WebRTC call in ${Meteor.config.app.WebRTCHangupRetryInterval} ms` - ); - return setTimeout(checkToHangupCall, Meteor.config.app.WebRTCHangupRetryInterval); - } - })(this); // automatically run function - return false; -}; - -// close the daudio UI, then join the conference. If listen only send the request to the server -this.joinVoiceCall = function (event, arg) { - let isListenOnly, joinCallback; - isListenOnly = (arg != null ? arg : {}).isListenOnly; - if (!isWebRTCAvailable()) { - notification_WebRTCNotSupported(); - return; - } - - if (isListenOnly == null) { - isListenOnly = true; - } - - // create voice call params - joinCallback = function (message) { - return console.log('Beginning WebRTC Conference Call'); - }; - - notification_WebRTCAudioJoining(); - if (isListenOnly) { - Meteor.call( - 'listenOnlyRequestToggle', - BBB.getMeetingId(), - getInSession('userId'), - getInSession('authToken'), - true - ); - } - - BBB.joinVoiceConference(joinCallback, isListenOnly); // make the call //TODO should we apply role permissions to this action? - return false; -}; - -// Starts the entire logout procedure. -// meeting: the meeting the user is in -// the user's userId -this.userLogout = function (meeting, user) { - Meteor.call('userLogout', meeting, user, getInSession('authToken')); - console.log('logging out'); - return clearSessionVar(document.location = getInSession('logoutURL')); // navigate to logout -}; - -this.kickUser = function (meetingId, toKickUserId, requesterUserId, authToken) { - return Meteor.call('kickUser', meetingId, toKickUserId, requesterUserId, authToken); -}; - -this.setUserPresenter = function ( - meetingId, - newPresenterId, - requesterSetPresenter, - newPresenterName, - authToken) { - return Meteor.call('setUserPresenter', meetingId, newPresenterId, requesterSetPresenter, newPresenterName, authToken); -}; - -// Clear the local user session -this.clearSessionVar = function (callback) { - amplify.store('authToken', null); - amplify.store('bbbServerVersion', null); - amplify.store('chats', null); - amplify.store('dateOfBuild', null); - amplify.store('display_chatPane', null); - amplify.store('display_chatbar', null); - amplify.store('display_navbar', null); - amplify.store('display_usersList', null); - amplify.store('display_whiteboard', null); - amplify.store('inChatWith', null); - amplify.store('logoutURL', null); - amplify.store('meetingId', null); - amplify.store('messageFontSize', null); - amplify.store('tabsRenderedTime', null); - amplify.store('userId', null); - amplify.store('display_menu', null); - if (callback != null) { - return callback(); - } -}; - -// assign the default values for the Session vars -this.setDefaultSettings = function () { - let initChats; - setInSession('display_navbar', true); - setInSession('display_chatbar', true); - setInSession('display_whiteboard', true); - setInSession('display_chatPane', true); - - //if it is a desktop version of the client - if (isPortraitMobile() || isLandscapeMobile()) { - setInSession('messageFontSize', Meteor.config.app.mobileFont); - } else { //if this is a mobile version of the client - setInSession('messageFontSize', Meteor.config.app.desktopFont); - } - - setInSession('display_slidingMenu', false); - setInSession('display_hiddenNavbarSection', false); - if (isLandscape()) { - setInSession('display_usersList', true); - } else { - setInSession('display_usersList', false); - } - - setInSession('display_menu', false); - setInSession('chatInputMinHeight', 0); - - //keep notifications and an opened private chat tab if page was refreshed - //reset to default if that's a new user - if (loginOrRefresh()) { - initChats = [ - { - userId: 'PUBLIC_CHAT', - gotMail: false, - number: 0, - }, - ]; - setInSession('chats', initChats); - setInSession('inChatWith', 'PUBLIC_CHAT'); - } - - return TimeSync.loggingEnabled = false; // suppresses the log messages from timesync -}; - -//true if it is a new user, false if the client was just refreshed -this.loginOrRefresh = function () { - let checkId, userId; - userId = getInSession('userId'); - checkId = getInSession('checkId'); - if (checkId === void 0) { - setInSession('checkId', userId); - return true; - } else if (userId !== checkId) { - setInSession('checkId', userId); - return true; - } else { - return false; - } -}; - -this.onLoadComplete = function () { - let ref; - document.title = `BigBlueButton ${(ref = BBB.getMeetingName()) != null ? ref : 'HTML5'}`; - setDefaultSettings(); - Meteor.Users.find().observe({ - removed(oldDocument) { - if (oldDocument.userId === getInSession('userId')) { - return document.location = getInSession('logoutURL'); - } - }, - }); - return Meteor.Users.find().observe({ - changed(newUser, oldUser) { - if (Meteor.config.app.listenOnly === true && newUser.user.presenter === false && oldUser.user.presenter === true && BBB.getCurrentUser().userId === newUser.userId && oldUser.user.listenOnly === false) { - return exitVoiceCall(this, joinVoiceCall); - } - }, - }); -}; - -// Detects a mobile device -this.isMobile = function () { - return navigator.userAgent.match(/Android/i) || - navigator.userAgent.match(/iPhone|iPad|iPod/i) || - navigator.userAgent.match(/BlackBerry/i) || - navigator.userAgent.match(/Windows Phone/i) || - navigator.userAgent.match(/IEMobile/i) || - navigator.userAgent.match(/BlackBerry/i) || - navigator.userAgent.match(/webOS/i); -}; - -this.isLandscape = function () { - return !isMobile() && - window.matchMedia('(orientation: landscape)').matches && // browser is landscape - window.matchMedia('(min-device-aspect-ratio: 1/1)').matches; // device is landscape -}; - -this.isPortrait = function () { - return !isMobile() && - window.matchMedia('(orientation: portrait)').matches && // browser is portrait - window.matchMedia('(min-device-aspect-ratio: 1/1)').matches; // device is landscape -}; - -// Checks if the view is portrait and a mobile device is being used -this.isPortraitMobile = function () { - return isMobile() && - window.matchMedia('(orientation: portrait)').matches && // browser is portrait - window.matchMedia('(max-device-aspect-ratio: 1/1)').matches; // device is portrait -}; - -// Checks if the view is landscape and mobile device is being used -this.isLandscapeMobile = function () { - return isMobile() && - window.matchMedia('(orientation: landscape)').matches && // browser is landscape - window.matchMedia('(min-device-aspect-ratio: 1/1)').matches; // device is landscape -}; - -this.isLandscapePhone = function () { - // @phone-landscape media query: - return window.matchMedia('(orientation: landscape)').matches && - window.matchMedia('(min-device-aspect-ratio: 1/1)').matches && - window.matchMedia('(max-device-width: 959px)').matches; -}; - -this.isPortraitPhone = function () { - // @phone-portrait media query: - return (window.matchMedia('(orientation: portrait)').matches && - window.matchMedia('(max-device-aspect-ratio: 1/1)').matches && - window.matchMedia('(max-device-width: 480px)').matches) || - - // @phone-portrait-with-keyboard media query: - (window.matchMedia('(orientation: landscape)').matches && - window.matchMedia('(max-device-aspect-ratio: 1/1)').matches && - window.matchMedia('(max-device-width: 480px)').matches); -}; - -this.isPhone = function () { - return isLandscapePhone() || isPortraitPhone(); -}; - -// The webpage orientation is now landscape -this.orientationBecameLandscape = function () { - return adjustChatInputHeight(); -}; - -// The webpage orientation is now portrait -this.orientationBecamePortrait = function () { - return adjustChatInputHeight(); -}; - -// Checks if only one panel (userlist/whiteboard/chatbar) is currently open -this.isOnlyOnePanelOpen = function () { - //return (getInSession("display_usersList") ? 1 : 0) + (getInSession("display_whiteboard") ? 1 : 0) + (getInSession("display_chatbar") ? 1 : 0) === 1 - return getInSession('display_usersList') + getInSession('display_whiteboard') + getInSession('display_chatbar') === 1; -}; - -// determines which browser is being used -this.getBrowserName = function () { - if (navigator.userAgent.match(/Chrome/i)) { - return 'Chrome'; - } else if (navigator.userAgent.match(/Firefox/i)) { - return 'Firefox'; - } else if (navigator.userAgent.match(/Safari/i)) { - return 'Safari'; - } else if (navigator.userAgent.match(/Trident/i)) { - return 'IE'; - } else { - return null; - } -}; - -this.scrollChatDown = function () { - let ref; - return $('#chatbody').scrollTop((ref = $('#chatbody')[0]) != null ? ref.scrollHeight : void 0); -}; - -// changes the height of the chat input area if needed (based on the textarea content) -this.adjustChatInputHeight = function () { - let projectedHeight, ref; - if (isLandscape()) { - $('#newMessageInput').css('height', 'auto'); - projectedHeight = $('#newMessageInput')[0].scrollHeight + 23; - if (projectedHeight !== $('.panel-footer').height() && projectedHeight >= getInSession('chatInputMinHeight')) { - $('#newMessageInput').css('overflow', 'hidden'); // prevents a scroll bar - - // resizes the chat input area - $('.panel-footer').css('top', `${-(projectedHeight - 70)}px`); - $('.panel-footer').css('height', `${projectedHeight}px`); - - $('#newMessageInput').height($('#newMessageInput')[0].scrollHeight); - - // resizes the chat messages container - $('#chatbody').height($('#chat').height() - projectedHeight - 45); - $('#chatbody').scrollTop((ref = $('#chatbody')[0]) != null ? ref.scrollHeight : void 0); - } - - return $('#newMessageInput').css('height', ''); - } else if (isPortrait()) { - $('.panel-footer').attr('style', ''); - $('#chatbody').attr('style', ''); - return $('#newMessageInput').attr('style', ''); - } -}; - -this.toggleEmojisFAB = function () { - if ($('.FABContainer').hasClass('openedFAB')) { - $('.FABContainer > button:nth-child(2)').css('opacity', $('.FABContainer > button:nth-child(2)').css('opacity')); - $('.FABContainer > button:nth-child(3)').css('opacity', $('.FABContainer > button:nth-child(3)').css('opacity')); - $('.FABContainer > button:nth-child(4)').css('opacity', $('.FABContainer > button:nth-child(4)').css('opacity')); - $('.FABContainer > button:nth-child(5)').css('opacity', $('.FABContainer > button:nth-child(5)').css('opacity')); - $('.FABContainer > button:nth-child(6)').css('opacity', $('.FABContainer > button:nth-child(6)').css('opacity')); - $('.FABContainer > button:nth-child(7)').css('opacity', $('.FABContainer > button:nth-child(7)').css('opacity')); - $('.FABContainer').removeClass('openedFAB'); - return $('.FABContainer').addClass('closedFAB'); - } else { - $('.FABContainer > button:nth-child(2)').css('opacity', $('.FABContainer > button:nth-child(2)').css('opacity')); - $('.FABContainer > button:nth-child(3)').css('opacity', $('.FABContainer > button:nth-child(3)').css('opacity')); - $('.FABContainer > button:nth-child(4)').css('opacity', $('.FABContainer > button:nth-child(4)').css('opacity')); - $('.FABContainer > button:nth-child(5)').css('opacity', $('.FABContainer > button:nth-child(5)').css('opacity')); - $('.FABContainer > button:nth-child(6)').css('opacity', $('.FABContainer > button:nth-child(6)').css('opacity')); - $('.FABContainer > button:nth-child(7)').css('opacity', $('.FABContainer > button:nth-child(7)').css('opacity')); - $('.FABContainer').removeClass('closedFAB'); - return $('.FABContainer').addClass('openedFAB'); - } -}; - -this.toggleUserlistMenu = function () { - // menu - if ($('.userlistMenu').hasClass('menuOut')) { - $('.userlistMenu').removeClass('menuOut'); - } else { - $('.userlistMenu').addClass('menuOut'); - } - - // icon - if ($('.toggleUserlistButton').hasClass('menuToggledOn')) { - return $('.toggleUserlistButton').removeClass('menuToggledOn'); - } else { - return $('.toggleUserlistButton').addClass('menuToggledOn'); - } -}; - -this.toggleSettingsMenu = function () { - // menu - if ($('.settingsMenu').hasClass('menuOut')) { - $('.settingsMenu').removeClass('menuOut'); - } else { - $('.settingsMenu').addClass('menuOut'); - } - - // icon - if ($('.toggleMenuButton').hasClass('menuToggledOn')) { - return $('.toggleMenuButton').removeClass('menuToggledOn'); - } else { - return $('.toggleMenuButton').addClass('menuToggledOn'); - } -}; diff --git a/bigbluebutton-html5/client/lib/.gitignore b/bigbluebutton-html5/client/lib/.gitignore deleted file mode 100644 index 553695ee28..0000000000 --- a/bigbluebutton-html5/client/lib/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -custom.bootstrap.mixins.import.less -custom.bootstrap.less \ No newline at end of file diff --git a/bigbluebutton-html5/client/lib/bbb_api_bridge.js b/bigbluebutton-html5/client/lib/bbb_api_bridge.js deleted file mode 100755 index a7548379a4..0000000000 --- a/bigbluebutton-html5/client/lib/bbb_api_bridge.js +++ /dev/null @@ -1,579 +0,0 @@ -/* -This file contains the BigBlueButton client APIs that will allow 3rd-party applications -to embed the HTML5 client and interact with it through Javascript. - -HOW TO USE: -Some APIs allow synchronous and asynchronous calls. When using asynchronous, the 3rd-party -JS should register as listener for events listed at the bottom of this file. For synchronous, -3rd-party JS should pass in a callback function when calling the API. - -For an example on how to use these APIs, see: - -https://github.com/bigbluebutton/bigbluebutton/blob/master/bigbluebutton-client/resources/prod/lib/3rd-party.js -https://github.com/bigbluebutton/bigbluebutton/blob/master/bigbluebutton-client/resources/prod/3rd-party.html - */ - -this.BBB = (function () { - let BBB, listeners, returnOrCallback; - BBB = {}; - returnOrCallback = function (res, callback) { - if ((callback != null) && typeof callback === 'function') { - return callback(res); - } else { - return res; - } - }; - - BBB.isPollGoing = function (userId) { - if (userId !== void 0 && Meteor.Polls.findOne({ - 'poll_info.users': userId, - })) { - return true; - } else { - return false; - } - }; - - BBB.getCurrentPoll = function (userId) { - if (userId !== void 0 && Meteor.Polls.findOne({ - 'poll_info.users': userId, - })) { - return Meteor.Polls.findOne({ - 'poll_info.users': userId, - }); - } - }; - - BBB.sendPollResponseMessage = function (key, pollAnswerId) { - return Meteor.call('publishVoteMessage', BBB.getMeetingId(), pollAnswerId, getInSession('userId'), getInSession('authToken')); - }; - - BBB.getMeetingId = function () { - let ref; - return (ref = Meteor.Meetings.findOne()) != null ? ref.meetingId : void 0; - }; - - BBB.getInternalMeetingId = function (callback) {}; - - /* - Queryies the user object via it's id - */ - BBB.getUser = function (userId) { - return Meteor.Users.findOne({ - userId: userId, - }); - }; - - BBB.getCurrentUser = function () { - return BBB.getUser(getInSession('userId')); - }; - - /* - Query if the current user is sharing webcam. - - Param: - callback - function to return the result - - If you want to instead receive an event with the result, register a listener - for AM_I_SHARING_CAM_RESP (see below). - */ - BBB.amISharingWebcam = function (callback) { - // BBB.isUserSharingWebcam BBB.getCurrentUser()?.userId - return false; - }; - - /* - - Query if another user is sharing her camera. - - Param: - userID : the id of the user that may be sharing the camera - callback: function if you want to be informed synchronously. Don't pass a function - if you want to be informed through an event. You have to register for - IS_USER_PUBLISHING_CAM_RESP (see below). - */ - BBB.isUserSharingWebcam = function (userId, callback) { - // BBB.getUser(userId)?.user?.webcam_stream?.length isnt 0 - return false; - }; - - // returns whether the user has joined any type of audio - BBB.amIInAudio = function (callback) { - let ref, ref1, ref2, user; - user = BBB.getCurrentUser(); - return (user != null ? (ref = user.user) != null ? ref.listenOnly : void 0 : void 0) || (user != null ? (ref1 = user.user) != null ? (ref2 = ref1.voiceUser) != null ? ref2.joined : void 0 : void 0 : void 0); - }; - - // returns true if the user has joined the listen only audio stream - BBB.amIListenOnlyAudio = function (callback) { - let ref, ref1; - return (ref = BBB.getCurrentUser()) != null ? (ref1 = ref.user) != null ? ref1.listenOnly : void 0 : void 0; - }; - - // returns whether the user has joined the voice conference and is sharing audio through a microphone - BBB.amISharingAudio = function (callback) { - let ref; - return BBB.isUserSharingAudio((ref = BBB.getCurrentUser()) != null ? ref.userId : void 0); - }; - - // returns whether the user is currently talking - BBB.amITalking = function (callback) { - let ref; - return BBB.isUserTalking((ref = BBB.getCurrentUser()) != null ? ref.userId : void 0); - }; - - BBB.isUserInAudio = function (userId, callback) { - let ref, ref1, ref2, user; - user = BBB.getUser(userId); - return (user != null ? (ref = user.user) != null ? ref.listenOnly : void 0 : void 0) || (user != null ? (ref1 = user.user) != null ? (ref2 = ref1.voiceUser) != null ? ref2.joined : void 0 : void 0 : void 0); - }; - - BBB.isUserListenOnlyAudio = function (userId, callback) { - let ref, ref1; - return (ref = BBB.getUser(userId)) != null ? (ref1 = ref.user) != null ? ref1.listenOnly : void 0 : void 0; - }; - - BBB.isUserSharingAudio = function (userId, callback) { - let ref, ref1, ref2; - return (ref = BBB.getUser(userId)) != null ? (ref1 = ref.user) != null ? (ref2 = ref1.voiceUser) != null ? ref2.joined : void 0 : void 0 : void 0; - }; - - BBB.isUserTalking = function (userId, callback) { - let ref, ref1, ref2; - return (ref = BBB.getUser(userId)) != null ? (ref1 = ref.user) != null ? (ref2 = ref1.voiceUser) != null ? ref2.talking : void 0 : void 0 : void 0; - }; - - BBB.isUserPresenter = function (userId, callback) { - let ref, ref1; - return (ref = BBB.getUser(userId)) != null ? (ref1 = ref.user) != null ? ref1.presenter : void 0 : void 0; - }; - - // returns true if the current user is marked as locked - BBB.amILocked = function () { - let ref; - return (ref = BBB.getCurrentUser()) != null ? ref.user.locked : void 0; - }; - - // check whether the user is locked AND the current lock settings for the room - // includes locking the microphone of viewers (listenOnly is still alowed) - BBB.isMyMicLocked = function () { - let lockedMicForRoom, ref; - lockedMicForRoom = (ref = Meteor.Meetings.findOne()) != null ? ref.roomLockSettings.disableMic : void 0; - - // note that voiceUser.locked is not used in BigBlueButton at this stage (April 2015) - - return lockedMicForRoom && BBB.amILocked(); - }; - - BBB.getCurrentSlide = function () { - let currentPresentation, currentSlide, presentationId, ref; - currentPresentation = Meteor.Presentations.findOne({ - 'presentation.current': true, - }); - presentationId = currentPresentation != null ? (ref = currentPresentation.presentation) != null ? ref.id : void 0 : void 0; - currentSlide = Meteor.Slides.findOne({ - presentationId: presentationId, - 'slide.current': true, - }); - return currentSlide; - }; - - BBB.getMeetingName = function () { - let ref; - return ((ref = Meteor.Meetings.findOne()) != null ? ref.meetingName : void 0) || null; - }; - - BBB.getNumberOfUsers = function () { - return Meteor.Users.find().count(); - }; - - BBB.currentPresentationName = function () { - let ref, ref1; - return (ref = Meteor.Presentations.findOne({ - 'presentation.current': true, - })) != null ? (ref1 = ref.presentation) != null ? ref1.name : void 0 : void 0; - }; - - /* - Raise user's hand. - Param: - */ - BBB.lowerHand = function (meetingId, toUserId, byUserId, byAuthToken) { - return Meteor.call('userLowerHand', meetingId, toUserId, byUserId, byAuthToken); - }; - - BBB.raiseHand = function (meetingId, toUserId, byUserId, byAuthToken) { - return Meteor.call('userRaiseHand', meetingId, toUserId, byUserId, byAuthToken); - }; - - BBB.setEmojiStatus = function (meetingId, toUserId, byUserId, byAuthToken, status) { - return Meteor.call('userSetEmoji', meetingId, toUserId, byUserId, byAuthToken, status); - }; - - BBB.isUserEmojiStatusSet = function (userId) { - let ref, ref1, ref2, ref3; - return ((ref = BBB.getUser(userId)) != null ? (ref1 = ref.user) != null ? ref1.emoji_status : void 0 : void 0) !== 'none' && ((ref2 = BBB.getUser(userId)) != null ? (ref3 = ref2.user) != null ? ref3.emoji_status : void 0 : void 0) !== void 0; - }; - - BBB.isCurrentUserEmojiStatusSet = function () { - let ref; - return BBB.isUserEmojiStatusSet((ref = BBB.getCurrentUser()) != null ? ref.userId : void 0); - }; - - BBB.isMeetingRecording = function () { - let ref; - return (ref = MEteor.Meetings.findOne()) != null ? ref.recorded : void 0; - }; - - /* - Issue a switch presenter command. - - Param: - newPresenterUserID - the user id of the new presenter - - 3rd-party JS must listen for SWITCHED_PRESENTER (see below) to get notified - of switch presenter events. - */ - BBB.switchPresenter = function (newPresenterUserID) {}; - - /* - Query if current user is presenter. - - Params: - callback - function if you want a callback as response. Otherwise, you need to listen - for AM_I_PRESENTER_RESP (see below). - */ - BBB.amIPresenter = function (callback) { - return returnOrCallback(false, callback); - }; - - /* - Eject a user. - - Params: - userID - userID of the user you want to eject. - */ - BBB.ejectUser = function (userID) {}; - - /* - Query who is presenter. - - Params: - callback - function that gets executed for the response. - */ - BBB.getPresenterUserID = function (callback) {}; - - /* - Query the current user's role. - Params: - callback - function if you want a callback as response. Otherwise, you need to listen - for GET_MY_ROLE_RESP (see below). - */ - BBB.getMyRole = function (callback) { - return returnOrCallback('VIEWER', callback); - }; - - /* - Query the current user's id. - - Params: - callback - function that gets executed for the response. - */ - BBB.getMyUserID = function (callback) { - return returnOrCallback(getInSession('userId'), callback); - }; - - BBB.getMyDBID = function (callback) { - let ref; - return returnOrCallback((ref = Meteor.Users.findOne({ - userId: getInSession('userId'), - })) != null ? ref._id : void 0, callback); - }; - - BBB.getMyUserName = function (callback) { - let ref; - return BBB.getUserName((ref = BBB.getCurrentUser()) != null ? ref.userId : void 0); - }; - - BBB.getMyVoiceBridge = function (callback) { - let res; - res = Meteor.Meetings.findOne({}).voiceConf; - return returnOrCallback(res, callback); - }; - - BBB.getUserName = function (userId, callback) { - let ref, ref1; - return returnOrCallback((ref = BBB.getUser(userId)) != null ? (ref1 = ref.user) != null ? ref1.name : void 0 : void 0, callback); - }; - - /* - Query the current user's role. - Params: - callback - function if you want a callback as response. Otherwise, you need to listen - for GET_MY_ROLE_RESP (see below). - */ - BBB.getMyUserInfo = function (callback) { - let result; - result = { - myUserID: BBB.getMyUserID(), - myUsername: BBB.getMyUserName(), - myInternalUserID: BBB.getMyUserID(), - myAvatarURL: null, - myRole: BBB.getMyRole(), - amIPresenter: BBB.amIPresenter(), - voiceBridge: BBB.getMyVoiceBridge(), - dialNumber: null, - }; - return returnOrCallback(result, callback); - }; - - /* - Query the meeting id. - - Params: - callback - function that gets executed for the response. - */ - - /* - Join the voice conference. - isListenOnly: signifies whether the user joining the conference audio requests to join the listen only stream - */ - BBB.joinVoiceConference = function (callback, isListenOnly) { - if (BBB.isMyMicLocked()) { - callIntoConference(BBB.getMyVoiceBridge(), callback, true); - } - - return callIntoConference(BBB.getMyVoiceBridge(), callback, isListenOnly); - }; - - /* - Leave the voice conference. - */ - BBB.leaveVoiceConference = function (callback) { - return webrtc_hangup(callback); - }; - - /* - Get a hold of the object containing the call information - */ - BBB.getCallStatus = function () { - return getCallStatus(); - }; - - /* - Share user's webcam. - - Params: - publishInClient : (DO NOT USE - Unimplemented) - */ - BBB.shareVideoCamera = function (publishInClient) {}; - - /* - Stop share user's webcam. - */ - BBB.stopSharingCamera = function () {}; - - /* - Indicates if a user is muted - */ - BBB.isUserMuted = function (id) { - let ref, ref1, ref2; - return (ref = BBB.getUser(id)) != null ? (ref1 = ref.user) != null ? (ref2 = ref1.voiceUser) != null ? ref2.muted : void 0 : void 0 : void 0; - }; - - /* - Indicates if the current user is muted - */ - BBB.amIMuted = function () { - return BBB.isUserMuted(BBB.getCurrentUser().userId); - }; - - /* - Mute the current user. - */ - BBB.muteMe = function () { - return BBB.muteUser(getInSession('userId'), getInSession('userId'), getInSession('authToken')); - }; - - /* - Unmute the current user. - */ - BBB.unmuteMe = function () { - return BBB.unmuteUser(getInSession('userId'), getInSession('userId'), getInSession('authToken')); - }; - - BBB.muteUser = function (meetingId, userId, toMuteId, requesterId, requestToken) { - return Meteor.call('muteUser', meetingId, toMuteId, requesterId, getInSession('authToken')); - }; - - BBB.unmuteUser = function (meetingId, userId, toMuteId, requesterId, requestToken) { - return Meteor.call('unmuteUser', meetingId, toMuteId, requesterId, getInSession('authToken')); - }; - - BBB.toggleMyMic = function () { - let request; - request = BBB.amIMuted() ? 'unmuteUser' : 'muteUser'; - return Meteor.call(request, BBB.getMeetingId(), getInSession('userId'), getInSession('userId'), getInSession('authToken')); - }; - - /* - Mute all the users. - */ - BBB.muteAll = function () {}; - - /* - Unmute all the users. - */ - BBB.unmuteAll = function () {}; - - /* - Switch to a new layout. - - Param: - newLayout : name of the layout as defined in layout.xml (found in /var/www/bigbluebutton/client/conf/layout.xml) - */ - BBB.switchLayout = function (newLayout) {}; - - /* - Lock the layout. - - Locking the layout means that users will have the same layout with the moderator that issued the lock command. - Other users won't be able to move or resize the different windows. - */ - BBB.lockLayout = function (lock) {}; - - /* - Request to send a public chat - fromUserID - the external user id for the sender - fontColor - the color of the font to display the message - localeLang - the 2-char locale code (e.g. en) for the sender - message - the message to send - */ - BBB.sendPublicChatMessage = function (fontColor, localeLang, message) { - let messageForServer; - messageForServer = { - message: message, - chat_type: 'PUBLIC_CHAT', - from_userid: getInSession('userId'), - from_username: BBB.getMyUserName(), - from_tz_offset: '240', - to_username: 'public_chat_username', - to_userid: 'public_chat_userid', - from_lang: localeLang, - from_time: getTime(), - from_color: fontColor, - }; - return Meteor.call('sendChatMessagetoServer', BBB.getMeetingId(), messageForServer, getInSession('userId'), getInSession('authToken')); - }; - - /* - Request to send a private chat - fromUserID - the external user id for the sender - fontColor - the color of the font to display the message - localeLang - the 2-char locale code (e.g. en) for the sender - message - the message to send - toUserID - the external user id of the receiver - */ - BBB.sendPrivateChatMessage = function (fontColor, localeLang, message, toUserID, toUserName) { - let messageForServer; - messageForServer = { - message: message, - chat_type: 'PRIVATE_CHAT', - from_userid: getInSession('userId'), - from_username: BBB.getMyUserName(), - from_tz_offset: '240', - to_username: toUserName, - to_userid: toUserID, - from_lang: localeLang, - from_time: getTime(), - from_color: fontColor, - }; - return Meteor.call('sendChatMessagetoServer', BBB.getMeetingId(), messageForServer, getInSession('userId'), getInSession('authToken')); - }; - - /* - Request to display a presentation. - presentationID - the presentation to display - */ - BBB.displayPresentation = function (presentationID) {}; - - /* - Query the list of uploaded presentations. - */ - BBB.queryListOfPresentations = function () {}; - - /* - Request to delete a presentation. - presentationID - the presentation to delete - */ - BBB.deletePresentation = function (presentationID) {}; - - // Request to switch the presentation to the previous slide - BBB.goToPreviousPage = function () { - return Meteor.call('publishSwitchToPreviousSlideMessage', getInSession('meetingId'), getInSession('userId'), getInSession('authToken')); - }; - - // Request to switch the presentation to the next slide - BBB.goToNextPage = function () { - return Meteor.call('publishSwitchToNextSlideMessage', getInSession('meetingId'), getInSession('userId'), getInSession('authToken')); - }; - - BBB.webRTCConferenceCallStarted = function () {}; - - BBB.webRTCConferenceCallConnecting = function () {}; - - BBB.webRTCConferenceCallEnded = function () {}; - - BBB.webRTCConferenceCallFailed = function (errorcode) {}; - - BBB.webRTCConferenceCallWaitingForICE = function () {}; - - BBB.webRTCCallProgressCallback = function (progress) {}; - - BBB.webRTCEchoTestStarted = function () {}; - - BBB.webRTCEchoTestConnecting = function () {}; - - BBB.webRTCEchoTestFailed = function (reason) {}; - - BBB.webRTCEchoTestWaitingForICE = function () {}; - - BBB.webRTCEchoTestEnded = function () {}; - - BBB.webRTCMediaRequest = function () {}; - - BBB.webRTCMediaSuccess = function () {}; - - BBB.webRTCMediaFail = function () {}; - - BBB.webRTCWebcamRequest = function () {}; - - BBB.webRTCWebcamRequestSuccess = function () {}; - - BBB.webRTCWebcamRequestFail = function (reason) {}; - - // Third-party JS apps should use this to query if the BBB SWF file is ready to handle calls. - - // *********************************************************************************** - // * Broadcasting of events to 3rd-party apps. - // ************************************************************************************ - - /* - Stores the 3rd-party app event listeners ** - */ - listeners = {}; - - /* - 3rd-party apps should use this method to register to listen for events. - */ - BBB.listen = function (eventName, handler) {}; - - /* - 3rd-party app should use this method to unregister listener for a given event. - */ - BBB.unlisten = function (eventName, handler) {}; - - BBB.init = function (callback) {}; - - return BBB; -})(); diff --git a/bigbluebutton-html5/client/lib/regex-weburl.js b/bigbluebutton-html5/client/lib/regex-weburl.js deleted file mode 100755 index 2c8601236d..0000000000 --- a/bigbluebutton-html5/client/lib/regex-weburl.js +++ /dev/null @@ -1,110 +0,0 @@ -// -// Regular Expression for URL validation -// -// Author: Diego Perini -// Updated: 2010/12/05 -// License: MIT -// -// Copyright (c) 2010-2013 Diego Perini (http://www.iport.it) -// -// Permission is hereby granted, free of charge, to any person -// obtaining a copy of this software and associated documentation -// files (the "Software"), to deal in the Software without -// restriction, including without limitation the rights to use, -// copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following -// conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -// OTHER DEALINGS IN THE SOFTWARE. -// -// the regular expression composed & commented -// could be easily tweaked for RFC compliance, -// it was expressly modified to fit & satisfy -// these test for an URL shortener: -// -// http://mathiasbynens.be/demo/url-regex -// -// Notes on possible differences from a standard/generic validation: -// -// - utf-8 char class take in consideration the full Unicode range -// - TLDs have been made mandatory so single names like "localhost" fails -// - protocols have been restricted to ftp, http and https only as requested -// -// Changes: -// -// - IP address dotted notation validation, range: 1.0.0.0 - 223.255.255.255 -// first and last IP address of each class is considered invalid -// (since they are broadcast/network addresses) -// -// - Added exclusion of private, reserved and/or local networks ranges -// -// - Made starting path slash optional (http://example.com?foo=bar) -// -// - Allow a dot (.) at the end of hostnames (http://example.com.) -// -// Compressed one-line versions: -// -// Javascript version -// -// /^(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,}))\.?)(?::\d{2,5})?(?:[/?#]\S*)?$/i -// -// PHP version -// -// _^(?:(?:https?|ftp)://)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\x{00a1}-\x{ffff}0-9]-*)*[a-z\x{00a1}-\x{ffff}0-9]+)(?:\.(?:[a-z\x{00a1}-\x{ffff}0-9]-*)*[a-z\x{00a1}-\x{ffff}0-9]+)*(?:\.(?:[a-z\x{00a1}-\x{ffff}]{2,}))\.?)(?::\d{2,5})?(?:[/?#]\S*)?$_iuS -// - -re_weburl = new RegExp( - - // protocol identifier - '(?:(?:https?|ftp)://)' + - - // user:pass authentication - '(?:\\S+(?::\\S*)?@)?' + - '(?:' + - - // IP address exclusion - // private & local networks - '(?!(?:10|127)(?:\\.\\d{1,3}){3})' + - '(?!(?:169\\.254|192\\.168)(?:\\.\\d{1,3}){2})' + - '(?!172\\.(?:1[6-9]|2\\d|3[0-1])(?:\\.\\d{1,3}){2})' + - - // IP address dotted notation octets - // excludes loopback network 0.0.0.0 - // excludes reserved space >= 224.0.0.0 - // excludes network & broacast addresses - // (first & last IP address of each class) - '(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])' + - '(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}' + - '(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))' + - '|' + - - // host name - '(?:(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)' + - - // domain name - '(?:\\.(?:[a-z\\u00a1-\\uffff0-9]-*)*[a-z\\u00a1-\\uffff0-9]+)*' + - - // TLD identifier - '(?:\\.(?:[a-z\\u00a1-\\uffff]{2,}))' + - - // TLD may end with dot - '\\.?' + - ')' + - - // port number - '(?::\\d{2,5})?' + - - // resource path - '(?:[/?#]\\S*)?', 'img' -); diff --git a/bigbluebutton-html5/client/lib/scale.raphael.js b/bigbluebutton-html5/client/lib/scale.raphael.js deleted file mode 100644 index b2c4bf99df..0000000000 --- a/bigbluebutton-html5/client/lib/scale.raphael.js +++ /dev/null @@ -1,106 +0,0 @@ -/* - * ScaleRaphael 0.8 by Zevan Rosser 2010 - * For use with Raphael library : www.raphaeljs.com - * Licensed under the MIT license. - * - * www.shapevent.com/scaleraphael/ - */ -(function () { - window.ScaleRaphael = function (container, width, height) { - var wrapper = document.getElementById(container); - if (!wrapper.style.position) wrapper.style.position = 'relative'; - wrapper.style.width = width + 'px'; - wrapper.style.height = height + 'px'; - wrapper.style.overflow = 'hidden'; - var nestedWrapper; - - if (Raphael.type == 'VML') { - wrapper.innerHTML = "
<\/div>";
- nestedWrapper = document.getElementById('svggroup');
- }
-
- var paper = new Raphael(nestedWrapper, width, height);
- var vmlDiv;
-
- if (Raphael.type == 'SVG') {
- paper.canvas.setAttribute('viewBox', '0 0 ' + width + ' ' + height);
- }else {
- vmlDiv = wrapper.getElementsByTagName('div')[0];
- }
-
- paper.changeSize = function (w, h, center, clipping) {
- clipping = !clipping;
-
- var ratioW = w / width;
- var ratioH = h / height;
- var scale = ratioW < ratioH ? ratioW : ratioH;
-
- var newHeight = parseInt(height * scale);
- var newWidth = parseInt(width * scale);
-
- if (Raphael.type == 'VML') {
- // scale the textpaths
- var txt = document.getElementsByTagName('textpath');
- for (var i in txt) {
- var curr = txt[i];
- if (curr.style) {
- if (!curr._fontSize) {
- var mod = curr.style.font.split('px');
- curr._fontSize = parseInt(mod[0]);
- curr._font = mod[1];
- }
-
- curr.style.font = curr._fontSize * scale + 'px' + curr._font;
- }
- }
-
- var newSize;
-
- if (newWidth < newHeight) {
- newSize = newWidth * 1000 / width;
- }else {
- newSize = newHeight * 1000 / height;
- }
-
- newSize = parseInt(newSize);
- nestedWrapper.style.width = newSize + 'px';
- nestedWrapper.style.height = newSize + 'px';
- if (clipping) {
- nestedWrapper.style.left = parseInt((w - newWidth) / 2) + 'px';
- nestedWrapper.style.top = parseInt((h - newHeight) / 2) + 'px';
- }
-
- vmlDiv.style.overflow = 'visible';
- }
-
- if (clipping) {
- newWidth = w;
- newHeight = h;
- }
-
- wrapper.style.width = newWidth + 'px';
- wrapper.style.height = newHeight + 'px';
- paper.setSize(newWidth, newHeight);
-
- if (center) {
- wrapper.style.position = 'absolute';
- wrapper.style.left = parseInt((w - newWidth) / 2) + 'px';
- wrapper.style.top = parseInt((h - newHeight) / 2) + 'px';
- }
- };
-
- paper.scaleAll = function (amount) {
- paper.changeSize(width * amount, height * amount);
- };
-
- paper.changeSize(width, height);
-
- paper.w = width;
- paper.h = height;
-
- return paper;
- };
-})();
diff --git a/bigbluebutton-html5/client/main.css b/bigbluebutton-html5/client/main.css
new file mode 100644
index 0000000000..6ed797b135
--- /dev/null
+++ b/bigbluebutton-html5/client/main.css
@@ -0,0 +1,29 @@
+html {
+ box-sizing: border-box;
+}
+
+*, *:before, *:after {
+ box-sizing: inherit;
+}
+
+body {
+ font-family: 'Source Sans Pro', Arial, sans-serif;
+ font-size: 1rem; /* 16px */
+}
+
+a {
+ color: inherit;
+}
+
+#app {
+ height: 100vh;
+ width: 100vw;
+ overflow: hidden;
+}
+
+
+/* DEBUG ONLY
+* {
+ background-color: rgba(0, 0, 0, .025) !important;
+}
+*/
diff --git a/bigbluebutton-html5/client/main.html b/bigbluebutton-html5/client/main.html
old mode 100755
new mode 100644
index 2ef9362f0f..915f8346cd
--- a/bigbluebutton-html5/client/main.html
+++ b/bigbluebutton-html5/client/main.html
@@ -1,47 +1,6 @@
-
-
-
-
-
- BBB - HTML5 Client
+
+
+
+
diff --git a/bigbluebutton-html5/client/main.jsx b/bigbluebutton-html5/client/main.jsx
index 5d93dad744..269a29427f 100755
--- a/bigbluebutton-html5/client/main.jsx
+++ b/bigbluebutton-html5/client/main.jsx
@@ -1,302 +1,44 @@
import React from 'react';
-import ReactDOM from 'react-dom';
-import {UserListContainer} from '/imports/ui/userlist/UserListContainer.jsx';
-import { createContainer } from 'meteor/react-meteor-data';
-import '/imports/ui/stylesheets/variables.less';
-import '/imports/ui/stylesheets/style.less';
-import '/imports/ui/stylesheets/chat.less';
-import '/imports/ui/stylesheets/mixins.less';
-import '/imports/ui/stylesheets/modals.less';
-import '/imports/ui/stylesheets/users.less';
-import '/imports/ui/stylesheets/whiteboard.less';
+import { Meteor } from 'meteor/meteor';
+import { render } from 'react-dom';
+import { renderRoutes } from '../imports/startup/client/routes.js';
+import { IntlProvider, addLocaleData } from 'react-intl';
-let loadLib;
+import Locales from '../imports/locales';
+
+import en from 'react-intl/locale-data/en';
+import es from 'react-intl/locale-data/es';
+import pt from 'react-intl/locale-data/pt';
+
+/* TODO: Add this dynamically */
+addLocaleData([...en, ...es, ...pt]);
+
+// Safari sends us en-us instead of en-US
+let locale = navigator.language.split('-');
+locale = locale[1] ? `${locale[0]}-${locale[1].toUpperCase()}` : navigator.language;
+
+/* TODO: We should load the en first then merge with the en-US
+ (eg: load country translation then region) */
+let messages = Locales[locale] || Locales['en'] || {};
// Helper to load javascript libraries from the BBB server
-loadLib = function (libname) {
- let retryMessageCallback, successCallback;
- successCallback = function () {};
-
- retryMessageCallback = function (param) {
+function loadLib(libname, successCallback) {
+ const retryMessageCallback = function (param) {
return console.log('Failed to load library', param);
};
- return Meteor.Loader.loadJs(`${window.location.origin}/client/lib/${libname}`, successCallback, 10000).fail(retryMessageCallback);
+ return Meteor.Loader.loadJs(`${window.location.origin}/client/lib/${libname}`, successCallback,
+ 10000).fail(retryMessageCallback);
};
-// These settings can just be stored locally in session, created at start up
Meteor.startup(() => {
- // Load SIP libraries before the application starts
loadLib('sip.js');
loadLib('bbb_webrtc_bridge_sip.js');
loadLib('bbblogger.js');
- return this.SessionAmplify = _.extend({}, Session, {
- keys: _.object(_.map(amplify.store.sessionStorage(), (value, key) => {
- return [key, JSON.stringify(value)];
- })),
- set(key, value) {
- Session.set.apply(this, arguments);
- amplify.store.sessionStorage(key, value);
- },
- });
+
+ render((
+
+ {renderRoutes()}
+
+ ), document.getElementById('app'));
});
-
-Template.menu.events({
- 'click .slideButton'(event) {
- toggleShield();
- toggleSettingsMenu();
- return $('.slideButton').blur();
- },
-
- 'click .toggleChatButton'(event) {
- return toggleChatbar();
- },
-});
-
-Template.main.rendered = function () {
- ReactDOM.render(
' breakline character for Flash -this.translateHTML5ToFlash = function (message) { - let result; - result = message; - result = result.replace(new RegExp(CARRIAGE_RETURN, 'g'), BREAK_LINE); - result = result.replace(new RegExp(NEW_LINE, 'g'), BREAK_LINE); - return result; -}; - // translate '
' breakline character to '\r' carriage return character for HTML5 -this.translateFlashToHTML5 = function (message) { +const translateFlashToHTML5 = function (message) { let result; result = message; result = result.replace(new RegExp(BREAK_LINE, 'g'), CARRIAGE_RETURN); diff --git a/bigbluebutton-html5/imports/api/chat/server/modifiers/clearChatCollection.js b/bigbluebutton-html5/imports/api/chat/server/modifiers/clearChatCollection.js new file mode 100755 index 0000000000..7aa05e2dbc --- /dev/null +++ b/bigbluebutton-html5/imports/api/chat/server/modifiers/clearChatCollection.js @@ -0,0 +1,14 @@ +import Chat from '/imports/api/chat'; +import { logger } from '/imports/startup/server/logger'; + +// called on server start and meeting end +export function clearChatCollection() { + const meetingId = arguments[0]; + if (meetingId != null) { + return Chat.remove({ + meetingId: meetingId, + }, logger.info(`cleared Chat Collection (meetingId: ${meetingId}!`)); + } else { + return Chat.remove({}, logger.info('cleared Chat Collection (all meetings)!')); + } +}; diff --git a/bigbluebutton-html5/imports/api/chat/server/modifiers/eventHandlers.js b/bigbluebutton-html5/imports/api/chat/server/modifiers/eventHandlers.js new file mode 100644 index 0000000000..71e33f4d1f --- /dev/null +++ b/bigbluebutton-html5/imports/api/chat/server/modifiers/eventHandlers.js @@ -0,0 +1,39 @@ +import { eventEmitter } from '/imports/startup/server'; +import { addChatToCollection } from '/imports/api/chat/server/modifiers/addChatToCollection'; +import Meetings from '/imports/api/meetings'; + +eventEmitter.on('get_chat_history_reply', function (arg) { + if (arg.payload.requester_id === 'nodeJSapp') { //TODO extract this check + const meetingId = arg.payload.meeting_id; + if (Meetings.findOne({ + meetingId: meetingId, + }) == null) { + const chatHistory = arg.payload.chat_history; + const chatHistoryLength = chatHistory.length; + for (i = 0; i < chatHistoryLength; i++) { + const chatMessage = chatHistory[i]; + addChatToCollection(meetingId, chatMessage); + } + } + } + + return arg.callback(); +}); + +eventEmitter.on('send_public_chat_message', function (arg) { + handleChatEvent(arg); +}); + +eventEmitter.on('send_private_chat_message', function (arg) { + handleChatEvent(arg); +}); + +const handleChatEvent = function (arg) { + const messageObject = arg.payload.message; + const meetingId = arg.payload.meeting_id; + + // use current_time instead of message.from_time so that the chats from Flash and HTML5 have uniform times + messageObject.from_time = arg.header.current_time; + addChatToCollection(meetingId, messageObject); + return arg.callback(); +}; diff --git a/bigbluebutton-html5/imports/api/chat/server/publications.js b/bigbluebutton-html5/imports/api/chat/server/publications.js new file mode 100755 index 0000000000..e139921f50 --- /dev/null +++ b/bigbluebutton-html5/imports/api/chat/server/publications.js @@ -0,0 +1,26 @@ +import Chat from '/imports/api/chat'; +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { logger } from '/imports/startup/server/logger'; + +Meteor.publish('chat', function (credentials) { + if (isAllowedTo('subscribeChat', credentials)) { + const { meetingId, requesterUserId, requesterToken } = credentials; + logger.info(`publishing chat for ${meetingId} ${requesterUserId} ${requesterToken}`); + return Chat.find({ + $or: [ + { + 'message.chat_type': 'PUBLIC_CHAT', + meetingId: meetingId, + }, { + 'message.from_userid': requesterUserId, + meetingId: meetingId, + }, { + 'message.to_userid': requesterUserId, + meetingId: meetingId, + }, + ], + }); + } else { + this.error(new Meteor.Error(402, "The user was not authorized to subscribe for 'chats'")); + } +}); diff --git a/bigbluebutton-html5/imports/api/cursor/index.js b/bigbluebutton-html5/imports/api/cursor/index.js new file mode 100755 index 0000000000..34b927ff2c --- /dev/null +++ b/bigbluebutton-html5/imports/api/cursor/index.js @@ -0,0 +1 @@ +export default new Mongo.Collection('cursor'); diff --git a/bigbluebutton-html5/imports/api/cursor/server/modifiers/clearCursorCollection.js b/bigbluebutton-html5/imports/api/cursor/server/modifiers/clearCursorCollection.js new file mode 100755 index 0000000000..6ad5d4ee03 --- /dev/null +++ b/bigbluebutton-html5/imports/api/cursor/server/modifiers/clearCursorCollection.js @@ -0,0 +1,18 @@ +import Cursor from '/imports/api/cursor'; +import { logger } from '/imports/startup/server/logger'; + +// called on server start and meeting end +export function clearCursorCollection() { + const meetingId = arguments[0]; + if (meetingId != null) { + return Cursor.remove({ + meetingId: meetingId, + }, () => { + return logger.info(`cleared Cursor Collection (meetingId: ${meetingId})!`); + }); + } else { + return Cursor.remove({}, () => { + return logger.info('cleared Cursor Collection (all meetings)!'); + }); + } +}; diff --git a/bigbluebutton-html5/imports/api/cursor/server/modifiers/eventHandlers.js b/bigbluebutton-html5/imports/api/cursor/server/modifiers/eventHandlers.js new file mode 100644 index 0000000000..2e15d14446 --- /dev/null +++ b/bigbluebutton-html5/imports/api/cursor/server/modifiers/eventHandlers.js @@ -0,0 +1,14 @@ +import { updateCursorLocation } from './updateCursorLocation'; +import { eventEmitter } from '/imports/startup/server'; + +eventEmitter.on('presentation_cursor_updated_message', function (arg) { + const meetingId = arg.payload.meeting_id; + const cursor = { + x: arg.payload.x_percent, + y: arg.payload.y_percent, + }; + + // update the location of the cursor on the whiteboard + updateCursorLocation(meetingId, cursor); + return arg.callback(); +}); diff --git a/bigbluebutton-html5/imports/api/cursor/server/modifiers/initializeCursor.js b/bigbluebutton-html5/imports/api/cursor/server/modifiers/initializeCursor.js new file mode 100755 index 0000000000..390b16eff2 --- /dev/null +++ b/bigbluebutton-html5/imports/api/cursor/server/modifiers/initializeCursor.js @@ -0,0 +1,18 @@ +import Cursor from '/imports/api/cursor'; +import { logger } from '/imports/startup/server/logger'; + +export function initializeCursor(meetingId) { + return Cursor.upsert({ + meetingId: meetingId, + }, { + meetingId: meetingId, + x: 0, + y: 0, + }, (err, numChanged) => { + if (err) { + return logger.error(`err upserting cursor for ${meetingId}`); + } else { + // logger.info "ok upserting cursor for #{meetingId}" + } + }); +}; diff --git a/bigbluebutton-html5/imports/api/cursor/server/modifiers/updateCursorLocation.js b/bigbluebutton-html5/imports/api/cursor/server/modifiers/updateCursorLocation.js new file mode 100755 index 0000000000..57189241b6 --- /dev/null +++ b/bigbluebutton-html5/imports/api/cursor/server/modifiers/updateCursorLocation.js @@ -0,0 +1,19 @@ +import Cursor from '/imports/api/cursor'; +import { logger } from '/imports/startup/server/logger'; + +export function updateCursorLocation(meetingId, cursorObject) { + return Cursor.update({ + meetingId: meetingId, + }, { + $set: { + x: cursorObject.x, + y: cursorObject.y, + }, + }, (err, numChanged) => { + if (err != null) { + return logger.error(`_unsucc update of cursor for ${meetingId} err=${JSON.stringify(err)}`); + } else { + // logger.info "updated cursor for #{meetingId} #{JSON.stringify cursorObject}" + } + }); +}; diff --git a/bigbluebutton-html5/imports/api/cursor/server/publications.js b/bigbluebutton-html5/imports/api/cursor/server/publications.js new file mode 100755 index 0000000000..73c2a8c509 --- /dev/null +++ b/bigbluebutton-html5/imports/api/cursor/server/publications.js @@ -0,0 +1,10 @@ +import Cursor from '/imports/api/cursor'; +import { logger } from '/imports/startup/server/logger'; + +Meteor.publish('cursor', function (credentials) { + const { meetingId } = credentials; + logger.info(`publishing cursor for ${meetingId}`); + return Cursor.find({ + meetingId: meetingId, + }); +}); diff --git a/bigbluebutton-html5/imports/api/deskshare/index.js b/bigbluebutton-html5/imports/api/deskshare/index.js new file mode 100755 index 0000000000..1f5ee028a7 --- /dev/null +++ b/bigbluebutton-html5/imports/api/deskshare/index.js @@ -0,0 +1 @@ +export default new Mongo.Collection('deskshare'); diff --git a/bigbluebutton-html5/imports/api/deskshare/server/modifiers/clearDeskshareCollection.js b/bigbluebutton-html5/imports/api/deskshare/server/modifiers/clearDeskshareCollection.js new file mode 100755 index 0000000000..369d701505 --- /dev/null +++ b/bigbluebutton-html5/imports/api/deskshare/server/modifiers/clearDeskshareCollection.js @@ -0,0 +1,14 @@ +import Deskshare from '/imports/api/deskshare'; +import { logger } from '/imports/startup/server/logger'; + +export function clearDeskshareCollection(meetingId) { + if (meetingId != null) { + Deskshare.remove({ meetingId: meetingId }, function () { + logger.info(`cleared Deskshare Collection (meetingId: ${this.meetingId}!)`); + }); + } else { + Deskshare.remove({}, function () { + logger.info(`cleared Deskshare Collection (all meetings)!`); + }); + } +} diff --git a/bigbluebutton-html5/imports/api/deskshare/server/modifiers/handleDeskShareChange.js b/bigbluebutton-html5/imports/api/deskshare/server/modifiers/handleDeskShareChange.js new file mode 100755 index 0000000000..95c505adc3 --- /dev/null +++ b/bigbluebutton-html5/imports/api/deskshare/server/modifiers/handleDeskShareChange.js @@ -0,0 +1,27 @@ +import Deskshare from '/imports/api/deskshare'; +import { logger } from '/imports/startup/server/logger'; + +export function handleDeskShareChange(meetingId, deskshareInfo) { + logger.info(`__${meetingId}__deskshareInfo= + ${JSON.stringify(deskshareInfo)}`); + const presenter = Users.findOne({ meetingId: meetingId, 'user.presenter': true }).user.userid; + Deskshare.upsert({ meetingId: meetingId }, { $set: { + broadcasting: deskshareInfo.broadcasting, + timestamp: 'now', + vw: deskshareInfo.vw, + vh: deskshareInfo.vh, + voice_bridge: deskshareInfo.voice_bridge, + startedBy: presenter, + }, }); +} + +// emitter.on('desk_share_notify_viewers_rtmp', function (arg) { +// handleIncomingDeskshareMessage(arg); +// return arg.callback(); +// }); +// +// emitter.on('desk_share_notify_a_single_viewer', function (arg) { +// if (arg.payload.requester_id === 'nodeJSapp') { +// handleIncomingDeskshareMessage(arg); +// } +// return arg.callback(); +// }); diff --git a/bigbluebutton-html5/imports/api/deskshare/server/modifiers/handleIncomingDeskshareMessage.js b/bigbluebutton-html5/imports/api/deskshare/server/modifiers/handleIncomingDeskshareMessage.js new file mode 100755 index 0000000000..3f33a9329f --- /dev/null +++ b/bigbluebutton-html5/imports/api/deskshare/server/modifiers/handleIncomingDeskshareMessage.js @@ -0,0 +1,14 @@ +import Meetings from '/imports/api/meetings'; + +export function handleIncomingDeskshareMessage(arg) { + const payload = arg.payload; + const voiceBridge = Meetings.findOne({ meetingId: payload.meetingId }).voiceConf; + const thisMeetingId = payload.meetingId; + const deskShareInfo = { + vw: payload.vw, + vh: payload.vh, + voice_bridge: voiceBridge, // payload.voice_bridge + broadcasting: payload.broadcasting, + }; + handleDeskShareChange(thisMeetingId, deskShareInfo); +} diff --git a/bigbluebutton-html5/imports/api/deskshare/server/publications.js b/bigbluebutton-html5/imports/api/deskshare/server/publications.js new file mode 100755 index 0000000000..2c479cc1c9 --- /dev/null +++ b/bigbluebutton-html5/imports/api/deskshare/server/publications.js @@ -0,0 +1,8 @@ +import Deskshare from '/imports/api/deskshare'; +import { logger } from '/imports/startup/server/logger'; + +Meteor.publish('deskshare', function (credentials) { + const { meetingId } = credentials; + logger.info(`publishing deskshare for ${meetingId}`); + return Deskshare.find({ meetingId: meetingId }); +}); diff --git a/bigbluebutton-html5/imports/api/meetings/index.js b/bigbluebutton-html5/imports/api/meetings/index.js new file mode 100755 index 0000000000..9a15930458 --- /dev/null +++ b/bigbluebutton-html5/imports/api/meetings/index.js @@ -0,0 +1 @@ +export default new Mongo.Collection('meetings'); diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js new file mode 100755 index 0000000000..228e91f63c --- /dev/null +++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js @@ -0,0 +1,47 @@ +import { initializeCursor } from '/imports/api/cursor/server/modifiers/initializeCursor'; +import Meetings from '/imports/api/meetings'; +import { logger } from '/imports/startup/server/logger'; + +export function addMeetingToCollection(meetingId, name, intendedForRecording, + voiceConf, duration, callback) { + //check if the meeting is already in the collection + Meetings.upsert({ + meetingId: meetingId, + }, { + $set: { + meetingName: name, + intendedForRecording: intendedForRecording, + currentlyBeingRecorded: false, + voiceConf: voiceConf, + duration: duration, + roomLockSettings: { + // by default the lock settings will be disabled on meeting create + disablePrivateChat: false, + disableCam: false, + disableMic: false, + lockOnJoin: Meteor.config.lockOnJoin, + lockedLayout: false, + disablePublicChat: false, + lockOnJoinConfigurable: false, // TODO + }, + }, + }, (_this => { + return function (err, numChanged) { + let funct; + if (numChanged.insertedId != null) { + funct = function (cbk) { + logger.info(`__added MEETING ${meetingId}`); + return cbk(); + }; + + return funct(callback); + } else { + logger.error('nothing happened'); + return callback(); + } + }; + })(this)); + + // initialize the cursor in the meeting + return initializeCursor(meetingId); +}; diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/clearMeetingsCollection.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/clearMeetingsCollection.js new file mode 100755 index 0000000000..aacbcb726f --- /dev/null +++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/clearMeetingsCollection.js @@ -0,0 +1,13 @@ +import Meetings from '/imports/api/meetings'; +import { logger } from '/imports/startup/server/logger'; + +export function clearMeetingsCollection() { + const meetingId = arguments[0]; + if (meetingId != null) { + return Meetings.remove({ + meetingId: meetingId, + }, logger.info(`cleared Meetings Collection (meetingId: ${meetingId}!`)); + } else { + return Meetings.remove({}, logger.info('cleared Meetings Collection (all meetings)!')); + } +}; diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/eventHandlers.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/eventHandlers.js new file mode 100644 index 0000000000..c8d9d90149 --- /dev/null +++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/eventHandlers.js @@ -0,0 +1,105 @@ +import { eventEmitter } from '/imports/startup/server'; +import { logger } from '/imports/startup/server/logger'; +import Meetings from '/imports/api/meetings'; +import { handleLockingMic } from '/imports/api/users/server/modifiers/handleLockingMic'; +import { addMeetingToCollection } from './addMeetingToCollection'; +import { removeMeetingFromCollection } from './removeMeetingFromCollection'; + +eventEmitter.on('meeting_ended_message', function (arg) { + handleEndOfMeeting(arg); +}); + +eventEmitter.on('meeting_destroyed_event', function (arg) { + handleEndOfMeeting(arg); +}); + +eventEmitter.on('recording_status_changed_message', function (arg) { + const intendedForRecording = arg.payload.recorded; + const currentlyBeingRecorded = arg.payload.recording; + const meetingId = arg.payload.meeting_id; + + Meetings.update({ + meetingId: meetingId, + intendedForRecording: intendedForRecording, + }, { + $set: { + currentlyBeingRecorded: currentlyBeingRecorded, + }, + }); + return arg.callback(); +}); + +eventEmitter.on('new_permission_settings', function (arg) { + const meetingId = arg.payload.meeting_id; + const payload = arg.payload; + const meetingObject = Meetings.findOne({ + meetingId: meetingId, + }); + if (meetingObject != null && payload != null) { + const oldSettings = meetingObject.roomLockSettings; + const newSettings = payload.permissions; + + // if the disableMic setting was turned on + if (oldSettings != null && !oldSettings.disableMic && newSettings.disableMic) { + handleLockingMic(meetingId, newSettings); + } + + const settingsObj = { + disablePrivateChat: newSettings.disablePrivateChat, + disableCam: newSettings.disableCam, + disableMic: newSettings.disableMic, + lockOnJoin: newSettings.lockOnJoin, + lockedLayout: newSettings.lockedLayout, + disablePublicChat: newSettings.disablePublicChat, + lockOnJoinConfigurable: newSettings.lockOnJoinConfigurable, + }; + + // substitute with the new lock settings + Meetings.update({ + meetingId: meetingId, + }, { + $set: { + roomLockSettings: settingsObj, + }, + }); + } + + return arg.callback(); +}); + +eventEmitter.on('meeting_created_message', function (arg) { + const meetingName = arg.payload.name; + const intendedForRecording = arg.payload.recorded; + const voiceConf = arg.payload.voice_conf; + const duration = arg.payload.duration; + const meetingId = arg.payload.meeting_id; + return addMeetingToCollection(meetingId, meetingName, intendedForRecording, + voiceConf, duration, arg.callback); +}); + +eventEmitter.on('get_all_meetings_reply', function (arg) { + logger.info('Let\'s store some data for the running meetings so that when an' + + ' HTML5 client joins everything is ready!'); + logger.info(JSON.stringify(arg.payload)); + const listOfMeetings = arg.payload.meetings; + + // Processing the meetings recursively with a callback to notify us, + // ensuring that we update the meeting collection serially + let processMeeting = function () { + let meeting = listOfMeetings.pop(); + if (meeting != null) { + return addMeetingToCollection(meeting.meetingID, meeting.meetingName, + meeting.recorded, meeting.voiceBridge, meeting.duration, processMeeting); + } else { + return arg.callback(); // all meeting arrays (if any) have been processed + } + }; + + return processMeeting(); +}); + +export const handleEndOfMeeting = function (arg) { + const meetingId = arg.payload.meeting_id; + logger.info(`DESTROYING MEETING ${meetingId}`); + return removeMeetingFromCollection(meetingId, arg.callback); +}; diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/removeMeetingFromCollection.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/removeMeetingFromCollection.js new file mode 100755 index 0000000000..11d49298a9 --- /dev/null +++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/removeMeetingFromCollection.js @@ -0,0 +1,50 @@ +import { clearUsersCollection } from '/imports/api/users/server/modifiers/clearUsersCollection'; +import { clearChatCollection } from '/imports/api/chat/server/modifiers/clearChatCollection'; +import { clearShapesCollection } from '/imports/api/shapes/server/modifiers/clearShapesCollection'; +import { clearSlidesCollection } from '/imports/api/slides/server/modifiers/clearSlidesCollection'; +import { clearPresentationsCollection } from '/imports/api/presentations/server/modifiers/clearPresentationsCollection'; +import { clearPollCollection } from '/imports/api/polls/server/modifiers/clearPollCollection'; +import { clearCursorCollection } from '/imports/api/cursor/server/modifiers/clearCursorCollection'; +import Meetings from '/imports/api/meetings'; +import { logger } from '/imports/startup/server/logger'; + +//clean up upon a meeting's end +export function removeMeetingFromCollection(meetingId, callback) { + if (Meetings.findOne({ + meetingId: meetingId, + }) != null) { + logger.info(`end of meeting ${meetingId}. Clear the meeting data from all collections`); + + // delete all users in the meeting + clearUsersCollection(meetingId); + + // delete all slides in the meeting + clearSlidesCollection(meetingId); + + // delete all shapes in the meeting + clearShapesCollection(meetingId); + + // delete all presentations in the meeting + clearPresentationsCollection(meetingId); + + // delete all chat messages in the meeting + clearChatCollection(meetingId); + + // delete the meeting + clearMeetingsCollection(meetingId); + + // delete the cursor for the meeting + clearCursorCollection(meetingId); + + //delete the polls for the meeting + clearPollCollection(meetingId); + return callback(); + } else { + let funct = function (localCallback) { + logger.error(`Error! There was no such meeting ${meetingId}`); + return localCallback(); + }; + + return funct(callback); + } +}; diff --git a/bigbluebutton-html5/imports/api/meetings/server/publications.js b/bigbluebutton-html5/imports/api/meetings/server/publications.js new file mode 100755 index 0000000000..12adaa0d13 --- /dev/null +++ b/bigbluebutton-html5/imports/api/meetings/server/publications.js @@ -0,0 +1,10 @@ +import Meetings from '/imports/api/meetings'; +import { logger } from '/imports/startup/server/logger'; + +Meteor.publish('meetings', function (credentials) { + const { meetingId } = credentials; + logger.info(`publishing meetings for ${meetingId}`); + return Meetings.find({ + meetingId: meetingId, + }); +}); diff --git a/bigbluebutton-html5/imports/api/phone/index.js b/bigbluebutton-html5/imports/api/phone/index.js new file mode 100755 index 0000000000..2053f90ee1 --- /dev/null +++ b/bigbluebutton-html5/imports/api/phone/index.js @@ -0,0 +1,96 @@ +import Users from '/imports/api/users'; +import Meetings from '/imports/api/meetings'; + +//TODO relocate? Anton + +// Periodically check the status of the WebRTC call, when a call has been established attempt to +// hangup, retry if a call is in progress, send the leave voice conference message to BBB +// export function exitVoiceCall(event, afterExitCall) { +// if (!Meteor.config.useSIPAudio) { +// leaveWebRTCVoiceConference_verto(); +// cur_call = null; +// return; +// } else { +// // To be called when the hangup is initiated +// hangupCallback = function() { +// console.log('Exiting Voice Conference'); +// } +// +// // Checks periodically until a call is established so we can successfully end the call +// // clean state +// getInSession("triedHangup", false); +// // function to initiate call +// const checkToHangupCall = (function(context) { +// // if an attempt to hang up the call is made when the current session is not yet finished, +// the request has no effect +// // keep track in the session if we haven't tried a hangup +// if (BBB.getCallStatus() != null && !getInSession("triedHangup")) { +// console.log('Attempting to hangup on WebRTC call'); +// notify BBB-apps we are leaving the call call if we are listen only +// if (BBB.amIListenOnlyAudio()) { +// Meteor.call('listenOnlyRequestToggle', BBB.getMeetingId(), BBB.getMyUserId(), +// BBB.getMyAuthToken(), false); +// } +// BBB.leaveVoiceConference(hangupCallback); +// getInSession("triedHangup", true); // we have hung up, prevent retries +// notification_WebRTCAudioExited(); +// if (afterExitCall) { +// afterExitCall(this, Meteor.config.app.listenOnly); +// } +// } else { +// // console.log(`RETRYING hangup on WebRTC call in +// ${Meteor.config.app.WebRTCHangupRetryInterval} ms`); +// // try again periodically +// setTimeout(checkToHangupCall, Meteor.config.app.WebRTCHangupRetryInterval); +// } +// })(this); // automatically run function +// return false; +// }; +// } + +BBB = {}; +BBB.getMyUserInfo = function (callback) { + let result = { + myUserID: 'getMyUserID', + myUsername: 'getMyUserName', + myInternalUserID: 'BBB.getMyUserID', + myAvatarURL: null, + myRole: 'getMyRole', + amIPresenter: 'amIPresenter', + voiceBridge: '70506', + dialNumber: null, + }; + return callback(result); +}; + +// join the conference. If listen only send the request to the server +function joinVoiceCall(options) { + console.log(options); + if (options.useSIPAudio) { + // create voice call params + const joinCallback = function (message) { + console.log('Beginning WebRTC Conference Call'); + }; + + if (options.isListenOnly) { + // Meteor.call('listenOnlyRequestToggle', getInSession('meetingId'), getInSession('userId'), + // getInSession('authToken'), true); + } + + const requestedListenOnly = options.isListenOnly; + + // BBB.joinVoiceConference(joinCallback, requestedListenOnly); // make the call + const voiceBridge = Meetings.findOne({}).voiceConf; + callIntoConference(voiceBridge, function () {}, requestedListenOnly); + + return; + } else { + const extension = Meetings.findOne().voiceConf; + const uName = Users.findOne({ userId: getInSession('userId') }).user.name; + conferenceUsername = 'FreeSWITCH User - ' + encodeURIComponent(uName); + conferenceIdNumber = '1009'; + vertoService.joinAudio(); + } +} + +export { joinVoiceCall }; diff --git a/bigbluebutton-html5/imports/api/phone/server/eventHandlers.js b/bigbluebutton-html5/imports/api/phone/server/eventHandlers.js new file mode 100644 index 0000000000..26ca8aa0a1 --- /dev/null +++ b/bigbluebutton-html5/imports/api/phone/server/eventHandlers.js @@ -0,0 +1,41 @@ +import { eventEmitter } from '/imports/startup/server'; +import { updateVoiceUser } from '/imports/api/users/server/modifiers/updateVoiceUser'; + +eventEmitter.on('user_left_voice_message', function (arg) { + handleVoiceEvent(arg); +}); + +eventEmitter.on('user_joined_voice_message', function (arg) { + handleVoiceEvent(arg); +}); + +eventEmitter.on('user_voice_talking_message', function (arg) { + handleVoiceEvent(arg); +}); + +eventEmitter.on('user_voice_muted_message', function (arg) { + handleVoiceEvent(arg); +}); + +eventEmitter.on('user_listening_only', function (arg) { + const voiceUserObj = { + web_userid: arg.payload.userid, + listen_only: arg.payload.listen_only, + }; + const meetingId = arg.payload.meeting_id; + return updateVoiceUser(meetingId, voiceUserObj, arg.callback); +}); + +const handleVoiceEvent = function (arg) { + const meetingId = arg.payload.meeting_id; + const voiceUser = payload.user.voiceUser; + const voiceUserObj = { + web_userid: voiceUser.web_userid, + listen_only: arg.payload.listen_only, + talking: voiceUser.talking, + joined: voiceUser.joined, + locked: voiceUser.locked, + muted: voiceUser.muted, + }; + return updateVoiceUser(meetingId, voiceUserObj, arg.callback); +}; diff --git a/bigbluebutton-html5/imports/api/polls/index.js b/bigbluebutton-html5/imports/api/polls/index.js new file mode 100755 index 0000000000..8923430f1d --- /dev/null +++ b/bigbluebutton-html5/imports/api/polls/index.js @@ -0,0 +1 @@ +export default new Mongo.Collection('polls'); diff --git a/bigbluebutton-html5/imports/api/polls/server/methods/publishVoteMessage.js b/bigbluebutton-html5/imports/api/polls/server/methods/publishVoteMessage.js new file mode 100755 index 0000000000..a38b668631 --- /dev/null +++ b/bigbluebutton-html5/imports/api/polls/server/methods/publishVoteMessage.js @@ -0,0 +1,49 @@ +import { publish } from '/imports/startup/server/helpers'; +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { appendMessageHeader } from '/imports/startup/server/helpers'; +import Polls from '/imports/api/polls'; +import { logger } from '/imports/startup/server/logger'; +import { redisConfig } from '/config'; + +Meteor.methods({ + publishVoteMessage(credentials, pollId, pollAnswerId) { //TODO discuss location + if (isAllowedTo('subscribePoll', credentials)) { + const { meetingId, requesterUserId, requesterToken } = credentials; + const eventName = 'vote_poll_user_request_message'; + + const result = Polls.findOne({ + users: { $in: [requesterUserId] }, + meetingId: meetingId, + poll: { answers: { id: { $in: [pollAnswerId] } } }, + poll: { id: pollId }, + }); + + if ((meetingId != null) && + (result.meetingId != null) && + (requesterUserId != null) && + (pollAnswerId != null)) { + let message = { + payload: { + meeting_id: result.meetingId, + user_id: requesterUserId, + poll_id: result.poll.id, + question_id: 0, + answer_id: pollAnswerId, + }, + }; + Polls.update({ + users: { $in: [requesterUserId] }, + meetingId: meetingId, + poll: { answers: { id: { $in: [pollAnswerId] } } }, + }, { + $pull: { + users: requesterUserId, + }, + }); + message = appendMessageHeader(eventName, message); + logger.info('publishing Poll response to redis'); + return publish(redisConfig.channels.toBBBApps.polling, message); + } + } + }, +}); diff --git a/bigbluebutton-html5/imports/api/polls/server/modifiers/addPollToCollection.js b/bigbluebutton-html5/imports/api/polls/server/modifiers/addPollToCollection.js new file mode 100755 index 0000000000..6ac5fb87e1 --- /dev/null +++ b/bigbluebutton-html5/imports/api/polls/server/modifiers/addPollToCollection.js @@ -0,0 +1,37 @@ +import Polls from '/imports/api/polls'; +import { logger } from '/imports/startup/server/logger'; + +export function addPollToCollection(poll, requesterId, users, meetingId) { + // copying all the userids into an array + let newUsers = []; + newUsersLength = users.length; + for (let i = 0; i < newUsersLength; i++) { + const user = users[i]; + newUsers.push(user.user.userid); + } + + // adding the initial number of votes for each answer + // _answers = poll.answers; + // _answers_length = _answers.length; + // for (j = 0; j < _answers_length; j++) { + // answer = _answers[j]; + // answer.num_votes = 0; + // } + + // adding the initial number of responders and respondents to the poll, which will be displayed + // for presenter (in HTML5 client) when they start the poll + numResponders = -1; + numRespondents = -1; + + // adding all together and inserting into the Polls collection + const entry = { + meetingId: meetingId, + poll: poll, + requester: requesterId, + users: newUsers, + num_responders: -1, + num_respondents: -1, + }; + logger.info(`added poll _id=[${poll.id}]:meetingId=[${meetingId}].`); + return Polls.insert(entry); +}; diff --git a/bigbluebutton-html5/imports/api/polls/server/modifiers/clearPollCollection.js b/bigbluebutton-html5/imports/api/polls/server/modifiers/clearPollCollection.js new file mode 100755 index 0000000000..d81ca906e5 --- /dev/null +++ b/bigbluebutton-html5/imports/api/polls/server/modifiers/clearPollCollection.js @@ -0,0 +1,20 @@ +import Polls from '/imports/api/polls'; +import { logger } from '/imports/startup/server/logger'; + +export function clearPollCollection() { + const meetingId = arguments[0]; + const pollId = arguments[1]; + + //TODO make it so you can delete the polls based only on meetingId + if (meetingId != null && pollId != null && Polls.findOne({ + meetingId: meetingId, + poll: { id: pollId }, + }) != null) { + return Polls.remove({ + meetingId: meetingId, + poll: { id: pollId }, + }, logger.info(`cleared Polls Collection (meetingId: ${meetingId}, pollId: ${pollId}!)`)); + } else { + return Polls.remove({}, logger.info('cleared Polls Collection (all meetings)!')); + } +}; diff --git a/bigbluebutton-html5/imports/api/polls/server/modifiers/eventHandlers.js b/bigbluebutton-html5/imports/api/polls/server/modifiers/eventHandlers.js new file mode 100644 index 0000000000..20bbc4c92c --- /dev/null +++ b/bigbluebutton-html5/imports/api/polls/server/modifiers/eventHandlers.js @@ -0,0 +1,70 @@ +import { eventEmitter } from '/imports/startup/server'; +import { clearPollCollection } from './clearPollCollection'; +import { updatePollCollection } from './updatePollCollection'; +import { addPollToCollection } from './addPollToCollection'; +import Meetings from '/imports/api/meetings'; +import Users from '/imports/api/users'; + +eventEmitter.on('poll_show_result_message', function (arg) { + const payload = arg.payload; + const meetingId = payload.meeting_id; + if (payload != null && payload.poll != null && payload.poll.id != null && meetingId != null) { + const pollId = payload.poll.id; + clearPollCollection(meetingId, pollId); + } + + return arg.callback(); +}); + +eventEmitter.on('poll_started_message', function (arg) { + const payload = arg.payload; + const meetingId = payload.meeting_id; + + if (payload != null && meetingId != null && + payload.requester_id != null && payload.poll != null) { + if (Meetings.findOne({ + meetingId: meetingId, + }) != null) { + const users = Users.find({ + meetingId: meetingId, + }, { + fields: { + 'user.userid': 1, + _id: 0, + }, + }).fetch(); + addPollToCollection( + payload.poll, + payload.requester_id, + users, + meetingId + ); + } + } + + return arg.callback(); +}); + +eventEmitter.on('poll_stopped_message', function (arg) { + const payload = arg.payload; + const meetingId = payload.meeting_id; + + if (meetingId != null && payload != null && payload.poll_id != null) { + const pollId = payload.poll_id; + clearPollCollection(meetingId, pollId); + } + + return arg.callback(); +}); + +eventEmitter.on('user_voted_poll_message', function (arg) { + const payload = arg.payload; + const meetingId = payload.meeting_id; + if (payload != null && payload.poll != null && meetingId != null && + payload.presenter_id != null) { + const pollObj = payload.poll; + const requesterId = payload.presenter_id; + updatePollCollection(pollObj, meetingId, requesterId); + return arg.callback(); + } +}); diff --git a/bigbluebutton-html5/imports/api/polls/server/modifiers/updatePollCollection.js b/bigbluebutton-html5/imports/api/polls/server/modifiers/updatePollCollection.js new file mode 100755 index 0000000000..e224c5932f --- /dev/null +++ b/bigbluebutton-html5/imports/api/polls/server/modifiers/updatePollCollection.js @@ -0,0 +1,19 @@ +import Polls from '/imports/api/polls'; +import { logger } from '/imports/startup/server/logger'; + +export function updatePollCollection(poll, meetingId, requesterId) { + if ((poll.answers != null) && (poll.numResponders != null) && (poll.numRespondents != null) && + (poll.id != null) && (meetingId != null) && (requesterId != null)) { + return Polls.update({ + meetingId: meetingId, + requester: requesterId, + poll: { id: poll.id }, + }, { + $set: { + poll: { answers: poll.answers }, + poll: { num_responders: poll.numResponders }, + poll: { num_respondents: poll.numRespondents }, + }, + }, logger.info(`updating Polls Collection (meetingId: ${meetingId}, pollId: ${poll.id}!)`)); + } +}; diff --git a/bigbluebutton-html5/imports/api/polls/server/publications.js b/bigbluebutton-html5/imports/api/polls/server/publications.js new file mode 100755 index 0000000000..379d89d325 --- /dev/null +++ b/bigbluebutton-html5/imports/api/polls/server/publications.js @@ -0,0 +1,31 @@ +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import Polls from '/imports/api/polls'; +import { logger } from '/imports/startup/server/logger'; + +Meteor.publish('polls', function (credentials) { + const { meetingId, requesterUserId, requesterToken } = credentials; + + //checking if it is allowed to see Poll Collection in general + if (isAllowedTo('subscribePoll', credentials)) { + //checking if it is allowed to see a number of votes (presenter only) + if (isAllowedTo('subscribeAnswers', credentials)) { + logger.info('publishing Poll for presenter: ' + meetingId + ' ' + requesterUserId + ' ' + requesterToken); + return Polls.find({ + 'poll_info.meetingId': meetingId, + 'poll_info.users': requesterUserId, + }); + } else { + logger.info('publishing Poll for viewer: ' + meetingId + ' ' + requesterUserId + ' ' + requesterToken); + return Polls.find({ + 'poll_info.meetingId': meetingId, + 'poll_info.users': requesterUserId, + }, { + fields: { + 'poll_info.poll.answers.num_votes': 0, + }, + }); + } + } else { + this.error(new Meteor.Error(402, "The user was not authorized to subscribe for 'polls'")); + } +}); diff --git a/bigbluebutton-html5/imports/api/presentations/index.js b/bigbluebutton-html5/imports/api/presentations/index.js new file mode 100755 index 0000000000..bd409675ab --- /dev/null +++ b/bigbluebutton-html5/imports/api/presentations/index.js @@ -0,0 +1 @@ +export default new Mongo.Collection('presentations'); diff --git a/bigbluebutton-html5/server/methods/publishSwitchToNextSlideMessage.js b/bigbluebutton-html5/imports/api/presentations/server/methods/publishSwitchToNextSlideMessage.js old mode 100644 new mode 100755 similarity index 53% rename from bigbluebutton-html5/server/methods/publishSwitchToNextSlideMessage.js rename to bigbluebutton-html5/imports/api/presentations/server/methods/publishSwitchToNextSlideMessage.js index d0e69a0109..57f6fa5597 --- a/bigbluebutton-html5/server/methods/publishSwitchToNextSlideMessage.js +++ b/bigbluebutton-html5/imports/api/presentations/server/methods/publishSwitchToNextSlideMessage.js @@ -1,33 +1,41 @@ +import { publish } from '/imports/startup/server/helpers'; +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { appendMessageHeader } from '/imports/startup/server/helpers'; +import Presentations from '/imports/api/presentations'; +import Slides from '/imports/api/slides'; +import { redisConfig } from '/config'; + Meteor.methods({ - publishSwitchToNextSlideMessage(meetingId, userId, authToken) { + publishSwitchToNextSlideMessage(credentials) { + const { meetingId, requesterUserId, requesterToken } = credentials; let currentPresentationDoc, currentSlideDoc, message, nextSlideDoc; - currentPresentationDoc = Meteor.Presentations.findOne({ + currentPresentationDoc = Presentations.findOne({ meetingId: meetingId, 'presentation.current': true, }); if (currentPresentationDoc != null) { - currentSlideDoc = Meteor.Slides.findOne({ + currentSlideDoc = Slides.findOne({ meetingId: meetingId, presentationId: currentPresentationDoc.presentation.id, 'slide.current': true, }); if (currentSlideDoc != null) { - nextSlideDoc = Meteor.Slides.findOne({ + nextSlideDoc = Slides.findOne({ meetingId: meetingId, presentationId: currentPresentationDoc.presentation.id, 'slide.num': currentSlideDoc.slide.num + 1, }); - if ((nextSlideDoc != null) && isAllowedTo('switchSlide', meetingId, userId, authToken)) { + if ((nextSlideDoc != null) && isAllowedTo('switchSlide', credentials)) { message = { payload: { page: nextSlideDoc.slide.id, meeting_id: meetingId, - } + }, }; message = appendMessageHeader('go_to_slide', message); - return publish(Meteor.config.redis.channels.toBBBApps.presentation, message); + return publish(redisConfig.channels.toBBBApps.presentation, message); } } } - } + }, }); diff --git a/bigbluebutton-html5/server/methods/publishSwitchToPreviousSlideMessage.js b/bigbluebutton-html5/imports/api/presentations/server/methods/publishSwitchToPreviousSlideMessage.js old mode 100644 new mode 100755 similarity index 53% rename from bigbluebutton-html5/server/methods/publishSwitchToPreviousSlideMessage.js rename to bigbluebutton-html5/imports/api/presentations/server/methods/publishSwitchToPreviousSlideMessage.js index f690a05b27..1fbeb4b838 --- a/bigbluebutton-html5/server/methods/publishSwitchToPreviousSlideMessage.js +++ b/bigbluebutton-html5/imports/api/presentations/server/methods/publishSwitchToPreviousSlideMessage.js @@ -1,33 +1,41 @@ +import { publish } from '/imports/startup/server/helpers'; +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { appendMessageHeader } from '/imports/startup/server/helpers'; +import Presentations from '/imports/api/presentations'; +import Slides from '/imports/api/slides'; +import { redisConfig } from '/config'; + Meteor.methods({ - publishSwitchToPreviousSlideMessage(meetingId, userId, authToken) { + publishSwitchToPreviousSlideMessage(credentials) { + const { meetingId, requesterUserId, requesterToken } = credentials; let currentPresentationDoc, currentSlideDoc, message, previousSlideDoc; - currentPresentationDoc = Meteor.Presentations.findOne({ + currentPresentationDoc = Presentations.findOne({ meetingId: meetingId, 'presentation.current': true, }); if (currentPresentationDoc != null) { - currentSlideDoc = Meteor.Slides.findOne({ + currentSlideDoc = Slides.findOne({ meetingId: meetingId, presentationId: currentPresentationDoc.presentation.id, 'slide.current': true, }); if (currentSlideDoc != null) { - previousSlideDoc = Meteor.Slides.findOne({ + previousSlideDoc = Slides.findOne({ meetingId: meetingId, presentationId: currentPresentationDoc.presentation.id, 'slide.num': currentSlideDoc.slide.num - 1, }); - if ((previousSlideDoc != null) && isAllowedTo('switchSlide', meetingId, userId, authToken)) { + if ((previousSlideDoc != null) && isAllowedTo('switchSlide', credentials)) { message = { payload: { page: previousSlideDoc.slide.id, meeting_id: meetingId, - } + }, }; message = appendMessageHeader('go_to_slide', message); - return publish(Meteor.config.redis.channels.toBBBApps.presentation, message); + return publish(redisConfig.channels.toBBBApps.presentation, message); } } } - } + }, }); diff --git a/bigbluebutton-html5/imports/api/presentations/server/modifiers/addPresentationToCollection.js b/bigbluebutton-html5/imports/api/presentations/server/modifiers/addPresentationToCollection.js new file mode 100755 index 0000000000..b63ef1b78f --- /dev/null +++ b/bigbluebutton-html5/imports/api/presentations/server/modifiers/addPresentationToCollection.js @@ -0,0 +1,25 @@ +import Presentations from '/imports/api/presentations'; + +export function addPresentationToCollection(meetingId, presentationObject) { + let entry, id, presentationObj; + + //check if the presentation is already in the collection + presentationObj = Presentations.findOne({ + meetingId: meetingId, + 'presentation.id': presentationObject.id, + }); + if (presentationObj == null) { + entry = { + meetingId: meetingId, + presentation: { + id: presentationObject.id, + name: presentationObject.name, + current: presentationObject.current, + }, + }; + return id = Presentations.insert(entry); + + //logger.info "presentation added id =[#{id}]:#{presentationObject.id} in #{meetingId}. + // Presentations.size is now #{Presentations.find({meetingId: meetingId}).count()}" + } +}; diff --git a/bigbluebutton-html5/imports/api/presentations/server/modifiers/clearPresentationsCollection.js b/bigbluebutton-html5/imports/api/presentations/server/modifiers/clearPresentationsCollection.js new file mode 100755 index 0000000000..2fb5af1d18 --- /dev/null +++ b/bigbluebutton-html5/imports/api/presentations/server/modifiers/clearPresentationsCollection.js @@ -0,0 +1,14 @@ +import Presentations from '/imports/api/presentations'; +import { logger } from '/imports/startup/server/logger'; + +// called on server start and meeting end +export function clearPresentationsCollection() { + const meetingId = arguments[0]; + if (meetingId != null) { + return Presentations.remove({ + meetingId: meetingId, + }, logger.info(`cleared Presentations Collection (meetingId: ${meetingId}!`)); + } else { + return Presentations.remove({}, logger.info('cleared Presentations Collection(all meetings)!')); + } +}; diff --git a/bigbluebutton-html5/imports/api/presentations/server/modifiers/eventHandlers.js b/bigbluebutton-html5/imports/api/presentations/server/modifiers/eventHandlers.js new file mode 100644 index 0000000000..20f9503aa4 --- /dev/null +++ b/bigbluebutton-html5/imports/api/presentations/server/modifiers/eventHandlers.js @@ -0,0 +1,148 @@ +import { eventEmitter } from '/imports/startup/server'; +import { removePresentationFromCollection } from './removePresentationFromCollection'; +import { addPresentationToCollection } from './addPresentationToCollection'; +import { displayThisSlide } from '/imports/api/slides/server/modifiers/displayThisSlide'; +import { addSlideToCollection } from '/imports/api/slides/server/modifiers/addSlideToCollection'; +import { appendMessageHeader, publish } from '/imports/startup/server/helpers'; +import Slides from '/imports/api/slides'; +import Presentations from '/imports/api/presentations'; +import { logger } from '/imports/startup/server/logger'; +import { redisConfig } from '/config'; + +eventEmitter.on('presentation_page_resized_message', function (arg) { + const payload = arg.payload; + const page = payload.page; + if (page != null && page.id != null && page.height_ratio != null + && page.width_ratio != null && page.x_offset != null && page.y_offset != null) { + const slideId = page.id; + const heightRatio = page.height_ratio; + const widthRatio = page.width_ratio; + const xOffset = page.x_offset; + const yOffset = page.y_offset; + const presentationId = slideId.split('/')[0]; + + // In the case when we don't resize, but switch a slide, this message + // follows a 'presentation_page_changed' and all these properties are already set. + let currentSlide = Slides.findOne( + { presentationId: presentationId, + 'slide.current': true, }); + if (currentSlide) { + currentSlide = currentSlide.slide; + } + + if (currentSlide != null && (currentSlide.height_ratio != heightRatio || + currentSlide.width_ratio != widthRatio || + currentSlide.x_offset != xOffset || + currentSlide.y_offset != yOffset)) { + Slides.update({ + presentationId: presentationId, + 'slide.current': true, + }, { + $set: { + 'slide.height_ratio': heightRatio, + 'slide.width_ratio': widthRatio, + 'slide.x_offset': xOffset, + 'slide.y_offset': yOffset, + }, + }); + } + } + + return arg.callback(); +}); + +eventEmitter.on('presentation_page_changed_message', function (arg) { + const newSlide = arg.payload.page; + const meetingId = arg.payload.meeting_id; + if (newSlide != null && newSlide.id != null && meetingId != null) { + displayThisSlide(meetingId, newSlide.id, newSlide); + } + + return arg.callback(); +}); + +eventEmitter.on('presentation_removed_message', function (arg) { + const meetingId = arg.payload.meeting_id; + const presentationId = arg.payload.presentation_id; + if (meetingId != null && presentationId != null) { + removePresentationFromCollection(meetingId, presentationId); + } + + return arg.callback(); +}); + +eventEmitter.on('presentation_shared_message', function (arg) { + const payload = arg.payload; + const meetingId = payload.meeting_id; + if (payload.presentation != null && payload.presentation.id != null && meetingId != null) { + const presentationId = payload.presentation.id; + + // change the currently displayed presentation to presentation.current = false + Presentations.update({ + 'presentation.current': true, + meetingId: meetingId, + }, { + $set: { + 'presentation.current': false, + }, + }); + + //update(if already present) entirely the presentation with the fresh data + removePresentationFromCollection(meetingId, presentationId); + addPresentationToCollection(meetingId, payload.presentation); + const pages = payload.presentation.pages; + for (j = 0; j < pages.length; j++) { + const slide = pages[j]; + addSlideToCollection( + meetingId, + presentationId, + slide + ); + } + } + + return arg.callback(); +}); + +eventEmitter.on('get_presentation_info_reply', function (arg) { + if (arg.payload.requester_id === 'nodeJSapp') { + const payload = arg.payload; + const meetingId = payload.meeting_id; + const presentations = payload.presentations; + for (let k = 0; k < payload.presentations.length; k++) { + const presentation = presentations[k]; + addPresentationToCollection(meetingId, presentation); + const pages = presentation.pages; + for (let l = 0; l < pages.length; l++) { + const page = pages[l]; + + //add the slide to the collection + addSlideToCollection(meetingId, presentation.id, page); + + //request for shapes + const whiteboardId = `${presentation.id}/${page.num}`; + + //logger.info "the whiteboard_id here is:" + whiteboardId + + const replyTo = `${meetingId}/nodeJSapp`; + let message = { + payload: { + meeting_id: meetingId, + requester_id: 'nodeJSapp', + whiteboard_id: whiteboardId, + reply_to: replyTo, + }, + }; + if (!!whiteboardId && !!meetingId) { + message = appendMessageHeader('request_whiteboard_annotation_history_request', message); + publish(redisConfig.channels.toBBBApps.whiteboard, message); + } else { + logger.info('did not have enough information to send a user_leaving_request'); + } + } + } + + return arg.callback(); + } +}); + diff --git a/bigbluebutton-html5/imports/api/presentations/server/modifiers/removePresentationFromCollection.js b/bigbluebutton-html5/imports/api/presentations/server/modifiers/removePresentationFromCollection.js new file mode 100755 index 0000000000..9246621573 --- /dev/null +++ b/bigbluebutton-html5/imports/api/presentations/server/modifiers/removePresentationFromCollection.js @@ -0,0 +1,18 @@ +import Slides from '/imports/api/slides'; +import Presentations from '/imports/api/presentations'; +import { logger } from '/imports/startup/server/logger'; + +export function removePresentationFromCollection(meetingId, presentationId) { + let id, presentationObject; + presentationObject = Presentations.findOne({ + meetingId: meetingId, + 'presentation.id': presentationId, + }); + if (presentationObject != null) { + Slides.remove({ + presentationId: presentationId, + }, logger.info(`cleared Slides Collection (presentationId: ${presentationId}!`)); + Presentations.remove(presentationObject._id); + return logger.info(`----removed presentation[${presentationId}] from ${meetingId}`); + } +}; diff --git a/bigbluebutton-html5/imports/api/presentations/server/publications.js b/bigbluebutton-html5/imports/api/presentations/server/publications.js new file mode 100755 index 0000000000..ba6d95022f --- /dev/null +++ b/bigbluebutton-html5/imports/api/presentations/server/publications.js @@ -0,0 +1,10 @@ +import Presentations from '/imports/api/presentations'; +import { logger } from '/imports/startup/server/logger'; + +Meteor.publish('presentations', function (credentials) { + const { meetingId } = credentials; + logger.info(`publishing presentations for ${meetingId}`); + return Presentations.find({ + meetingId: meetingId, + }); +}); diff --git a/bigbluebutton-html5/imports/api/shapes/index.js b/bigbluebutton-html5/imports/api/shapes/index.js new file mode 100755 index 0000000000..f15f19a892 --- /dev/null +++ b/bigbluebutton-html5/imports/api/shapes/index.js @@ -0,0 +1 @@ +export default new Mongo.Collection('shapes'); diff --git a/bigbluebutton-html5/imports/api/shapes/server/modifiers/addShapeToCollection.js b/bigbluebutton-html5/imports/api/shapes/server/modifiers/addShapeToCollection.js new file mode 100755 index 0000000000..7710aeeb47 --- /dev/null +++ b/bigbluebutton-html5/imports/api/shapes/server/modifiers/addShapeToCollection.js @@ -0,0 +1,89 @@ +import Shapes from '/imports/api/shapes'; +import { logger } from '/imports/startup/server/logger'; + +export function addShapeToCollection(meetingId, whiteboardId, shapeObject) { + let entry, id, removeTempTextShape; + if (shapeObject != null && shapeObject.shape_type === 'text') { + logger.info(`we are dealing with a text shape and the event is:${shapeObject.status}`); + entry = { + meetingId: meetingId, + whiteboardId: whiteboardId, + shape: { + type: shapeObject.shape.type, + textBoxHeight: shapeObject.shape.textBoxHeight, + backgroundColor: shapeObject.shape.backgroundColor, + fontColor: shapeObject.shape.fontColor, + status: shapeObject.shape.status, + dataPoints: shapeObject.shape.dataPoints, + x: shapeObject.shape.x, + textBoxWidth: shapeObject.shape.textBoxWidth, + whiteboardId: shapeObject.shape.whiteboardId, + fontSize: shapeObject.shape.fontSize, + id: shapeObject.shape.id, + y: shapeObject.shape.y, + calcedFontSize: shapeObject.shape.calcedFontSize, + text: shapeObject.shape.text, + background: shapeObject.shape.background, + }, + }; + if (shapeObject.status === 'textEdited' || shapeObject.status === 'textPublished') { + // only keep the final version of the text shape + removeTempTextShape = function (callback) { + Shapes.remove({ + 'shape.id': shapeObject.shape.id, + }); + return callback(); + }; + + return removeTempTextShape(() => { + // display as the prestenter is typing + let id; + id = Shapes.insert(entry); + return logger.info(`${shapeObject.status} substituting the temp shapes with the newer one`); + }); + } + + // the mouse button was released - the drawing is complete + // TODO: pencil messages currently don't send draw_end and are labeled all as DRAW_START + } else if (shapeObject != null && (shapeObject.status === 'DRAW_START' || + shapeObject.status === 'DRAW_UPDATE' || shapeObject.status === 'DRAW_END')) { + shape = Shapes.findOne({ + 'shape.id': shapeObject.shape.id, + }); + if (shape != null) { + return id = Shapes.update({ + 'shape.id': shapeObject.shape.id, + }, { + $set: { + 'shape.shape.points': shapeObject.shape.points, + }, + }); + } else { + entry = { + meetingId: meetingId, + whiteboardId: whiteboardId, + shape: { + wb_id: shapeObject.wb_id, + shape_type: shapeObject.shape_type, + status: shapeObject.status, + id: shapeObject.id, + shape: { + type: shapeObject.shape.type, + status: shapeObject.shape.status, + points: shapeObject.shape.points, + whiteboardId: shapeObject.shape.whiteboardId, + id: shapeObject.shape.id, + square: shapeObject.shape.square, + transparency: shapeObject.shape.transparency, + thickness: shapeObject.shape.thickness, + color: shapeObject.shape.color, + result: shapeObject.shape.result, + num_respondents: shapeObject.shape.num_respondents, + num_responders: shapeObject.shape.num_responders, + }, + }, + }; + return id = Shapes.insert(entry); + } + } +}; diff --git a/bigbluebutton-html5/imports/api/shapes/server/modifiers/clearShapesCollection.js b/bigbluebutton-html5/imports/api/shapes/server/modifiers/clearShapesCollection.js new file mode 100755 index 0000000000..2db8eb1043 --- /dev/null +++ b/bigbluebutton-html5/imports/api/shapes/server/modifiers/clearShapesCollection.js @@ -0,0 +1,18 @@ +import Shapes from '/imports/api/shapes'; +import { logger } from '/imports/startup/server/logger'; + +// called on server start and meeting end +export function clearShapesCollection() { + const meetingId = arguments[0]; + if (meetingId != null) { + return Shapes.remove({ + meetingId: meetingId, + }, () => { + logger.info(`cleared Shapes Collection (meetingId: ${meetingId}!`); + }); + } else { + return Shapes.remove({}, () => { + logger.info('cleared Shapes Collection (all meetings)!'); + }); + } +}; diff --git a/bigbluebutton-html5/imports/api/shapes/server/modifiers/eventHandlers.js b/bigbluebutton-html5/imports/api/shapes/server/modifiers/eventHandlers.js new file mode 100644 index 0000000000..c4c1307431 --- /dev/null +++ b/bigbluebutton-html5/imports/api/shapes/server/modifiers/eventHandlers.js @@ -0,0 +1,54 @@ +import { eventEmitter } from '/imports/startup/server'; +import { addShapeToCollection } from '/imports/api/shapes/server/modifiers/addShapeToCollection'; +import { removeAllShapesFromSlide } from '/imports/api/shapes/server/modifiers/removeAllShapesFromSlide'; +import { removeShapeFromSlide } from '/imports/api/shapes/server/modifiers/removeShapeFromSlide'; + +eventEmitter.on('get_whiteboard_shapes_reply', function (arg) { + if (arg.payload.requester_id === 'nodeJSapp') { + const meetingId = arg.payload.meeting_id; + const shapes = arg.payload.shapes; + const shapesLength = shapes.length; + for (let m = 0; m < shapesLength; m++) { + let shape = shapes[m]; + let whiteboardId = shape.wb_id; + addShapeToCollection(meetingId, whiteboardId, shape); + } + + return arg.callback(); + } +}); + +eventEmitter.on('send_whiteboard_shape_message', function (arg) { + const payload = arg.payload; + const meetingId = payload.meeting_id; + + //Meteor stringifies an array of JSONs (...shape.result) in this message + //parsing the String and reassigning the value + if (payload.shape.shape_type === 'poll_result' && + typeof payload.shape.shape.result === 'string') { + payload.shape.shape.result = JSON.parse(payload.shape.shape.result); + } + + const shape = payload.shape; + if (!!shape && !!shape.wb_id) { + const whiteboardId = shape.wb_id; + addShapeToCollection(meetingId, whiteboardId, shape); + } + + return arg.callback(); +}); + +eventEmitter.on('whiteboard_cleared_message', function (arg) { + const meetingId = arg.payload.meeting_id; + const whiteboardId = arg.payload.whiteboard_id; + removeAllShapesFromSlide(meetingId, whiteboardId); + return arg.callback(); +}); + +eventEmitter.on('undo_whiteboard_request', function (arg) { + const meetingId = arg.payload.meeting_id; + const whiteboardId = arg.payload.whiteboard_id; + const shapeId = arg.payload.shape_id; + removeShapeFromSlide(meetingId, whiteboardId, shapeId); + return arg.callback(); +}); diff --git a/bigbluebutton-html5/imports/api/shapes/server/modifiers/removeAllShapesFromSlide.js b/bigbluebutton-html5/imports/api/shapes/server/modifiers/removeAllShapesFromSlide.js new file mode 100755 index 0000000000..1ac936997a --- /dev/null +++ b/bigbluebutton-html5/imports/api/shapes/server/modifiers/removeAllShapesFromSlide.js @@ -0,0 +1,18 @@ +import Shapes from '/imports/api/shapes'; +import { logger } from '/imports/startup/server/logger'; + +export function removeAllShapesFromSlide(meetingId, whiteboardId) { + logger.info(`removeAllShapesFromSlide__${whiteboardId}`); + + if ((meetingId != null) && (whiteboardId != null) && (Shapes.find({ + meetingId: meetingId, + whiteboardId: whiteboardId, + }) != null)) { + return Shapes.remove({ + meetingId: meetingId, + whiteboardId: whiteboardId, + }, () => { + logger.info('clearing all shapes from slide'); + }); + } +}; diff --git a/bigbluebutton-html5/imports/api/shapes/server/modifiers/removeShapeFromSlide.js b/bigbluebutton-html5/imports/api/shapes/server/modifiers/removeShapeFromSlide.js new file mode 100755 index 0000000000..1617a2becb --- /dev/null +++ b/bigbluebutton-html5/imports/api/shapes/server/modifiers/removeShapeFromSlide.js @@ -0,0 +1,22 @@ +import Shapes from '/imports/api/shapes'; +import { logger } from '/imports/startup/server/logger'; + +export function removeShapeFromSlide(meetingId, whiteboardId, shapeId) { + let shapeToRemove; + if (meetingId != null && whiteboardId != null && shapeId != null) { + shapeToRemove = Shapes.findOne({ + meetingId: meetingId, + whiteboardId: whiteboardId, + 'shape.id': shapeId, + }); + if (shapeToRemove != null) { + Shapes.remove(shapeToRemove._id); + logger.info(`----removed shape[${shapeId}] from ${whiteboardId}`); + return logger.info(`remaining shapes on the slide: ${ + Shapes.find({ + meetingId: meetingId, + whiteboardId: whiteboardId, + }).count()}`); + } + } +}; diff --git a/bigbluebutton-html5/imports/api/shapes/server/publications.js b/bigbluebutton-html5/imports/api/shapes/server/publications.js new file mode 100755 index 0000000000..781c00df19 --- /dev/null +++ b/bigbluebutton-html5/imports/api/shapes/server/publications.js @@ -0,0 +1,8 @@ +import Shapes from '/imports/api/shapes'; + +Meteor.publish('shapes', function (credentials) { + const { meetingId } = credentials; + return Shapes.find({ + meetingId: meetingId, + }); +}); diff --git a/bigbluebutton-html5/imports/api/slides/index.js b/bigbluebutton-html5/imports/api/slides/index.js new file mode 100755 index 0000000000..1834357cc4 --- /dev/null +++ b/bigbluebutton-html5/imports/api/slides/index.js @@ -0,0 +1 @@ +export default new Mongo.Collection('slides'); diff --git a/bigbluebutton-html5/imports/api/slides/server/modifiers/addSlideToCollection.js b/bigbluebutton-html5/imports/api/slides/server/modifiers/addSlideToCollection.js new file mode 100755 index 0000000000..319bcd3701 --- /dev/null +++ b/bigbluebutton-html5/imports/api/slides/server/modifiers/addSlideToCollection.js @@ -0,0 +1,31 @@ +import Slides from '/imports/api/slides'; + +export function addSlideToCollection(meetingId, presentationId, slideObject) { + if (Slides.findOne({ + meetingId: meetingId, + 'slide.id': slideObject.id, + }) == null) { + const entry = { + meetingId: meetingId, + presentationId: presentationId, + slide: { + height_ratio: slideObject.height_ratio, + y_offset: slideObject.y_offset, + num: slideObject.num, + x_offset: slideObject.x_offset, + current: slideObject.current, + img_uri: slideObject.svg_uri != null ? slideObject.svg_uri : slideObject.png_uri, + txt_uri: slideObject.txt_uri, + id: slideObject.id, + width_ratio: slideObject.width_ratio, + swf_uri: slideObject.swf_uri, + thumb_uri: slideObject.thumb_uri, + }, + }; + const id = Slides.insert(entry); + return id; + + //logger.info "added slide id =[#{id}]:#{slideObject.id} in #{meetingId}. Now there + // are #{Slides.find({meetingId: meetingId}).count()} slides in the meeting" + } +}; diff --git a/bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesCollection.js b/bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesCollection.js new file mode 100755 index 0000000000..ecfa73af39 --- /dev/null +++ b/bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesCollection.js @@ -0,0 +1,14 @@ +import Slides from '/imports/api/slides'; +import { logger } from '/imports/startup/server/logger'; + +// called on server start and meeting end +export function clearSlidesCollection() { + const meetingId = arguments[0]; + if (meetingId != null) { + return Slides.remove({ + meetingId: meetingId, + }, logger.info(`cleared Slides Collection (meetingId: ${meetingId}!`)); + } else { + return Slides.remove({}, logger.info('cleared Slides Collection (all meetings)!')); + } +}; diff --git a/bigbluebutton-html5/imports/api/slides/server/modifiers/displayThisSlide.js b/bigbluebutton-html5/imports/api/slides/server/modifiers/displayThisSlide.js new file mode 100755 index 0000000000..ad8bed79e6 --- /dev/null +++ b/bigbluebutton-html5/imports/api/slides/server/modifiers/displayThisSlide.js @@ -0,0 +1,31 @@ +import Slides from '/imports/api/slides'; + +export function displayThisSlide(meetingId, newSlideId, slideObject) { + + // grab the presentationId part of the slideId + const presentationId = newSlideId.split('/')[0]; + + // change current to false for the old slide + Slides.update({ + presentationId: presentationId, + 'slide.current': true, + }, { + $set: { + 'slide.current': false, + }, + }); + + //change current to true for the new slide and update its ratios and offsets + Slides.update({ + presentationId: presentationId, + 'slide.id': newSlideId, + }, { + $set: { + 'slide.current': true, + 'slide.height_ratio': slideObject.height_ratio, + 'slide.width_ratio': slideObject.width_ratio, + 'slide.x_offset': slideObject.x_offset, + 'slide.y_offset': slideObject.y_offset, + }, + }); +}; diff --git a/bigbluebutton-html5/imports/api/slides/server/publications.js b/bigbluebutton-html5/imports/api/slides/server/publications.js new file mode 100755 index 0000000000..be05ff47c3 --- /dev/null +++ b/bigbluebutton-html5/imports/api/slides/server/publications.js @@ -0,0 +1,10 @@ +import Slides from '/imports/api/slides'; +import { logger } from '/imports/startup/server/logger'; + +Meteor.publish('slides', function (credentials) { + const { meetingId } = credentials; + logger.info(`publishing slides for ${meetingId}`); + return Slides.find({ + meetingId: meetingId, + }); +}); diff --git a/bigbluebutton-html5/imports/api/users/index.js b/bigbluebutton-html5/imports/api/users/index.js new file mode 100755 index 0000000000..1ed8abaa31 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/index.js @@ -0,0 +1 @@ +export default new Mongo.Collection('users'); diff --git a/bigbluebutton-html5/server/methods/kickUser.js b/bigbluebutton-html5/imports/api/users/server/methods/kickUser.js old mode 100644 new mode 100755 similarity index 53% rename from bigbluebutton-html5/server/methods/kickUser.js rename to bigbluebutton-html5/imports/api/users/server/methods/kickUser.js index d868bcb10a..77594b689c --- a/bigbluebutton-html5/server/methods/kickUser.js +++ b/bigbluebutton-html5/imports/api/users/server/methods/kickUser.js @@ -1,20 +1,25 @@ +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { appendMessageHeader, publish } from '/imports/startup/server/helpers'; +import { redisConfig } from '/config'; + Meteor.methods({ //meetingId: the meeting where the user is //toKickUserId: the userid of the user to kick //requesterUserId: the userid of the user that wants to kick //authToken: the authToken of the user that wants to kick - kickUser(meetingId, toKickUserId, requesterUserId, authToken) { + kickUser(credentials, toKickUserId) { + const { meetingId, requesterUserId, requesterToken } = credentials; let message; - if (isAllowedTo('kickUser', meetingId, requesterUserId, authToken)) { + if (isAllowedTo('kickUser', credentials)) { message = { payload: { userid: toKickUserId, ejected_by: requesterUserId, meeting_id: meetingId, - } + }, }; message = appendMessageHeader('eject_user_from_meeting_request_message', message); - return publish(Meteor.config.redis.channels.toBBBApps.users, message); + return publish(redisConfig.channels.toBBBApps.users, message); } }, -}); \ No newline at end of file +}); diff --git a/bigbluebutton-html5/server/methods/listenOnlyRequestToggle.js b/bigbluebutton-html5/imports/api/users/server/methods/listenOnlyRequestToggle.js old mode 100644 new mode 100755 similarity index 53% rename from bigbluebutton-html5/server/methods/listenOnlyRequestToggle.js rename to bigbluebutton-html5/imports/api/users/server/methods/listenOnlyRequestToggle.js index 173ba77b94..4420526160 --- a/bigbluebutton-html5/server/methods/listenOnlyRequestToggle.js +++ b/bigbluebutton-html5/imports/api/users/server/methods/listenOnlyRequestToggle.js @@ -1,18 +1,26 @@ +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { appendMessageHeader, publish } from '/imports/startup/server/helpers'; +import Meetings from '/imports/api/meetings'; +import Users from '/imports/api/users'; +import { logger } from '/imports/startup/server/logger'; +import { redisConfig } from '/config'; + Meteor.methods({ // meetingId: the meetingId of the meeting the user is in // toSetUserId: the userId of the user joining // requesterUserId: the userId of the requester // requesterToken: the authToken of the requester - listenOnlyRequestToggle(meetingId, userId, authToken, isJoining) { + listenOnlyRequestToggle(credentials, isJoining) { + const { meetingId, requesterUserId, requesterToken } = credentials; let message, userObject, username, voiceConf, meetingObject; - meetingObject = Meteor.Meetings.findOne({ + meetingObject = Meetings.findOne({ meetingId: meetingId, }); if (meetingObject != null) { voiceConf = meetingObject.voiceConf; } - userObject = Meteor.Users.findOne({ + userObject = Users.findOne({ meetingId: meetingId, userId: userId, }); @@ -21,32 +29,32 @@ Meteor.methods({ } if (isJoining) { - if (isAllowedTo('joinListenOnly', meetingId, userId, authToken)) { + if (isAllowedTo('joinListenOnly', credentials)) { message = { payload: { userid: userId, meeting_id: meetingId, voice_conf: voiceConf, name: username, - } + }, }; message = appendMessageHeader('user_connected_to_global_audio', message); - Meteor.log.info(`publishing a user listenOnly toggleRequest ${isJoining} request for ${userId}`); - publish(Meteor.config.redis.channels.toBBBApps.meeting, message); + logger.info(`publishing a user listenOnly toggleRequest ${isJoining} request for ${userId}`); + publish(redisConfig.channels.toBBBApps.meeting, message); } } else { - if (isAllowedTo('leaveListenOnly', meetingId, userId, authToken)) { + if (isAllowedTo('leaveListenOnly', credentials)) { message = { payload: { userid: userId, meeting_id: meetingId, voice_conf: voiceConf, name: username, - } + }, }; message = appendMessageHeader('user_disconnected_from_global_audio', message); - Meteor.log.info(`publishing a user listenOnly toggleRequest ${isJoining} request for ${userId}`); - publish(Meteor.config.redis.channels.toBBBApps.meeting, message); + logger.info(`publishing a user listenOnly toggleRequest ${isJoining} request for ${userId}`); + publish(redisConfig.channels.toBBBApps.meeting, message); } } }, diff --git a/bigbluebutton-html5/imports/api/users/server/methods/muteUser.js b/bigbluebutton-html5/imports/api/users/server/methods/muteUser.js new file mode 100755 index 0000000000..8f5f2cd8bd --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/methods/muteUser.js @@ -0,0 +1,42 @@ +import { publish } from '/imports/startup/server/helpers'; +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { appendMessageHeader } from '/imports/startup/server/helpers'; +import { updateVoiceUser } from '/imports/api/users/server/modifiers/updateVoiceUser'; +import { logger } from '/imports/startup/server/logger'; +import { redisConfig } from '/config'; + +Meteor.methods({ + // meetingId: the meetingId of the meeting the user[s] is in + // toMuteUserId: the userId of the user to be muted + // requesterUserId: the userId of the requester + // requesterToken: the authToken of the requester + muteUser(credentials, toMuteUserId) { + const { meetingId, requesterUserId, requesterToken } = credentials; + const action = function () { + if (toMuteUserId === requesterUserId) { + return 'muteSelf'; + } else { + return 'muteOther'; + } + }; + + if (isAllowedTo(action(), credentials)) { + let message = { + payload: { + user_id: toMuteUserId, + meeting_id: meetingId, + mute: true, + requester_id: requesterUserId, + }, + }; + message = appendMessageHeader('mute_user_request_message', message); + logger.info(`publishing a user mute request for ${toMuteUserId}`); + publish(redisConfig.channels.toBBBApps.users, message); + updateVoiceUser(meetingId, { + web_userid: toMuteUserId, + talking: false, + muted: true, + }); + } + }, +}); diff --git a/bigbluebutton-html5/server/methods/setUserPresenter.js b/bigbluebutton-html5/imports/api/users/server/methods/setUserPresenter.js old mode 100644 new mode 100755 similarity index 50% rename from bigbluebutton-html5/server/methods/setUserPresenter.js rename to bigbluebutton-html5/imports/api/users/server/methods/setUserPresenter.js index 4fa835f63b..4cf9e47b14 --- a/bigbluebutton-html5/server/methods/setUserPresenter.js +++ b/bigbluebutton-html5/imports/api/users/server/methods/setUserPresenter.js @@ -1,3 +1,8 @@ +import { publish } from '/imports/startup/server/helpers'; +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { appendMessageHeader } from '/imports/startup/server/helpers'; +import { redisConfig } from '/config'; + Meteor.methods({ //meetingId: the meeting where the user is //newPresenterId: the userid of the new presenter @@ -5,23 +10,23 @@ Meteor.methods({ //newPresenterName: user name of the new presenter //authToken: the authToken of the user that wants to kick setUserPresenter( - meetingId, + credentials, newPresenterId, - requesterSetPresenter, - newPresenterName, - authToken) { + newPresenterName) { + const { meetingId, requesterSetPresenter, requesterToken } = credentials; let message; - if (isAllowedTo('setPresenter', meetingId, requesterSetPresenter, authToken)) { + if (isAllowedTo('setPresenter', credentials)) { message = { payload: { new_presenter_id: newPresenterId, new_presenter_name: newPresenterName, meeting_id: meetingId, assigned_by: requesterSetPresenter, - } + }, }; + + message = appendMessageHeader('assign_presenter_request_message', message); + return publish(redisConfig.channels.toBBBApps.users, message); } - message = appendMessageHeader('assign_presenter_request_message', message); - return publish(Meteor.config.redis.channels.toBBBApps.users, message); - } + }, }); diff --git a/bigbluebutton-html5/server/methods/unmuteUser.js b/bigbluebutton-html5/imports/api/users/server/methods/unmuteUser.js old mode 100644 new mode 100755 similarity index 53% rename from bigbluebutton-html5/server/methods/unmuteUser.js rename to bigbluebutton-html5/imports/api/users/server/methods/unmuteUser.js index b528f1f786..0c2fc29fe7 --- a/bigbluebutton-html5/server/methods/unmuteUser.js +++ b/bigbluebutton-html5/imports/api/users/server/methods/unmuteUser.js @@ -1,12 +1,18 @@ -Meteor.methods({ +import { publish } from '/imports/startup/server/helpers'; +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { appendMessageHeader } from '/imports/startup/server/helpers'; +import { updateVoiceUser } from '/imports/api/users/server/modifiers/updateVoiceUser'; +import { logger } from '/imports/startup/server/logger'; +import { redisConfig } from '/config'; +Meteor.methods({ // meetingId: the meetingId of the meeting the user[s] is in // toMuteUserId: the userId of the user to be unmuted // requesterUserId: the userId of the requester // requesterToken: the authToken of the requester - unmuteUser(meetingId, toMuteUserId, requesterUserId, requesterToken) { - let action, message; - action = function () { + unmuteUser(credentials, toMuteUserId) { + const { meetingId, requesterUserId, requesterToken } = credentials; + const action = function () { if (toMuteUserId === requesterUserId) { return 'unmuteSelf'; } else { @@ -15,22 +21,22 @@ Meteor.methods({ }; if (isAllowedTo(action(), meetingId, requesterUserId, requesterToken)) { - message = { + let message = { payload: { user_id: toMuteUserId, meeting_id: meetingId, mute: false, requester_id: requesterUserId, - } + }, }; message = appendMessageHeader('mute_user_request_message', message); - Meteor.log.info(`publishing a user unmute request for ${toMuteUserId}`); - publish(Meteor.config.redis.channels.toBBBApps.users, message); + logger.info(`publishing a user unmute request for ${toMuteUserId}`); + publish(redisConfig.channels.toBBBApps.users, message); updateVoiceUser(meetingId, { web_userid: toMuteUserId, talking: false, muted: false, }); } - } + }, }); diff --git a/bigbluebutton-html5/imports/api/users/server/methods/userLogout.js b/bigbluebutton-html5/imports/api/users/server/methods/userLogout.js new file mode 100755 index 0000000000..b16d651cf5 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/methods/userLogout.js @@ -0,0 +1,16 @@ +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { requestUserLeaving } from '/imports/api/users/server/modifiers/requestUserLeaving'; +import { logger } from '/imports/startup/server/logger'; + +Meteor.methods({ + // meetingId: the meeting where the user is + // userId: the userid of the user logging out + // authToken: the authToken of the user + userLogout(credentials) { + if (isAllowedTo('logoutSelf', credentials)) { + const { meetingId, requesterUserId, requesterToken } = credentials; + logger.info(`a user is logging out from ${meetingId}:${userId}`); + return requestUserLeaving(meetingId, userId); + } + }, +}); diff --git a/bigbluebutton-html5/imports/api/users/server/methods/userSetEmoji.js b/bigbluebutton-html5/imports/api/users/server/methods/userSetEmoji.js new file mode 100755 index 0000000000..ecd15c32d7 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/methods/userSetEmoji.js @@ -0,0 +1,25 @@ +import { publish } from '/imports/startup/server/helpers'; +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { appendMessageHeader } from '/imports/startup/server/helpers'; +import { redisConfig } from '/config'; + +Meteor.methods({ + userSetEmoji(credentials, toRaiseUserId, status) { + const { meetingId, requesterUserId, requesterToken } = credentials; + let message; + if (isAllowedTo('setEmojiStatus', credentials)) { + message = { + payload: { + emoji_status: status, + userid: toRaiseUserId, + meeting_id: meetingId, + }, + }; + + message = appendMessageHeader('user_emoji_status_message', message); + + // publish to pubsub + publish(redisConfig.channels.toBBBApps.users, message); + } + }, +}); diff --git a/bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js b/bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js new file mode 100755 index 0000000000..63c78636e0 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js @@ -0,0 +1,34 @@ +import { logger } from '/imports/startup/server/logger'; +import { redisConfig } from '/config'; +import { createDummyUser } from '/imports/api/users/server/modifiers/createDummyUser'; +import { publish } from '/imports/startup/server/helpers'; + +Meteor.methods({ + // Construct and send a message to bbb-web to validate the user + validateAuthToken(credentials) { + const { meetingId, requesterUserId, requesterToken } = credentials; + logger.info('sending a validate_auth_token with', { + userid: requesterUserId, + authToken: requesterToken, + meetingid: meetingId, + }); + let message = { + payload: { + auth_token: requesterToken, + userid: requesterUserId, + meeting_id: meetingId, + }, + header: { + timestamp: new Date().getTime(), + reply_to: `${meetingId}/${requesterUserId}`, + name: 'validate_auth_token', + }, + }; + if ((requesterToken != null) && (requesterUserId != null) && (meetingId != null)) { + createDummyUser(meetingId, requesterUserId, requesterToken); + return publish(redisConfig.channels.toBBBApps.meeting, message); + } else { + return logger.info('did not have enough information to send a validate_auth_token message'); + } + }, +}); diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/clearUsersCollection.js b/bigbluebutton-html5/imports/api/users/server/modifiers/clearUsersCollection.js new file mode 100755 index 0000000000..ba64b345bc --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/clearUsersCollection.js @@ -0,0 +1,26 @@ +import Users from '/imports/api/users'; +import { logger } from '/imports/startup/server/logger'; + +// called on server start and on meeting end +export function clearUsersCollection() { + const meetingId = arguments[0]; + if (meetingId != null) { + return Users.remove({ + meetingId: meetingId, + }, err => { + if (err != null) { + return logger.error(`_error ${JSON.stringify(err)} while removing users from ${meetingId}`); + } else { + return logger.info(`_cleared Users Collection (meetingId: ${meetingId})!`); + } + }); + } else { + return Users.remove({}, err => { + if (err != null) { + return logger.error(`_error ${JSON.stringify(err)} while removing users from all meetings`); + } else { + return logger.info('_cleared Users Collection (all meetings)!'); + } + }); + } +}; diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/createDummyUser.js b/bigbluebutton-html5/imports/api/users/server/modifiers/createDummyUser.js new file mode 100755 index 0000000000..e8b5d7cb1f --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/createDummyUser.js @@ -0,0 +1,24 @@ +import Users from '/imports/api/users'; +import { logger } from '/imports/startup/server/logger'; + +export function createDummyUser(meetingId, userId, authToken) { + if (Users.findOne({ + userId: userId, + meetingId: meetingId, + authToken: authToken, + }) != null) { + const msg = `html5 user userId:[${userId}] from [${meetingId}] tried to revalidate token`; + return logger.info(msg); + } else { + return Users.insert({ + meetingId: meetingId, + userId: userId, + authToken: authToken, + clientType: 'HTML5', + validated: false, //will be validated on validate_auth_token_reply + }, (err, id) => { + const res = Users.find({ meetingId: meetingId, }).count(); + return logger.info(`_added a dummy html5 user userId=[${userId}] Users.size is now ${res}`); + }); + } +}; diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/eventHandlers.js b/bigbluebutton-html5/imports/api/users/server/modifiers/eventHandlers.js new file mode 100644 index 0000000000..69b194e3fd --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/eventHandlers.js @@ -0,0 +1,219 @@ +import { logger } from '/imports/startup/server/logger'; +import { eventEmitter } from '/imports/startup/server'; +import { handleEndOfMeeting } from '/imports/api/meetings/server/modifiers/eventHandlers'; +import { userJoined } from './userJoined'; +import { setUserLockedStatus } from './setUserLockedStatus'; +import { markUserOffline } from './markUserOffline'; +import Users from '../..'; + +eventEmitter.on('user_eject_from_meeting', function (arg) { + handleRemoveUserEvent(arg); +}); + +eventEmitter.on('disconnect_user_message', function (arg) { + handleRemoveUserEvent(arg); +}); + +eventEmitter.on('end_and_kick_all_message', function (arg) { + handleEndOfMeeting(arg); +}); + +eventEmitter.on('disconnect_all_users_message', function (arg) { + handleEndOfMeeting(arg); +}); + +eventEmitter.on('user_left_message', function (arg) { + handleRemoveUserEvent(arg); +}); + +eventEmitter.on('validate_auth_token_reply', function (arg) { + const meetingId = arg.payload.meeting_id; + const userId = arg.payload.userid; + const user = Users.findOne({ + userId: userId, + meetingId: meetingId, + }); + const validStatus = arg.payload.valid; + + // if the user already exists in the db + if (user != null && user.clientType === 'HTML5') { + //if the html5 client user was validated successfully, add a flag + return Users.update({ + userId: userId, + meetingId: meetingId, + }, { + $set: { + validated: validStatus, + }, + }, (err, numChanged) => { + if (numChanged.insertedId != null) { + let funct = function (cbk) { + let user = Users.findOne({ + userId: userId, + meetingId: meetingId, + }); + let val; + if (user != null) { + val = user.validated; + } + + logger.info(`user.validated for ${userId} in meeting ${meetingId} just became ${val}`); + return cbk(); + }; + + return funct(arg.callback); + } else { + return arg.callback(); + } + }); + } else { + logger.info('a non-html5 user got validate_auth_token_reply.'); + return arg.callback(); + } +}); + +eventEmitter.on('user_joined_message', function (arg) { + const meetingId = arg.payload.meeting_id; + const payload = arg.payload; + let userObj = payload.user; + let dbUser = Users.findOne({ + userId: userObj.userid, + meetingId: meetingId, + }); + + // On attempting reconnection of Flash clients (in voiceBridge) we receive + // an extra user_joined_message. Ignore it as it will add an extra user + // in the user list, creating discrepancy with the list in the Flash client + if (dbUser != null && dbUser.user != null && dbUser.user.connection_status === 'offline') { + if (payload.user != null && payload.user.phone_user) { + logger.error('offline AND phone user'); + return arg.callback(); //return without joining the user + } + } else { + if (dbUser != null && dbUser.clientType === 'HTML5') { + // typically html5 users will be in + // the db [as a dummy user] before the joining message + let status = dbUser.validated; + logger.info(`in user_joined_message the validStatus of the user was ${status}`); + userObj.timeOfJoining = arg.header.current_time; + } + + return userJoined(meetingId, userObj, arg.callback); + } + + return arg.callback(); +}); + +eventEmitter.on('get_users_reply', function (arg) { + if (arg.payload.requester_id === 'nodeJSapp') { + console.log('get_users_reply handling'); + let users = arg.payload.users; + const meetingId = arg.payload.meeting_id; + + //TODO make the serialization be split per meeting. This will allow us to + // use N threads vs 1 and we'll take advantage of Mongo's concurrency tricks + + // Processing the users recursively with a callback to notify us, + // ensuring that we update the users collection serially + let processUser = function () { + let user = users.pop(); + if (user != null) { + user.timeOfJoining = arg.header.current_time; + if (user.emoji_status !== 'none' && typeof user.emoji_status === 'string') { + user.set_emoji_time = new Date(); + return userJoined(meetingId, user, processUser); + } else { + return userJoined(meetingId, user, processUser); + } + } else { + return arg.callback(); // all meeting arrays (if any) have been processed + } + }; + + return processUser(); + } else { + arg.callback(); + } +}); + +eventEmitter.on('user_emoji_status_message', function (arg) { + const userId = arg.payload.userid; + const meetingId = arg.payload.meeting_id; + const emojiStatus = arg.payload.emoji_status; + if (userId != null && meetingId != null) { + const setEmojiTime = new Date(); + Users.update({ + 'user.userid': userId, + }, { + $set: { + 'user.set_emoji_time': setEmojiTime, + 'user.emoji_status': emojiStatus, + }, + }, (err, numUpdated) => { + return logger.info(` Updating emoji numUpdated=${numUpdated}, err=${err}`); + }); + } + + return arg.callback(); +}); + +eventEmitter.on('user_locked_message', function (arg) { + handleLockEvent(arg); +}); + +eventEmitter.on('user_unlocked_message', function (arg) { + handleLockEvent(arg); +}); + +eventEmitter.on('presenter_assigned_message', function (arg) { + const meetingId = arg.payload.meeting_id; + const newPresenterId = arg.payload.new_presenter_id; + if (newPresenterId != null) { + // reset the previous presenter + Users.update({ + 'user.presenter': true, + meetingId: meetingId, + }, { + $set: { + 'user.presenter': false, + }, + }, (err, numUpdated) => { + return logger.info(` Updating old presenter numUpdated=${numUpdated}, err=${err}`); + }); + + // set the new presenter + Users.update({ + 'user.userid': newPresenterId, + meetingId: meetingId, + }, { + $set: { + 'user.presenter': true, + }, + }, (err, numUpdated) => { + return logger.info(` Updating new presenter numUpdated=${numUpdated}, err=${err}`); + }); + } + + return arg.callback(); +}); + +const handleRemoveUserEvent = function (arg) { + if (arg.payload.user != null && + arg.payload.user.userid != null && + arg.payload.meeting_id != null) { + const meetingId = arg.payload.meeting_id; + const userId = arg.payload.user.userid; + return markUserOffline(meetingId, userId, arg.callback); + } else { + logger.info('could not perform handleRemoveUserEvent'); + return arg.callback(); + } +}; + +const handleLockEvent = function (arg) { + const userId = arg.payload.userid; + const isLocked = arg.payload.locked; + const meetingId = arg.payload.meeting_id; + setUserLockedStatus(meetingId, userId, isLocked); + return arg.callback(); +}; diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/handleLockingMic.js b/bigbluebutton-html5/imports/api/users/server/modifiers/handleLockingMic.js new file mode 100755 index 0000000000..0348411c09 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/handleLockingMic.js @@ -0,0 +1,26 @@ +import Users from '/imports/api/users'; + +// when new lock settings including disableMic are set, +// all viewers that are in the audio bridge with a mic should be muted and locked +export function handleLockingMic(meetingId, newSettings) { + // send mute requests for the viewer users joined with mic + let i, results, userObject; + userObjects = Users.find({ + meetingId: meetingId, + 'user.role': 'VIEWER', + 'user.listenOnly': false, + 'user.locked': true, + 'user.voiceUser.joined': true, + 'user.voiceUser.muted': false, + }).fetch(); + + _userObjects_length = userObjects.length; + results = []; + for (i = 0; i < _userObjects_length; i++) { + userObject = userObjects[i]; + results.push(Meteor.call('muteUser', meetingId, userObject.userId, userObject.userId, + userObject.authToken, true)); //true for muted + } + + return results; +}; diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/markUserOffline.js b/bigbluebutton-html5/imports/api/users/server/modifiers/markUserOffline.js new file mode 100755 index 0000000000..e425a13233 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/markUserOffline.js @@ -0,0 +1,63 @@ +import Users from '/imports/api/users'; +import { logger } from '/imports/startup/server/logger'; + +// Only callable from server +// Received information from BBB-Apps that a user left +// Need to update the collection +// params: meetingid, userid as defined in BBB-Apps +// callback +export function markUserOffline(meetingId, userId, callback) { + // mark the user as offline. remove from the collection on meeting_end #TODO + let user = Users.findOne({ + meetingId: meetingId, + userId: userId, + }); + + if (user != null && user.clientType === 'HTML5') { + logger.info(`marking html5 user [${userId}] as offline in meeting[${meetingId}]`); + return Users.update({ + meetingId: meetingId, + userId: userId, + }, { + $set: { + 'user.connection_status': 'offline', + 'user.voiceUser.talking': false, + 'user.voiceUser.joined': false, + 'user.voiceUser.muted': false, + 'user.time_of_joining': 0, + 'user.listenOnly': false, //TODO make this user: {} + }, + }, (err, numChanged) => { + let funct; + if (err != null) { + logger.error(`_unsucc update (mark as offline) of user ${user.user.name} ${userId} err=${JSON.stringify(err)}`); + return callback(); + } else { + funct = function (cbk) { + logger.info(`_marking as offline html5 user ${user.user.name} ${userId} numChanged=${numChanged}`); + return cbk(); + }; + + return funct(callback); + } + }); + } else { + return Users.remove({ + meetingId: meetingId, + userId: userId, + }, (err, numDeletions) => { + let funct; + if (err != null) { + logger.error(`_unsucc deletion of user ${user != null ? user.user.name : void 0} ${userId} err=${JSON.stringify(err)}`); + return callback(); + } else { + funct = function (cbk) { + logger.info(`_deleting info for user ${user != null ? user.user.name : void 0} ${userId} numDeletions=${numDeletions}`); + return cbk(); + }; + + return funct(callback); + } + }); + } +}; diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/requestUserLeaving.js b/bigbluebutton-html5/imports/api/users/server/modifiers/requestUserLeaving.js new file mode 100755 index 0000000000..3fa45db3e4 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/requestUserLeaving.js @@ -0,0 +1,62 @@ +import { publish } from '/imports/startup/server/helpers'; +import Meetings from '/imports/api/meetings'; +import Users from '/imports/api/users'; +import { logger } from '/imports/startup/server/logger'; +import { redisConfig } from '/config'; + +// Corresponds to a valid action on the HTML clientside +// After authorization, publish a user_leaving_request in redis +// params: meetingid, userid as defined in BBB-App +export function requestUserLeaving(meetingId, userId) { + let listenOnlyMessage, message, userObject, meetingObject, voiceConf; + userObject = Users.findOne({ + meetingId: meetingId, + userId: userId, + }); + meetingObject = Meetings.findOne({ + meetingId: meetingId, + }); + if (meetingObject != null) { + voiceConf = meetingObject.voiceConf; + } + + if ((userObject != null) && (voiceConf != null) && (userId != null) && (meetingId != null)) { + let lOnly = false; + if (userObject.hasOwnProperty('user') && userObject.user.hasOwnProperty('listenOnly')) { + lOnly = userObject.user.listenOnly; + } + + // end listenOnly audio for the departing user + if (null != lOnly && lOnly) { + listenOnlyMessage = { + payload: { + userid: userId, + meeting_id: meetingId, + voice_conf: voiceConf, + name: userObject.user.name, + }, + header: { + timestamp: new Date().getTime(), + name: 'user_disconnected_from_global_audio', + }, + }; + publish(redisConfig.channels.toBBBApps.meeting, listenOnlyMessage); + } + + // remove user from meeting + message = { + payload: { + meeting_id: meetingId, + userid: userId, + }, + header: { + timestamp: new Date().getTime(), + name: 'user_leaving_request', + }, + }; + logger.info(`sending a user_leaving_request for ${meetingId}:${userId}`); + return publish(redisConfig.channels.toBBBApps.users, message); + } else { + return logger.info('did not have enough information to send a user_leaving_request'); + } +}; diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/setUserLockedStatus.js b/bigbluebutton-html5/imports/api/users/server/modifiers/setUserLockedStatus.js new file mode 100755 index 0000000000..7e651538e5 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/setUserLockedStatus.js @@ -0,0 +1,38 @@ +import Users from '/imports/api/users'; +import { logger } from '/imports/startup/server/logger'; + +// change the locked status of a user (lock settings) +export function setUserLockedStatus(meetingId, userId, isLocked) { + let userObject; + userObject = Users.findOne({ + meetingId: meetingId, + userId: userId, + }); + if (userObject != null) { + Users.update({ + userId: userId, + meetingId: meetingId, + }, { + $set: { + 'user.locked': isLocked, + }, + }, (err, numChanged) => { + if (err != null) { + return logger.error(`_error ${err} while updating user ${userId} with lock settings`); + } else { + return logger.info(`_setting user locked status for:[${userId}] from [${meetingId}] locked=${isLocked}`); + } + }); + + // if the user is sharing audio, he should be muted upon locking involving disableMic + if (userObject.user.role === 'VIEWER' && !userObject.user.listenOnly && + userObject.user.voiceUser.joined && !userObject.user.voiceUser.muted && isLocked) { + // TODO why are we doing Meteor.call here?! Anton + return Meteor.call('muteUser', meetingId, userObject.userId, userObject.userId, + userObject.authToken, true); //true for muted + } + } else { + let tempMsg = '(unsuccessful-no such user) setting user locked status for userid:'; + return logger.error(`${tempMsg}[${userId}] from [${meetingId}] locked=${isLocked}`); + } +}; diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/updateVoiceUser.js b/bigbluebutton-html5/imports/api/users/server/modifiers/updateVoiceUser.js new file mode 100755 index 0000000000..de194a0b7e --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/updateVoiceUser.js @@ -0,0 +1,97 @@ +import Users from '/imports/api/users'; +import { logger } from '/imports/startup/server/logger'; + +//update a voiceUser - a helper method +export function updateVoiceUser(meetingId, voiceUserObject, callback) { + let userObject; + userObject = Users.findOne({ + userId: voiceUserObject.web_userid, + }); + if (userObject != null) { + if (voiceUserObject.talking != null) { + Users.update({ + meetingId: meetingId, + userId: voiceUserObject.web_userid, + }, { + $set: { + 'user.voiceUser.talking': voiceUserObject.talking, + }, + }, (err, numChanged) => { + if (err != null) { + logger.error(`_unsucc update of voiceUser ${voiceUserObject.web_userid} [talking] err=${JSON.stringify(err)}`); + } + + return callback(); + }); + } // talking + if (voiceUserObject.joined != null) { + Users.update({ + meetingId: meetingId, + userId: voiceUserObject.web_userid, + }, { + $set: { + 'user.voiceUser.joined': voiceUserObject.joined, + }, + }, (err, numChanged) => { + if (err != null) { + logger.error( + `_unsucc update of voiceUser ${voiceUserObject.web_userid} [joined] err=${JSON.stringify(err)}` + ); + } + + return callback(); + }); + } // joined + if (voiceUserObject.locked != null) { + Users.update({ + meetingId: meetingId, + userId: voiceUserObject.web_userid, + }, { + $set: { + 'user.voiceUser.locked': voiceUserObject.locked, + }, + }, (err, numChanged) => { + if (err != null) { + logger.error(`_unsucc update of voiceUser ${voiceUserObject.web_userid} [locked] err=${JSON.stringify(err)}`); + } + + return callback(); + }); + } // locked + if (voiceUserObject.muted != null) { + Users.update({ + meetingId: meetingId, + userId: voiceUserObject.web_userid, + }, { + $set: { + 'user.voiceUser.muted': voiceUserObject.muted, + }, + }, (err, numChanged) => { + if (err != null) { + logger.error(`_unsucc update of voiceUser ${voiceUserObject.web_userid} [muted] err=${JSON.stringify(err)}`); + } + + return callback(); + }); + } // muted + if (voiceUserObject.listen_only != null) { + return Users.update({ + meetingId: meetingId, + userId: voiceUserObject.web_userid, + }, { + $set: { + 'user.listenOnly': voiceUserObject.listen_only, + }, + }, (err, numChanged) => { + if (err != null) { + logger.error(`_unsucc update of voiceUser ${voiceUserObject.web_userid} [listenOnly] err=${JSON.stringify(err)}`); + } + + return callback(); + }); + } // listenOnly + } else { + logger.error('ERROR! did not find such voiceUser!'); + return callback(); + } +}; diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/userJoined.js b/bigbluebutton-html5/imports/api/users/server/modifiers/userJoined.js new file mode 100755 index 0000000000..a739c56406 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/userJoined.js @@ -0,0 +1,158 @@ +import Chat from '/imports/api/chat'; +import Users from '/imports/api/users'; +import Meetings from '/imports/api/meetings'; +import { logger } from '/imports/startup/server/logger'; + +export function userJoined(meetingId, user, callback) { + let userObject, userId, welcomeMessage, meetingObject; + userId = user.userid; + userObject = Users.findOne({ + userId: user.userid, + meetingId: meetingId, + }); + + // the collection already contains an entry for this user + // because the user is reconnecting OR + // in the case of an html5 client user we added a dummy user on + // register_user_message (to save authToken) + if (userObject != null && userObject.authToken != null) { + Users.update({ + userId: user.userid, + meetingId: meetingId, + }, { + $set: { + user: { + userid: user.userid, + presenter: user.presenter, + name: user.name, + _sort_name: user.name.toLowerCase(), + phone_user: user.phone_user, + set_emoji_time: user.set_emoji_time, + emoji_status: user.emoji_status, + has_stream: user.has_stream, + role: user.role, + listenOnly: user.listenOnly, + extern_userid: user.extern_userid, + locked: user.locked, + time_of_joining: user.timeOfJoining, + connection_status: 'online', // TODO consider other default value + voiceUser: { + web_userid: user.voiceUser.web_userid, + callernum: user.voiceUser.callernum, + userid: user.voiceUser.userid, + talking: user.voiceUser.talking, + joined: user.voiceUser.joined, + callername: user.voiceUser.callername, + locked: user.voiceUser.locked, + muted: user.voiceUser.muted, + }, + webcam_stream: user.webcam_stream, + }, + }, + }, err => { + let funct; + if (err != null) { + logger.error(`_error ${err} when trying to insert user ${userId}`); + return callback(); + } else { + funct = function (cbk) { + logger.info(`_(case1) UPDATING USER ${user.userid}, authToken= ${userObject.authToken}, locked=${user.locked}, username=${user.name}`); + return cbk(); + }; + + return funct(callback); + } + }); + meetingObject = Meetings.findOne({ + meetingId: meetingId, + }); + if (meetingObject != null) { + welcomeMessage = Meteor.config.defaultWelcomeMessage.replace(/%%CONFNAME%%/, + meetingObject.meetingName); + } + + welcomeMessage = welcomeMessage + Meteor.config.defaultWelcomeMessageFooter; + + // add the welcome message if it's not there already OR update time_of_joining + return Chat.upsert({ + meetingId: meetingId, + userId: userId, + 'message.chat_type': 'SYSTEM_MESSAGE', + 'message.to_userid': userId, + }, { + meetingId: meetingId, + userId: userId, + message: { + chat_type: 'SYSTEM_MESSAGE', + message: welcomeMessage, + from_color: '0x3399FF', + to_userid: userId, + from_userid: 'SYSTEM_MESSAGE', + from_username: '', + from_time: (user != null && user.timeOfJoining != null) ? user.timeOfJoining.toString() : void 0, + }, + }, err => { + if (err != null) { + return logger.error(`_error ${err} when trying to insert welcome message for ${userId}`); + } else { + return logger.info(`_added/updated a system message in chat for user ${userId}`); + } + + // note that we already called callback() when updating the user. Adding + // the welcome message in the chat is not as vital and we can afford to + // complete it when possible, without blocking the serial event messages processing + }); + } else { + // logger.info "NOTE: got user_joined_message #{user.name} #{user.userid}" + return Users.upsert({ + meetingId: meetingId, + userId: userId, + }, { + meetingId: meetingId, + userId: userId, + user: { + userid: user.userid, + presenter: user.presenter, + name: user.name, + _sort_name: user.name.toLowerCase(), + phone_user: user.phone_user, + emoji_status: user.emoji_status, + set_emoji_time: user.set_emoji_time, + has_stream: user.has_stream, + role: user.role, + listenOnly: user.listenOnly, + extern_userid: user.extern_userid, + locked: user.locked, + time_of_joining: user.timeOfJoining, + connection_status: '', + voiceUser: { + web_userid: user.voiceUser.web_userid, + callernum: user.voiceUser.callernum, + userid: user.voiceUser.userid, + talking: user.voiceUser.talking, + joined: user.voiceUser.joined, + callername: user.voiceUser.callername, + locked: user.voiceUser.locked, + muted: user.voiceUser.muted, + }, + webcam_stream: user.webcam_stream, + }, + }, (err, numChanged) => { + let funct; + if (numChanged.insertedId != null) { + funct = function (cbk) { + logger.info( + `_joining user (case2) userid=[${userId}]:${user.name}. Users.size is now ${Users.find({ + meetingId: meetingId, + }).count()}` + ); + return cbk(); + }; + + return funct(callback); + } else { + return callback(); + } + }); + } +}; diff --git a/bigbluebutton-html5/imports/api/users/server/publications.js b/bigbluebutton-html5/imports/api/users/server/publications.js new file mode 100755 index 0000000000..b15358e0d9 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/publications.js @@ -0,0 +1,77 @@ +import Users from '/imports/api/users'; +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { logger } from '/imports/startup/server/logger'; +import { requestUserLeaving } from '/imports/api/users/server/modifiers/requestUserLeaving'; + +// Publish only the online users that are in the particular meetingId +// Also contains reconnection and connection_status info +Meteor.publish('users', function (credentials) { + const meetingId = credentials.meetingId; + const userid = credentials.requesterUserId; + const authToken = credentials.requesterToken; + + logger.info(`attempt publishing users for ${meetingId}, ${userid}, ${authToken}`); + const userObject = Users.findOne({ + userId: userid, + meetingId: meetingId, + }); + + if (!!userObject && !!userObject.user) { + let username = 'UNKNOWN'; + if (isAllowedTo('subscribeUsers', credentials)) { + logger.info(`${userid} was allowed to subscribe to 'users'`); + username = userObject.user.name; + + // offline -> online + if (userObject.user.connection_status !== 'online') { + Meteor.call('validateAuthToken', credentials); + setConnectionStatus(meetingId, userid, 'online'); + } + + this._session.socket.on('close', Meteor.bindEnvironment((function (_this) { + return function () { + logger.info(`a user lost connection: session.id=${_this._session.id}` + + ` userId = ${userid}, username=${username}, meeting=${meetingId}`); + setConnectionStatus(meetingId, userid, 'offline'); + return requestUserLeaving(meetingId, userid); + }; + })(this))); + + return getUsers(meetingId); + } else { + logger.warn('was not authorized to subscribe to users'); + return this.error(new Meteor.Error(402, 'User was not authorized to subscribe to users')); + } + } else { //subscribing before the user was added to the collection + Meteor.call('validateAuthToken', credentials); + logger.error(`there was no user ${userid} in ${meetingId}. Sending validateAuthToken`); + return getUsers(meetingId); + } +}); + +const getUsers = function (meetingId) { + //publish the users which are not offline + return Users.find({ + meetingId: meetingId, + 'user.connection_status': { + $in: ['online', ''], + }, + }, { + fields: { + authToken: false, + }, + }); +}; + +const setConnectionStatus = function (meetingId, userId, statusStr) { + Users.update({ + meetingId: meetingId, + userId: userId, + }, { + $set: { + 'user.connection_status': statusStr, + }, + }, (err, numChanged) => { + logger.info(`User ${userId} in ${meetingId} goes ${statusStr}`); + }); +}; diff --git a/bigbluebutton-html5/imports/api/verto/index.js b/bigbluebutton-html5/imports/api/verto/index.js new file mode 100755 index 0000000000..f88655087e --- /dev/null +++ b/bigbluebutton-html5/imports/api/verto/index.js @@ -0,0 +1,57 @@ +import Meetings from '/imports/api/users'; + +function joinAudio(options) { + // joinVertoCall() +} + +function watchVideo(options) { + // joinVertoCall() +} + +function joinVertoCall(options) { + let extension = null; + if (options.extension) { + extension = options.extension; + } else { + extension = Meetings.findOne().voiceConf; + } + + if (!isWebRTCAvailable()) { + return; + } + + if (!Meteor.config.useSIPAudio) { + const vertoServerCredentials = { + vertoPort: Meteor.config.vertoPort, + hostName: Meteor.config.vertoServerAddress, + login: conferenceIdNumber, + password: Meteor.config.freeswitchProfilePassword, + }; + + let wasCallSuccessful = false; + let debuggerCallback = function (message) { + console.log('CALLBACK: ' + JSON.stringify(message)); + + // + // Beginning of hacky method to make Firefox media calls succeed. + // Always fail the first time. Retry on failure. + // + if (!!navigator.mozGetUserMedia && message.errorcode == 1001) { + const logCallback = function (m) { + console.log('CALLBACK: ' + JSON.stringify(m)); + }; + + callIntoConference_verto(extension, conferenceUsername, conferenceIdNumber, logCallback, + 'webcam', options, vertoServerCredentials); + } + + // + // End of hacky method + // + }; + + callIntoConference_verto(extension, conferenceUsername, conferenceIdNumber, debuggerCallback, + 'webcam', options, vertoServerCredentials); + return; + } +} diff --git a/bigbluebutton-html5/imports/locales/en.json b/bigbluebutton-html5/imports/locales/en.json new file mode 100644 index 0000000000..30b65b368f --- /dev/null +++ b/bigbluebutton-html5/imports/locales/en.json @@ -0,0 +1,3 @@ +{ + "app.home.greeting": "Welcome {name}! Your presentation will begin shortly..." +} diff --git a/bigbluebutton-html5/imports/locales/index.js b/bigbluebutton-html5/imports/locales/index.js new file mode 100644 index 0000000000..f7abe1b3cb --- /dev/null +++ b/bigbluebutton-html5/imports/locales/index.js @@ -0,0 +1,7 @@ +import en from './en.json'; +import ptBR from './pt-BR.json'; + +export default { + en: en, + 'pt-BR': ptBR, +}; diff --git a/bigbluebutton-html5/imports/locales/pt-BR.json b/bigbluebutton-html5/imports/locales/pt-BR.json new file mode 100644 index 0000000000..963b6fc018 --- /dev/null +++ b/bigbluebutton-html5/imports/locales/pt-BR.json @@ -0,0 +1,3 @@ +{ + "app.home.greeting": "Bem-vindo {name}! Sua aprensentação começará em breve..." +} diff --git a/bigbluebutton-html5/imports/startup/client/routes.js b/bigbluebutton-html5/imports/startup/client/routes.js new file mode 100755 index 0000000000..e2b7872313 --- /dev/null +++ b/bigbluebutton-html5/imports/startup/client/routes.js @@ -0,0 +1,36 @@ +import React from 'react'; +import { Router, Route, Redirect, IndexRoute, + IndexRedirect, useRouterHistory } from 'react-router'; +import { createHistory } from 'history'; + +// route components +import AppContainer from '../../ui/components/app/container'; +import {setCredentials, subscribeForData} from '../../ui/components/app/service'; +import UserListContainer from '../../ui/components/user-list/UserListContainer'; +import ChatContainer from '../../ui/components/chat/ChatContainer'; + +const browserHistory = useRouterHistory(createHistory)({ + basename: '/html5client', +}); + +export const renderRoutes = () => ( +
+
+
+
+
+
+);
diff --git a/bigbluebutton-html5/imports/startup/server/EventQueue.js b/bigbluebutton-html5/imports/startup/server/EventQueue.js
new file mode 100644
index 0000000000..00040954ad
--- /dev/null
+++ b/bigbluebutton-html5/imports/startup/server/EventQueue.js
@@ -0,0 +1,143 @@
+import { logger } from '/imports/startup/server/logger';
+import { eventEmitter } from '/imports/startup/server';
+import { indexOf } from '/imports/startup/server/helpers';
+
+export class EventQueue {
+
+ constructor() {
+ console.log('in EventQueue constructor');
+ let queue = new PowerQueue({
+ // autoStart:true
+ // isPaused: true
+ });
+
+ queue.taskHandler = function (data, next, failures) {
+ const parsedMsg = JSON.parse(data.jsonMsg);
+ let eventName = null;
+ if (parsedMsg != null) {
+ eventName = parsedMsg.header.name;
+ const length = queue.length();
+ const lengthString = (function () {
+ if (length > 0) {
+ return `In the queue we have ${length} event(s) to process.`;
+ } else return '';
+ }()) || '';
+
+ logger.info(`in callback after handleRedisMessage ${eventName}. ${lengthString}`);
+ }
+
+ console.log('in taskHandler:' + eventName);
+
+ if (failures > 0) {
+ next();
+ return logger.error(`got a failure on taskHandler ${eventName} ${failures}`);
+ } else {
+ logRedisMessage(eventName, data.jsonMsg);
+
+ // note!! we first check if we handle the event type. The handled event types are listed
+ // in an array if NOT in the array, call arg.callback()
+ if (handledMessageTypes.indexOf(eventName) > -1) {
+ return eventEmitter.emit(eventName, {
+ payload: parsedMsg.payload,
+ header: parsedMsg.header, //TODO extract meetingId here
+
+ callback: () => {
+ console.log('ready for next message');
+ return next();
+ },
+ });
+ } else {
+ logger.error('NOT HANDLING:' + eventName);
+ return next();
+ }
+ }
+ };
+
+ return queue;
+ }
+}
+
+const logRedisMessage = function (eventName, json) {
+ // Avoid cluttering the log with json messages carrying little or repetitive
+ // information. Comment out a message type in the array to be able to see it
+ // in the log upon restarting of the Meteor process.
+ notLoggedEventTypes = [
+ 'keep_alive_reply',
+ 'page_resized_message',
+ 'presentation_page_resized_message',
+ 'presentation_cursor_updated_message',
+ 'get_presentation_info_reply',
+
+ //'get_users_reply'
+ 'get_chat_history_reply',
+
+ //'get_all_meetings_reply'
+ 'get_whiteboard_shapes_reply',
+ 'presentation_shared_message',
+ 'presentation_conversion_done_message',
+ 'presentation_conversion_progress_message',
+ 'presentation_page_generated_message',
+
+ //'presentation_page_changed_message'
+ 'BbbPubSubPongMessage',
+ 'bbb_apps_is_alive_message',
+ 'user_voice_talking_message',
+ 'meeting_state_message',
+ 'get_recording_status_reply',
+ ];
+
+ // LOG in the meteor console
+ if (eventName, indexOf.call(notLoggedEventTypes, eventName) < 0) {
+
+ // For DEVELOPMENT purposes only
+ // Dynamic shapes' updates will slow down significantly
+ if (Meteor.settings.public.mode == 'development') {
+ logger.info(`redis incoming message ${eventName} `, {
+ message: json,
+ });
+ }
+ }
+};
+
+const handledMessageTypes = [
+ 'get_users_reply',
+ 'meeting_created_message',
+ 'get_all_meetings_reply',
+ 'user_left_voice_message',
+ 'user_joined_voice_message',
+ 'user_voice_talking_message',
+ 'user_voice_muted_message',
+ 'user_listening_only',
+ 'user_left_message',
+ 'validate_auth_token_reply',
+ 'user_joined_message',
+ 'presenter_assigned_message',
+ 'user_emoji_status_message',
+ 'user_locked_message',
+ 'user_unlocked_message',
+ 'meeting_ended_message',
+ 'meeting_destroyed_event',
+ 'end_and_kick_all_message',
+ 'disconnect_all_users_message',
+ 'get_chat_history_reply',
+ 'send_public_chat_message',
+ 'send_private_chat_message',
+ 'presentation_shared_message',
+ 'get_presentation_info_reply',
+ 'presentation_page_changed_message',
+ 'presentation_removed_message',
+ 'get_whiteboard_shapes_reply',
+ 'send_whiteboard_shape_message',
+ 'presentation_cursor_updated_message',
+ 'whiteboard_cleared_message',
+ 'undo_whiteboard_request',
+ 'user_eject_from_meeting',
+ 'disconnect_user_message',
+ 'presentation_page_resized_message',
+ 'recording_status_changed_message',
+ 'new_permission_settings',
+ 'poll_show_result_message',
+ 'poll_started_message',
+ 'poll_stopped_message',
+ 'user_voted_poll_message',
+];
diff --git a/bigbluebutton-html5/imports/startup/server/RedisPubSub.js b/bigbluebutton-html5/imports/startup/server/RedisPubSub.js
new file mode 100644
index 0000000000..c4b33b8c16
--- /dev/null
+++ b/bigbluebutton-html5/imports/startup/server/RedisPubSub.js
@@ -0,0 +1,56 @@
+import { logger } from '/imports/startup/server/logger';
+import { redisConfig } from '/config';
+import { myQueue } from '/imports/startup/server';
+import { indexOf, publish } from '/imports/startup/server/helpers';
+
+export class RedisPubSub {
+ constructor() {
+ logger.info('constructor RedisPubSub');
+ this.pubClient = redis.createClient();
+ this.subClient = redis.createClient();
+ logger.info(`Subscribing message on channel: ${redisConfig.channels.fromBBBApps}`);
+ this.subClient.on('psubscribe', Meteor.bindEnvironment(this._onSubscribe));
+ this.subClient.on('pmessage', Meteor.bindEnvironment(this._addToQueue));
+ this.subClient.psubscribe(redisConfig.channels.fromBBBApps);
+ }
+
+ _onSubscribe(channel, count) {
+ let message;
+ logger.info(`Subscribed to ${channel}`);
+
+ //grab data about all active meetings on the server
+ message = {
+ header: {
+ name: 'get_all_meetings_request',
+ },
+ payload: {}, // I need this, otherwise bbb-apps won't recognize the message
+ };
+ return publish(redisConfig.channels.toBBBApps.meeting, message);
+ }
+
+ _addToQueue(pattern, channel, jsonMsg) {
+ let eventName, message, messagesWeIgnore;
+ message = JSON.parse(jsonMsg);
+ eventName = message.header.name;
+ messagesWeIgnore = [
+ 'BbbPubSubPongMessage',
+ 'bbb_apps_is_alive_message',
+ 'broadcast_layout_message',
+ ];
+ if (indexOf.call(messagesWeIgnore, eventName) < 0) {
+
+ // For DEVELOPMENT purposes only
+ // Dynamic shapes' updates will slow down significantly
+ if (Meteor.settings.public.mode == 'development') {
+ logger.info(`Q ${eventName} ${myQueue.total()}`);
+ }
+
+ return myQueue.add({
+ pattern: pattern,
+ channel: channel,
+ jsonMsg: jsonMsg,
+ });
+ }
+ }
+
+}
diff --git a/bigbluebutton-html5/imports/startup/server/helpers.js b/bigbluebutton-html5/imports/startup/server/helpers.js
new file mode 100755
index 0000000000..f96d1b6f01
--- /dev/null
+++ b/bigbluebutton-html5/imports/startup/server/helpers.js
@@ -0,0 +1,64 @@
+import { clearUsersCollection } from '/imports/api/users/server/modifiers/clearUsersCollection';
+import { clearChatCollection} from '/imports/api/chat/server/modifiers/clearChatCollection';
+import { clearMeetingsCollection} from '/imports/api/meetings/server/modifiers/clearMeetingsCollection';
+import { clearShapesCollection } from '/imports/api/shapes/server/modifiers/clearShapesCollection';
+import { clearSlidesCollection } from '/imports/api/slides/server/modifiers/clearSlidesCollection';
+import { clearPresentationsCollection } from '/imports/api/presentations/server/modifiers/clearPresentationsCollection';
+import { clearPollCollection } from '/imports/api/polls/server/modifiers/clearPollCollection';
+import { clearCursorCollection } from '/imports/api/cursor/server/modifiers/clearCursorCollection';
+
+import { logger } from '/imports/startup/server/logger';
+import { redisPubSub } from '/imports/startup/server';
+
+export function appendMessageHeader(eventName, messageObj) {
+ let header;
+ header = {
+ timestamp: new Date().getTime(),
+ name: eventName,
+ };
+ messageObj.header = header;
+ return messageObj;
+};
+
+export function clearCollections() {
+ console.log('in function clearCollections');
+ clearUsersCollection();
+ clearChatCollection();
+ clearMeetingsCollection();
+ clearShapesCollection();
+ clearSlidesCollection();
+ clearPresentationsCollection();
+ clearPollCollection();
+ clearCursorCollection();
+}
+
+export const indexOf = [].indexOf || function (item) {
+ for (let i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1;
+ };
+
+export function publish(channel, message) {
+ logger.info(`redis outgoing message ${message.header.name}`, {
+ channel: channel,
+ message: message,
+ });
+ if (redisPubSub != null) {
+ return redisPubSub.pubClient.publish(channel, JSON.stringify(message), (err, res) => {
+ if (err) {
+ return logger.info('error', {
+ error: err,
+ });
+ }
+ });
+ } else {
+ return logger.info('ERROR!! redisPubSub was undefined');
+ }
+};
+
+// translate '\n' newline character and '\r' carriage
+// returns to '
' breakline character for Flash +export const translateHTML5ToFlash = function (message) { + let result = message; + result = result.replace(new RegExp(CARRIAGE_RETURN, 'g'), BREAK_LINE); + result = result.replace(new RegExp(NEW_LINE, 'g'), BREAK_LINE); + return result; +}; diff --git a/bigbluebutton-html5/imports/startup/server/index.js b/bigbluebutton-html5/imports/startup/server/index.js new file mode 100644 index 0000000000..56fa4c1ff6 --- /dev/null +++ b/bigbluebutton-html5/imports/startup/server/index.js @@ -0,0 +1,16 @@ +import { logger } from '/imports/startup/server/logger'; +import '/server/server'; +import { RedisPubSub } from '/imports/startup/server/RedisPubSub'; +import { EventQueue } from '/imports/startup/server/EventQueue'; +import { clearCollections } from '/imports/startup/server/helpers'; + +Meteor.startup(function () { + clearCollections(); + logger.info('server start'); +}); + +export const myQueue = new EventQueue(); + +export const eventEmitter = new (Npm.require('events').EventEmitter); + +export const redisPubSub = new RedisPubSub(); diff --git a/bigbluebutton-html5/imports/startup/server/logger.js b/bigbluebutton-html5/imports/startup/server/logger.js new file mode 100644 index 0000000000..498598a885 --- /dev/null +++ b/bigbluebutton-html5/imports/startup/server/logger.js @@ -0,0 +1,15 @@ +// Setting up a logger +const log = {}; +if (process != null && process.env != null && process.env.NODE_ENV == 'production') { + log.path = '/var/log/bigbluebutton/bbbnode.log'; +} else { + log.path = `${process.env.PWD}/log/development.log`; +} + +export let logger = new Winston.Logger({ + transports: [ + new Winston.transports.Console(), new Winston.transports.File({ + filename: log.path, + }), + ], +}); diff --git a/bigbluebutton-html5/server/user_permissions.js b/bigbluebutton-html5/imports/startup/server/userPermissions.js similarity index 63% rename from bigbluebutton-html5/server/user_permissions.js rename to bigbluebutton-html5/imports/startup/server/userPermissions.js index 99730f4a1d..2a45440152 100755 --- a/bigbluebutton-html5/server/user_permissions.js +++ b/bigbluebutton-html5/imports/startup/server/userPermissions.js @@ -1,6 +1,8 @@ -let moderator, presenter, viewer; +import Users from '/imports/api/users'; +import Meetings from '/imports/api/meetings'; +import { logger } from '/imports/startup/server/logger'; -presenter = { +const presenter = { switchSlide: true, //poll @@ -10,7 +12,7 @@ presenter = { // holds the values for whether the moderator user is allowed to perform an action (true) // or false if not allowed. Some actions have dynamic values depending on the current lock settings -moderator = { +const moderator = { // audio listen only joinListenOnly: true, leaveListenOnly: true, @@ -51,7 +53,7 @@ moderator = { // holds the values for whether the viewer user is allowed to perform an action (true) // or false if not allowed. Some actions have dynamic values depending on the current lock settings -viewer = function (meetingId, userId) { +const viewer = function (meetingId, userId) { let meeting, user; return { @@ -68,8 +70,8 @@ viewer = function (meetingId, userId) { // muting muteSelf: true, - unmuteSelf: !((meeting = Meteor.Meetings.findOne({ meetingId: meetingId })) != null && meeting.roomLockSettings.disableMic) || - !((user = Meteor.Users.findOne({ meetingId: meetingId, userId: userId })) != null && user.user.locked), + unmuteSelf: !((meeting = Meetings.findOne({ meetingId: meetingId })) != null && meeting.roomLockSettings.disableMic) || + !((user = Users.findOne({ meetingId: meetingId, userId: userId })) != null && user.user.locked), logoutSelf: true, @@ -78,12 +80,12 @@ viewer = function (meetingId, userId) { subscribeChat: true, //chat - chatPublic: !((meeting = Meteor.Meetings.findOne({ meetingId: meetingId })) != null && meeting.roomLockSettings.disablePublicChat) || - !((user = Meteor.Users.findOne({ meetingId: meetingId, userId: userId })) != null && user.user.locked) || + chatPublic: !((meeting = Meetings.findOne({ meetingId: meetingId })) != null && meeting.roomLockSettings.disablePublicChat) || + !((user = Users.findOne({ meetingId: meetingId, userId: userId })) != null && user.user.locked) || (user != null && user.user.presenter), - chatPrivate: !((meeting = Meteor.Meetings.findOne({ meetingId: meetingId })) != null && meeting.roomLockSettings.disablePrivateChat) || - !((user = Meteor.Users.findOne({ meetingId: meetingId, userId: userId })) != null && user.user.locked) || + chatPrivate: !((meeting = Meetings.findOne({ meetingId: meetingId })) != null && meeting.roomLockSettings.disablePrivateChat) || + !((user = Users.findOne({ meetingId: meetingId, userId: userId })) != null && user.user.locked) || (user != null && user.user.presenter), //poll @@ -98,9 +100,13 @@ viewer = function (meetingId, userId) { // carries out the decision making for actions affecting users. For the list of // actions and the default value - see 'viewer' and 'moderator' in the beginning of the file -this.isAllowedTo = function (action, meetingId, userId, authToken) { +export function isAllowedTo(action, credentials) { + const meetingId = credentials.meetingId; + const userId = credentials.requesterUserId; + const authToken = credentials.requesterToken; + let user, validated; - user = Meteor.Users.findOne({ + user = Users.findOne({ meetingId: meetingId, userId: userId, }); @@ -108,47 +114,47 @@ this.isAllowedTo = function (action, meetingId, userId, authToken) { validated = user.validated; } - Meteor.log.info(`in isAllowedTo: action-${action}, userId=${userId}, authToken=${authToken} validated:${validated}`); - user = Meteor.Users.findOne({ + logger.info(`in isAllowedTo: action-${action}, userId=${userId}, authToken=${authToken} validated:${validated}`); + user = Users.findOne({ meetingId: meetingId, userId: userId, }); - // Meteor.log.info "user=" + JSON.stringify user + // logger.info "user=" + JSON.stringify user if ((user != null) && authToken === user.authToken) { // check if the user is who he claims to be if (user.validated && user.clientType === 'HTML5') { // PRESENTER // check presenter specific actions or fallback to regular viewer actions if (user.user != null && user.user.presenter) { - Meteor.log.info('user permissions presenter case'); + logger.info('user permissions presenter case'); return presenter[action] || viewer(meetingId, userId)[action] || false; // VIEWER } else if (user.user != null && user.user.role === 'VIEWER') { - Meteor.log.info('user permissions viewer case'); + logger.info('user permissions viewer case'); return viewer(meetingId, userId)[action] || false; // MODERATOR } else if (user.user != null && user.user.role === 'MODERATOR') { - Meteor.log.info('user permissions moderator case'); + logger.info('user permissions moderator case'); return moderator[action] || false; } else { - Meteor.log.warn(`UNSUCCESSFULL ATTEMPT FROM userid=${userId} to perform:${action}`); + logger.warn(`UNSUCCESSFULL ATTEMPT FROM userid=${userId} to perform:${action}`); return false; } } else { // user was not validated if (action === 'logoutSelf') { // on unsuccessful sign-in - Meteor.log.warn('a user was successfully removed from the meeting following an unsuccessful login'); + logger.warn('a user was successfully removed from the meeting following an unsuccessful login'); return true; } return false; } } else { - Meteor.log.error(`in meetingId=${meetingId} userId=${userId} tried to perform ${action} without permission${'\n..while the authToken was ' + + logger.error(`in meetingId=${meetingId} userId=${userId} tried to perform ${action} without permission${'\n..while the authToken was ' + (user != null && user.authToken != null ? user.authToken : void 0) + " and the user's object is " + (JSON.stringify(user))}`); return false; diff --git a/bigbluebutton-html5/imports/ui/Button.jsx b/bigbluebutton-html5/imports/ui/Button.jsx deleted file mode 100755 index 7cc3f4c1ee..0000000000 --- a/bigbluebutton-html5/imports/ui/Button.jsx +++ /dev/null @@ -1,66 +0,0 @@ -import React from 'react'; -import CustomPropTypes from './utils/propTypes.js'; - -const { PropTypes } = React; -const TYPES = [ - 'button', 'reset', 'submit', -]; - -export let Button = React.createClass({ - propTypes: { - disabled: PropTypes.bool, - - /** - * You can use a custom element for this component - */ - componentClass: CustomPropTypes.elementType, - - /** - * Defines HTML button type Attribute - * @type {("button"|"reset"|"submit")} - * @defaultValue 'button' - */ - type: PropTypes.oneOf(TYPES), - }, - - getDefaultProps() { - return { - disabled: false, - type: 'button', - }; - }, - - render() { - let renderFuncName = this.props.href || this.props.target ? - 'renderAnchor' : 'renderButton'; - - return this[renderFuncName](); - }, - - renderAnchor() { - let Component = this.props.componentClass || 'a'; - let href = this.props.href || '#'; - - return ( -
- {this.props.children}
-
- );
- },
-
- renderButton() {
- let Component = this.props.componentClass || 'button';
-
- return (
-
- {this.props.children}
-
- );
- },
-});
diff --git a/bigbluebutton-html5/imports/ui/EmojiIcon.jsx b/bigbluebutton-html5/imports/ui/EmojiIcon.jsx
deleted file mode 100755
index 08681f4cd5..0000000000
--- a/bigbluebutton-html5/imports/ui/EmojiIcon.jsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import React from 'react';
-import classNames from 'classnames';
-
-const { PropTypes } = React;
-
-export let EmojiIcon = React.createClass({
- propTypes: {
- iconName: PropTypes.string.isRequired,
- },
-
- render() {
- return this.renderIcon();
- },
-
- renderIcon() {
- if (this.props.iconName === 'raiseHand') {
- return ();
- } else if (this.props.iconName === 'happy') {
- return (
-
- );
- } else if (this.props.iconName === 'neutral') {
- return (
-
- );
- } else if (this.props.iconName === 'confused') {
- return (
-
- );
- } else if (this.props.iconName === 'sad') {
- return (
-
- );
- } else if (this.props.iconName === 'away') {
- return (
-
- );
- } else if (this.props.iconName === 'plus') {
- return (
-
- );
- }
- },
-});
diff --git a/bigbluebutton-html5/imports/ui/Icon.jsx b/bigbluebutton-html5/imports/ui/Icon.jsx
deleted file mode 100755
index a2671eab06..0000000000
--- a/bigbluebutton-html5/imports/ui/Icon.jsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react';
-import classNames from 'classnames';
-import {Tooltip} from './Tooltip.jsx';
-
-const { PropTypes } = React;
-
-export let Icon = React.createClass({
- propTypes: {
- iconName: PropTypes.string.isRequired,
- },
-
- getDefaultProps() {
- return {
- prependIconName: 'fi-',
- title: '',
- };
- },
-
- render() {
- let renderFuncName = this.props.title ? 'renderTooltip' : 'renderIcon';
- return this[renderFuncName]();
- },
-
- renderIcon() {
- return ();
- },
-
- renderTooltip() {
- return (
-
- {this.renderIcon()}
-
- );
- },
-});
diff --git a/bigbluebutton-html5/imports/ui/Tooltip.jsx b/bigbluebutton-html5/imports/ui/Tooltip.jsx
deleted file mode 100755
index ce4c1fa7ab..0000000000
--- a/bigbluebutton-html5/imports/ui/Tooltip.jsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import CustomPropTypes from './utils/propTypes.js';
-const { PropTypes } = React;
-
-export let Tooltip = React.createClass({
- propTypes: {
- title: PropTypes.string.isRequired,
- },
-
- getDefaultProps() {
- return {
- placement: 'bottom',
- componentClass: 'span',
- };
- },
-
- render() {
- let Component = this.props.componentClass;
-
- return (
-
- {this.props.children}
-
- );
- },
-});
diff --git a/bigbluebutton-html5/imports/ui/chat/Chat.jsx b/bigbluebutton-html5/imports/ui/chat/Chat.jsx
deleted file mode 100755
index 9bdc48cbc2..0000000000
--- a/bigbluebutton-html5/imports/ui/chat/Chat.jsx
+++ /dev/null
@@ -1,155 +0,0 @@
-import React from 'react';
-import { PrivateChatToolBar } from './PrivateChatToolBar.jsx';
-import { ChatInputControls } from './ChatInputControls.jsx';
-import { ChatMessage } from './ChatMessage.jsx';
-
-export let Chat = React.createClass({
- mixins: [ReactMeteorData],
- getMeteorData() {
- let chatMessages, privateChatName, chattingWith, user, messageFontSize, temp, user_exists;
-
- messageFontSize = { fontSize: getInSession('messageFontSize') + 'px' };
- chattingWith = getInSession('inChatWith');
- if (chattingWith === 'PUBLIC_CHAT') { // find all public and system messages
- chatMessages = Meteor.Chat.find({ 'message.chat_type': { $in: ['SYSTEM_MESSAGE', 'PUBLIC_CHAT'] } },
- { sort: { 'message.from_time': 1 } }).fetch();
- } else {
- chatMessages = Meteor.Chat.find({ 'message.chat_type': 'PRIVATE_CHAT', $or: [{ 'message.to_userid': chattingWith },
- { 'message.from_userid': chattingWith }, ], }).fetch();
- }
-
- user = Meteor.Users.findOne({ userId: chattingWith });
- if (user != null) {
- privateChatName = user.user.name;
- }
-
- if (getInSession('inChatWith') === 'PUBLIC_CHAT' || Meteor.Users.findOne({
- userId: getInSession('inChatWith'),
- }) != null) {
- user_exists = true;
- } else {
- user_exists = false;
- }
-
- return {
- chatMessages: chatMessages,
- privateChatName: privateChatName,
- messageFontSize: messageFontSize,
- user_exists: user_exists,
- };
- },
-
- detectUnreadChat: function () {
- //if the current tab is not the same as the tab we just published in
- return Meteor.Chat.find({}).observe({
- added: (_this => {
- return function (chatMessage) {
- let findDestinationTab;
- findDestinationTab = function () {
- let ref, ref1;
- if (((ref = chatMessage.message) != null ? ref.chat_type : void 0) === 'PUBLIC_CHAT') {
- return 'PUBLIC_CHAT';
- } else {
- return (ref1 = chatMessage.message) != null ? ref1.from_userid : void 0;
- }
- };
-
- return Tracker.autorun(comp => {
- let destinationTab, tabsTime;
- tabsTime = getInSession('userListRenderedTime');
- if ((tabsTime != null) && chatMessage.message.from_userid !== 'SYSTEM_MESSAGE' && chatMessage.message.from_time - tabsTime > 0) {
- populateNotifications(chatMessage); // check if we need to show a new notification
- destinationTab = findDestinationTab();
- if (destinationTab !== getInSession('inChatWith')) {
- setInSession('chats', getInSession('chats').map(tab => {
- if (tab.userId === destinationTab) {
- tab.gotMail = true;
- tab.number++;
- }
-
- return tab;
- }));
- }
- }
-
- return comp.stop();
- });
- };
- })(this),
- });
- },
-
- componentDidMount: function () {
- this.detectUnreadChat();
- },
-
- getCombinedMessagesForChat(msgs) {
- let deleted, i, j, len;
- len = msgs != null ? msgs.length : void 0; // get length of messages
- i = 0;
- while (i < len) { // Must be a do while, for loop compiles and stores the length of array which can change inside the loop!
- if (msgs[i].message.from_userid !== 'System') { // skip system messages
- j = i + 1; // Start looking at messages right after the current one
- while (j < len) {
- deleted = false;
- if (msgs[j].message.from_userid !== 'System') { // Ignore system messages
- // Check if the time discrepancy between the two messages exceeds window for grouping
- if ((parseFloat(msgs[j].message.from_time) - parseFloat(msgs[i].message.from_time)) >= 60000) { // 60 seconds/1 minute
- break; // Messages are too far between, so them seperated and stop joining here
- }
-
- if (msgs[i].message.from_userid === msgs[j].message.from_userid) { // Both messages are from the same user
- // insert a '\r' carriage return character between messages to put them on a new line
- msgs[i].message.message += `${CARRIAGE_RETURN}${msgs[j].message.message}`; // Combine the messages
- msgs.splice(j, 1); // Delete the message from the collection
- deleted = true;
- } else {
- break; // Messages are from different people, move on
- }
- } else {
- break; // This is the break point in the chat, don't merge
- }
-
- len = msgs.length;
- if (!deleted) {
- ++j;
- }
- }
- }
-
- ++i;
- len = msgs.length;
- }
-
- return msgs;
- },
-
- inPrivateChat() {
- return (getInSession('inChatWith') !== 'PUBLIC_CHAT');
- },
-
- render() {
- return (
-
-
- {this.props.message.message.from_username ?
-
- {this.props.message.message.from_username}
-
- : null }
-
- {this.getTime()}
-
-
- );
- },
-});
diff --git a/bigbluebutton-html5/imports/ui/chat/PrivateChatToolBar.jsx b/bigbluebutton-html5/imports/ui/chat/PrivateChatToolBar.jsx
deleted file mode 100755
index 34bbc480f7..0000000000
--- a/bigbluebutton-html5/imports/ui/chat/PrivateChatToolBar.jsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react';
-import { Button } from '../shared/Button.jsx';
-
-export let PrivateChatToolBar = React.createClass({
- componentDidMount: function () {
- if (isLandscape() || isPortrait()) {
- return $('#newMessageInput').focus();
- }
- },
-
- handleClick: function () {
- setInSession('inChatWith', 'PUBLIC_CHAT');
- return setInSession('chats', getInSession('chats').map(chat => {
- if (chat.userId === 'PUBLIC_CHAT') {
- chat.gotMail = false;
- chat.number = 0;
- }
- $('.ui-tooltip').hide();
- return chat;
- }));
- },
-
- render() {
- return (
-
+ {this.props.children}
+
+ );
+ }
+}
+
+export default createContainer(() => {
+ return {};
+}, ActionsBarContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/styles.scss b/bigbluebutton-html5/imports/ui/components/actions-bar/styles.scss
new file mode 100644
index 0000000000..0c45a2177e
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/styles.scss
@@ -0,0 +1,29 @@
+@import "imports/ui/stylesheets/variables/_all";
+
+.actionsbar {
+ padding: $line-height-computed / 2;
+ display: flex;
+ flex-direction: row;
+}
+
+.left,
+.right,
+.center {
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+
+ > * {
+ margin: 0 $line-height-computed;
+ }
+}
+
+.left,
+.right {
+ flex: 0;
+}
+
+.center {
+ flex: 1;
+}
diff --git a/bigbluebutton-html5/imports/ui/components/app/component.jsx b/bigbluebutton-html5/imports/ui/components/app/component.jsx
new file mode 100755
index 0000000000..8df446db8e
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/app/component.jsx
@@ -0,0 +1,138 @@
+import React, { Component, PropTypes } from 'react';
+import styles from './styles';
+
+const propTypes = {
+ navbar: PropTypes.element,
+ sidebar: PropTypes.element,
+ sidebarRight: PropTypes.element,
+ media: PropTypes.element,
+ actionsbar: PropTypes.element,
+ settings: PropTypes.element,
+};
+
+export default class App extends Component {
+ renderNavBar() {
+ const { navbar } = this.props;
+
+ if (navbar) {
+ return (
+
+ {navbar}
+
+ );
+ }
+
+ return false;
+ }
+
+ renderSidebar() {
+ const { sidebar } = this.props;
+
+ if (sidebar) {
+ return (
+
+ );
+ }
+
+ return false;
+ }
+
+ renderUserList() {
+ const { userList } = this.props;
+
+ if (userList) {
+ return (
+
+ );
+ }
+
+ return false;
+ }
+
+ renderChat() {
+ const { chat } = this.props;
+
+ if (chat) {
+ return (
+
+ {chat}
+
+ );
+ }
+
+ return false;
+ }
+
+ renderMedia() {
+ const { media } = this.props;
+
+ if (media) {
+ return (
+
+ {media}
+
+ );
+ }
+
+ return false;
+ }
+
+ renderActionsBar() {
+ const { actionsbar } = this.props;
+
+ if (actionsbar) {
+ return (
+
+ {actionsbar}
+
+ );
+ }
+
+ return false;
+ }
+
+ renderSettings() {
+ const { settings } = this.props;
+
+ if (settings) {
+ return (
+
+ {settings}
+
+ );
+ }
+
+ return false;
+ }
+
+ renderAudioElement() {
+ return (
+
+ );
+ }
+
+ render() {
+ return (
+
+
+ {this.renderUserList()}
+ {this.renderChat()}
+
+ {this.renderSettings()}
+ {this.renderAudioElement()}
+
+ );
+ }
+}
+
+App.propTypes = propTypes;
diff --git a/bigbluebutton-html5/imports/ui/components/app/container.jsx b/bigbluebutton-html5/imports/ui/components/app/container.jsx
new file mode 100755
index 0000000000..941e6458ce
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/app/container.jsx
@@ -0,0 +1,52 @@
+import React, { Component, PropTypes } from 'react';
+import { createContainer } from 'meteor/react-meteor-data';
+
+import App from './component';
+import { pollExists } from './service';
+
+import NavBarContainer from '../nav-bar/container';
+import ActionsBarContainer from '../actions-bar/container';
+import MediaContainer from '../media/container';
+import PollingContainer from '../polling/container';
+import SettingsModal from '../modals/settings/SettingsModal';
+
+const defaultProps = {
+ navbar:
+ {this.props.children}
+
+ );
+ }
+}
+
+AppContainer.defaultProps = defaultProps;
+
+const actionControlsToShow = () => {
+ if (pollExists()) {
+ return
+ {this.props.children}
+
+ );
+ }
+}
+
+ButtonBase.propTypes = propTypes;
+ButtonBase.defaultProps = defaultProps;
diff --git a/bigbluebutton-html5/imports/ui/components/button/component.jsx b/bigbluebutton-html5/imports/ui/components/button/component.jsx
new file mode 100755
index 0000000000..54a338e34b
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/button/component.jsx
@@ -0,0 +1,201 @@
+import React, { PropTypes } from 'react';
+import BaseButton from './base/component';
+import styles from './styles';
+import cx from 'classnames';
+import _ from 'underscore';
+
+import Icon from '../icon/component';
+
+const SIZES = [
+ 'lg', 'md', 'sm',
+];
+
+const COLORS = [
+ 'default', 'primary', 'danger', 'success',
+];
+
+const propTypes = {
+ ...BaseButton.propTypes,
+ /**
+ * Defines the button size style
+ * @type {("lg"|"md"|"sm")}
+ * @defaultValue 'md'
+ */
+ size: PropTypes.oneOf(SIZES),
+
+ /**
+ * Defines the button color style
+ * @type {("default"|"primary"|"danger"|"success")}
+ * @defaultValue 'md'
+ */
+ color: PropTypes.oneOf(COLORS),
+
+ /**
+ * Defines if the button should be styled as a ghost (outline)
+ * @defaultValue false
+ */
+ ghost: PropTypes.bool,
+
+ /**
+ * Defines if the button should be styled as circle
+ * @defaultValue false
+ */
+ circle: PropTypes.bool,
+
+ /**
+ * Defines if the button should have `display: block`
+ * @defaultValue false
+ */
+ block: PropTypes.bool,
+
+ /**
+ * Defines the button icon
+ * @defaultValue undefined
+ */
+ icon: PropTypes.string,
+
+ /**
+ * Defines the button icon is on the right side
+ * @defaultValue false
+ */
+ iconRight: PropTypes.bool,
+
+ /**
+ * Defines the button label
+ * @defaultValue undefined
+ */
+ label: PropTypes.string,
+};
+
+const defaultProps = {
+ ...BaseButton.defaultProps,
+ size: 'md',
+ color: 'default',
+ ghost: false,
+ circle: false,
+ block: false,
+ iconRight: false,
+};
+
+export default class Button extends BaseButton {
+ constructor(props) {
+ super(props);
+ props['aria-labelledby'] = this.id;
+ }
+
+ componentWillMount() {
+ this.labelId = _.uniqueId('btn-label-');
+ }
+
+ _getClassNames() {
+ const {
+ icon,
+ size,
+ color,
+ ghost,
+ circle,
+ block,
+ iconRight,
+ } = this.props;
+
+ let propClassNames = {};
+ propClassNames[styles.button] = true;
+ propClassNames[styles[size]] = true;
+ propClassNames[styles[color]] = true;
+ propClassNames[styles.ghost] = ghost;
+ propClassNames[styles.circle] = circle;
+ propClassNames[styles.block] = block;
+ propClassNames[styles.iconRight] = iconRight;
+
+ return propClassNames;
+ }
+
+ render() {
+ let renderFuncName = this.props.circle ?
+ 'renderCircle' : 'renderDefault';
+
+ return this[renderFuncName]();
+ }
+
+ renderDefault() {
+ const {
+ tagName,
+ className,
+ iconRight,
+ } = this.props;
+
+ const Component = tagName;
+
+ /* TODO: We can change this and make the button with flexbox to avoid html
+ changes */
+ const renderLeftFuncName = !iconRight ? 'renderIcon' : 'renderLabel';
+ const renderRightFuncName = !iconRight ? 'renderLabel' : 'renderIcon';
+
+ return (
+
+ {this[renderLeftFuncName]()}
+ {this[renderRightFuncName]()}
+
+ );
+ }
+
+ renderCircle() {
+ const {
+ tagName,
+ className,
+ size,
+ iconRight
+ } = this.props;
+
+ const Component = tagName;
+
+ return (
+
+ {!iconRight ? null : this.renderLabel(true)}
+
+ {this.renderIcon()}
+
+ {iconRight ? null : this.renderLabel(true)}
+
+ );
+ }
+
+ renderIcon() {
+ const iconName = this.props.icon;
+
+ if (iconName) {
+ return (
+ {this.props.children}
+
+ );
+ }
+}
+
+export default createContainer(() => {
+ return {};
+}, ChatContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/chat/styles.scss b/bigbluebutton-html5/imports/ui/components/chat/styles.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/bigbluebutton-html5/imports/ui/components/deskshare/component.jsx b/bigbluebutton-html5/imports/ui/components/deskshare/component.jsx
new file mode 100755
index 0000000000..a53eafb166
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/deskshare/component.jsx
@@ -0,0 +1,9 @@
+import React from 'react';
+
+export default class DeskshareComponent extends React.Component {
+ render() {
+ return (
+
+ );
+ }
+};
diff --git a/bigbluebutton-html5/imports/ui/components/deskshare/container.jsx b/bigbluebutton-html5/imports/ui/components/deskshare/container.jsx
new file mode 100755
index 0000000000..c812c9b2aa
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/deskshare/container.jsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import {videoIsBroadcasting} from './service';
+import { createContainer } from 'meteor/react-meteor-data';
+import DeskshareComponent from './component';
+
+class DeskshareContainer extends React.Component {
+ render() {
+ if (this.props.videoIsBroadcasting) {
+ return
+
+ {this.props.children}
+
+ );
+ }
+}
+
+MediaContainer.defaultProps = defaultProps;
+
+export default createContainer(() => {
+ return {};
+}, MediaContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/media/styles.scss b/bigbluebutton-html5/imports/ui/components/media/styles.scss
new file mode 100644
index 0000000000..e3498f909e
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/media/styles.scss
@@ -0,0 +1,62 @@
+@import "imports/ui/stylesheets/variables/_all";
+
+.container {
+ position: relative;
+ display: flex;
+ flex: 2;
+ align-items: center;
+ justify-content: center;
+}
+
+%ratio {
+ position: relative;
+ display: block;
+ height: 0;
+ padding: 0;
+ padding-bottom: calc(100% * 9 / 16);
+}
+
+%ratio-item {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ border: 0;
+}
+
+.contentWrapper {
+ flex-basis: 90%;
+
+ @include mq($large-up) {
+ flex-basis: 70%;
+ }
+}
+
+.contentRatio {
+ @extend %ratio;
+}
+
+.content {
+ @extend %ratio-item;
+}
+
+.overlayWrapper {
+ position: absolute;
+ width: 30%;
+ right: 2%;
+ bottom: 2%;
+
+ @include mq($large-up) {
+ flex-basis: 15%;
+ }
+}
+
+.overlayRatio {
+ @extend %ratio;
+}
+
+.overlay {
+ @extend %ratio-item;
+}
diff --git a/bigbluebutton-html5/imports/ui/components/modals/BaseModal.jsx b/bigbluebutton-html5/imports/ui/components/modals/BaseModal.jsx
new file mode 100755
index 0000000000..bd1dac292e
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/modals/BaseModal.jsx
@@ -0,0 +1,97 @@
+import React from 'react';
+import Modal from 'react-modal';
+import Icon from '/imports/ui/components/icon/component';
+import Button from '/imports/ui/components/button/component';
+import styles from './styles';
+import classNames from 'classnames';
+
+const customStyles = {
+ overlay: {
+ zIndex: 1000,
+ },
+ content: {
+ top: '50%',
+ left: '50%',
+ right: 'auto',
+ bottom: 'auto',
+ marginRight: '-50%',
+ transform: 'translate(-50%, -50%)',
+ },
+};
+
+export default class BaseModal extends React.Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ modalIsOpen: false,
+ title: props.title || 'title',
+ content:
+
+
+ {this.state.title}
+
+
+
+
+
+
+
+
+ );
+ }
+};
diff --git a/bigbluebutton-html5/imports/ui/components/modals/settings/SettingsModal.jsx b/bigbluebutton-html5/imports/ui/components/modals/settings/SettingsModal.jsx
new file mode 100755
index 0000000000..ee947dd8a7
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/modals/settings/SettingsModal.jsx
@@ -0,0 +1,82 @@
+import React from 'react';
+import Modal from 'react-modal';
+import Icon from '/imports/ui/components/icon/component';
+import Button from '/imports/ui/components/button/component';
+import BaseModal from '../BaseModal';
+import AudioMenu from './submenus/AudioMenu';
+import VideoMenu from './submenus/VideoMenu';
+import ApplicationMenu from './submenus/ApplicationMenu';
+import UsersMenu from './submenus/UsersMenu';
+import SessionMenu from './submenus/SessionMenu';
+import classNames from 'classnames';
+import ReactDOM from 'react-dom';
+import styles from './styles';
+
+export default class SettingsModal extends BaseModal {
+ constructor(props) {
+ super(props);
+ this.submenus = [];
+ }
+
+ componentWillMount() {
+ this.setState({ activeSubmenu: 0 });
+ this.submenus.push({ className: AudioMenu,
+ props: { title: 'Audio', prependIconName: 'ion-', icon: 'ios-mic-outline', }, });
+ this.submenus.push({ className: VideoMenu,
+ props: { title: 'Video', prependIconName: 'ion-', icon: 'ios-videocam-outline', }, });
+ this.submenus.push({ className: ApplicationMenu,
+ props: { title: 'App', prependIconName: 'ion-', icon: 'ios-folder-outline', }, });
+ this.submenus.push({ className: UsersMenu,
+ props: { title: 'Participants', prependIconName: 'ion-', icon: 'person', }, });
+ this.submenus.push({ className: SessionMenu,
+ props: { title: 'Session', prependIconName: 'ion-', icon: 'android-exit', }, });
+ }
+
+ componentDidMount() {
+ ReactDOM.render(
+ , document.getElementById('settingsButtonPlaceHolder'));
+ }
+
+ createMenu() {
+ const curr = this.state.activeSubmenu === undefined ? 0 : this.state.activeSubmenu;
+
+ let props = {
+ title: this.submenus[curr].props.title,
+ prependIconName: this.submenus[curr].props.prependIconName,
+ icon: this.submenus[curr].props.icon,
+ };
+
+ const Submenu = this.submenus[curr].className;
+ return
+ {this.props.children}
+
+ );
+ }
+}
+
+export default createContainer(() => {
+ return {
+ presentationTitle: 'IMDT 1004 Design Process',
+ hasUnreadMessages: true,
+ };
+}, NavBarContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/styles.scss b/bigbluebutton-html5/imports/ui/components/nav-bar/styles.scss
new file mode 100644
index 0000000000..9e55a943de
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/styles.scss
@@ -0,0 +1,37 @@
+@import "imports/ui/stylesheets/variables/_all";
+
+.navbar {
+ padding: $line-height-computed / 2;
+ display: flex;
+ flex-direction: row;
+}
+
+.left,
+.right,
+.center {
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+
+ > * {
+ margin: 0 $line-height-computed;
+ }
+}
+
+.left,
+.right {
+ flex: 0;
+}
+
+.center {
+ flex: 1;
+}
+
+.presentationTitle {
+ font-weight: 200;
+ color: $color-white;
+ font-size: $font-size-base * 1.2;
+ margin: 0;
+ padding: 0;
+}
diff --git a/bigbluebutton-html5/imports/ui/components/polling/component.jsx b/bigbluebutton-html5/imports/ui/components/polling/component.jsx
new file mode 100755
index 0000000000..7641d46083
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/polling/component.jsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import Button from '../button/component';
+
+export default class PollingComponent extends React.Component {
+ render() {
+ const poll = this.props.poll;
+ return (
+
+ {this.props.children}
+
+ );
+ }
+}
+
+export default createContainer(() => {
+ return {};
+}, UserListContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/styles.scss b/bigbluebutton-html5/imports/ui/components/user-list/styles.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/bigbluebutton-html5/imports/ui/components/video-dock/component.jsx b/bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
new file mode 100644
index 0000000000..4a20b33164
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
@@ -0,0 +1,12 @@
+import React, { Component, PropTypes } from 'react';
+import styles from './styles.scss';
+import { FormattedMessage, FormattedDate } from 'react-intl';
+
+export default class VideoDock extends Component {
+ render() {
+ return (
+
+ {this.props.children}
+
+ );
+ }
+}
+
+export default createContainer(() => {
+ return {};
+}, VideoDockContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/video-dock/styles.scss b/bigbluebutton-html5/imports/ui/components/video-dock/styles.scss
new file mode 100644
index 0000000000..0d1604deb3
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/video-dock/styles.scss
@@ -0,0 +1,15 @@
+@import "imports/ui/stylesheets/variables/_all";
+
+.videoDock {
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+
+ background-image: url(https://avatars.slack-edge.com/2016-01-04/17715243383_99a961f4cb2bf2cde5c4_512.jpg);
+ background-size: cover;
+ background-position: center;
+ box-shadow: 0 0 5px rgba(0, 0, 0, .5);
+ border-radius: .2rem;
+}
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx
new file mode 100644
index 0000000000..561b8c4610
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/component.jsx
@@ -0,0 +1,157 @@
+import React, { Component, PropTypes } from 'react';
+import styles from './styles.scss';
+import { FormattedMessage, FormattedDate } from 'react-intl';
+
+import Button from '../button/component';
+
+export default class Whiteboard extends Component {
+ handleClick() {
+ console.log('dummy handler');
+ }
+
+ render() {
+ return (
+
+ {this.props.children}
+
+ );
+ }
+}
+
+export default createContainer(() => {
+ return {};
+}, WhiteboardContainer);
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/styles.scss b/bigbluebutton-html5/imports/ui/components/whiteboard/styles.scss
new file mode 100644
index 0000000000..2a6d3f9e3e
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/styles.scss
@@ -0,0 +1,16 @@
+@import "imports/ui/stylesheets/variables/_all";
+
+.whiteboard {
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+
+ padding: $line-height-computed;
+ border: 0.25rem dashed;
+ border-radius: 1.5rem;
+ color: rgba(255, 255, 255, .5);
+ text-align: center;
+ overflow: auto;
+}
diff --git a/bigbluebutton-html5/imports/ui/main/Header.jsx b/bigbluebutton-html5/imports/ui/main/Header.jsx
deleted file mode 100755
index 77b03816d2..0000000000
--- a/bigbluebutton-html5/imports/ui/main/Header.jsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import React from 'react';
-import {Button} from '../shared/Button.jsx';
-
-export let Header = React.createClass({
- mixins: [ReactMeteorData],
- getMeteorData() {
- let in_audio, whiteboard_title, in_listen_only, is_muted, is_talking;
- in_audio = BBB.amIInAudio();
- whiteboard_title = BBB.currentPresentationName() || 'No active presentation';
- in_listen_only = BBB.amIListenOnlyAudio();
- is_muted = BBB.amIMuted();
- is_talking = BBB.amITalking();
- return {
- is_talking: is_talking,
- is_muted: is_muted,
- in_listen_only: in_listen_only,
- whiteboard_title: whiteboard_title,
- in_audio: in_audio,
- };
- },
-
- handleLeaveAudioButton(event) {
- return exitVoiceCall(event);
- },
-
- handleMuteButton(event) {
- $('.tooltip').hide();
- return toggleMic(this);
- },
-
- handleToggleUserlistButton(event) {
- if (isLandscape() || isLandscapeMobile()) {
- return toggleUsersList();
- } else {
- if ($('.settingsMenu').hasClass('menuOut')) {
- toggleSettingsMenu();
- } else {
- toggleShield();
- }
-
- return toggleUserlistMenu();
- }
- },
-
- handleToggleMenuButton(event) {
- if ($('.userlistMenu').hasClass('menuOut')) {
- toggleUserlistMenu();
- } else {
- toggleShield();
- }
-
- $('.toggleMenuButton').blur();
- return toggleSettingsMenu();
- },
-
- handleSettingsButton(event) {
- return $('#settingsModal').foundation('reveal', 'open');
- },
-
- handleSignOutButton(event) {
- $('.signOutIcon').blur();
- return $('#logoutModal').foundation('reveal', 'open');
- },
-
- render() {
- return (
-
- );
- },
-});
diff --git a/bigbluebutton-html5/imports/ui/services/api/index.js b/bigbluebutton-html5/imports/ui/services/api/index.js
new file mode 100755
index 0000000000..5b3d156963
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/services/api/index.js
@@ -0,0 +1,24 @@
+import {getInStorage} from '/imports/ui/components/app/service';
+
+function callServer(name) {
+ if (!name || !(typeof (name) === 'string' || name instanceof String) || name.length === 0 ||
+ !name.trim() || /^\s*$/.test(name)) {
+ console.error(`serverCall: invalid function name '${name}'`);
+ return false;
+ }
+
+ const credentials = {
+ meetingId: getInStorage('meetingID'),
+ requesterUserId: getInStorage('userID'),
+ requesterToken: getInStorage('authToken'),
+ };
+
+ // slice off the first element. That is the function name but we already have that.
+ // the last 3 elements are a React event, an undefined object, and a JavaScript event
+ const args = Array.prototype.slice.call(arguments, 1, -3);
+ Meteor.call(name, credentials, ...args);
+};
+
+export {
+ callServer,
+};
diff --git a/bigbluebutton-html5/imports/ui/shared/Button.jsx b/bigbluebutton-html5/imports/ui/shared/Button.jsx
deleted file mode 100755
index 741d0614e8..0000000000
--- a/bigbluebutton-html5/imports/ui/shared/Button.jsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import React from 'react';
-import { EmojisSVG } from '../whiteboard/EmojisSVG.jsx';
-
-export let Button = React.createClass({
- componentDidMount() {
- return $('button[rel=tooltip]').tooltip();
- },
-
- hasGotUnreadMail(userId) {
- let chats, i, j, len, len1, tabs;
- chats = getInSession('chats');
- if (chats !== void 0) {
- if (userId === 'all_chats') {
- for (i = 0, len = chats.length; i < len; i++) {
- tabs = chats[i];
- if (tabs.gotMail === true) {
- return true;
- }
- }
- } else if (userId === 'PUBLIC_CHAT') {
- for (j = 0, len1 = chats.length; j < len1; j++) {
- tabs = chats[j];
- if (tabs.userId === userId && tabs.gotMail === true) {
- return true;
- }
- }
- }
- }
-
- return false;
- },
-
- getNumberOfUnreadMessages(userId) {
- let chat, chats, i, len;
- if (userId === 'all_chats') {
- return;
- } else {
- chats = getInSession('chats');
- if (chats !== void 0) {
- for (i = 0, len = chats.length; i < len; i++) {
- chat = chats[i];
- if (chat.userId === userId && chat.gotMail) {
- if (chat.number > 9) {
- return '9+';
- } else {
- return chat.number;
- }
- }
- }
- }
- }
- },
-
- getNotificationClass(userId) {
- if (userId === 'all_chats') {
- return 'unreadChat';
- }
-
- if (userId === 'PUBLIC_CHAT') {
- return 'unreadChatNumber';
- }
- },
-
- processNotification(notification) {
- let _className, _number;
- if (this.hasGotUnreadMail(notification)) {
- _className = this.getNotificationClass(notification);
- _number = this.getNumberOfUnreadMessages(notification);
- return (
-
-
- {this.props.users.map((user) =>
- );
- },
-});;
diff --git a/bigbluebutton-html5/imports/ui/userlist/UserListContainer.jsx b/bigbluebutton-html5/imports/ui/userlist/UserListContainer.jsx
deleted file mode 100755
index 6b903d0181..0000000000
--- a/bigbluebutton-html5/imports/ui/userlist/UserListContainer.jsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react';
-import {UserList} from './UserList.jsx';
-import {mapUsers} from './UserListService.js';
-
-export let UserListContainer = React.createClass({
- mixins: [ReactMeteorData],
- getMeteorData() {
- return mapUsers();
- },
-
- render() {
- return (
-
- );
- },
-});;
diff --git a/bigbluebutton-html5/imports/ui/userlist/UserListItem.jsx b/bigbluebutton-html5/imports/ui/userlist/UserListItem.jsx
deleted file mode 100755
index 1a83d2a9bd..0000000000
--- a/bigbluebutton-html5/imports/ui/userlist/UserListItem.jsx
+++ /dev/null
@@ -1,192 +0,0 @@
-import React from 'react';
-import {Button} from '../Button.jsx';
-import {Icon} from '../Icon.jsx';
-import {EmojiIcon} from '../EmojiIcon.jsx';
-import {Tooltip} from '../Tooltip.jsx';
-import classNames from 'classnames';
-
-export let UserListItem = React.createClass({
-
- handleKick(user) {
- return user.actions.kick(user);
- },
-
- handleMuteUnmute(user) {
- return user.actions.mute(user);
- },
-
- handleOpenPrivateChat(user) {
- return user.actions.openChat(user);
- },
-
- handleSetPresenter(user) {
- return user.actions.setPresenter(user);
- },
-
- render() {
- const user = this.props.user;
-
- return (
-
- {this.renderStatusIcons()}
- {this.renderUserName()}
- {this.renderSharingStatus()}
-
- );
- },
-
- renderStatusIcons() {
- const user = this.props.user;
- let statusIcons = [];
-
- if (user.emoji !== 'none' && !user.isPresenter) {
- statusIcons.push((
-
- ));
- }
-
- if (this.props.currentUser.isModerator && !user.isPresenter) {
- statusIcons.push((
-
- {statusIcons.map(i => i)}
-
- );
- },
-
- renderUserName() {
- const user = this.props.user;
-
- let userName = user.name;
-
- if (user.isCurrent) {
- userName = userName.concat(' (you)');
- }
-
- return (
- this.handleOpenPrivateChat(user)}>
-
- {userName} {this.renderUnreadBadge()}
-
-
- );
- },
-
- renderUnreadBadge() {
- const unreadMessagesCount = this.props.user.unreadMessagesCount;
-
- if (!unreadMessagesCount) {
- return;
- }
-
- return (
-
- {(unreadMessagesCount > 9) ? '9+' : unreadMessagesCount}
-
- );
- },
-
- renderSharingStatus() {
- const user = this.props.user;
- const { sharingStatus, name: userName } = user;
- const currentUser = this.props.currentUser;
-
- let icons = {
- mic: null,
- webcam: null,
- lock: null,
- kick: null,
- };
-
- if (sharingStatus.isInAudio) {
- if (sharingStatus.isListenOnly) {
- icons.mic = (
-
-
-
-
- );
- },
-});;
diff --git a/bigbluebutton-html5/imports/ui/userlist/UserListService.js b/bigbluebutton-html5/imports/ui/userlist/UserListService.js
deleted file mode 100644
index 5d36bb5f39..0000000000
--- a/bigbluebutton-html5/imports/ui/userlist/UserListService.js
+++ /dev/null
@@ -1,111 +0,0 @@
-let shouldUserBeLocked = function (userId) {
- let lockInAction, locked, meeting, settings;
- locked = (locked = BBB.getUser(userId)) !== null ? locked.user.locked : null;
- settings = (meeting = Meteor.Meetings.findOne()) !== null ? meeting.roomLockSettings : null;
- lockInAction = settings.disablePrivateChat || settings.disableCam || settings.disableMic || settings.lockedLayout || settings.disablePublicChat;
- return locked && lockInAction;
-};
-
-let setUserPresenter = function (user) {
- setUserPresenter(BBB.getMeetingId(), user.id, getInSession('userId'), user.name, getInSession('authToken'));
-};
-
-let openChat = function (user) {
- const currentUser = BBB.getCurrentUser();
- const currentUserId = currentUser.userId;
-
- let userIdSelected = user.id;
-
- if (userIdSelected !== null) {
- if (userIdSelected === currentUserId) {
- setInSession('inChatWith', 'PUBLIC_CHAT');
- } else {
- setInSession('inChatWith', userIdSelected);
- }
- }
-
- if (isPortrait() || isPortraitMobile()) {
- toggleUserlistMenu();
- toggleShield();
- }
-
- return setTimeout(() => { // waits until the end of execution queue
- return $('#newMessageInput').focus();
- }, 0);
-};
-
-let kickUser = function (user) {
- kickUser(BBB.getMeetingId(), user.id, getInSession('userId'), getInSession('authToken'));
-};
-
-let muteUser = function () {
- BBB.toggleMyMic();
-};
-
-let mapUsers = function () {
- const currentUser = BBB.getCurrentUser();
- const isCurrentUserModerator = currentUser.user.role === 'MODERATOR';
- const currentUserId = currentUser.userId;
-
- const chats = getInSession('chats');
-
- let users = Meteor.Users.find().fetch().map(u => u.user).map(u => {
- let user = {
- id: u.userid,
- name: u.name,
- isCurrent: u.userid === currentUserId,
- isPresenter: u.presenter,
- isModerator: u.role === 'MODERATOR',
- emoji: u.emoji_status,
- unreadMessagesCount: 0,
- sharingStatus: {
- isInAudio: BBB.isUserInAudio(u.userid),
- isLocked: shouldUserBeLocked(u.userid), //TODO: Migrate blaze logic
- isWebcamOpen: u.webcam_stream.length,
- isListenOnly: u.listenOnly,
- isMuted: u.voiceUser.muted,
- isTalking: u.voiceUser.talking,
- },
- actions: {
- kick(user) {
- kickUser(user);
- },
-
- setPresenter(user) {
- setUserPresenter(user);
- },
-
- openChat(user) {
- openChat(user);
- },
-
- muteUser() {
- muteUser();
- },
- },
- };
-
- chats.forEach(c => {
- let key = c.userId;
-
- // show unread count for public chat on the user itself
- if (user.isCurrent) {
- key = 'PUBLIC_CHAT';
- }
-
- if (c.gotMail && c.userId === user.id) {
- user.unreadMessagesCount = c.number;
- }
- });
-
- return user;
- });
-
- return {
- // All this mapping should be on a service and not on the component itself
- currentUser: users.find(u => u.isCurrent),
- users: users,
- };
-};
-
-export {mapUsers};
diff --git a/bigbluebutton-html5/imports/ui/utils/propTypes.js b/bigbluebutton-html5/imports/ui/utils/propTypes.js
deleted file mode 100755
index c57d151356..0000000000
--- a/bigbluebutton-html5/imports/ui/utils/propTypes.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var CustomPropTypes = {};
-
-CustomPropTypes.elementType = function (props, propName, componentName) {
- const errBeginning = `Invalid prop '${propName}' of value '${props[propName]}'` +
-` supplied to '${componentName}'. Expected an Element 'type'`;
-
- if (typeof props[propName] !== 'function') {
- if (React.isValidElement(props[propName])) {
- return new Error(errBeginning + ', not an actual Element');
- }
-
- if (typeof props[propName] !== 'string') {
- return new Error(errBeginning +
- ' such as a tag name or return value of React.createClass(...)');
- }
- }
-};
-
-export default CustomPropTypes;
diff --git a/bigbluebutton-html5/imports/ui/whiteboard/EmojiContainer.jsx b/bigbluebutton-html5/imports/ui/whiteboard/EmojiContainer.jsx
deleted file mode 100755
index 6a778c8107..0000000000
--- a/bigbluebutton-html5/imports/ui/whiteboard/EmojiContainer.jsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import React from 'react';
-import classNames from 'classnames';
-import { Button } from '../shared/Button.jsx';
-
-export let EmojiContainer = React.createClass({
- mixins: [ReactMeteorData],
- getMeteorData() {
- let user, emoji_status, current_presentation;
- user = BBB.getCurrentUser();
- if (user != null) {
- emoji_status = user.user.emoji_status;
- } else {
- emoji_status = 'none';
- }
-
- current_presentation = Meteor.Presentations.findOne({
- 'presentation.current': true,
- });
- current_presentation ? current_presentation = true : current_presentation = false;
- return {
- emoji_status: emoji_status,
- current_presentation: current_presentation,
- };
- },
-
- getCurrentUserEmojiStatus(name) {
- return name == this.data.emoji_status;
- },
-
- emojiIcons() {
- return [
- { name: 'sad', icon: 'sad-face', title: '' },
- { name: 'happy', icon: 'happy-face', title: '' },
- { name: 'confused', icon: 'confused-face', title: '' },
- { name: 'neutral', icon: 'neutral-face', title: '' },
- { name: 'away', icon: 'clock', title: '' },
- { name: 'raiseHand', icon: 'hand', title: 'Lower your Hand' },
- ];
- },
-
- handleInactive(name, event) {
- if ($(event.target).css('opacity') === '1') {
- BBB.setEmojiStatus(
- BBB.getMeetingId(),
- getInSession('userId'),
- getInSession('userId'),
- getInSession('authToken'),
- name
- );
- $('.FABTriggerButton').blur();
- return toggleEmojisFAB();
- }
- },
-
- handleActive(event) {
- if ($('.activeEmojiButton').css('opacity') === '1') {
- BBB.setEmojiStatus(
- BBB.getMeetingId(),
- getInSession('userId'),
- getInSession('userId'),
- getInSession('authToken'),
- 'none'
- );
- $('.FABTriggerButton').blur();
- return toggleEmojisFAB();
- }
- },
-
- handleFABTriggerButton(event) {
- $('.FABTriggerButton').blur();
- return toggleEmojisFAB();
- },
-
- render() {
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/bigbluebutton-web/bigbluebutton-web.iml b/bigbluebutton-web/bigbluebutton-web.iml
deleted file mode 100644
index 860c70dc1e..0000000000
--- a/bigbluebutton-web/bigbluebutton-web.iml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
- file://$MODULE_DIR$/grails-app/conf/spring/resources.xml
- file://$MODULE_DIR$/web-app/WEB-INF/applicationContext.xml
- file://$MODULE_DIR$/grails-app/conf/spring/bbb-redis-messaging.xml
- file://$MODULE_DIR$/grails-app/conf/spring/doc-conversion.xml
- file://$MODULE_DIR$/grails-app/conf/spring/turn-stun-servers.xml
- file://$MODULE_DIR$/grails-app/conf/spring/bbb-redis-pool.xml
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bigbluebutton-web/bigbluebutton-web.ipr b/bigbluebutton-web/bigbluebutton-web.ipr
deleted file mode 100644
index a38997b408..0000000000
--- a/bigbluebutton-web/bigbluebutton-web.ipr
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1.8
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bigbluebutton-web/bigbluebutton-web.iws b/bigbluebutton-web/bigbluebutton-web.iws
deleted file mode 100644
index 6b5903f144..0000000000
--- a/bigbluebutton-web/bigbluebutton-web.iws
+++ /dev/null
@@ -1,723 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1455718032655
-
- 1455718032655
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bigbluebutton-web/build.gradle b/bigbluebutton-web/build.gradle
index 16acca6efa..f15d7ec490 100755
--- a/bigbluebutton-web/build.gradle
+++ b/bigbluebutton-web/build.gradle
@@ -1,122 +1,92 @@
-apply plugin: 'java'
-apply plugin: 'eclipse'
-
-task resolveDeps(type: Copy) {
- into('lib')
- from configurations.default
- from configurations.default.allArtifacts.file
-}
-
-repositories {
- mavenCentral()
- mavenLocal()
-
- ivy{
- url "http://red5.googlecode.com/svn/repository"
- layout "pattern",{
- artifact "[artifact](-[revision]).[ext]"
- artifact "[organisation]/[artifact](-[revision]).[ext]"
- }
- url "http://blindside.googlecode.com/svn/repository"
- layout "pattern",{
- artifact "[artifact](-[revision]).[ext]"
- artifact "[organisation]/[artifact](-[revision]).[ext]"
- }
- url "http://repo1.maven.org/maven2"
- layout "pattern",{
- artifact "[organisation]/[module]/[revision]/[artifact](-[revision])-jdk15.[ext]"
- artifact "[[organisation]/[artifact]/[revision]/[artifact](-[revision])-jdk15.[ext]"
- }
- layout "pattern",{
- artifact "external/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"
- artifact "release/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"
- }
- }
- maven {
- url "http://repository.jboss.org/nexus/content/groups/public-jboss"
-
- url "http://oss.sonatype.org/content/repositories/snapshots"
-
- url "http://oss.sonatype.org/content/repositories/releases"
- }
-
-}
-
-dependencies {
- //redis
- compile 'redis.clients:jedis:2.7.2'
- compile 'org.apache.commons:commons-pool2:2.3'
-
- compile 'commons-lang:commons-lang:2.5'
- compile 'commons-io:commons-io:2.4'
- compile 'com.google.code.gson:gson:2.5'
- compile 'commons-httpclient:commons-httpclient:3.1'
-
- compile 'org.bigbluebutton:bbb-common-message:0.0.17-SNAPSHOT'
- compile 'com.zaxxer:nuprocess:1.0.4'
-
- // Logging
- // Commenting out as it results in build failure (ralam - may 11, 2014)
- //compile 'ch.qos.logback:logback-core:1.0.9@jar'
- //compile 'ch.qos.logback:logback-classic:1.0.9@jar'
- //compile 'org.slf4j:log4j-over-slf4j:1.7.2@jar'
- //compile 'org.slf4j:jcl-over-slf4j:1.7.2@jar'
- //compile 'org.slf4j:jul-to-slf4j:1.7.2@jar'
- //compile 'org.slf4j:slf4j-api:1.7.2@jar'
-
- // XML creation speedup
- compile 'org.freemarker:freemarker:2.3.23'
-
- //junit
- compile 'junit:junit:4.8.2'
-
- // Logging
-/**** UNCOMMENT WHEN you want to run gradle test
- compile 'ch.qos.logback:logback-core:1.0.13@jar'
- compile 'ch.qos.logback:logback-classic:1.0.13@jar'
- compile 'org.slf4j:log4j-over-slf4j:1.7.5@jar'
- compile 'org.slf4j:jcl-over-slf4j:1.7.5@jar'
- compile 'org.slf4j:jul-to-slf4j:1.7.5@jar'
- compile 'org.slf4j:slf4j-api:1.7.5@jar'
- compile 'org.apache.commons:commons-lang3:3.1'
- compile 'commons-codec:commons-codec:1.3'
- compile 'commons-httpclient:commons-httpclient:3.1'
- compile 'commons-io:commons-io:1.4'
- compile 'com.artofsolving:jodconverter:2.2.1'
-
- compile 'org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:1.0'
- compile 'org.openoffice:unoil:3.2.1'
- compile 'org.openoffice:ridl:3.2.1'
- compile 'org.openoffice:juh:3.2.1'
- compile 'org.openoffice:jurt:3.2.1'
- compile 'org.codehaus.groovy:groovy-all:1.6.3'
-****/
-
- // Testing
- testCompile 'org.testng:testng:5.8@jar'
- testCompile 'org.easymock:easymock:2.4@jar'
-}
-
-sourceSets {
- main {
- java {
- srcDir 'src/java'
- }
- resources {
- srcDir 'src/resources'
- }
- }
- test {
- java {
- srcDir 'test/unit'
- }
- resources {
- srcDir 'test/resources'
- }
- }
-}
-
-test {
- useTestNG()
-}
-
+apply plugin: 'java'
+apply plugin: 'eclipse'
+
+task resolveDeps(type: Copy) {
+ into('lib')
+ from configurations.default
+ from configurations.default.allArtifacts.file
+}
+
+repositories {
+ mavenCentral()
+ mavenLocal()
+}
+
+dependencies {
+ //redis
+ compile 'redis.clients:jedis:2.7.2'
+ compile 'org.apache.commons:commons-pool2:2.3'
+
+ compile 'commons-lang:commons-lang:2.5'
+ compile 'commons-io:commons-io:2.4'
+ compile 'com.google.code.gson:gson:1.7.1'
+ compile 'commons-httpclient:commons-httpclient:3.1'
+ compile 'com.zaxxer:nuprocess:1.0.4'
+
+ compile 'org.bigbluebutton:bbb-common-message:0.0.18-SNAPSHOT'
+
+ // Logging
+ // Commenting out as it results in build failure (ralam - may 11, 2014)
+ //compile 'ch.qos.logback:logback-core:1.0.9@jar'
+ //compile 'ch.qos.logback:logback-classic:1.0.9@jar'
+ //compile 'org.slf4j:log4j-over-slf4j:1.7.2@jar'
+ //compile 'org.slf4j:jcl-over-slf4j:1.7.2@jar'
+ //compile 'org.slf4j:jul-to-slf4j:1.7.2@jar'
+ //compile 'org.slf4j:slf4j-api:1.7.2@jar'
+
+ // XML creation speedup
+ compile 'org.freemarker:freemarker:2.3.23'
+
+ //junit
+ compile 'junit:junit:4.8.2'
+
+ // Logging
+/**** UNCOMMENT WHEN you want to run gradle test
+ compile 'ch.qos.logback:logback-core:1.0.13@jar'
+ compile 'ch.qos.logback:logback-classic:1.0.13@jar'
+ compile 'org.slf4j:log4j-over-slf4j:1.7.5@jar'
+ compile 'org.slf4j:jcl-over-slf4j:1.7.5@jar'
+ compile 'org.slf4j:jul-to-slf4j:1.7.5@jar'
+ compile 'org.slf4j:slf4j-api:1.7.5@jar'
+ compile 'org.apache.commons:commons-lang3:3.1'
+ compile 'commons-codec:commons-codec:1.3'
+ compile 'commons-httpclient:commons-httpclient:3.1'
+ compile 'commons-io:commons-io:1.4'
+ compile 'com.artofsolving:jodconverter:2.2.1'
+
+ compile 'org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec:1.0'
+ compile 'org.openoffice:unoil:3.2.1'
+ compile 'org.openoffice:ridl:3.2.1'
+ compile 'org.openoffice:juh:3.2.1'
+ compile 'org.openoffice:jurt:3.2.1'
+ compile 'org.codehaus.groovy:groovy-all:1.6.3'
+****/
+
+ // Testing
+ testCompile 'org.testng:testng:5.8@jar'
+ testCompile 'org.easymock:easymock:2.4@jar'
+}
+
+sourceSets {
+ main {
+ java {
+ srcDir 'src/java'
+ }
+ resources {
+ srcDir 'src/resources'
+ }
+ }
+ test {
+ java {
+ srcDir 'test/unit'
+ }
+ resources {
+ srcDir 'test/resources'
+ }
+}
+}
+
+test {
+ useTestNG()
+}
+
diff --git a/bigbluebutton-web/build.sh b/bigbluebutton-web/build.sh
deleted file mode 100644
index 05c35a4792..0000000000
--- a/bigbluebutton-web/build.sh
+++ /dev/null
@@ -1 +0,0 @@
-sudo rm -rf bin/org/ sudo rm -rf /var/lib/tomcat7/webapps/bigbluebutton && sudo rm /var/lib/tomcat7/webapps/bigbluebutton.war && sudo chmod -R ugo+rwx /var/bigbluebutton && sudo chmod -R ugo+rwx /var/log/bigbluebutton && gradle clean && gradle resolveDeps && grails compile && grails war && sudo cp target/bigbluebutton-0.9.0.war /var/lib/tomcat7/webapps/bigbluebutton.war && sudo bbb-conf --clean
\ No newline at end of file
diff --git a/bigbluebutton-web/grails-app/conf/BuildConfig.groovy b/bigbluebutton-web/grails-app/conf/BuildConfig.groovy
index da36511e7c..ba49ecd141 100644
--- a/bigbluebutton-web/grails-app/conf/BuildConfig.groovy
+++ b/bigbluebutton-web/grails-app/conf/BuildConfig.groovy
@@ -49,7 +49,7 @@ grails.project.dependency.resolution = {
dependencies {
// specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes e.g.
// runtime 'mysql:mysql-connector-java:5.1.27'
-
+ runtime 'org.json:json:20160212'
}
plugins {
diff --git a/bigbluebutton-web/grails-app/conf/spring/resources.xml b/bigbluebutton-web/grails-app/conf/spring/resources.xml
index 06e2989fd6..08e23e55d2 100755
--- a/bigbluebutton-web/grails-app/conf/spring/resources.xml
+++ b/bigbluebutton-web/grails-app/conf/spring/resources.xml
@@ -33,6 +33,8 @@ with BigBlueButton; if not, see
updateParams = paramsProcessorUtil.processUpdateCreateParams(params);
- if (existing.getViewerPassword().equals(params.get("attendeePW")) && existing.getModeratorPassword().equals(params.get("moderatorPW"))) {
- paramsProcessorUtil.updateMeeting(updateParams, existing);
- // trying to create a conference a second time, return success, but give extra info
- // Ignore pre-uploaded presentations. We only allow uploading of presentation once.
- //uploadDocuments(existing);
- respondWithConference(existing, "duplicateWarning", "This conference was already in existence and may currently be in progress.");
- } else {
// BEGIN - backward compatibility
- invalid("idNotUnique", "A meeting already exists with that meeting ID. Please use a different meeting ID.");
- return;
+ if (StringUtils.isEmpty(params.checksum)) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+
+ if (!StringUtils.isEmpty(params.meetingID)) {
+ params.meetingID = StringUtils.strip(params.meetingID);
+ if (StringUtils.isEmpty(params.meetingID)) {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+ } else {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+
+
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
// END - backward compatibility
- // enforce meetingID unique-ness
- errors.nonUniqueMeetingIdError()
- respondWithErrors(errors)
- }
+ ApiErrors errors = new ApiErrors();
+ paramsProcessorUtil.processRequiredCreateParams(params, errors);
- return;
- }
-
- Meeting newMeeting = paramsProcessorUtil.processCreateParams(params);
-
- if (! StringUtils.isEmpty(params.moderatorOnlyMessage)) {
- newMeeting.setModeratorOnlyMessage(params.moderatorOnlyMessage);
- }
-
- meetingService.createMeeting(newMeeting);
-
- // See if the request came with pre-uploading of presentation.
- uploadDocuments(newMeeting);
- respondWithConference(newMeeting, null, null)
- }
-
- /**********************************************
- * JOIN API
- *********************************************/
- def join = {
- String API_CALL = 'join'
- log.debug CONTROLLER_NAME + "#${API_CALL}"
- ApiErrors errors = new ApiErrors()
-
- // BEGIN - backward compatibility
- if (StringUtils.isEmpty(params.checksum)) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
-
- //checking for an empty username or for a username containing whitespaces only
- if(!StringUtils.isEmpty(params.fullName)) {
- params.fullName = StringUtils.strip(params.fullName);
- if (StringUtils.isEmpty(params.fullName)) {
- invalid("missingParamFullName", "You must specify a name for the attendee who will be joining the meeting.");
- return
- }
- } else {
- invalid("missingParamFullName", "You must specify a name for the attendee who will be joining the meeting.");
- return
- }
-
- if(!StringUtils.isEmpty(params.meetingID)) {
- params.meetingID = StringUtils.strip(params.meetingID);
- if (StringUtils.isEmpty(params.meetingID)) {
- invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
- return
- }
- } else {
- invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
- return
- }
-
- if (StringUtils.isEmpty(params.password)) {
- invalid("invalidPassword","You either did not supply a password or the password supplied is neither the attendee or moderator password for this conference.");
- return
- }
-
- if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
-
- // END - backward compatibility
-
- // Do we have a checksum? If none, complain.
- if (StringUtils.isEmpty(params.checksum)) {
- errors.missingParamError("checksum");
- }
-
- // Do we have a name for the user joining? If none, complain.
- if(!StringUtils.isEmpty(params.fullName)) {
- params.fullName = StringUtils.strip(params.fullName);
- if (StringUtils.isEmpty(params.fullName)) {
- errors.missingParamError("fullName");
- }
- } else {
- errors.missingParamError("fullName");
- }
- String fullName = params.fullName
-
- // Do we have a meeting id? If none, complain.
- if(!StringUtils.isEmpty(params.meetingID)) {
- params.meetingID = StringUtils.strip(params.meetingID);
- if (StringUtils.isEmpty(params.meetingID)) {
- errors.missingParamError("meetingID");
- }
- }
- else {
- errors.missingParamError("meetingID");
- }
- String externalMeetingId = params.meetingID
-
- // Do we have a password? If not, complain.
- String attPW = params.password
- if (StringUtils.isEmpty(attPW)) {
- errors.missingParamError("password");
- }
-
- if (errors.hasErrors()) {
- respondWithErrors(errors)
- return
- }
-
- // Do we agree on the checksum? If not, complain.
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- errors.checksumError()
- respondWithErrors(errors)
- return
- }
-
- Boolean isBreakoutRoom = false
- if(!StringUtils.isEmpty(params.isBreakout)) {
- isBreakoutRoom = new Boolean(StringUtils.strip(params.isBreakout))
- }
-
- // Everything is good so far. Translate the external meeting id to an internal meeting id. If
- // we can't find the meeting, complain.
- String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(externalMeetingId);
- if (isBreakoutRoom) {
- // This is a join request for a breakout room. Use the passed meetingId to find the meeting.
- internalMeetingId = externalMeetingId
- log.info("Join request for breakout room " + internalMeetingId)
- }
-
- log.info("Retrieving meeting ${internalMeetingId}")
- Meeting meeting = meetingService.getMeeting(internalMeetingId);
- if (meeting == null) {
- // BEGIN - backward compatibility
- invalid("invalidMeetingIdentifier", "The meeting ID that you supplied did not match any existing meetings");
- return;
- // END - backward compatibility
-
- errors.invalidMeetingIdError();
- respondWithErrors(errors)
- return;
- }
-
- // the createTime mismatch with meeting's createTime, complain
- // In the future, the createTime param will be required
- if (params.createTime != null) {
- long createTime = 0;
- try{
- createTime=Long.parseLong(params.createTime);
- } catch(Exception e){
- log.warn("could not parse createTime param");
- createTime = -1;
- }
- if(createTime != meeting.getCreateTime()) {
- errors.mismatchCreateTimeParam();
- respondWithErrors(errors);
- return;
- }
- }
-
- // Is this user joining a meeting that has been ended. If so, complain.
- if (meeting.isForciblyEnded()) {
- // BEGIN - backward compatibility
- invalid("meetingForciblyEnded", "You can not re-join a meeting that has already been forcibly ended. However, once the meeting is removed from memory (according to the timeout configured on this server, you will be able to once again create a meeting with the same meeting ID");
- return;
- // END - backward compatibility
-
- errors.meetingForciblyEndedError();
- respondWithErrors(errors)
- return;
- }
-
- // Now determine if this user is a moderator or a viewer.
- String role = null;
- if (meeting.getModeratorPassword().equals(attPW)) {
- role = ROLE_MODERATOR;
- } else if (meeting.getViewerPassword().equals(attPW)) {
- role = ROLE_ATTENDEE;
- }
-
- if (role == null) {
- // BEGIN - backward compatibility
- invalid("invalidPassword","You either did not supply a password or the password supplied is neither the attendee or moderator password for this conference.");
- return
- // END - backward compatibility
-
- errors.invalidPasswordError()
- respondWithErrors(errors)
- return;
- }
-
- String webVoice = StringUtils.isEmpty(params.webVoiceConf) ? meeting.getTelVoice() : params.webVoiceConf
-
- boolean redirectImm = parseBoolean(params.redirectImmediately)
-
- String internalUserID = RandomStringUtils.randomAlphanumeric(12).toLowerCase()
-
- String authToken = RandomStringUtils.randomAlphanumeric(12).toLowerCase()
-
- String sessionToken = RandomStringUtils.randomAlphanumeric(16).toLowerCase()
-
- String externUserID = params.userID
- if (StringUtils.isEmpty(externUserID)) {
- externUserID = internalUserID
- }
-
- //Return a Map with the user custom data
- Map userCustomData = paramsProcessorUtil.getUserCustomData(params);
-
- //Currently, it's associated with the externalUserID
- if (userCustomData.size() > 0)
- meetingService.addUserCustomData(meeting.getInternalId(), externUserID, userCustomData);
-
- String configxml = null;
-
- if (! StringUtils.isEmpty(params.configToken)) {
- Config conf = meeting.getConfig(params.configToken);
- if (conf == null) {
- // Check if this config is one of our pre-built config
- configxml = configService.getConfig(params.configToken)
- if (configxml == null) {
- // Default to the default config.
- configxml = conf.config;
- }
- } else {
- configxml = conf.config;
- }
- } else {
- Config conf = meeting.getDefaultConfig();
- if (conf == null) {
- errors.noConfigFound();
- respondWithErrors(errors);
- } else {
- configxml = conf.config;
- }
- }
-
- if (StringUtils.isEmpty(configxml)) {
- errors.noConfigFound();
- respondWithErrors(errors);
- }
- UserSession us = new UserSession();
- us.authToken = authToken;
- us.internalUserId = internalUserID
- us.conferencename = meeting.getName()
- us.meetingID = meeting.getInternalId()
- us.externMeetingID = meeting.getExternalId()
- us.externUserID = externUserID
- us.fullname = fullName
- us.role = role
- us.conference = meeting.getInternalId()
- us.room = meeting.getInternalId()
- us.voicebridge = meeting.getTelVoice()
- us.webvoiceconf = meeting.getWebVoice()
- us.mode = "LIVE"
- us.record = meeting.isRecord()
- us.welcome = meeting.getWelcomeMessage()
- us.logoutUrl = meeting.getLogoutUrl();
- us.configXML = configxml;
-
- if (! StringUtils.isEmpty(params.defaultLayout)) {
- us.defaultLayout = params.defaultLayout;
- }
-
- if (! StringUtils.isEmpty(params.avatarURL)) {
- us.avatarURL = params.avatarURL;
- } else {
- us.avatarURL = meeting.defaultAvatarURL
- }
-
- session[sessionToken] = sessionToken
- meetingService.addUserSession(sessionToken, us);
-
- // Register user into the meeting.
- meetingService.registerUser(us.meetingID, us.internalUserId, us.fullname, us.role, us.externUserID, us.authToken)
-
- log.info("Session user token for " + us.fullname + " [" + session[sessionToken]+ "]")
- session.setMaxInactiveInterval(SESSION_TIMEOUT);
-
- //check if exists the param redirect
- boolean redirectClient = true;
- String clientURL = paramsProcessorUtil.getDefaultClientUrl();
-
- if(! StringUtils.isEmpty(params.redirect)) {
- try{
- redirectClient = Boolean.parseBoolean(params.redirect);
- }catch(Exception e){
- redirectClient = true;
- }
- }
-
- if(!StringUtils.isEmpty(params.clientURL)){
- clientURL = params.clientURL;
- }
-
- if (redirectClient){
- String destUrl = clientURL + "?sessionToken=" + sessionToken
- log.info("Successfully joined. Redirecting to ${paramsProcessorUtil.getDefaultClientUrl()}");
- redirect(url: destUrl);
- }
- else{
- log.info("Successfully joined. Sending XML response.");
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode(RESP_CODE_SUCCESS)
- messageKey("successfullyJoined")
- message("You have joined successfully.")
- meeting_id() { mkp.yield(us.meetingID) }
- user_id(us.internalUserId)
- auth_token(us.authToken)
- }
- }
- }
- }
- }
- }
-
- /*******************************************
- * IS_MEETING_RUNNING API
- *******************************************/
- def isMeetingRunning = {
- String API_CALL = 'isMeetingRunning'
- log.debug CONTROLLER_NAME + "#${API_CALL}"
-
- // BEGIN - backward compatibility
- if (StringUtils.isEmpty(params.checksum)) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
-
- if(!StringUtils.isEmpty(params.meetingID)) {
- params.meetingID = StringUtils.strip(params.meetingID);
- if (StringUtils.isEmpty(params.meetingID)) {
- invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
- return
- }
- } else {
- invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
- return
- }
-
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
- // END - backward compatibility
-
- ApiErrors errors = new ApiErrors()
-
- // Do we have a checksum? If none, complain.
- if (StringUtils.isEmpty(params.checksum)) {
- errors.missingParamError("checksum");
- }
-
- // Do we have a meeting id? If none, complain.
- if(!StringUtils.isEmpty(params.meetingID)) {
- params.meetingID = StringUtils.strip(params.meetingID);
- if (StringUtils.isEmpty(params.meetingID)) {
- errors.missingParamError("meetingID");
- }
- } else {
- errors.missingParamError("meetingID");
- }
- String externalMeetingId = params.meetingID
-
-
- if (errors.hasErrors()) {
- respondWithErrors(errors)
- return
- }
-
- // Do we agree on the checksum? If not, complain.
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- errors.checksumError()
- respondWithErrors(errors)
- return
- }
-
- // Everything is good so far. Translate the external meeting id to an internal meeting id. If
- // we can't find the meeting, complain.
- String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(externalMeetingId);
- log.info("Retrieving meeting ${internalMeetingId}")
- Meeting meeting = meetingService.getMeeting(internalMeetingId);
- boolean isRunning = meeting != null && meeting.isRunning();
-
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode(RESP_CODE_SUCCESS)
- running(isRunning ? "true" : "false")
- }
- }
- }
- }
- }
-
- /************************************
- * END API
- ************************************/
- def end = {
- String API_CALL = "end"
-
- log.debug CONTROLLER_NAME + "#${API_CALL}"
-
- // BEGIN - backward compatibility
- if (StringUtils.isEmpty(params.checksum)) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
-
- if(!StringUtils.isEmpty(params.meetingID)) {
- params.meetingID = StringUtils.strip(params.meetingID);
- if (StringUtils.isEmpty(params.meetingID)) {
- invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
- return
- }
- } else {
- invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
- return
- }
-
- if (StringUtils.isEmpty(params.password)) {
- invalid("invalidPassword","You must supply the moderator password for this call.");
- return
- }
-
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
- // END - backward compatibility
-
- ApiErrors errors = new ApiErrors()
-
- // Do we have a checksum? If none, complain.
- if (StringUtils.isEmpty(params.checksum)) {
- errors.missingParamError("checksum");
- }
-
- // Do we have a meeting id? If none, complain.
- if(!StringUtils.isEmpty(params.meetingID)) {
- params.meetingID = StringUtils.strip(params.meetingID);
- if (StringUtils.isEmpty(params.meetingID)) {
- errors.missingParamError("meetingID");
- }
- } else {
- errors.missingParamError("meetingID");
- }
- String externalMeetingId = params.meetingID
-
- // Do we have a password? If not, complain.
- String modPW = params.password
- if (StringUtils.isEmpty(modPW)) {
- errors.missingParamError("password");
- }
-
- if (errors.hasErrors()) {
- respondWithErrors(errors)
- return
- }
-
- // Do we agree on the checksum? If not, complain.
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- errors.checksumError()
- respondWithErrors(errors)
- return
- }
-
- // Everything is good so far. Translate the external meeting id to an internal meeting id. If
- // we can't find the meeting, complain.
- String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(externalMeetingId);
- log.info("Retrieving meeting ${internalMeetingId}")
- Meeting meeting = meetingService.getMeeting(internalMeetingId);
- if (meeting == null) {
- // BEGIN - backward compatibility
- invalid("notFound", "We could not find a meeting with that meeting ID - perhaps the meeting is not yet running?");
- return;
- // END - backward compatibility
-
- errors.invalidMeetingIdError();
- respondWithErrors(errors)
- return;
- }
-
- if (meeting.getModeratorPassword().equals(modPW) == false) {
- // BEGIN - backward compatibility
- invalid("invalidPassword","You must supply the moderator password for this call.");
- return;
- // END - backward compatibility
-
- errors.invalidPasswordError();
- respondWithErrors(errors)
- return;
- }
-
- meetingService.endMeeting(meeting.getInternalId());
-
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode(RESP_CODE_SUCCESS)
- messageKey("sentEndMeetingRequest")
- message("A request to end the meeting was sent. Please wait a few seconds, and then use the getMeetingInfo or isMeetingRunning API calls to verify that it was ended.")
- }
- }
- }
- }
- }
-
- /*****************************************
- * GETMEETINGINFO API
- *****************************************/
- def getMeetingInfo = {
- String API_CALL = "getMeetingInfo"
- log.debug CONTROLLER_NAME + "#${API_CALL}"
-
- // BEGIN - backward compatibility
- if (StringUtils.isEmpty(params.checksum)) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
-
- if(!StringUtils.isEmpty(params.meetingID)) {
- params.meetingID = StringUtils.strip(params.meetingID);
- if (StringUtils.isEmpty(params.meetingID)) {
- invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
- return
- }
- } else {
- invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
- return
- }
-
-
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
- // END - backward compatibility
-
- ApiErrors errors = new ApiErrors()
-
- // Do we have a checksum? If none, complain.
- if (StringUtils.isEmpty(params.checksum)) {
- errors.missingParamError("checksum");
- }
-
- // Do we have a meeting id? If none, complain.
- if(!StringUtils.isEmpty(params.meetingID)) {
- params.meetingID = StringUtils.strip(params.meetingID);
- if (StringUtils.isEmpty(params.meetingID)) {
- errors.missingParamError("meetingID");
- }
- } else {
- errors.missingParamError("meetingID");
- }
- String externalMeetingId = params.meetingID
-
- if (errors.hasErrors()) {
- respondWithErrors(errors)
- return
- }
-
- // Do we agree on the checksum? If not, complain.
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- errors.checksumError()
- respondWithErrors(errors)
- return
- }
-
- // Everything is good so far. Translate the external meeting id to an internal meeting id. If
- // we can't find the meeting, complain.
- String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(externalMeetingId);
- log.info("Retrieving meeting ${internalMeetingId}")
- Meeting meeting = meetingService.getMeeting(internalMeetingId);
- if (meeting == null) {
- // BEGIN - backward compatibility
- invalid("notFound", "We could not find a meeting with that meeting ID");
- return;
- // END - backward compatibility
-
- errors.invalidMeetingIdError();
- respondWithErrors(errors)
- return;
- }
-
- respondWithConferenceDetails(meeting, null, null, null);
- }
-
- /************************************
- * GETMEETINGS API
- ************************************/
- def getMeetingsHandler = {
- String API_CALL = "getMeetings"
- log.debug CONTROLLER_NAME + "#${API_CALL}"
-
- // BEGIN - backward compatibility
- if (StringUtils.isEmpty(params.checksum)) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
-
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
- // END - backward compatibility
-
- ApiErrors errors = new ApiErrors()
-
- // Do we have a checksum? If none, complain.
- if (StringUtils.isEmpty(params.checksum)) {
- errors.missingParamError("checksum");
- }
-
- if (errors.hasErrors()) {
- respondWithErrors(errors)
- return
- }
-
- // Do we agree on the checksum? If not, complain.
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- errors.checksumError()
- respondWithErrors(errors)
- return
- }
-
- Collection mtgs = meetingService.getMeetings();
-
- if (mtgs == null || mtgs.isEmpty()) {
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode(RESP_CODE_SUCCESS)
- meetings()
- messageKey("noMeetings")
- message("no meetings were found on this server")
- }
- }
- }
- }
- } else {
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode(RESP_CODE_SUCCESS)
- meetings {
- for (m in mtgs) {
- meeting {
- meetingID() { mkp.yield(m.getExternalId()) }
- isBreakout() { mkp.yield(m.isBreakout()) }
- meetingName() { mkp.yield(m.getName()) }
- createTime(m.getCreateTime())
- createDate(formatPrettyDate(m.getCreateTime()))
- voiceBridge() { mkp.yield(m.getTelVoice()) }
- dialNumber() { mkp.yield(m.getDialNumber()) }
- attendeePW() { mkp.yield(m.getViewerPassword()) }
- moderatorPW() { mkp.yield(m.getModeratorPassword()) }
- hasBeenForciblyEnded(m.isForciblyEnded() ? "true" : "false")
- running(m.isRunning() ? "true" : "false")
- participantCount(m.getNumUsers())
- listenerCount(m.getNumListenOnly())
- voiceParticipantCount(m.getNumVoiceJoined())
- videoCount(m.getNumVideos())
- duration(m.duration)
- hasUserJoined(m.hasUserJoined())
- }
- }
- }
- }
- }
- }
- }
- }
- }
-
- /************************************
- * GETSESSIONS API
- ************************************/
- def getSessionsHandler = {
- String API_CALL = "getSessions"
- log.debug CONTROLLER_NAME + "#${API_CALL}"
-
- // BEGIN - backward compatibility
- if (StringUtils.isEmpty(params.checksum)) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
-
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
- // END - backward compatibility
-
- ApiErrors errors = new ApiErrors()
-
- // Do we have a checksum? If none, complain.
- if (StringUtils.isEmpty(params.checksum)) {
- errors.missingParamError("checksum");
- }
-
- if (errors.hasErrors()) {
- respondWithErrors(errors)
- return
- }
-
- // Do we agree on the checksum? If not, complain.
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- errors.checksumError()
- respondWithErrors(errors)
- return
- }
-
- Collection sssns = meetingService.getSessions();
-
- if (sssns == null || sssns.isEmpty()) {
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode(RESP_CODE_SUCCESS)
- sessions()
- messageKey("noSessions")
- message("no sessions were found on this server")
- }
- }
- }
- }
- } else {
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode(RESP_CODE_SUCCESS)
- sessions {
- for (m in sssns) {
- meeting {
- meetingID() { mkp.yield(m.meetingID) }
- meetingName() { mkp.yield(m.conferencename) }
- userName() { mkp.yield(m.fullname) }
- }
- }
- }
- }
- }
- }
- }
- }
- }
-
-
- def getDefaultConfigXML = {
-
- String API_CALL = "getDefaultConfigXML"
- ApiErrors errors = new ApiErrors();
-
- if (StringUtils.isEmpty(params.checksum)) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
-
- // Do we agree on the checksum? If not, complain.
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- errors.checksumError()
- respondWithErrors(errors)
- return
- }
-
- String defConfigXML = paramsProcessorUtil.getDefaultConfigXML();
-
- response.addHeader("Cache-Control", "no-cache")
- render text: defConfigXML, contentType: 'text/xml'
-
- }
-
- private Map getParameters(ServletRequest request) {
- // Copy the parameters into our own Map as we can't pass the paramMap
- // from the request as it's an unmodifiable map.
- Map reqParams = new HashMap();
- Map unModReqParams = request.getParameterMap();
-
- SortedSet keys = new TreeSet(unModReqParams.keySet());
-
- for (String key: keys) {
- reqParams.put(key, unModReqParams.get(key));
- }
-
- return reqParams;
- }
-
- /***********************************************
- * POLL API
- ***********************************************/
- def setPollXML = {
- String API_CALL = "setPollXML"
- log.debug CONTROLLER_NAME + "#${API_CALL}"
-
- if (StringUtils.isEmpty(params.checksum)) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
-
- if (StringUtils.isEmpty(params.pollXML)) {
- invalid("configXMLError", "You did not pass a poll XML")
- return
- }
-
- if(!StringUtils.isEmpty(params.meetingID)) {
- params.meetingID = StringUtils.strip(params.meetingID);
- if (StringUtils.isEmpty(params.meetingID)) {
- invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
- return
- }
- } else {
- invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
- return
- }
-
- // Translate the external meeting id into an internal meeting id.
- String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(params.meetingID);
- Meeting meeting = meetingService.getMeeting(internalMeetingId);
- if (meeting == null) {
- // BEGIN - backward compatibility
- invalid("invalidMeetingIdentifier", "The meeting ID that you supplied did not match any existing meetings");
- return;
- // END - backward compatibility
-
- errors.invalidMeetingIdError();
- respondWithErrors(errors)
- return;
- }
-
- Map reqParams = getParameters(request)
-
- String pollXML = params.pollXML
-
- String decodedPollXML;
-
- try {
- decodedPollXML = URLDecoder.decode(pollXML, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- log.error("Couldn't decode poll XML.");
- invalid("pollXMLError", "Cannot decode poll XML")
- return;
- }
-
- if (! paramsProcessorUtil.isPostChecksumSame(API_CALL, reqParams)) {
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode("FAILED")
- messageKey("pollXMLChecksumError")
- message("pollXMLChecksumError: request did not pass the checksum security check.")
- }
- }
- }
- }
- } else {
-
- def pollxml = new XmlSlurper().parseText(decodedPollXML);
-
- pollxml.children().each { poll ->
- String title = poll.title.text();
- String question = poll.question.text();
- String questionType = poll.questionType.text();
-
- ArrayList answers = new ArrayList();
- poll.answers.children().each { answer ->
- answers.add(answer.text());
+ if (errors.hasErrors()) {
+ respondWithErrors(errors)
+ return
}
- //send poll to BigBlueButton Apps
- meetingService.createdPolls(meeting.getInternalId(), title, question, questionType, answers);
- }
-
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() { returncode("SUCCESS") }
- }
- }
- }
- }
- }
-
- /***********************************************
- * CONFIG API
- ***********************************************/
- def setConfigXML = {
- String API_CALL = "setConfigXML"
- log.debug CONTROLLER_NAME + "#${API_CALL}"
-
- if (StringUtils.isEmpty(params.checksum)) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
-
- if (StringUtils.isEmpty(params.configXML)) {
- invalid("configXMLError", "You did not pass a config XML")
- return
- }
-
- if(!StringUtils.isEmpty(params.meetingID)) {
- params.meetingID = StringUtils.strip(params.meetingID);
- if (StringUtils.isEmpty(params.meetingID)) {
- invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
- return
- }
- } else {
- invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
- return
- }
-
- // Translate the external meeting id into an internal meeting id.
- String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(params.meetingID);
- Meeting meeting = meetingService.getMeeting(internalMeetingId);
- if (meeting == null) {
- // BEGIN - backward compatibility
- invalid("invalidMeetingIdentifier", "The meeting ID that you supplied did not match any existing meetings");
- return;
- // END - backward compatibility
-
- errors.invalidMeetingIdError();
- respondWithErrors(errors)
- return;
- }
-
- Map reqParams = getParameters(request)
-
- String configXML = params.configXML
-
- String decodedConfigXML;
-
- try {
- decodedConfigXML = URLDecoder.decode(configXML, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- log.error("Couldn't decode config XML.");
- invalid("configXMLError", "Cannot decode config XML")
- return;
- }
-
- if (! paramsProcessorUtil.isPostChecksumSame(API_CALL, reqParams)) {
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode("FAILED")
- messageKey("configXMLChecksumError")
- message("configXMLChecksumError: request did not pass the checksum security check.")
- }
- }
- }
- }
- } else {
- boolean defaultConfig = false;
-
- if (! StringUtils.isEmpty(params.defaultConfig)) {
- try {
- defaultConfig = Boolean.parseBoolean(params.defaultConfig);
- } catch(Exception e) {
- defaultConfig = false;
- }
- }
-
-
- String token = meeting.storeConfig(defaultConfig, decodedConfigXML);
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode("SUCCESS")
- configToken(token)
- }
- }
- }
- }
- }
- }
-
- /***********************************************
- * CALLBACK API
- ***********************************************/
- def subscribeEvent = {
- String API_CALL = "subscribeEvent"
- log.debug CONTROLLER_NAME + "#${API_CALL}"
-
- if (StringUtils.isEmpty(params.checksum)) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
-
- if (StringUtils.isEmpty(params.callbackURL)) {
- invalid("missingParamCallbackURL", "You must specify a callbackURL for subscribing");
- return
- }
-
- if(!StringUtils.isEmpty(params.meetingID)) {
- params.meetingID = StringUtils.strip(params.meetingID);
- if (StringUtils.isEmpty(params.meetingID)) {
- invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
- return
- }
- } else {
- invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
- return
- }
-
- String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(params.meetingID);
- Meeting meeting = meetingService.getMeeting(internalMeetingId);
- if (meeting == null) {
- // BEGIN - backward compatibility
- invalid("invalidMeetingIdentifier", "The meeting ID that you supplied did not match any existing meetings");
- return;
- // END - backward compatibility
-
- errors.invalidMeetingIdError();
- respondWithErrors(errors)
- return;
- }
-
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode("FAILED")
- messageKey("subscribeEventChecksumError")
- message("subscribeEventChecksumError: request did not pass the checksum security check.")
- }
- }
- }
- }
- } else {
- String sid = meetingService.addSubscription(meeting.getInternalId(), meeting.getExternalId(), params.callbackURL);
-
- if(sid.isEmpty()){
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode("FAILED")
- messageKey("subscribeEventError")
- message("subscribeEventError: An error happen while storing your subscription. Check the logs.")
- }
- }
- }
+ // Do we agree with the checksum? If not, complain.
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ errors.checksumError()
+ respondWithErrors(errors)
+ return
}
- }else{
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode("SUCCESS")
- subscriptionID(sid)
- }
- }
- }
- }
- }
- }
- }
-
- def unsubscribeEvent = {
- String API_CALL = "unsubscribeEvent"
- log.debug CONTROLLER_NAME + "#${API_CALL}"
-
- if (StringUtils.isEmpty(params.checksum)) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
-
- if (StringUtils.isEmpty(params.subscriptionID)) {
- invalid("missingParamSubscriptionID", "You must pass a subscriptionID for unsubscribing")
- return
- }
-
- if(!StringUtils.isEmpty(params.meetingID)) {
- params.meetingID = StringUtils.strip(params.meetingID);
- if (StringUtils.isEmpty(params.meetingID)) {
- invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
- return
- }
- } else {
- invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
- return
- }
-
- String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(params.meetingID);
- Meeting meeting = meetingService.getMeeting(internalMeetingId);
- if (meeting == null) {
- // BEGIN - backward compatibility
- invalid("invalidMeetingIdentifier", "The meeting ID that you supplied did not match any existing meetings");
- return;
- // END - backward compatibility
-
- errors.invalidMeetingIdError();
- respondWithErrors(errors)
- return;
- }
-
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode("FAILED")
- messageKey("unsubscribeEventChecksumError")
- message("unsubscribeEventChecksumError: request did not pass the checksum security check.")
- }
- }
- }
- }
- } else {
- boolean status = meetingService.removeSubscription(meeting.getInternalId(), params.subscriptionID);
-
- if(!status){
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode("FAILED")
- messageKey("unsubscribeEventError")
- message("unsubscribeEventError: An error happen while unsubscribing. Check the logs.")
- }
- }
- }
- }
-
- }else{
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode("SUCCESS")
- unsubscribed(status)
- }
- }
- }
- }
- }
- }
- }
-
- def listSubscriptions = {
- String API_CALL = "listSubscriptions"
- log.debug CONTROLLER_NAME + "#${API_CALL}"
-
- if (StringUtils.isEmpty(params.checksum)) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
-
- if(!StringUtils.isEmpty(params.meetingID)) {
- params.meetingID = StringUtils.strip(params.meetingID);
- if (StringUtils.isEmpty(params.meetingID)) {
- invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
- return
- }
- } else {
- invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
- return
- }
-
- String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(params.meetingID);
- Meeting meeting = meetingService.getMeeting(internalMeetingId);
- if (meeting == null) {
- // BEGIN - backward compatibility
- invalid("invalidMeetingIdentifier", "The meeting ID that you supplied did not match any existing meetings");
- return;
- // END - backward compatibility
-
- errors.invalidMeetingIdError();
- respondWithErrors(errors)
- return;
- }
-
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode("FAILED")
- messageKey("listSubscriptionsChecksumError")
- message("listSubscriptionsChecksumError: request did not pass the checksum security check.")
- }
- }
- }
- }
- } else {
- List> list = meetingService.listSubscriptions(meeting.getInternalId());
-
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode("SUCCESS")
- subscriptions() {
- list.each{ item ->
- subscription(){
- subscriptionID() { mkp.yield(item.get("subscriptionID")) }
- event() { mkp.yield(item.get("event")) }
- callbackURL() { mkp.yield(item.get("callbackURL")) }
- active() { mkp.yield(item.get("active")) }
- }
- }
- }
- }
- }
- }
- }
-
- }
- }
-
- /***********************************************
- * CONFIG API
- ***********************************************/
- def configXML = {
-
- String logoutUrl = paramsProcessorUtil.getDefaultLogoutUrl()
- boolean reject = false
- String sessionToken = null
- UserSession us = null
-
- if (StringUtils.isEmpty(params.sessionToken)) {
- println("No session for user in conference.")
- reject = true
- } else {
- sessionToken = StringUtils.strip(params.sessionToken)
- println("SessionToken = " + sessionToken)
- if (!session[sessionToken]) {
- reject = true
- } else {
- us = meetingService.getUserSession(sessionToken);
- if (us == null) reject = true
- }
- }
-
- if (reject) {
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode("FAILED")
- message("Could not find conference.")
- logoutURL() { mkp.yield(logoutUrl) }
- }
- }
- }
- }
- } else {
- response.addHeader("Cache-Control", "no-cache")
- render text: us.configXML, contentType: 'text/xml'
- }
- }
-
- /***********************************************
- * ENTER API
- ***********************************************/
- def enter = {
- boolean reject = false;
-
- if (StringUtils.isEmpty(params.sessionToken)) {
- println("SessionToken is missing.")
- }
-
- String sessionToken = StringUtils.strip(params.sessionToken)
-
- UserSession us = null;
- Meeting meeting = null;
-
- if (!session[sessionToken]) {
- log.info("No session found for token [" + sessionToken + "].")
- reject = true;
- } else {
- if (meetingService.getUserSession(sessionToken) == null) {
- log.info("Cannot get user session for token [" + sessionToken + "].")
- reject = true;
- } else {
- us = meetingService.getUserSession(sessionToken);
- meeting = meetingService.getMeeting(us.meetingID);
- if (meeting == null || meeting.isForciblyEnded()) {
- log.info("Cannot get meeting for token [" + sessionToken + "].")
- reject = true
- }
- }
- }
-
- if (reject) {
- log.info("No session for user in conference.")
-
- // Determine the logout url so we can send the user there.
- String logoutUrl = paramsProcessorUtil.getDefaultLogoutUrl()
-
- if (us != null) {
- logoutUrl = us.logoutUrl
- }
-
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- json {
- render(contentType: "application/json") {
- response = {
- returncode = "FAILED"
- message = "Could not find conference."
- logoutURL = logoutUrl
- }
- }
- }
- }
- } else {
-
- Map userCustomData = paramsProcessorUtil.getUserCustomData(params);
-
- // Generate a new userId for this user. This prevents old connections from
- // removing the user when the user reconnects after being disconnected. (ralam jan 22, 2015)
- // We use underscore (_) to associate userid with the user. We are also able to track
- // how many times a user reconnects or refresh the browser.
- String newInternalUserID = us.internalUserId + "_" + us.incrementConnectionNum()
-
- log.info("Found conference for " + us.fullname)
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- json {
- render(contentType: "application/json") {
- response = {
- returncode = "SUCCESS"
- fullname = us.fullname
- confname = us.conferencename
- meetingID = us.meetingID
- externMeetingID = us.externMeetingID
- externUserID = us.externUserID
- internalUserID = newInternalUserID
- authToken = us.authToken
- role = us.role
- conference = us.conference
- room = us.room
- voicebridge = us.voicebridge
- dialnumber = meeting.getDialNumber()
- webvoiceconf = us.webvoiceconf
- mode = us.mode
- record = us.record
- isBreakout = meeting.isBreakout()
- allowStartStopRecording = meeting.getAllowStartStopRecording()
- welcome = us.welcome
- if (! StringUtils.isEmpty(meeting.moderatorOnlyMessage))
- modOnlyMessage = meeting.moderatorOnlyMessage
- logoutUrl = us.logoutUrl
- defaultLayout = us.defaultLayout
- avatarURL = us.avatarURL
- customdata = array {
- userCustomData.each { k, v ->
- // Somehow we need to prepend something (custdata) for the JSON to work
- custdata "$k" : v
- }
- }
- }
- }
- }
- }
- }
- }
-
- /***********************************************
- * STUN/TURN API
- ***********************************************/
- def stuns = {
- boolean reject = false;
-
- UserSession us = null;
- Meeting meeting = null;
- String sessionToken = null
-
- if (!StringUtils.isEmpty(params.sessionToken)) {
- sessionToken = StringUtils.strip(params.sessionToken)
- println("Session token = [" + sessionToken + "]")
- }
-
- if (!session[sessionToken]) {
- reject = true;
- } else {
- if (meetingService.getUserSession(session[sessionToken]) == null)
- reject = true;
- else {
- us = meetingService.getUserSession(session[sessionToken]);
- meeting = meetingService.getMeeting(us.meetingID);
- if (meeting == null || meeting.isForciblyEnded()) {
- reject = true
- }
- }
- }
-
- if (reject) {
- log.info("No session for user in conference.")
-
- String logoutUrl = paramsProcessorUtil.getDefaultLogoutUrl()
-
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- json {
- render(contentType: "application/json") {
- response = {
- returncode = "FAILED"
- message = "Could not find conference."
- logoutURL = logoutUrl
- }
- }
- }
- }
- } else {
- Set stuns = stunTurnService.getStunServers()
- Set turns = stunTurnService.getStunAndTurnServersFor(us.internalUserId)
-
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- json {
- render(contentType: "application/json") {
- stunServers = array {
- stuns.each { stun ->
- stunData = { url = stun.url }
- }
- }
- turnServers = array {
- turns.each { turn ->
- turnData = {
- username = turn.username
- password = turn.password
- url = turn.url
- ttl = turn.ttl
- }
- }
- }
- }
- }
- }
- }
- }
-
-
- /*************************************************
- * SIGNOUT API
- *************************************************/
- def signOut = {
-
- String sessionToken = null
-
- if (! StringUtils.isEmpty(params.sessionToken)) {
- sessionToken = StringUtils.strip(params.sessionToken)
- println("SessionToken = " + sessionToken)
- }
-
- Meeting meeting = null;
-
- if (sessionToken != null) {
- log.info("Found session for user in conference.")
- UserSession us = meetingService.removeUserSession(sessionToken);
- session.removeAttribute(sessionToken)
- }
-
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() { returncode(RESP_CODE_SUCCESS) }
- }
- }
- }
- }
-
- /******************************************************
- * GET_RECORDINGS API
- ******************************************************/
- def getRecordingsHandler = {
- String API_CALL = "getRecordings"
- log.debug CONTROLLER_NAME + "#${API_CALL}"
-
- // BEGIN - backward compatibility
- if (StringUtils.isEmpty(params.checksum)) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
-
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
- // END - backward compatibility
-
- ApiErrors errors = new ApiErrors()
-
- // Do we have a checksum? If none, complain.
- if (StringUtils.isEmpty(params.checksum)) {
- errors.missingParamError("checksum");
- respondWithErrors(errors)
- return
- }
-
- // Do we agree on the checksum? If not, complain.
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- errors.checksumError()
- respondWithErrors(errors)
- return
- }
-
- List externalMeetingIds = new ArrayList();
- if (!StringUtils.isEmpty(params.meetingID)) {
- externalMeetingIds=paramsProcessorUtil.decodeIds(params.meetingID);
- }
-
- List internalRecordIds = new ArrayList()
- if (!StringUtils.isEmpty(params.recordID)) {
- internalRecordIds = paramsProcessorUtil.decodeIds(params.recordID)
- }
-
- List states = new ArrayList()
- if (!StringUtils.isEmpty(params.state)) {
- states = paramsProcessorUtil.decodeIds(params.state)
- }
-
- // Everything is good so far.
- if ( internalRecordIds.size() == 0 && externalMeetingIds.size() > 0 ) {
- // No recordIDs, process the request based on meetingID(s)
- // Translate the external meeting ids to internal meeting ids (which is the seed for the recordIDs).
- internalRecordIds = paramsProcessorUtil.convertToInternalMeetingId(externalMeetingIds);
- }
-
-
- Map recs = meetingService.getRecordings(internalRecordIds, states);
- recs = meetingService.filterRecordingsByMetadata(recs, ParamsProcessorUtil.processMetaParam(params));
-
- if (recs.isEmpty()) {
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode(RESP_CODE_SUCCESS)
- recordings(null)
- messageKey("noRecordings")
- message("There are not recordings for the meetings")
- }
- }
- }
- }
- return;
- }
- def cfg = new Configuration()
-
- // Load the XML template
- // TODO: Maybe there is a better way to define the templates path
- def wtl = new WebappTemplateLoader(getServletContext(), "/WEB-INF/freemarker")
- cfg.setTemplateLoader(wtl)
- def ftl = cfg.getTemplate("get-recordings.ftl")
- def xmlText = new StringWriter()
- ftl.process([code:RESP_CODE_SUCCESS, recs:recs.values()], xmlText)
- withFormat {
- xml {
- render(text: xmlText.toString(), contentType: "text/xml")
- }
- }
- }
-
- /******************************************************
- * PUBLISH_RECORDINGS API
- ******************************************************/
-
- def publishRecordings = {
- String API_CALL = "publishRecordings"
- log.debug CONTROLLER_NAME + "#${API_CALL}"
-
- // BEGIN - backward compatibility
- if (StringUtils.isEmpty(params.checksum)) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
-
- if (StringUtils.isEmpty(params.recordID)) {
- invalid("missingParamRecordID", "You must specify a recordID.");
- return
- }
-
- if (StringUtils.isEmpty(params.publish)) {
- invalid("missingParamPublish", "You must specify a publish value true or false.");
- return
- }
-
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
- // END - backward compatibility
-
- ApiErrors errors = new ApiErrors()
-
- // Do we have a checksum? If none, complain.
- if (StringUtils.isEmpty(params.checksum)) {
- errors.missingParamError("checksum");
- }
-
- // Do we have a recording id? If none, complain.
- String recordId = params.recordID
- if (StringUtils.isEmpty(recordId)) {
- errors.missingParamError("recordID");
- }
- // Do we have a publish status? If none, complain.
- String publish = params.publish
- if (StringUtils.isEmpty(publish)) {
- errors.missingParamError("publish");
- }
-
- if (errors.hasErrors()) {
- respondWithErrors(errors)
- return
- }
-
- // Do we agree on the checksum? If not, complain.
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- errors.checksumError()
- respondWithErrors(errors)
- return
- }
-
- List recordIdList = new ArrayList();
- if (!StringUtils.isEmpty(recordId)) {
- recordIdList=paramsProcessorUtil.decodeIds(recordId);
- }
-
- if(!meetingService.existsAnyRecording(recordIdList)){
- // BEGIN - backward compatibility
- invalid("notFound", "We could not find recordings");
- return;
- // END - backward compatibility
-
- errors.recordingNotFound();
- respondWithErrors(errors);
- return;
- }
-
- meetingService.setPublishRecording(recordIdList,publish.toBoolean());
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode(RESP_CODE_SUCCESS)
- published(publish)
- }
- }
- }
- }
- }
-
- /******************************************************
- * DELETE_RECORDINGS API
- ******************************************************/
- def deleteRecordings = {
- String API_CALL = "deleteRecordings"
- log.debug CONTROLLER_NAME + "#${API_CALL}"
-
- // BEGIN - backward compatibility
- if (StringUtils.isEmpty(params.checksum)) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
-
- if (StringUtils.isEmpty(params.recordID)) {
- invalid("missingParamRecordID", "You must specify a recordID.");
- return
- }
-
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- invalid("checksumError", "You did not pass the checksum security check")
- return
- }
- // END - backward compatibility
-
- ApiErrors errors = new ApiErrors()
-
- // Do we have a checksum? If none, complain.
- if (StringUtils.isEmpty(params.checksum)) {
- errors.missingParamError("checksum");
- }
-
- // Do we have a recording id? If none, complain.
- String recordId = params.recordID
- if (StringUtils.isEmpty(recordId)) {
- errors.missingParamError("recordID");
- }
-
- if (errors.hasErrors()) {
- respondWithErrors(errors)
- return
- }
-
- // Do we agree on the checksum? If not, complain.
- if (! paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
- errors.checksumError()
- respondWithErrors(errors)
- return
- }
-
- ArrayList recordIdList = new ArrayList();
- if (!StringUtils.isEmpty(recordId)) {
- recordIdList=paramsProcessorUtil.decodeIds(recordId);
- }
-
- if(recordIdList.isEmpty()){
- // BEGIN - backward compatibility
- invalid("notFound", "We could not find recordings");
- return;
- // END - backward compatibility
-
- errors.recordingNotFound();
- respondWithErrors(errors);
- return;
- }
-
- meetingService.deleteRecordings(recordIdList);
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode(RESP_CODE_SUCCESS)
- deleted(true)
- }
- }
- }
- }
- }
-
- def uploadDocuments(conf) {
- log.debug("ApiController#uploadDocuments(${conf.getInternalId()})");
-
- String requestBody = request.inputStream == null ? null : request.inputStream.text;
- requestBody = StringUtils.isEmpty(requestBody) ? null : requestBody;
-
- if (requestBody == null) {
- downloadAndProcessDocument(presentationService.defaultUploadedPresentation, conf.getInternalId());
- } else {
- log.debug "Request body: \n" + requestBody;
- def xml = new XmlSlurper().parseText(requestBody);
- xml.children().each { module ->
- log.debug("module config found: [${module.@name}]");
-
- if ("presentation".equals(module.@name.toString())) {
- // need to iterate over presentation files and process them
- module.children().each { document ->
- if (!StringUtils.isEmpty(document.@url.toString())) {
- downloadAndProcessDocument(document.@url.toString(), conf.getInternalId());
- } else if (!StringUtils.isEmpty(document.@name.toString())) {
- def b64 = new Base64()
- def decodedBytes = b64.decode(document.text().getBytes())
- processDocumentFromRawBytes(decodedBytes, document.@name.toString(), conf.getInternalId());
+ // Translate the external meeting id into an internal meeting id.
+ String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(params.meetingID);
+ Meeting existing = meetingService.getNotEndedMeetingWithId(internalMeetingId);
+ if (existing != null) {
+ log.debug "Existing conference found"
+ Map updateParams = paramsProcessorUtil.processUpdateCreateParams(params);
+ if (existing.getViewerPassword().equals(params.get("attendeePW")) && existing.getModeratorPassword().equals(params.get("moderatorPW"))) {
+ paramsProcessorUtil.updateMeeting(updateParams, existing);
+ // trying to create a conference a second time, return success, but give extra info
+ // Ignore pre-uploaded presentations. We only allow uploading of presentation once.
+ //uploadDocuments(existing);
+ respondWithConference(existing, "duplicateWarning", "This conference was already in existence and may currently be in progress.");
} else {
- log.debug("presentation module config found, but it did not contain url or name attributes");
+ // BEGIN - backward compatibility
+ invalid("idNotUnique", "A meeting already exists with that meeting ID. Please use a different meeting ID.");
+ return;
+ // END - backward compatibility
+
+ // enforce meetingID unique-ness
+ errors.nonUniqueMeetingIdError()
+ respondWithErrors(errors)
}
- }
+
+ return;
}
- }
- }
- }
+ Meeting newMeeting = paramsProcessorUtil.processCreateParams(params);
- def processDocumentFromRawBytes(bytes, presFilename, meetingId) {
- def filenameExt = Util.getFilenameExt(presFilename);
- String presentationDir = presentationService.getPresentationDir()
- def presId = Util.generatePresentationId(presFilename)
- File uploadDir = Util.createPresentationDirectory(meetingId, presentationDir, presId)
- if (uploadDir != null) {
- def newFilename = Util.createNewFilename(presId, filenameExt)
- def pres = new File(uploadDir.absolutePath + File.separatorChar + newFilename);
+ if (!StringUtils.isEmpty(params.moderatorOnlyMessage)) {
+ newMeeting.setModeratorOnlyMessage(params.moderatorOnlyMessage);
+ }
- FileOutputStream fos = new java.io.FileOutputStream(pres)
- fos.write(bytes)
- fos.flush()
- fos.close()
+ meetingService.createMeeting(newMeeting);
- processUploadedFile(meetingId, presId, presFilename, pres);
+ // See if the request came with pre-uploading of presentation.
+ uploadDocuments(newMeeting);
+ respondWithConference(newMeeting, null, null)
}
- }
+ /**********************************************
+ * JOIN API
+ *********************************************/
+ def join = {
+ String API_CALL = 'join'
+ log.debug CONTROLLER_NAME + "#${API_CALL}"
+ ApiErrors errors = new ApiErrors()
- def downloadAndProcessDocument(address, meetingId) {
- log.debug("ApiController#downloadAndProcessDocument(${address}, ${meetingId})");
- String presFilename = address.tokenize("/")[-1];
- def filenameExt = presDownloadService.getFilenameExt(presFilename);
- String presentationDir = presentationService.getPresentationDir()
+ // BEGIN - backward compatibility
+ if (StringUtils.isEmpty(params.checksum)) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
- def presId = presDownloadService.generatePresentationId(presFilename)
- File uploadDir = presDownloadService.createPresentationDirectory(meetingId, presentationDir, presId)
- if (uploadDir != null) {
- def newFilename = presDownloadService.createNewFilename(presId, filenameExt)
- def newFilePath = uploadDir.absolutePath + File.separatorChar + newFilename
+ //checking for an empty username or for a username containing whitespaces only
+ if (!StringUtils.isEmpty(params.fullName)) {
+ params.fullName = StringUtils.strip(params.fullName);
+ if (StringUtils.isEmpty(params.fullName)) {
+ invalid("missingParamFullName", "You must specify a name for the attendee who will be joining the meeting.");
+ return
+ }
+ } else {
+ invalid("missingParamFullName", "You must specify a name for the attendee who will be joining the meeting.");
+ return
+ }
- if (presDownloadService.savePresentation(meetingId, newFilePath, address)) {
- def pres = new File(newFilePath)
- processUploadedFile(meetingId, presId, presFilename, pres);
- } else {
- log.error("Failed to download presentation=[${address}], meeting=[${meetingId}]")
- }
- }
- }
+ if (!StringUtils.isEmpty(params.meetingID)) {
+ params.meetingID = StringUtils.strip(params.meetingID);
+ if (StringUtils.isEmpty(params.meetingID)) {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+ } else {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+ if (StringUtils.isEmpty(params.password)) {
+ invalid("invalidPassword", "You either did not supply a password or the password supplied is neither the attendee or moderator password for this conference.");
+ return
+ }
- def processUploadedFile(meetingId, presId, filename, presFile) {
- def presentationBaseUrl = presentationService.presentationBaseUrl
- UploadedPresentation uploadedPres = new UploadedPresentation(meetingId, presId, filename, presentationBaseUrl);
- uploadedPres.setUploadedFile(presFile);
- presentationService.processUploadedPresentation(uploadedPres);
- }
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
- def beforeInterceptor = {
- if (paramsProcessorUtil.isServiceEnabled() == false) {
- log.info("apiNotEnabled: The API service and/or controller is not enabled on this server. To use it, you must first enable it.")
- // TODO: this doesn't stop the request - so it generates invalid XML
- // since the request continues and renders a second response
- invalid("apiNotEnabled", "The API service and/or controller is not enabled on this server. To use it, you must first enable it.")
- }
- }
+ // END - backward compatibility
- def formatPrettyDate(timestamp) {
- // SimpleDateFormat ft = new SimpleDateFormat ("E yyyy.MM.dd 'at' hh:mm:ss a zzz");
- // return ft.format(new Date(timestamp))
+ // Do we have a checksum? If none, complain.
+ if (StringUtils.isEmpty(params.checksum)) {
+ errors.missingParamError("checksum");
+ }
- return new Date(timestamp).toString()
- }
+ // Do we have a name for the user joining? If none, complain.
+ if (!StringUtils.isEmpty(params.fullName)) {
+ params.fullName = StringUtils.strip(params.fullName);
+ if (StringUtils.isEmpty(params.fullName)) {
+ errors.missingParamError("fullName");
+ }
+ } else {
+ errors.missingParamError("fullName");
+ }
+ String fullName = params.fullName
- def respondWithConferenceDetails(meeting, room, msgKey, msg) {
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode(RESP_CODE_SUCCESS)
- meetingName() { mkp.yield(meeting.getName()) }
- isBreakout() { mkp.yield(meeting.isBreakout()) }
- meetingID() { mkp.yield(meeting.getExternalId()) }
- internalMeetingID(meeting.getInternalId())
- createTime(meeting.getCreateTime())
- createDate(formatPrettyDate(meeting.getCreateTime()))
- voiceBridge() { mkp.yield(meeting.getTelVoice()) }
- dialNumber() { mkp.yield(meeting.getDialNumber()) }
- attendeePW() { mkp.yield(meeting.getViewerPassword()) }
- moderatorPW() { mkp.yield(meeting.getModeratorPassword()) }
- running(meeting.isRunning() ? "true" : "false")
- duration(meeting.duration)
- hasUserJoined(meeting.hasUserJoined())
- recording(meeting.isRecord() ? "true" : "false")
- hasBeenForciblyEnded(meeting.isForciblyEnded() ? "true" : "false")
- startTime(meeting.getStartTime())
- endTime(meeting.getEndTime())
- participantCount(meeting.getNumUsers())
- listenerCount(meeting.getNumListenOnly())
- voiceParticipantCount(meeting.getNumVoiceJoined())
- videoCount(meeting.getNumVideos())
- maxUsers(meeting.getMaxUsers())
- moderatorCount(meeting.getNumModerators())
- attendees() {
- meeting.getUsers().each { att ->
- attendee() {
- userID() { mkp.yield("${att.externalUserId}") }
- fullName() { mkp.yield("${att.fullname}") }
- role("${att.role}")
- isPresenter("${att.isPresenter()}")
- isListeningOnly("${att.isListeningOnly()}")
- hasJoinedVoice("${att.isVoiceJoined()}")
- hasVideo("${att.hasVideo()}")
- customdata(){
- meeting.getUserCustomData(att.externalUserId).each{ k,v ->
- "$k"("$v")
- }
- }
+ // Do we have a meeting id? If none, complain.
+ if (!StringUtils.isEmpty(params.meetingID)) {
+ params.meetingID = StringUtils.strip(params.meetingID);
+ if (StringUtils.isEmpty(params.meetingID)) {
+ errors.missingParamError("meetingID");
+ }
+ } else {
+ errors.missingParamError("meetingID");
+ }
+ String externalMeetingId = params.meetingID
+
+ // Do we have a password? If not, complain.
+ String attPW = params.password
+ if (StringUtils.isEmpty(attPW)) {
+ errors.missingParamError("password");
+ }
+
+ if (errors.hasErrors()) {
+ respondWithErrors(errors)
+ return
+ }
+
+ // Do we agree on the checksum? If not, complain.
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ errors.checksumError()
+ respondWithErrors(errors)
+ return
+ }
+
+ Boolean isBreakoutRoom = false
+ if (!StringUtils.isEmpty(params.isBreakout)) {
+ isBreakoutRoom = new Boolean(StringUtils.strip(params.isBreakout))
+ }
+
+ // Everything is good so far. Translate the external meeting id to an internal meeting id. If
+ // we can't find the meeting, complain.
+ String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(externalMeetingId);
+ if (isBreakoutRoom) {
+ // This is a join request for a breakout room. Use the passed meetingId to find the meeting.
+ internalMeetingId = externalMeetingId
+ log.info("Join request for breakout room " + internalMeetingId)
+ }
+
+ log.info("Retrieving meeting ${internalMeetingId}")
+ Meeting meeting = meetingService.getMeeting(internalMeetingId);
+ if (meeting == null) {
+ // BEGIN - backward compatibility
+ invalid("invalidMeetingIdentifier", "The meeting ID that you supplied did not match any existing meetings");
+ return;
+ // END - backward compatibility
+
+ errors.invalidMeetingIdError();
+ respondWithErrors(errors)
+ return;
+ }
+
+ // the createTime mismatch with meeting's createTime, complain
+ // In the future, the createTime param will be required
+ if (params.createTime != null) {
+ long createTime = 0;
+ try {
+ createTime = Long.parseLong(params.createTime);
+ } catch (Exception e) {
+ log.warn("could not parse createTime param");
+ createTime = -1;
+ }
+ if (createTime != meeting.getCreateTime()) {
+ errors.mismatchCreateTimeParam();
+ respondWithErrors(errors);
+ return;
+ }
+ }
+
+ // Is this user joining a meeting that has been ended. If so, complain.
+ if (meeting.isForciblyEnded()) {
+ // BEGIN - backward compatibility
+ invalid("meetingForciblyEnded", "You can not re-join a meeting that has already been forcibly ended. However, once the meeting is removed from memory (according to the timeout configured on this server, you will be able to once again create a meeting with the same meeting ID");
+ return;
+ // END - backward compatibility
+
+ errors.meetingForciblyEndedError();
+ respondWithErrors(errors)
+ return;
+ }
+
+ // Now determine if this user is a moderator or a viewer.
+ String role = null;
+ if (meeting.getModeratorPassword().equals(attPW)) {
+ role = ROLE_MODERATOR;
+ } else if (meeting.getViewerPassword().equals(attPW)) {
+ role = ROLE_ATTENDEE;
+ }
+
+ if (role == null) {
+ // BEGIN - backward compatibility
+ invalid("invalidPassword", "You either did not supply a password or the password supplied is neither the attendee or moderator password for this conference.");
+ return
+ // END - backward compatibility
+
+ errors.invalidPasswordError()
+ respondWithErrors(errors)
+ return;
+ }
+
+ String webVoice = StringUtils.isEmpty(params.webVoiceConf) ? meeting.getTelVoice() : params.webVoiceConf
+
+ boolean redirectImm = parseBoolean(params.redirectImmediately)
+
+ String internalUserID = RandomStringUtils.randomAlphanumeric(12).toLowerCase()
+
+ String authToken = RandomStringUtils.randomAlphanumeric(12).toLowerCase()
+
+ String sessionToken = RandomStringUtils.randomAlphanumeric(16).toLowerCase()
+
+ String externUserID = params.userID
+ if (StringUtils.isEmpty(externUserID)) {
+ externUserID = internalUserID
+ }
+
+ //Return a Map with the user custom data
+ Map userCustomData = paramsProcessorUtil.getUserCustomData(params);
+
+ //Currently, it's associated with the externalUserID
+ if (userCustomData.size() > 0)
+ meetingService.addUserCustomData(meeting.getInternalId(), externUserID, userCustomData);
+
+ String configxml = null;
+
+ if (!StringUtils.isEmpty(params.configToken)) {
+ Config conf = meeting.getConfig(params.configToken);
+ if (conf == null) {
+ // Check if this config is one of our pre-built config
+ configxml = configService.getConfig(params.configToken)
+ if (configxml == null) {
+ // Default to the default config.
+ configxml = conf.config;
}
- }
+ } else {
+ configxml = conf.config;
}
- metadata(){
- meeting.getMetadata().each{ k,v ->
- "$k"("$v")
- }
+ } else {
+ Config conf = meeting.getDefaultConfig();
+ if (conf == null) {
+ errors.noConfigFound();
+ respondWithErrors(errors);
+ } else {
+ configxml = conf.config;
}
- messageKey(msgKey == null ? "" : msgKey)
- message(msg == null ? "" : msg)
- }
}
- }
- }
- }
- def respondWithConference(meeting, msgKey, msg) {
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- log.debug "Rendering as xml"
- render(contentType:"text/xml") {
- response() {
- returncode(RESP_CODE_SUCCESS)
- meetingID() { mkp.yield(meeting.getExternalId()) }
- attendeePW() { mkp.yield(meeting.getViewerPassword()) }
- moderatorPW() { mkp.yield(meeting.getModeratorPassword()) }
- createTime(meeting.getCreateTime())
- voiceBridge() { mkp.yield(meeting.getTelVoice()) }
- dialNumber() { mkp.yield(meeting.getDialNumber()) }
- createDate(formatPrettyDate(meeting.getCreateTime()))
- hasUserJoined(meeting.hasUserJoined())
- duration(meeting.duration)
- hasBeenForciblyEnded(meeting.isForciblyEnded() ? "true" : "false")
- messageKey(msgKey == null ? "" : msgKey)
- message(msg == null ? "" : msg)
- }
+ if (StringUtils.isEmpty(configxml)) {
+ errors.noConfigFound();
+ respondWithErrors(errors);
}
- }
- }
- }
+ UserSession us = new UserSession();
+ us.authToken = authToken;
+ us.internalUserId = internalUserID
+ us.conferencename = meeting.getName()
+ us.meetingID = meeting.getInternalId()
+ us.externMeetingID = meeting.getExternalId()
+ us.externUserID = externUserID
+ us.fullname = fullName
+ us.role = role
+ us.conference = meeting.getInternalId()
+ us.room = meeting.getInternalId()
+ us.voicebridge = meeting.getTelVoice()
+ us.webvoiceconf = meeting.getWebVoice()
+ us.mode = "LIVE"
+ us.record = meeting.isRecord()
+ us.welcome = meeting.getWelcomeMessage()
+ us.logoutUrl = meeting.getLogoutUrl();
+ us.configXML = configxml;
- def respondWithErrors(errorList) {
- log.debug CONTROLLER_NAME + "#invalid"
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode(RESP_CODE_FAILED)
- errors() {
- ArrayList errs = errorList.getErrors();
- Iterator itr = errs.iterator();
- while (itr.hasNext()){
- String[] er = (String[]) itr.next();
- log.debug CONTROLLER_NAME + "#invalid" + er[0]
- error(key: er[0], message: er[1])
- }
+ if (!StringUtils.isEmpty(params.defaultLayout)) {
+ us.defaultLayout = params.defaultLayout;
+ }
+
+ if (!StringUtils.isEmpty(params.avatarURL)) {
+ us.avatarURL = params.avatarURL;
+ } else {
+ us.avatarURL = meeting.defaultAvatarURL
+ }
+ // Register user into the meeting.
+ meetingService.registerUser(us.meetingID, us.internalUserId, us.fullname, us.role, us.externUserID, us.authToken, us.avatarURL)
+
+ // Validate if the maxParticipants limit has been reached based on registeredUsers. If so, complain.
+ // when maxUsers is set to 0, the validation is ignored
+ int maxUsers = meeting.getMaxUsers();
+ if (maxUsers > 0 && meeting.getRegisteredUsers().size() >= maxUsers) {
+ errors.maxParticipantsReached();
+ respondWithErrors(errors, true);
+ return;
+ }
+
+ // Mark user as registered
+ meeting.userRegistered(internalUserID);
+
+ session[sessionToken] = sessionToken
+ meetingService.addUserSession(sessionToken, us);
+
+ // Register user into the meeting.
+ meetingService.registerUser(us.meetingID, us.internalUserId, us.fullname, us.role, us.externUserID, us.authToken)
+
+ log.info("Session user token for " + us.fullname + " [" + session[sessionToken] + "]")
+ session.setMaxInactiveInterval(SESSION_TIMEOUT);
+
+ //check if exists the param redirect
+ boolean redirectClient = true;
+ String clientURL = paramsProcessorUtil.getDefaultClientUrl();
+
+ if (!StringUtils.isEmpty(params.redirect)) {
+ try {
+ redirectClient = Boolean.parseBoolean(params.redirect);
+ } catch (Exception e) {
+ redirectClient = true;
}
- }
- }
- }
- json {
- log.debug "Rendering as json"
- render(contentType:"text/json") {
- returncode(RESP_CODE_FAILED)
- messageKey(key)
- message(msg)
- }
- }
- }
- }
- //TODO: method added for backward compability, it will be removed in next versions after 0.8
- def invalid(key, msg) {
- String deprecatedMsg=" Note: This xml scheme will be DEPRECATED."
- log.debug CONTROLLER_NAME + "#invalid"
- response.addHeader("Cache-Control", "no-cache")
- withFormat {
- xml {
- render(contentType:"text/xml") {
- response() {
- returncode(RESP_CODE_FAILED)
- messageKey(key)
- message(msg)
- }
- }
- }
- json {
- log.debug "Rendering as json"
- render(contentType:"text/json") {
- returncode(RESP_CODE_FAILED)
- messageKey(key)
- message(msg)
- }
- }
- }
- }
- def parseBoolean(obj) {
- if (obj instanceof Number) {
- return ((Number) obj).intValue() == 1;
- }
- return false
- }
+ if (redirectClient) {
+ log.info("Successfully joined. Redirecting to ${paramsProcessorUtil.getDefaultClientUrl()}");
+ redirect(url: clientURL);
+ } else {
+ log.info("Successfully joined. Sending XML response.");
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode(RESP_CODE_SUCCESS)
+ messageKey("successfullyJoined")
+ message("You have joined successfully.")
+ meeting_id() { mkp.yield(us.meetingID) }
+ user_id(us.internalUserId)
+ auth_token(us.authToken)
+ }
+ }
+ }
+ }
+ }
+ }
+ if (!StringUtils.isEmpty(params.clientURL)) {
+ clientURL = params.clientURL;
+ }
+
+ if (redirectClient) {
+ String destUrl = clientURL + "?sessionToken=" + sessionToken
+ log.info("Successfully joined. Redirecting to ${paramsProcessorUtil.getDefaultClientUrl()}");
+ redirect(url: destUrl);
+ } else {
+ log.info("Successfully joined. Sending XML response.");
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode(RESP_CODE_SUCCESS)
+ messageKey("successfullyJoined")
+ message("You have joined successfully.")
+ meeting_id() { mkp.yield(us.meetingID) }
+ user_id(us.internalUserId)
+ auth_token(us.authToken)
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /*******************************************
+ * IS_MEETING_RUNNING API
+ *******************************************/
+ def isMeetingRunning = {
+ String API_CALL = 'isMeetingRunning'
+ log.debug CONTROLLER_NAME + "#${API_CALL}"
+
+ // BEGIN - backward compatibility
+ if (StringUtils.isEmpty(params.checksum)) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+
+ if (!StringUtils.isEmpty(params.meetingID)) {
+ params.meetingID = StringUtils.strip(params.meetingID);
+ if (StringUtils.isEmpty(params.meetingID)) {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+ } else {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+ // END - backward compatibility
+
+ ApiErrors errors = new ApiErrors()
+
+ // Do we have a checksum? If none, complain.
+ if (StringUtils.isEmpty(params.checksum)) {
+ errors.missingParamError("checksum");
+ }
+
+ // Do we have a meeting id? If none, complain.
+ if (!StringUtils.isEmpty(params.meetingID)) {
+ params.meetingID = StringUtils.strip(params.meetingID);
+ if (StringUtils.isEmpty(params.meetingID)) {
+ errors.missingParamError("meetingID");
+ }
+ } else {
+ errors.missingParamError("meetingID");
+ }
+ String externalMeetingId = params.meetingID
+
+
+ if (errors.hasErrors()) {
+ respondWithErrors(errors)
+ return
+ }
+
+ // Do we agree on the checksum? If not, complain.
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ errors.checksumError()
+ respondWithErrors(errors)
+ return
+ }
+
+ // Everything is good so far. Translate the external meeting id to an internal meeting id. If
+ // we can't find the meeting, complain.
+ String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(externalMeetingId);
+ log.info("Retrieving meeting ${internalMeetingId}")
+ Meeting meeting = meetingService.getMeeting(internalMeetingId);
+ boolean isRunning = meeting != null && meeting.isRunning();
+
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode(RESP_CODE_SUCCESS)
+ running(isRunning ? "true" : "false")
+ }
+ }
+ }
+ }
+ }
+
+ /************************************
+ * END API
+ ************************************/
+ def end = {
+ String API_CALL = "end"
+
+ log.debug CONTROLLER_NAME + "#${API_CALL}"
+
+ // BEGIN - backward compatibility
+ if (StringUtils.isEmpty(params.checksum)) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+
+ if (!StringUtils.isEmpty(params.meetingID)) {
+ params.meetingID = StringUtils.strip(params.meetingID);
+ if (StringUtils.isEmpty(params.meetingID)) {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+ } else {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+
+ if (StringUtils.isEmpty(params.password)) {
+ invalid("invalidPassword", "You must supply the moderator password for this call.");
+ return
+ }
+
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+ // END - backward compatibility
+
+ ApiErrors errors = new ApiErrors()
+
+ // Do we have a checksum? If none, complain.
+ if (StringUtils.isEmpty(params.checksum)) {
+ errors.missingParamError("checksum");
+ }
+
+ // Do we have a meeting id? If none, complain.
+ if (!StringUtils.isEmpty(params.meetingID)) {
+ params.meetingID = StringUtils.strip(params.meetingID);
+ if (StringUtils.isEmpty(params.meetingID)) {
+ errors.missingParamError("meetingID");
+ }
+ } else {
+ errors.missingParamError("meetingID");
+ }
+ String externalMeetingId = params.meetingID
+
+ // Do we have a password? If not, complain.
+ String modPW = params.password
+ if (StringUtils.isEmpty(modPW)) {
+ errors.missingParamError("password");
+ }
+
+ if (errors.hasErrors()) {
+ respondWithErrors(errors)
+ return
+ }
+
+ // Do we agree on the checksum? If not, complain.
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ errors.checksumError()
+ respondWithErrors(errors)
+ return
+ }
+
+ // Everything is good so far. Translate the external meeting id to an internal meeting id. If
+ // we can't find the meeting, complain.
+ String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(externalMeetingId);
+ log.info("Retrieving meeting ${internalMeetingId}")
+ Meeting meeting = meetingService.getMeeting(internalMeetingId);
+ if (meeting == null) {
+ // BEGIN - backward compatibility
+ invalid("notFound", "We could not find a meeting with that meeting ID - perhaps the meeting is not yet running?");
+ return;
+ // END - backward compatibility
+
+ errors.invalidMeetingIdError();
+ respondWithErrors(errors)
+ return;
+ }
+
+ if (meeting.getModeratorPassword().equals(modPW) == false) {
+ // BEGIN - backward compatibility
+ invalid("invalidPassword", "You must supply the moderator password for this call.");
+ return;
+ // END - backward compatibility
+
+ errors.invalidPasswordError();
+ respondWithErrors(errors)
+ return;
+ }
+
+ meetingService.endMeeting(meeting.getInternalId());
+
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode(RESP_CODE_SUCCESS)
+ messageKey("sentEndMeetingRequest")
+ message("A request to end the meeting was sent. Please wait a few seconds, and then use the getMeetingInfo or isMeetingRunning API calls to verify that it was ended.")
+ }
+ }
+ }
+ }
+ }
+
+ /*****************************************
+ * GETMEETINGINFO API
+ *****************************************/
+ def getMeetingInfo = {
+ String API_CALL = "getMeetingInfo"
+ log.debug CONTROLLER_NAME + "#${API_CALL}"
+
+ // BEGIN - backward compatibility
+ if (StringUtils.isEmpty(params.checksum)) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+
+ if (!StringUtils.isEmpty(params.meetingID)) {
+ params.meetingID = StringUtils.strip(params.meetingID);
+ if (StringUtils.isEmpty(params.meetingID)) {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+ } else {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+
+
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+ // END - backward compatibility
+
+ ApiErrors errors = new ApiErrors()
+
+ // Do we have a checksum? If none, complain.
+ if (StringUtils.isEmpty(params.checksum)) {
+ errors.missingParamError("checksum");
+ }
+
+ // Do we have a meeting id? If none, complain.
+ if (!StringUtils.isEmpty(params.meetingID)) {
+ params.meetingID = StringUtils.strip(params.meetingID);
+ if (StringUtils.isEmpty(params.meetingID)) {
+ errors.missingParamError("meetingID");
+ }
+ } else {
+ errors.missingParamError("meetingID");
+ }
+ String externalMeetingId = params.meetingID
+
+ if (errors.hasErrors()) {
+ respondWithErrors(errors)
+ return
+ }
+
+ // Do we agree on the checksum? If not, complain.
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ errors.checksumError()
+ respondWithErrors(errors)
+ return
+ }
+
+ // Everything is good so far. Translate the external meeting id to an internal meeting id. If
+ // we can't find the meeting, complain.
+ String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(externalMeetingId);
+ log.info("Retrieving meeting ${internalMeetingId}")
+ Meeting meeting = meetingService.getMeeting(internalMeetingId);
+ if (meeting == null) {
+ // BEGIN - backward compatibility
+ invalid("notFound", "We could not find a meeting with that meeting ID");
+ return;
+ // END - backward compatibility
+
+ errors.invalidMeetingIdError();
+ respondWithErrors(errors)
+ return;
+ }
+
+ respondWithConferenceDetails(meeting, null, null, null);
+ }
+
+ /************************************
+ * GETMEETINGS API
+ ************************************/
+ def getMeetingsHandler = {
+ String API_CALL = "getMeetings"
+ log.debug CONTROLLER_NAME + "#${API_CALL}"
+
+ // BEGIN - backward compatibility
+ if (StringUtils.isEmpty(params.checksum)) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+ // END - backward compatibility
+
+ ApiErrors errors = new ApiErrors()
+
+ // Do we have a checksum? If none, complain.
+ if (StringUtils.isEmpty(params.checksum)) {
+ errors.missingParamError("checksum");
+ }
+
+ if (errors.hasErrors()) {
+ respondWithErrors(errors)
+ return
+ }
+
+ // Do we agree on the checksum? If not, complain.
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ errors.checksumError()
+ respondWithErrors(errors)
+ return
+ }
+
+ Collection mtgs = meetingService.getMeetings();
+
+ if (mtgs == null || mtgs.isEmpty()) {
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode(RESP_CODE_SUCCESS)
+ meetings()
+ messageKey("noMeetings")
+ message("no meetings were found on this server")
+ }
+ }
+ }
+ }
+ } else {
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode(RESP_CODE_SUCCESS)
+ meetings {
+ for (m in mtgs) {
+ meeting {
+ meetingID() { mkp.yield(m.getExternalId()) }
+ isBreakout() { mkp.yield(m.isBreakout()) }
+ meetingName() { mkp.yield(m.getName()) }
+ createTime(m.getCreateTime())
+ createDate(formatPrettyDate(m.getCreateTime()))
+ voiceBridge() { mkp.yield(m.getTelVoice()) }
+ dialNumber() { mkp.yield(m.getDialNumber()) }
+ attendeePW() { mkp.yield(m.getViewerPassword()) }
+ moderatorPW() { mkp.yield(m.getModeratorPassword()) }
+ hasBeenForciblyEnded(m.isForciblyEnded() ? "true" : "false")
+ running(m.isRunning() ? "true" : "false")
+ participantCount(m.getNumUsers())
+ listenerCount(m.getNumListenOnly())
+ voiceParticipantCount(m.getNumVoiceJoined())
+ videoCount(m.getNumVideos())
+ duration(m.duration)
+ hasUserJoined(m.hasUserJoined())
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /************************************
+ * GETSESSIONS API
+ ************************************/
+ def getSessionsHandler = {
+ String API_CALL = "getSessions"
+ log.debug CONTROLLER_NAME + "#${API_CALL}"
+
+ // BEGIN - backward compatibility
+ if (StringUtils.isEmpty(params.checksum)) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+ // END - backward compatibility
+
+ ApiErrors errors = new ApiErrors()
+
+ // Do we have a checksum? If none, complain.
+ if (StringUtils.isEmpty(params.checksum)) {
+ errors.missingParamError("checksum");
+ }
+
+ if (errors.hasErrors()) {
+ respondWithErrors(errors)
+ return
+ }
+
+ // Do we agree on the checksum? If not, complain.
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ errors.checksumError()
+ respondWithErrors(errors)
+ return
+ }
+
+ Collection sssns = meetingService.getSessions();
+
+ if (sssns == null || sssns.isEmpty()) {
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode(RESP_CODE_SUCCESS)
+ sessions()
+ messageKey("noSessions")
+ message("no sessions were found on this server")
+ }
+ }
+ }
+ }
+ } else {
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode(RESP_CODE_SUCCESS)
+ sessions {
+ for (m in sssns) {
+ meeting {
+ meetingID() { mkp.yield(m.meetingID) }
+ meetingName() { mkp.yield(m.conferencename) }
+ userName() { mkp.yield(m.fullname) }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+
+ def getDefaultConfigXML = {
+
+ String API_CALL = "getDefaultConfigXML"
+ ApiErrors errors = new ApiErrors();
+
+ if (StringUtils.isEmpty(params.checksum)) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+
+ // Do we agree on the checksum? If not, complain.
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ errors.checksumError()
+ respondWithErrors(errors)
+ return
+ }
+
+ String defConfigXML = paramsProcessorUtil.getDefaultConfigXML();
+
+ response.addHeader("Cache-Control", "no-cache")
+ render text: defConfigXML, contentType: 'text/xml'
+
+ }
+
+ private Map getParameters(ServletRequest request) {
+ // Copy the parameters into our own Map as we can't pass the paramMap
+ // from the request as it's an unmodifiable map.
+ Map reqParams = new HashMap();
+ Map unModReqParams = request.getParameterMap();
+
+ SortedSet keys = new TreeSet(unModReqParams.keySet());
+
+ for (String key : keys) {
+ reqParams.put(key, unModReqParams.get(key));
+ }
+
+ return reqParams;
+ }
+
+ /***********************************************
+ * POLL API
+ ***********************************************/
+ def setPollXML = {
+ String API_CALL = "setPollXML"
+ log.debug CONTROLLER_NAME + "#${API_CALL}"
+
+ if (StringUtils.isEmpty(params.checksum)) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+
+ if (StringUtils.isEmpty(params.pollXML)) {
+ invalid("configXMLError", "You did not pass a poll XML")
+ return
+ }
+
+ if (!StringUtils.isEmpty(params.meetingID)) {
+ params.meetingID = StringUtils.strip(params.meetingID);
+ if (StringUtils.isEmpty(params.meetingID)) {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+ } else {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+
+ // Translate the external meeting id into an internal meeting id.
+ String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(params.meetingID);
+ Meeting meeting = meetingService.getMeeting(internalMeetingId);
+ if (meeting == null) {
+ // BEGIN - backward compatibility
+ invalid("invalidMeetingIdentifier", "The meeting ID that you supplied did not match any existing meetings");
+ return;
+ // END - backward compatibility
+
+ errors.invalidMeetingIdError();
+ respondWithErrors(errors)
+ return;
+ }
+
+ Map reqParams = getParameters(request)
+
+ String pollXML = params.pollXML
+
+ String decodedPollXML;
+
+ try {
+ decodedPollXML = URLDecoder.decode(pollXML, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ log.error("Couldn't decode poll XML.");
+ invalid("pollXMLError", "Cannot decode poll XML")
+ return;
+ }
+
+ if (!paramsProcessorUtil.isPostChecksumSame(API_CALL, reqParams)) {
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode("FAILED")
+ messageKey("pollXMLChecksumError")
+ message("pollXMLChecksumError: request did not pass the checksum security check.")
+ }
+ }
+ }
+ }
+ } else {
+
+ def pollxml = new XmlSlurper().parseText(decodedPollXML);
+
+ pollxml.children().each { poll ->
+ String title = poll.title.text();
+ String question = poll.question.text();
+ String questionType = poll.questionType.text();
+
+ ArrayList answers = new ArrayList();
+ poll.answers.children().each { answer ->
+ answers.add(answer.text());
+ }
+
+ //send poll to BigBlueButton Apps
+ meetingService.createdPolls(meeting.getInternalId(), title, question, questionType, answers);
+ }
+
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() { returncode("SUCCESS") }
+ }
+ }
+ }
+ }
+ }
+
+ /***********************************************
+ * CONFIG API
+ ***********************************************/
+ def setConfigXML = {
+ String API_CALL = "setConfigXML"
+ log.debug CONTROLLER_NAME + "#${API_CALL}"
+
+ if (StringUtils.isEmpty(params.checksum)) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+
+ if (StringUtils.isEmpty(params.configXML)) {
+ invalid("configXMLError", "You did not pass a config XML")
+ return
+ }
+
+ if (!StringUtils.isEmpty(params.meetingID)) {
+ params.meetingID = StringUtils.strip(params.meetingID);
+ if (StringUtils.isEmpty(params.meetingID)) {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+ } else {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+
+ // Translate the external meeting id into an internal meeting id.
+ String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(params.meetingID);
+ Meeting meeting = meetingService.getMeeting(internalMeetingId);
+ if (meeting == null) {
+ // BEGIN - backward compatibility
+ invalid("invalidMeetingIdentifier", "The meeting ID that you supplied did not match any existing meetings");
+ return;
+ // END - backward compatibility
+
+ errors.invalidMeetingIdError();
+ respondWithErrors(errors)
+ return;
+ }
+
+ Map reqParams = getParameters(request)
+
+ String configXML = params.configXML
+
+ String decodedConfigXML;
+
+ try {
+ decodedConfigXML = URLDecoder.decode(configXML, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ log.error("Couldn't decode config XML.");
+ invalid("configXMLError", "Cannot decode config XML")
+ return;
+ }
+
+ if (!paramsProcessorUtil.isPostChecksumSame(API_CALL, reqParams)) {
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode("FAILED")
+ messageKey("configXMLChecksumError")
+ message("configXMLChecksumError: request did not pass the checksum security check.")
+ }
+ }
+ }
+ }
+ } else {
+ boolean defaultConfig = false;
+
+ if (!StringUtils.isEmpty(params.defaultConfig)) {
+ try {
+ defaultConfig = Boolean.parseBoolean(params.defaultConfig);
+ } catch (Exception e) {
+ defaultConfig = false;
+ }
+ }
+
+
+ String token = meeting.storeConfig(defaultConfig, decodedConfigXML);
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode("SUCCESS")
+ configToken(token)
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /***********************************************
+ * CALLBACK API
+ ***********************************************/
+ def subscribeEvent = {
+ String API_CALL = "subscribeEvent"
+ log.debug CONTROLLER_NAME + "#${API_CALL}"
+
+ if (StringUtils.isEmpty(params.checksum)) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+
+ if (StringUtils.isEmpty(params.callbackURL)) {
+ invalid("missingParamCallbackURL", "You must specify a callbackURL for subscribing");
+ return
+ }
+
+ if (!StringUtils.isEmpty(params.meetingID)) {
+ params.meetingID = StringUtils.strip(params.meetingID);
+ if (StringUtils.isEmpty(params.meetingID)) {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+ } else {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+
+ String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(params.meetingID);
+ Meeting meeting = meetingService.getMeeting(internalMeetingId);
+ if (meeting == null) {
+ // BEGIN - backward compatibility
+ invalid("invalidMeetingIdentifier", "The meeting ID that you supplied did not match any existing meetings");
+ return;
+ // END - backward compatibility
+
+ errors.invalidMeetingIdError();
+ respondWithErrors(errors)
+ return;
+ }
+
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode("FAILED")
+ messageKey("subscribeEventChecksumError")
+ message("subscribeEventChecksumError: request did not pass the checksum security check.")
+ }
+ }
+ }
+ }
+ } else {
+ String sid = meetingService.addSubscription(meeting.getInternalId(), meeting.getExternalId(), params.callbackURL);
+
+ if (sid.isEmpty()) {
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode("FAILED")
+ messageKey("subscribeEventError")
+ message("subscribeEventError: An error happen while storing your subscription. Check the logs.")
+ }
+ }
+ }
+ }
+
+ } else {
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode("SUCCESS")
+ subscriptionID(sid)
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ def unsubscribeEvent = {
+ String API_CALL = "unsubscribeEvent"
+ log.debug CONTROLLER_NAME + "#${API_CALL}"
+
+ if (StringUtils.isEmpty(params.checksum)) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+
+ if (StringUtils.isEmpty(params.subscriptionID)) {
+ invalid("missingParamSubscriptionID", "You must pass a subscriptionID for unsubscribing")
+ return
+ }
+
+ if (!StringUtils.isEmpty(params.meetingID)) {
+ params.meetingID = StringUtils.strip(params.meetingID);
+ if (StringUtils.isEmpty(params.meetingID)) {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+ } else {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+
+ String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(params.meetingID);
+ Meeting meeting = meetingService.getMeeting(internalMeetingId);
+ if (meeting == null) {
+ // BEGIN - backward compatibility
+ invalid("invalidMeetingIdentifier", "The meeting ID that you supplied did not match any existing meetings");
+ return;
+ // END - backward compatibility
+
+ errors.invalidMeetingIdError();
+ respondWithErrors(errors)
+ return;
+ }
+
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode("FAILED")
+ messageKey("unsubscribeEventChecksumError")
+ message("unsubscribeEventChecksumError: request did not pass the checksum security check.")
+ }
+ }
+ }
+ }
+ } else {
+ boolean status = meetingService.removeSubscription(meeting.getInternalId(), params.subscriptionID);
+
+ if (!status) {
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode("FAILED")
+ messageKey("unsubscribeEventError")
+ message("unsubscribeEventError: An error happen while unsubscribing. Check the logs.")
+ }
+ }
+ }
+ }
+
+ } else {
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode("SUCCESS")
+ unsubscribed(status)
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ def listSubscriptions = {
+ String API_CALL = "listSubscriptions"
+ log.debug CONTROLLER_NAME + "#${API_CALL}"
+
+ if (StringUtils.isEmpty(params.checksum)) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+
+ if (!StringUtils.isEmpty(params.meetingID)) {
+ params.meetingID = StringUtils.strip(params.meetingID);
+ if (StringUtils.isEmpty(params.meetingID)) {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+ } else {
+ invalid("missingParamMeetingID", "You must specify a meeting ID for the meeting.");
+ return
+ }
+
+ String internalMeetingId = paramsProcessorUtil.convertToInternalMeetingId(params.meetingID);
+ Meeting meeting = meetingService.getMeeting(internalMeetingId);
+ if (meeting == null) {
+ // BEGIN - backward compatibility
+ invalid("invalidMeetingIdentifier", "The meeting ID that you supplied did not match any existing meetings");
+ return;
+ // END - backward compatibility
+
+ errors.invalidMeetingIdError();
+ respondWithErrors(errors)
+ return;
+ }
+
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode("FAILED")
+ messageKey("listSubscriptionsChecksumError")
+ message("listSubscriptionsChecksumError: request did not pass the checksum security check.")
+ }
+ }
+ }
+ }
+ } else {
+ List> list = meetingService.listSubscriptions(meeting.getInternalId());
+
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode("SUCCESS")
+ subscriptions() {
+ list.each { item ->
+ subscription() {
+ subscriptionID() { mkp.yield(item.get("subscriptionID")) }
+ event() { mkp.yield(item.get("event")) }
+ callbackURL() { mkp.yield(item.get("callbackURL")) }
+ active() { mkp.yield(item.get("active")) }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ }
+ }
+
+ /***********************************************
+ * CONFIG API
+ ***********************************************/
+ def configXML = {
+
+ String logoutUrl = paramsProcessorUtil.getDefaultLogoutUrl()
+ boolean reject = false
+ String sessionToken = null
+ UserSession us = null
+
+ if (StringUtils.isEmpty(params.sessionToken)) {
+ println("No session for user in conference.")
+ reject = true
+ } else {
+ sessionToken = StringUtils.strip(params.sessionToken)
+ println("SessionToken = " + sessionToken)
+ if (!session[sessionToken]) {
+ reject = true
+ } else {
+ us = meetingService.getUserSession(sessionToken);
+ if (us == null) reject = true
+ }
+ }
+
+ if (reject) {
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode("FAILED")
+ message("Could not find conference.")
+ logoutURL() { mkp.yield(logoutUrl) }
+ }
+ }
+ }
+ }
+ } else {
+ response.addHeader("Cache-Control", "no-cache")
+ render text: us.configXML, contentType: 'text/xml'
+ }
+ }
+
+ /***********************************************
+ * ENTER API
+ ***********************************************/
+ def enter = {
+ boolean reject = false;
+
+ if (StringUtils.isEmpty(params.sessionToken)) {
+ println("SessionToken is missing.")
+ }
+
+ String sessionToken = StringUtils.strip(params.sessionToken)
+
+ UserSession us = null;
+ Meeting meeting = null;
+
+ if (!session[sessionToken]) {
+ log.info("No session found for token [" + sessionToken + "].")
+ reject = true;
+ } else {
+ if (meetingService.getUserSession(sessionToken) == null) {
+ log.info("Cannot get user session for token [" + sessionToken + "].")
+ reject = true;
+ } else {
+ us = meetingService.getUserSession(sessionToken);
+ meeting = meetingService.getMeeting(us.meetingID);
+ if (meeting == null || meeting.isForciblyEnded()) {
+ log.info("Cannot get meeting for token [" + sessionToken + "].")
+ reject = true
+ }
+ }
+ }
+
+ if (reject) {
+ log.info("No session for user in conference.")
+
+ // Determine the logout url so we can send the user there.
+ String logoutUrl = paramsProcessorUtil.getDefaultLogoutUrl()
+
+ if (us != null) {
+ logoutUrl = us.logoutUrl
+ }
+
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ json {
+ render(contentType: "application/json") {
+ response = {
+ returncode = "FAILED"
+ message = "Could not find conference."
+ logoutURL = logoutUrl
+ }
+ }
+ }
+ }
+ } else {
+
+ Map userCustomData = paramsProcessorUtil.getUserCustomData(params);
+
+ // Generate a new userId for this user. This prevents old connections from
+ // removing the user when the user reconnects after being disconnected. (ralam jan 22, 2015)
+ // We use underscore (_) to associate userid with the user. We are also able to track
+ // how many times a user reconnects or refresh the browser.
+ String newInternalUserID = us.internalUserId + "_" + us.incrementConnectionNum()
+
+ log.info("Found conference for " + us.fullname)
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ json {
+ render(contentType: "application/json") {
+ response = {
+ returncode = "SUCCESS"
+ fullname = us.fullname
+ confname = us.conferencename
+ meetingID = us.meetingID
+ externMeetingID = us.externMeetingID
+ externUserID = us.externUserID
+ internalUserID = newInternalUserID
+ authToken = us.authToken
+ role = us.role
+ conference = us.conference
+ room = us.room
+ voicebridge = us.voicebridge
+ dialnumber = meeting.getDialNumber()
+ webvoiceconf = us.webvoiceconf
+ mode = us.mode
+ record = us.record
+ isBreakout = meeting.isBreakout()
+ allowStartStopRecording = meeting.getAllowStartStopRecording()
+ welcome = us.welcome
+ if (!StringUtils.isEmpty(meeting.moderatorOnlyMessage))
+ modOnlyMessage = meeting.moderatorOnlyMessage
+ logoutUrl = us.logoutUrl
+ defaultLayout = us.defaultLayout
+ avatarURL = us.avatarURL
+ customdata = array {
+ userCustomData.each { k, v ->
+ // Somehow we need to prepend something (custdata) for the JSON to work
+ custdata "$k": v
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /***********************************************
+ * STUN/TURN API
+ ***********************************************/
+ def stuns = {
+ boolean reject = false;
+
+ UserSession us = null;
+ Meeting meeting = null;
+ String sessionToken = null
+
+ if (!StringUtils.isEmpty(params.sessionToken)) {
+ sessionToken = StringUtils.strip(params.sessionToken)
+ println("Session token = [" + sessionToken + "]")
+ }
+
+ if (!session[sessionToken]) {
+ reject = true;
+ } else {
+ if (meetingService.getUserSession(session[sessionToken]) == null)
+ reject = true;
+ else {
+ us = meetingService.getUserSession(session[sessionToken]);
+ meeting = meetingService.getMeeting(us.meetingID);
+ if (meeting == null || meeting.isForciblyEnded()) {
+ reject = true
+ }
+ }
+ }
+
+ if (reject) {
+ log.info("No session for user in conference.")
+
+ String logoutUrl = paramsProcessorUtil.getDefaultLogoutUrl()
+
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ json {
+ render(contentType: "application/json") {
+ response = {
+ returncode = "FAILED"
+ message = "Could not find conference."
+ logoutURL = logoutUrl
+ }
+ }
+ }
+ }
+ } else {
+ Set stuns = stunTurnService.getStunServers()
+ Set turns = stunTurnService.getStunAndTurnServersFor(us.internalUserId)
+
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ json {
+ render(contentType: "application/json") {
+ stunServers = array {
+ stuns.each { stun ->
+ stunData = { url = stun.url }
+ }
+ }
+ turnServers = array {
+ turns.each { turn ->
+ turnData = {
+ username = turn.username
+ password = turn.password
+ url = turn.url
+ ttl = turn.ttl
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /*************************************************
+ * SIGNOUT API
+ *************************************************/
+ def signOut = {
+
+ String sessionToken = null
+
+ if (!StringUtils.isEmpty(params.sessionToken)) {
+ sessionToken = StringUtils.strip(params.sessionToken)
+ println("SessionToken = " + sessionToken)
+ }
+
+ Meeting meeting = null;
+
+ if (sessionToken != null) {
+ log.info("Found session for user in conference.")
+ UserSession us = meetingService.removeUserSession(sessionToken);
+ session.removeAttribute(sessionToken)
+ }
+
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() { returncode(RESP_CODE_SUCCESS) }
+ }
+ }
+ }
+ }
+
+ /******************************************************
+ * GET_RECORDINGS API
+ ******************************************************/
+ def getRecordingsHandler = {
+ String API_CALL = "getRecordings"
+ log.debug CONTROLLER_NAME + "#${API_CALL}"
+
+ // BEGIN - backward compatibility
+ if (StringUtils.isEmpty(params.checksum)) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+ // END - backward compatibility
+
+ ApiErrors errors = new ApiErrors()
+
+ // Do we have a checksum? If none, complain.
+ if (StringUtils.isEmpty(params.checksum)) {
+ errors.missingParamError("checksum");
+ respondWithErrors(errors)
+ return
+ }
+
+ // Do we agree on the checksum? If not, complain.
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ errors.checksumError()
+ respondWithErrors(errors)
+ return
+ }
+
+ List externalMeetingIds = new ArrayList();
+ if (!StringUtils.isEmpty(params.meetingID)) {
+ externalMeetingIds = paramsProcessorUtil.decodeIds(params.meetingID);
+ }
+
+ List internalRecordIds = new ArrayList()
+ if (!StringUtils.isEmpty(params.recordID)) {
+ internalRecordIds = paramsProcessorUtil.decodeIds(params.recordID)
+ }
+
+ List states = new ArrayList()
+ if (!StringUtils.isEmpty(params.state)) {
+ states = paramsProcessorUtil.decodeIds(params.state)
+ }
+
+ // Everything is good so far.
+ if (internalRecordIds.size() == 0 && externalMeetingIds.size() > 0) {
+ // No recordIDs, process the request based on meetingID(s)
+ // Translate the external meeting ids to internal meeting ids (which is the seed for the recordIDs).
+ internalRecordIds = paramsProcessorUtil.convertToInternalMeetingId(externalMeetingIds);
+ }
+
+
+ Map recs = meetingService.getRecordings(internalRecordIds, states);
+ recs = meetingService.filterRecordingsByMetadata(recs, ParamsProcessorUtil.processMetaParam(params));
+
+ if (recs.isEmpty()) {
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode(RESP_CODE_SUCCESS)
+ recordings(null)
+ messageKey("noRecordings")
+ message("There are not recordings for the meetings")
+ }
+ }
+ }
+ }
+ return;
+ }
+ def cfg = new Configuration()
+
+ // Load the XML template
+ // TODO: Maybe there is a better way to define the templates path
+ def wtl = new WebappTemplateLoader(getServletContext(), "/WEB-INF/freemarker")
+ cfg.setTemplateLoader(wtl)
+ def ftl = cfg.getTemplate("get-recordings.ftl")
+ def xmlText = new StringWriter()
+ ftl.process([code: RESP_CODE_SUCCESS, recs: recs.values()], xmlText)
+ withFormat {
+ xml {
+ render(text: xmlText.toString(), contentType: "text/xml")
+ }
+ }
+ }
+
+ /******************************************************
+ * PUBLISH_RECORDINGS API
+ ******************************************************/
+
+ def publishRecordings = {
+ String API_CALL = "publishRecordings"
+ log.debug CONTROLLER_NAME + "#${API_CALL}"
+
+ // BEGIN - backward compatibility
+ if (StringUtils.isEmpty(params.checksum)) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+
+ if (StringUtils.isEmpty(params.recordID)) {
+ invalid("missingParamRecordID", "You must specify a recordID.");
+ return
+ }
+
+ if (StringUtils.isEmpty(params.publish)) {
+ invalid("missingParamPublish", "You must specify a publish value true or false.");
+ return
+ }
+
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+ // END - backward compatibility
+
+ ApiErrors errors = new ApiErrors()
+
+ // Do we have a checksum? If none, complain.
+ if (StringUtils.isEmpty(params.checksum)) {
+ errors.missingParamError("checksum");
+ }
+
+ // Do we have a recording id? If none, complain.
+ String recordId = params.recordID
+ if (StringUtils.isEmpty(recordId)) {
+ errors.missingParamError("recordID");
+ }
+ // Do we have a publish status? If none, complain.
+ String publish = params.publish
+ if (StringUtils.isEmpty(publish)) {
+ errors.missingParamError("publish");
+ }
+
+ if (errors.hasErrors()) {
+ respondWithErrors(errors)
+ return
+ }
+
+ // Do we agree on the checksum? If not, complain.
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ errors.checksumError()
+ respondWithErrors(errors)
+ return
+ }
+
+ List recordIdList = new ArrayList();
+ if (!StringUtils.isEmpty(recordId)) {
+ recordIdList = paramsProcessorUtil.decodeIds(recordId);
+ }
+
+ if (!meetingService.existsAnyRecording(recordIdList)) {
+ // BEGIN - backward compatibility
+ invalid("notFound", "We could not find recordings");
+ return;
+ // END - backward compatibility
+
+ errors.recordingNotFound();
+ respondWithErrors(errors);
+ return;
+ }
+
+ meetingService.setPublishRecording(recordIdList, publish.toBoolean());
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode(RESP_CODE_SUCCESS)
+ published(publish)
+ }
+ }
+ }
+ }
+ }
+
+ /******************************************************
+ * DELETE_RECORDINGS API
+ ******************************************************/
+ def deleteRecordings = {
+ String API_CALL = "deleteRecordings"
+ log.debug CONTROLLER_NAME + "#${API_CALL}"
+
+ // BEGIN - backward compatibility
+ if (StringUtils.isEmpty(params.checksum)) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+
+ if (StringUtils.isEmpty(params.recordID)) {
+ invalid("missingParamRecordID", "You must specify a recordID.");
+ return
+ }
+
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ invalid("checksumError", "You did not pass the checksum security check")
+ return
+ }
+ // END - backward compatibility
+
+ ApiErrors errors = new ApiErrors()
+
+ // Do we have a checksum? If none, complain.
+ if (StringUtils.isEmpty(params.checksum)) {
+ errors.missingParamError("checksum");
+ }
+
+ List recordIdList = new ArrayList();
+ if (!StringUtils.isEmpty(recordId)) {
+ recordIdList = paramsProcessorUtil.decodeIds(recordId);
+ }
+
+ if (!meetingService.existsAnyRecording(recordIdList)) {
+ // BEGIN - backward compatibility
+ invalid("notFound", "We could not find recordings");
+ return;
+ // END - backward compatibility
+ }
+
+ // Do we have a recording id? If none, complain.
+ String recordId = params.recordID
+ if (StringUtils.isEmpty(recordId)) {
+ errors.missingParamError("recordID");
+ }
+
+ if (errors.hasErrors()) {
+ respondWithErrors(errors)
+ return
+ }
+
+ // Do we agree on the checksum? If not, complain.
+ if (!paramsProcessorUtil.isChecksumSame(API_CALL, params.checksum, request.getQueryString())) {
+ errors.checksumError()
+ respondWithErrors(errors)
+ return
+ }
+
+ if (recordIdList.isEmpty()) {
+ // BEGIN - backward compatibility
+ invalid("notFound", "We could not find recordings");
+ return;
+ // END - backward compatibility
+
+ errors.recordingNotFound();
+ respondWithErrors(errors);
+ return;
+ }
+
+ meetingService.deleteRecordings(recordIdList);
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode(RESP_CODE_SUCCESS)
+ deleted(true)
+ }
+ }
+ }
+ }
+ }
+
+ def uploadDocuments(conf) {
+ log.debug("ApiController#uploadDocuments(${conf.getInternalId()})");
+
+ String requestBody = request.inputStream == null ? null : request.inputStream.text;
+ requestBody = StringUtils.isEmpty(requestBody) ? null : requestBody;
+
+ if (requestBody == null) {
+ downloadAndProcessDocument(presentationService.defaultUploadedPresentation, conf.getInternalId());
+ } else {
+ log.debug "Request body: \n" + requestBody;
+ def xml = new XmlSlurper().parseText(requestBody);
+ xml.children().each { module ->
+ log.debug("module config found: [${module.@name}]");
+
+ if ("presentation".equals(module.@name.toString())) {
+ // need to iterate over presentation files and process them
+ module.children().each { document ->
+ if (!StringUtils.isEmpty(document.@url.toString())) {
+ downloadAndProcessDocument(document.@url.toString(), conf.getInternalId());
+ } else if (!StringUtils.isEmpty(document.@name.toString())) {
+ def b64 = new Base64()
+ def decodedBytes = b64.decode(document.text().getBytes())
+ processDocumentFromRawBytes(decodedBytes, document.@name.toString(), conf.getInternalId());
+ } else {
+ log.debug("presentation module config found, but it did not contain url or name attributes");
+ }
+ }
+ }
+ }
+ }
+ }
+
+
+ def processDocumentFromRawBytes(bytes, presFilename, meetingId) {
+ def filenameExt = Util.getFilenameExt(presFilename);
+ String presentationDir = presentationService.getPresentationDir()
+ def presId = Util.generatePresentationId(presFilename)
+ File uploadDir = Util.createPresentationDirectory(meetingId, presentationDir, presId)
+ if (uploadDir != null) {
+ def newFilename = Util.createNewFilename(presId, filenameExt)
+ def pres = new File(uploadDir.absolutePath + File.separatorChar + newFilename);
+
+ FileOutputStream fos = new java.io.FileOutputStream(pres)
+ fos.write(bytes)
+ fos.flush()
+ fos.close()
+
+ processUploadedFile(meetingId, presId, presFilename, pres);
+ }
+
+ }
+
+ def downloadAndProcessDocument(address, meetingId) {
+ log.debug("ApiController#downloadAndProcessDocument(${address}, ${meetingId})");
+ String presFilename = address.tokenize("/")[-1];
+ def filenameExt = presDownloadService.getFilenameExt(presFilename);
+ String presentationDir = presentationService.getPresentationDir()
+
+ def presId = presDownloadService.generatePresentationId(presFilename)
+ File uploadDir = presDownloadService.createPresentationDirectory(meetingId, presentationDir, presId)
+ if (uploadDir != null) {
+ def newFilename = presDownloadService.createNewFilename(presId, filenameExt)
+ def newFilePath = uploadDir.absolutePath + File.separatorChar + newFilename
+
+ if (presDownloadService.savePresentation(meetingId, newFilePath, address)) {
+ def pres = new File(newFilePath)
+ processUploadedFile(meetingId, presId, presFilename, pres);
+ } else {
+ log.error("Failed to download presentation=[${address}], meeting=[${meetingId}]")
+ }
+ }
+ }
+
+
+ def processUploadedFile(meetingId, presId, filename, presFile) {
+ def presentationBaseUrl = presentationService.presentationBaseUrl
+ UploadedPresentation uploadedPres = new UploadedPresentation(meetingId, presId, filename, presentationBaseUrl);
+ uploadedPres.setUploadedFile(presFile);
+ presentationService.processUploadedPresentation(uploadedPres);
+ }
+
+ def beforeInterceptor = {
+ if (paramsProcessorUtil.isServiceEnabled() == false) {
+ log.info("apiNotEnabled: The API service and/or controller is not enabled on this server. To use it, you must first enable it.")
+ // TODO: this doesn't stop the request - so it generates invalid XML
+ // since the request continues and renders a second response
+ invalid("apiNotEnabled", "The API service and/or controller is not enabled on this server. To use it, you must first enable it.")
+ }
+ }
+
+ def formatPrettyDate(timestamp) {
+ // SimpleDateFormat ft = new SimpleDateFormat ("E yyyy.MM.dd 'at' hh:mm:ss a zzz");
+ // return ft.format(new Date(timestamp))
+
+ return new Date(timestamp).toString()
+ }
+
+ def respondWithConferenceDetails(meeting, room, msgKey, msg) {
+ response.addHeader("Cache-Control", "no-cache")
+ withFormat {
+ xml {
+ render(contentType: "text/xml") {
+ response() {
+ returncode(RESP_CODE_SUCCESS)
+ meetingName() { mkp.yield(meeting.getName()) }
+ isBreakout() { mkp.yield(meeting.isBreakout()) }
+ meetingID() { mkp.yield(meeting.getExternalId()) }
+ internalMeetingID(meeting.getInternalId())
+ createTime(meeting.getCreateTime())
+ createDate(formatPrettyDate(meeting.getCreateTime()))
+ voiceBridge() { mkp.yield(meeting.getTelVoice()) }
+ dialNumber() { mkp.yield(meeting.getDialNumber()) }
+ attendeePW() { mkp.yield(meeting.getViewerPassword()) }
+ moderatorPW() { mkp.yield(meeting.getModeratorPassword()) }
+ running(meeting.isRunning() ? "true" : "false")
+ duration(meeting.duration)
+ hasUserJoined(meeting.hasUserJoined())
+ recording(meeting.isRecord() ? "true" : "false")
+ hasBeenForciblyEnded(meeting.isForciblyEnded() ? "true" : "false")
+ startTime(meeting.getStartTime())
+ endTime(meeting.getEndTime())
+ participantCount(meeting.getNumUsers())
+ listenerCount(meeting.getNumListenOnly())
+ voiceParticipantCount(meeting.getNumVoiceJoined())
+ videoCount(meeting.getNumVideos())
+ maxUsers(meeting.getMaxUsers())
+ moderatorCount(meeting.getNumModerators())
+ attendees() {
+ meeting.getUsers().each { att ->
+ attendee() {
+ userID() { mkp.yield("${att.externalUserId}") }
+ fullName() { mkp.yield("${att.fullname}") }
+ role("${att.role}")
+ isPresenter("${att.isPresenter()}")
+ isListeningOnly("${att.isListeningOnly()}")
+ hasJoinedVoice("${att.isVoiceJoined()}")
+ hasVideo("${att.hasVideo()}")
+ customdata() {
+ meeting.getUserCustomData(att.externalUserId).each { k, v ->
+ "$k"("$v")
+ }
+ }
+ }
+ }
+ }
+ metadata() {
+ meeting.getMetadata().each { k, v ->
+ "$k"("$v")
+ }
+ json {
+ log.debug "Rendering as json"
+ render(contentType: "text/json") {
+ returncode(RESP_CODE_FAILED)
+ messageKey(key)
+ message(msg)
+ }
+ }
+ }
+ messageKey(msgKey == null ? "" : msgKey)
+ message(msg == null ? "" : msg)
+ }
+ }
+ }
+ }
+ }
+
+ private void respondWithErrors(errorList, htmlResponse = false) {
+ log.debug CONTROLLER_NAME + "#invalid"
+
+ //check if exists the param redirect
+ boolean redirectClient = true;
+ String clientURL = paramsProcessorUtil.getDefaultClientUrl();
+
+ if (!StringUtils.isEmpty(params.redirect)) {
+ try {
+ redirectClient = Boolean.parseBoolean(params.redirect);
+ } catch (Exception e) {
+ redirectClient = true;
+ }
+ }
+
+ if (htmlResponse && redirectClient) {
+ String logoutUrl = paramsProcessorUtil.getDefaultLogoutUrl()
+ URI oldUri = URI.create(logoutUrl)
+
+ if (!StringUtils.isEmpty(params.logoutURL)) {
+ try {
+ oldUri = URI.create(params.logoutURL)
+ } catch (Exception e) {
+ // Do nothing, the variable oldUri was already initialized
+ }
+ }
+
+ String newQuery = oldUri.getQuery();
+
+ ArrayList
- {{#if isDisconnected}}
- {{>status}}
- {{else}}
-
-
-
-
-
-
-
-
- - Demo Meeting -
-
-
-
- {{> menu id="menu"}}
-
-
-
- {{/if}}
-
- {{> makeButton btn_class="slideButton toggleChatButton" i_class="ion-chatbubble" label="Chat"}}
- {{> makeButton btn_class="slideButton settingsIcon" i_class="ion-gear-b" label="Settings"}}
- {{> makeButton btn_class="slideButton signOutIcon" i_class="ion-log-out" label="Log out"}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ ' breakline character for Flash -this.translateHTML5ToFlash = function (message) { - let result; - result = message; - result = result.replace(new RegExp(CARRIAGE_RETURN, 'g'), BREAK_LINE); - result = result.replace(new RegExp(NEW_LINE, 'g'), BREAK_LINE); - return result; -}; - // translate '
' breakline character to '\r' carriage return character for HTML5 -this.translateFlashToHTML5 = function (message) { +const translateFlashToHTML5 = function (message) { let result; result = message; result = result.replace(new RegExp(BREAK_LINE, 'g'), CARRIAGE_RETURN); diff --git a/bigbluebutton-html5/imports/api/chat/server/modifiers/clearChatCollection.js b/bigbluebutton-html5/imports/api/chat/server/modifiers/clearChatCollection.js new file mode 100755 index 0000000000..7aa05e2dbc --- /dev/null +++ b/bigbluebutton-html5/imports/api/chat/server/modifiers/clearChatCollection.js @@ -0,0 +1,14 @@ +import Chat from '/imports/api/chat'; +import { logger } from '/imports/startup/server/logger'; + +// called on server start and meeting end +export function clearChatCollection() { + const meetingId = arguments[0]; + if (meetingId != null) { + return Chat.remove({ + meetingId: meetingId, + }, logger.info(`cleared Chat Collection (meetingId: ${meetingId}!`)); + } else { + return Chat.remove({}, logger.info('cleared Chat Collection (all meetings)!')); + } +}; diff --git a/bigbluebutton-html5/imports/api/chat/server/modifiers/eventHandlers.js b/bigbluebutton-html5/imports/api/chat/server/modifiers/eventHandlers.js new file mode 100644 index 0000000000..71e33f4d1f --- /dev/null +++ b/bigbluebutton-html5/imports/api/chat/server/modifiers/eventHandlers.js @@ -0,0 +1,39 @@ +import { eventEmitter } from '/imports/startup/server'; +import { addChatToCollection } from '/imports/api/chat/server/modifiers/addChatToCollection'; +import Meetings from '/imports/api/meetings'; + +eventEmitter.on('get_chat_history_reply', function (arg) { + if (arg.payload.requester_id === 'nodeJSapp') { //TODO extract this check + const meetingId = arg.payload.meeting_id; + if (Meetings.findOne({ + meetingId: meetingId, + }) == null) { + const chatHistory = arg.payload.chat_history; + const chatHistoryLength = chatHistory.length; + for (i = 0; i < chatHistoryLength; i++) { + const chatMessage = chatHistory[i]; + addChatToCollection(meetingId, chatMessage); + } + } + } + + return arg.callback(); +}); + +eventEmitter.on('send_public_chat_message', function (arg) { + handleChatEvent(arg); +}); + +eventEmitter.on('send_private_chat_message', function (arg) { + handleChatEvent(arg); +}); + +const handleChatEvent = function (arg) { + const messageObject = arg.payload.message; + const meetingId = arg.payload.meeting_id; + + // use current_time instead of message.from_time so that the chats from Flash and HTML5 have uniform times + messageObject.from_time = arg.header.current_time; + addChatToCollection(meetingId, messageObject); + return arg.callback(); +}; diff --git a/bigbluebutton-html5/imports/api/chat/server/publications.js b/bigbluebutton-html5/imports/api/chat/server/publications.js new file mode 100755 index 0000000000..e139921f50 --- /dev/null +++ b/bigbluebutton-html5/imports/api/chat/server/publications.js @@ -0,0 +1,26 @@ +import Chat from '/imports/api/chat'; +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { logger } from '/imports/startup/server/logger'; + +Meteor.publish('chat', function (credentials) { + if (isAllowedTo('subscribeChat', credentials)) { + const { meetingId, requesterUserId, requesterToken } = credentials; + logger.info(`publishing chat for ${meetingId} ${requesterUserId} ${requesterToken}`); + return Chat.find({ + $or: [ + { + 'message.chat_type': 'PUBLIC_CHAT', + meetingId: meetingId, + }, { + 'message.from_userid': requesterUserId, + meetingId: meetingId, + }, { + 'message.to_userid': requesterUserId, + meetingId: meetingId, + }, + ], + }); + } else { + this.error(new Meteor.Error(402, "The user was not authorized to subscribe for 'chats'")); + } +}); diff --git a/bigbluebutton-html5/imports/api/cursor/index.js b/bigbluebutton-html5/imports/api/cursor/index.js new file mode 100755 index 0000000000..34b927ff2c --- /dev/null +++ b/bigbluebutton-html5/imports/api/cursor/index.js @@ -0,0 +1 @@ +export default new Mongo.Collection('cursor'); diff --git a/bigbluebutton-html5/imports/api/cursor/server/modifiers/clearCursorCollection.js b/bigbluebutton-html5/imports/api/cursor/server/modifiers/clearCursorCollection.js new file mode 100755 index 0000000000..6ad5d4ee03 --- /dev/null +++ b/bigbluebutton-html5/imports/api/cursor/server/modifiers/clearCursorCollection.js @@ -0,0 +1,18 @@ +import Cursor from '/imports/api/cursor'; +import { logger } from '/imports/startup/server/logger'; + +// called on server start and meeting end +export function clearCursorCollection() { + const meetingId = arguments[0]; + if (meetingId != null) { + return Cursor.remove({ + meetingId: meetingId, + }, () => { + return logger.info(`cleared Cursor Collection (meetingId: ${meetingId})!`); + }); + } else { + return Cursor.remove({}, () => { + return logger.info('cleared Cursor Collection (all meetings)!'); + }); + } +}; diff --git a/bigbluebutton-html5/imports/api/cursor/server/modifiers/eventHandlers.js b/bigbluebutton-html5/imports/api/cursor/server/modifiers/eventHandlers.js new file mode 100644 index 0000000000..2e15d14446 --- /dev/null +++ b/bigbluebutton-html5/imports/api/cursor/server/modifiers/eventHandlers.js @@ -0,0 +1,14 @@ +import { updateCursorLocation } from './updateCursorLocation'; +import { eventEmitter } from '/imports/startup/server'; + +eventEmitter.on('presentation_cursor_updated_message', function (arg) { + const meetingId = arg.payload.meeting_id; + const cursor = { + x: arg.payload.x_percent, + y: arg.payload.y_percent, + }; + + // update the location of the cursor on the whiteboard + updateCursorLocation(meetingId, cursor); + return arg.callback(); +}); diff --git a/bigbluebutton-html5/imports/api/cursor/server/modifiers/initializeCursor.js b/bigbluebutton-html5/imports/api/cursor/server/modifiers/initializeCursor.js new file mode 100755 index 0000000000..390b16eff2 --- /dev/null +++ b/bigbluebutton-html5/imports/api/cursor/server/modifiers/initializeCursor.js @@ -0,0 +1,18 @@ +import Cursor from '/imports/api/cursor'; +import { logger } from '/imports/startup/server/logger'; + +export function initializeCursor(meetingId) { + return Cursor.upsert({ + meetingId: meetingId, + }, { + meetingId: meetingId, + x: 0, + y: 0, + }, (err, numChanged) => { + if (err) { + return logger.error(`err upserting cursor for ${meetingId}`); + } else { + // logger.info "ok upserting cursor for #{meetingId}" + } + }); +}; diff --git a/bigbluebutton-html5/imports/api/cursor/server/modifiers/updateCursorLocation.js b/bigbluebutton-html5/imports/api/cursor/server/modifiers/updateCursorLocation.js new file mode 100755 index 0000000000..57189241b6 --- /dev/null +++ b/bigbluebutton-html5/imports/api/cursor/server/modifiers/updateCursorLocation.js @@ -0,0 +1,19 @@ +import Cursor from '/imports/api/cursor'; +import { logger } from '/imports/startup/server/logger'; + +export function updateCursorLocation(meetingId, cursorObject) { + return Cursor.update({ + meetingId: meetingId, + }, { + $set: { + x: cursorObject.x, + y: cursorObject.y, + }, + }, (err, numChanged) => { + if (err != null) { + return logger.error(`_unsucc update of cursor for ${meetingId} err=${JSON.stringify(err)}`); + } else { + // logger.info "updated cursor for #{meetingId} #{JSON.stringify cursorObject}" + } + }); +}; diff --git a/bigbluebutton-html5/imports/api/cursor/server/publications.js b/bigbluebutton-html5/imports/api/cursor/server/publications.js new file mode 100755 index 0000000000..73c2a8c509 --- /dev/null +++ b/bigbluebutton-html5/imports/api/cursor/server/publications.js @@ -0,0 +1,10 @@ +import Cursor from '/imports/api/cursor'; +import { logger } from '/imports/startup/server/logger'; + +Meteor.publish('cursor', function (credentials) { + const { meetingId } = credentials; + logger.info(`publishing cursor for ${meetingId}`); + return Cursor.find({ + meetingId: meetingId, + }); +}); diff --git a/bigbluebutton-html5/imports/api/deskshare/index.js b/bigbluebutton-html5/imports/api/deskshare/index.js new file mode 100755 index 0000000000..1f5ee028a7 --- /dev/null +++ b/bigbluebutton-html5/imports/api/deskshare/index.js @@ -0,0 +1 @@ +export default new Mongo.Collection('deskshare'); diff --git a/bigbluebutton-html5/imports/api/deskshare/server/modifiers/clearDeskshareCollection.js b/bigbluebutton-html5/imports/api/deskshare/server/modifiers/clearDeskshareCollection.js new file mode 100755 index 0000000000..369d701505 --- /dev/null +++ b/bigbluebutton-html5/imports/api/deskshare/server/modifiers/clearDeskshareCollection.js @@ -0,0 +1,14 @@ +import Deskshare from '/imports/api/deskshare'; +import { logger } from '/imports/startup/server/logger'; + +export function clearDeskshareCollection(meetingId) { + if (meetingId != null) { + Deskshare.remove({ meetingId: meetingId }, function () { + logger.info(`cleared Deskshare Collection (meetingId: ${this.meetingId}!)`); + }); + } else { + Deskshare.remove({}, function () { + logger.info(`cleared Deskshare Collection (all meetings)!`); + }); + } +} diff --git a/bigbluebutton-html5/imports/api/deskshare/server/modifiers/handleDeskShareChange.js b/bigbluebutton-html5/imports/api/deskshare/server/modifiers/handleDeskShareChange.js new file mode 100755 index 0000000000..95c505adc3 --- /dev/null +++ b/bigbluebutton-html5/imports/api/deskshare/server/modifiers/handleDeskShareChange.js @@ -0,0 +1,27 @@ +import Deskshare from '/imports/api/deskshare'; +import { logger } from '/imports/startup/server/logger'; + +export function handleDeskShareChange(meetingId, deskshareInfo) { + logger.info(`__${meetingId}__deskshareInfo= + ${JSON.stringify(deskshareInfo)}`); + const presenter = Users.findOne({ meetingId: meetingId, 'user.presenter': true }).user.userid; + Deskshare.upsert({ meetingId: meetingId }, { $set: { + broadcasting: deskshareInfo.broadcasting, + timestamp: 'now', + vw: deskshareInfo.vw, + vh: deskshareInfo.vh, + voice_bridge: deskshareInfo.voice_bridge, + startedBy: presenter, + }, }); +} + +// emitter.on('desk_share_notify_viewers_rtmp', function (arg) { +// handleIncomingDeskshareMessage(arg); +// return arg.callback(); +// }); +// +// emitter.on('desk_share_notify_a_single_viewer', function (arg) { +// if (arg.payload.requester_id === 'nodeJSapp') { +// handleIncomingDeskshareMessage(arg); +// } +// return arg.callback(); +// }); diff --git a/bigbluebutton-html5/imports/api/deskshare/server/modifiers/handleIncomingDeskshareMessage.js b/bigbluebutton-html5/imports/api/deskshare/server/modifiers/handleIncomingDeskshareMessage.js new file mode 100755 index 0000000000..3f33a9329f --- /dev/null +++ b/bigbluebutton-html5/imports/api/deskshare/server/modifiers/handleIncomingDeskshareMessage.js @@ -0,0 +1,14 @@ +import Meetings from '/imports/api/meetings'; + +export function handleIncomingDeskshareMessage(arg) { + const payload = arg.payload; + const voiceBridge = Meetings.findOne({ meetingId: payload.meetingId }).voiceConf; + const thisMeetingId = payload.meetingId; + const deskShareInfo = { + vw: payload.vw, + vh: payload.vh, + voice_bridge: voiceBridge, // payload.voice_bridge + broadcasting: payload.broadcasting, + }; + handleDeskShareChange(thisMeetingId, deskShareInfo); +} diff --git a/bigbluebutton-html5/imports/api/deskshare/server/publications.js b/bigbluebutton-html5/imports/api/deskshare/server/publications.js new file mode 100755 index 0000000000..2c479cc1c9 --- /dev/null +++ b/bigbluebutton-html5/imports/api/deskshare/server/publications.js @@ -0,0 +1,8 @@ +import Deskshare from '/imports/api/deskshare'; +import { logger } from '/imports/startup/server/logger'; + +Meteor.publish('deskshare', function (credentials) { + const { meetingId } = credentials; + logger.info(`publishing deskshare for ${meetingId}`); + return Deskshare.find({ meetingId: meetingId }); +}); diff --git a/bigbluebutton-html5/imports/api/meetings/index.js b/bigbluebutton-html5/imports/api/meetings/index.js new file mode 100755 index 0000000000..9a15930458 --- /dev/null +++ b/bigbluebutton-html5/imports/api/meetings/index.js @@ -0,0 +1 @@ +export default new Mongo.Collection('meetings'); diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js new file mode 100755 index 0000000000..228e91f63c --- /dev/null +++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js @@ -0,0 +1,47 @@ +import { initializeCursor } from '/imports/api/cursor/server/modifiers/initializeCursor'; +import Meetings from '/imports/api/meetings'; +import { logger } from '/imports/startup/server/logger'; + +export function addMeetingToCollection(meetingId, name, intendedForRecording, + voiceConf, duration, callback) { + //check if the meeting is already in the collection + Meetings.upsert({ + meetingId: meetingId, + }, { + $set: { + meetingName: name, + intendedForRecording: intendedForRecording, + currentlyBeingRecorded: false, + voiceConf: voiceConf, + duration: duration, + roomLockSettings: { + // by default the lock settings will be disabled on meeting create + disablePrivateChat: false, + disableCam: false, + disableMic: false, + lockOnJoin: Meteor.config.lockOnJoin, + lockedLayout: false, + disablePublicChat: false, + lockOnJoinConfigurable: false, // TODO + }, + }, + }, (_this => { + return function (err, numChanged) { + let funct; + if (numChanged.insertedId != null) { + funct = function (cbk) { + logger.info(`__added MEETING ${meetingId}`); + return cbk(); + }; + + return funct(callback); + } else { + logger.error('nothing happened'); + return callback(); + } + }; + })(this)); + + // initialize the cursor in the meeting + return initializeCursor(meetingId); +}; diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/clearMeetingsCollection.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/clearMeetingsCollection.js new file mode 100755 index 0000000000..aacbcb726f --- /dev/null +++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/clearMeetingsCollection.js @@ -0,0 +1,13 @@ +import Meetings from '/imports/api/meetings'; +import { logger } from '/imports/startup/server/logger'; + +export function clearMeetingsCollection() { + const meetingId = arguments[0]; + if (meetingId != null) { + return Meetings.remove({ + meetingId: meetingId, + }, logger.info(`cleared Meetings Collection (meetingId: ${meetingId}!`)); + } else { + return Meetings.remove({}, logger.info('cleared Meetings Collection (all meetings)!')); + } +}; diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/eventHandlers.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/eventHandlers.js new file mode 100644 index 0000000000..c8d9d90149 --- /dev/null +++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/eventHandlers.js @@ -0,0 +1,105 @@ +import { eventEmitter } from '/imports/startup/server'; +import { logger } from '/imports/startup/server/logger'; +import Meetings from '/imports/api/meetings'; +import { handleLockingMic } from '/imports/api/users/server/modifiers/handleLockingMic'; +import { addMeetingToCollection } from './addMeetingToCollection'; +import { removeMeetingFromCollection } from './removeMeetingFromCollection'; + +eventEmitter.on('meeting_ended_message', function (arg) { + handleEndOfMeeting(arg); +}); + +eventEmitter.on('meeting_destroyed_event', function (arg) { + handleEndOfMeeting(arg); +}); + +eventEmitter.on('recording_status_changed_message', function (arg) { + const intendedForRecording = arg.payload.recorded; + const currentlyBeingRecorded = arg.payload.recording; + const meetingId = arg.payload.meeting_id; + + Meetings.update({ + meetingId: meetingId, + intendedForRecording: intendedForRecording, + }, { + $set: { + currentlyBeingRecorded: currentlyBeingRecorded, + }, + }); + return arg.callback(); +}); + +eventEmitter.on('new_permission_settings', function (arg) { + const meetingId = arg.payload.meeting_id; + const payload = arg.payload; + const meetingObject = Meetings.findOne({ + meetingId: meetingId, + }); + if (meetingObject != null && payload != null) { + const oldSettings = meetingObject.roomLockSettings; + const newSettings = payload.permissions; + + // if the disableMic setting was turned on + if (oldSettings != null && !oldSettings.disableMic && newSettings.disableMic) { + handleLockingMic(meetingId, newSettings); + } + + const settingsObj = { + disablePrivateChat: newSettings.disablePrivateChat, + disableCam: newSettings.disableCam, + disableMic: newSettings.disableMic, + lockOnJoin: newSettings.lockOnJoin, + lockedLayout: newSettings.lockedLayout, + disablePublicChat: newSettings.disablePublicChat, + lockOnJoinConfigurable: newSettings.lockOnJoinConfigurable, + }; + + // substitute with the new lock settings + Meetings.update({ + meetingId: meetingId, + }, { + $set: { + roomLockSettings: settingsObj, + }, + }); + } + + return arg.callback(); +}); + +eventEmitter.on('meeting_created_message', function (arg) { + const meetingName = arg.payload.name; + const intendedForRecording = arg.payload.recorded; + const voiceConf = arg.payload.voice_conf; + const duration = arg.payload.duration; + const meetingId = arg.payload.meeting_id; + return addMeetingToCollection(meetingId, meetingName, intendedForRecording, + voiceConf, duration, arg.callback); +}); + +eventEmitter.on('get_all_meetings_reply', function (arg) { + logger.info('Let\'s store some data for the running meetings so that when an' + + ' HTML5 client joins everything is ready!'); + logger.info(JSON.stringify(arg.payload)); + const listOfMeetings = arg.payload.meetings; + + // Processing the meetings recursively with a callback to notify us, + // ensuring that we update the meeting collection serially + let processMeeting = function () { + let meeting = listOfMeetings.pop(); + if (meeting != null) { + return addMeetingToCollection(meeting.meetingID, meeting.meetingName, + meeting.recorded, meeting.voiceBridge, meeting.duration, processMeeting); + } else { + return arg.callback(); // all meeting arrays (if any) have been processed + } + }; + + return processMeeting(); +}); + +export const handleEndOfMeeting = function (arg) { + const meetingId = arg.payload.meeting_id; + logger.info(`DESTROYING MEETING ${meetingId}`); + return removeMeetingFromCollection(meetingId, arg.callback); +}; diff --git a/bigbluebutton-html5/imports/api/meetings/server/modifiers/removeMeetingFromCollection.js b/bigbluebutton-html5/imports/api/meetings/server/modifiers/removeMeetingFromCollection.js new file mode 100755 index 0000000000..11d49298a9 --- /dev/null +++ b/bigbluebutton-html5/imports/api/meetings/server/modifiers/removeMeetingFromCollection.js @@ -0,0 +1,50 @@ +import { clearUsersCollection } from '/imports/api/users/server/modifiers/clearUsersCollection'; +import { clearChatCollection } from '/imports/api/chat/server/modifiers/clearChatCollection'; +import { clearShapesCollection } from '/imports/api/shapes/server/modifiers/clearShapesCollection'; +import { clearSlidesCollection } from '/imports/api/slides/server/modifiers/clearSlidesCollection'; +import { clearPresentationsCollection } from '/imports/api/presentations/server/modifiers/clearPresentationsCollection'; +import { clearPollCollection } from '/imports/api/polls/server/modifiers/clearPollCollection'; +import { clearCursorCollection } from '/imports/api/cursor/server/modifiers/clearCursorCollection'; +import Meetings from '/imports/api/meetings'; +import { logger } from '/imports/startup/server/logger'; + +//clean up upon a meeting's end +export function removeMeetingFromCollection(meetingId, callback) { + if (Meetings.findOne({ + meetingId: meetingId, + }) != null) { + logger.info(`end of meeting ${meetingId}. Clear the meeting data from all collections`); + + // delete all users in the meeting + clearUsersCollection(meetingId); + + // delete all slides in the meeting + clearSlidesCollection(meetingId); + + // delete all shapes in the meeting + clearShapesCollection(meetingId); + + // delete all presentations in the meeting + clearPresentationsCollection(meetingId); + + // delete all chat messages in the meeting + clearChatCollection(meetingId); + + // delete the meeting + clearMeetingsCollection(meetingId); + + // delete the cursor for the meeting + clearCursorCollection(meetingId); + + //delete the polls for the meeting + clearPollCollection(meetingId); + return callback(); + } else { + let funct = function (localCallback) { + logger.error(`Error! There was no such meeting ${meetingId}`); + return localCallback(); + }; + + return funct(callback); + } +}; diff --git a/bigbluebutton-html5/imports/api/meetings/server/publications.js b/bigbluebutton-html5/imports/api/meetings/server/publications.js new file mode 100755 index 0000000000..12adaa0d13 --- /dev/null +++ b/bigbluebutton-html5/imports/api/meetings/server/publications.js @@ -0,0 +1,10 @@ +import Meetings from '/imports/api/meetings'; +import { logger } from '/imports/startup/server/logger'; + +Meteor.publish('meetings', function (credentials) { + const { meetingId } = credentials; + logger.info(`publishing meetings for ${meetingId}`); + return Meetings.find({ + meetingId: meetingId, + }); +}); diff --git a/bigbluebutton-html5/imports/api/phone/index.js b/bigbluebutton-html5/imports/api/phone/index.js new file mode 100755 index 0000000000..2053f90ee1 --- /dev/null +++ b/bigbluebutton-html5/imports/api/phone/index.js @@ -0,0 +1,96 @@ +import Users from '/imports/api/users'; +import Meetings from '/imports/api/meetings'; + +//TODO relocate? Anton + +// Periodically check the status of the WebRTC call, when a call has been established attempt to +// hangup, retry if a call is in progress, send the leave voice conference message to BBB +// export function exitVoiceCall(event, afterExitCall) { +// if (!Meteor.config.useSIPAudio) { +// leaveWebRTCVoiceConference_verto(); +// cur_call = null; +// return; +// } else { +// // To be called when the hangup is initiated +// hangupCallback = function() { +// console.log('Exiting Voice Conference'); +// } +// +// // Checks periodically until a call is established so we can successfully end the call +// // clean state +// getInSession("triedHangup", false); +// // function to initiate call +// const checkToHangupCall = (function(context) { +// // if an attempt to hang up the call is made when the current session is not yet finished, +// the request has no effect +// // keep track in the session if we haven't tried a hangup +// if (BBB.getCallStatus() != null && !getInSession("triedHangup")) { +// console.log('Attempting to hangup on WebRTC call'); +// notify BBB-apps we are leaving the call call if we are listen only +// if (BBB.amIListenOnlyAudio()) { +// Meteor.call('listenOnlyRequestToggle', BBB.getMeetingId(), BBB.getMyUserId(), +// BBB.getMyAuthToken(), false); +// } +// BBB.leaveVoiceConference(hangupCallback); +// getInSession("triedHangup", true); // we have hung up, prevent retries +// notification_WebRTCAudioExited(); +// if (afterExitCall) { +// afterExitCall(this, Meteor.config.app.listenOnly); +// } +// } else { +// // console.log(`RETRYING hangup on WebRTC call in +// ${Meteor.config.app.WebRTCHangupRetryInterval} ms`); +// // try again periodically +// setTimeout(checkToHangupCall, Meteor.config.app.WebRTCHangupRetryInterval); +// } +// })(this); // automatically run function +// return false; +// }; +// } + +BBB = {}; +BBB.getMyUserInfo = function (callback) { + let result = { + myUserID: 'getMyUserID', + myUsername: 'getMyUserName', + myInternalUserID: 'BBB.getMyUserID', + myAvatarURL: null, + myRole: 'getMyRole', + amIPresenter: 'amIPresenter', + voiceBridge: '70506', + dialNumber: null, + }; + return callback(result); +}; + +// join the conference. If listen only send the request to the server +function joinVoiceCall(options) { + console.log(options); + if (options.useSIPAudio) { + // create voice call params + const joinCallback = function (message) { + console.log('Beginning WebRTC Conference Call'); + }; + + if (options.isListenOnly) { + // Meteor.call('listenOnlyRequestToggle', getInSession('meetingId'), getInSession('userId'), + // getInSession('authToken'), true); + } + + const requestedListenOnly = options.isListenOnly; + + // BBB.joinVoiceConference(joinCallback, requestedListenOnly); // make the call + const voiceBridge = Meetings.findOne({}).voiceConf; + callIntoConference(voiceBridge, function () {}, requestedListenOnly); + + return; + } else { + const extension = Meetings.findOne().voiceConf; + const uName = Users.findOne({ userId: getInSession('userId') }).user.name; + conferenceUsername = 'FreeSWITCH User - ' + encodeURIComponent(uName); + conferenceIdNumber = '1009'; + vertoService.joinAudio(); + } +} + +export { joinVoiceCall }; diff --git a/bigbluebutton-html5/imports/api/phone/server/eventHandlers.js b/bigbluebutton-html5/imports/api/phone/server/eventHandlers.js new file mode 100644 index 0000000000..26ca8aa0a1 --- /dev/null +++ b/bigbluebutton-html5/imports/api/phone/server/eventHandlers.js @@ -0,0 +1,41 @@ +import { eventEmitter } from '/imports/startup/server'; +import { updateVoiceUser } from '/imports/api/users/server/modifiers/updateVoiceUser'; + +eventEmitter.on('user_left_voice_message', function (arg) { + handleVoiceEvent(arg); +}); + +eventEmitter.on('user_joined_voice_message', function (arg) { + handleVoiceEvent(arg); +}); + +eventEmitter.on('user_voice_talking_message', function (arg) { + handleVoiceEvent(arg); +}); + +eventEmitter.on('user_voice_muted_message', function (arg) { + handleVoiceEvent(arg); +}); + +eventEmitter.on('user_listening_only', function (arg) { + const voiceUserObj = { + web_userid: arg.payload.userid, + listen_only: arg.payload.listen_only, + }; + const meetingId = arg.payload.meeting_id; + return updateVoiceUser(meetingId, voiceUserObj, arg.callback); +}); + +const handleVoiceEvent = function (arg) { + const meetingId = arg.payload.meeting_id; + const voiceUser = payload.user.voiceUser; + const voiceUserObj = { + web_userid: voiceUser.web_userid, + listen_only: arg.payload.listen_only, + talking: voiceUser.talking, + joined: voiceUser.joined, + locked: voiceUser.locked, + muted: voiceUser.muted, + }; + return updateVoiceUser(meetingId, voiceUserObj, arg.callback); +}; diff --git a/bigbluebutton-html5/imports/api/polls/index.js b/bigbluebutton-html5/imports/api/polls/index.js new file mode 100755 index 0000000000..8923430f1d --- /dev/null +++ b/bigbluebutton-html5/imports/api/polls/index.js @@ -0,0 +1 @@ +export default new Mongo.Collection('polls'); diff --git a/bigbluebutton-html5/imports/api/polls/server/methods/publishVoteMessage.js b/bigbluebutton-html5/imports/api/polls/server/methods/publishVoteMessage.js new file mode 100755 index 0000000000..a38b668631 --- /dev/null +++ b/bigbluebutton-html5/imports/api/polls/server/methods/publishVoteMessage.js @@ -0,0 +1,49 @@ +import { publish } from '/imports/startup/server/helpers'; +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { appendMessageHeader } from '/imports/startup/server/helpers'; +import Polls from '/imports/api/polls'; +import { logger } from '/imports/startup/server/logger'; +import { redisConfig } from '/config'; + +Meteor.methods({ + publishVoteMessage(credentials, pollId, pollAnswerId) { //TODO discuss location + if (isAllowedTo('subscribePoll', credentials)) { + const { meetingId, requesterUserId, requesterToken } = credentials; + const eventName = 'vote_poll_user_request_message'; + + const result = Polls.findOne({ + users: { $in: [requesterUserId] }, + meetingId: meetingId, + poll: { answers: { id: { $in: [pollAnswerId] } } }, + poll: { id: pollId }, + }); + + if ((meetingId != null) && + (result.meetingId != null) && + (requesterUserId != null) && + (pollAnswerId != null)) { + let message = { + payload: { + meeting_id: result.meetingId, + user_id: requesterUserId, + poll_id: result.poll.id, + question_id: 0, + answer_id: pollAnswerId, + }, + }; + Polls.update({ + users: { $in: [requesterUserId] }, + meetingId: meetingId, + poll: { answers: { id: { $in: [pollAnswerId] } } }, + }, { + $pull: { + users: requesterUserId, + }, + }); + message = appendMessageHeader(eventName, message); + logger.info('publishing Poll response to redis'); + return publish(redisConfig.channels.toBBBApps.polling, message); + } + } + }, +}); diff --git a/bigbluebutton-html5/imports/api/polls/server/modifiers/addPollToCollection.js b/bigbluebutton-html5/imports/api/polls/server/modifiers/addPollToCollection.js new file mode 100755 index 0000000000..6ac5fb87e1 --- /dev/null +++ b/bigbluebutton-html5/imports/api/polls/server/modifiers/addPollToCollection.js @@ -0,0 +1,37 @@ +import Polls from '/imports/api/polls'; +import { logger } from '/imports/startup/server/logger'; + +export function addPollToCollection(poll, requesterId, users, meetingId) { + // copying all the userids into an array + let newUsers = []; + newUsersLength = users.length; + for (let i = 0; i < newUsersLength; i++) { + const user = users[i]; + newUsers.push(user.user.userid); + } + + // adding the initial number of votes for each answer + // _answers = poll.answers; + // _answers_length = _answers.length; + // for (j = 0; j < _answers_length; j++) { + // answer = _answers[j]; + // answer.num_votes = 0; + // } + + // adding the initial number of responders and respondents to the poll, which will be displayed + // for presenter (in HTML5 client) when they start the poll + numResponders = -1; + numRespondents = -1; + + // adding all together and inserting into the Polls collection + const entry = { + meetingId: meetingId, + poll: poll, + requester: requesterId, + users: newUsers, + num_responders: -1, + num_respondents: -1, + }; + logger.info(`added poll _id=[${poll.id}]:meetingId=[${meetingId}].`); + return Polls.insert(entry); +}; diff --git a/bigbluebutton-html5/imports/api/polls/server/modifiers/clearPollCollection.js b/bigbluebutton-html5/imports/api/polls/server/modifiers/clearPollCollection.js new file mode 100755 index 0000000000..d81ca906e5 --- /dev/null +++ b/bigbluebutton-html5/imports/api/polls/server/modifiers/clearPollCollection.js @@ -0,0 +1,20 @@ +import Polls from '/imports/api/polls'; +import { logger } from '/imports/startup/server/logger'; + +export function clearPollCollection() { + const meetingId = arguments[0]; + const pollId = arguments[1]; + + //TODO make it so you can delete the polls based only on meetingId + if (meetingId != null && pollId != null && Polls.findOne({ + meetingId: meetingId, + poll: { id: pollId }, + }) != null) { + return Polls.remove({ + meetingId: meetingId, + poll: { id: pollId }, + }, logger.info(`cleared Polls Collection (meetingId: ${meetingId}, pollId: ${pollId}!)`)); + } else { + return Polls.remove({}, logger.info('cleared Polls Collection (all meetings)!')); + } +}; diff --git a/bigbluebutton-html5/imports/api/polls/server/modifiers/eventHandlers.js b/bigbluebutton-html5/imports/api/polls/server/modifiers/eventHandlers.js new file mode 100644 index 0000000000..20bbc4c92c --- /dev/null +++ b/bigbluebutton-html5/imports/api/polls/server/modifiers/eventHandlers.js @@ -0,0 +1,70 @@ +import { eventEmitter } from '/imports/startup/server'; +import { clearPollCollection } from './clearPollCollection'; +import { updatePollCollection } from './updatePollCollection'; +import { addPollToCollection } from './addPollToCollection'; +import Meetings from '/imports/api/meetings'; +import Users from '/imports/api/users'; + +eventEmitter.on('poll_show_result_message', function (arg) { + const payload = arg.payload; + const meetingId = payload.meeting_id; + if (payload != null && payload.poll != null && payload.poll.id != null && meetingId != null) { + const pollId = payload.poll.id; + clearPollCollection(meetingId, pollId); + } + + return arg.callback(); +}); + +eventEmitter.on('poll_started_message', function (arg) { + const payload = arg.payload; + const meetingId = payload.meeting_id; + + if (payload != null && meetingId != null && + payload.requester_id != null && payload.poll != null) { + if (Meetings.findOne({ + meetingId: meetingId, + }) != null) { + const users = Users.find({ + meetingId: meetingId, + }, { + fields: { + 'user.userid': 1, + _id: 0, + }, + }).fetch(); + addPollToCollection( + payload.poll, + payload.requester_id, + users, + meetingId + ); + } + } + + return arg.callback(); +}); + +eventEmitter.on('poll_stopped_message', function (arg) { + const payload = arg.payload; + const meetingId = payload.meeting_id; + + if (meetingId != null && payload != null && payload.poll_id != null) { + const pollId = payload.poll_id; + clearPollCollection(meetingId, pollId); + } + + return arg.callback(); +}); + +eventEmitter.on('user_voted_poll_message', function (arg) { + const payload = arg.payload; + const meetingId = payload.meeting_id; + if (payload != null && payload.poll != null && meetingId != null && + payload.presenter_id != null) { + const pollObj = payload.poll; + const requesterId = payload.presenter_id; + updatePollCollection(pollObj, meetingId, requesterId); + return arg.callback(); + } +}); diff --git a/bigbluebutton-html5/imports/api/polls/server/modifiers/updatePollCollection.js b/bigbluebutton-html5/imports/api/polls/server/modifiers/updatePollCollection.js new file mode 100755 index 0000000000..e224c5932f --- /dev/null +++ b/bigbluebutton-html5/imports/api/polls/server/modifiers/updatePollCollection.js @@ -0,0 +1,19 @@ +import Polls from '/imports/api/polls'; +import { logger } from '/imports/startup/server/logger'; + +export function updatePollCollection(poll, meetingId, requesterId) { + if ((poll.answers != null) && (poll.numResponders != null) && (poll.numRespondents != null) && + (poll.id != null) && (meetingId != null) && (requesterId != null)) { + return Polls.update({ + meetingId: meetingId, + requester: requesterId, + poll: { id: poll.id }, + }, { + $set: { + poll: { answers: poll.answers }, + poll: { num_responders: poll.numResponders }, + poll: { num_respondents: poll.numRespondents }, + }, + }, logger.info(`updating Polls Collection (meetingId: ${meetingId}, pollId: ${poll.id}!)`)); + } +}; diff --git a/bigbluebutton-html5/imports/api/polls/server/publications.js b/bigbluebutton-html5/imports/api/polls/server/publications.js new file mode 100755 index 0000000000..379d89d325 --- /dev/null +++ b/bigbluebutton-html5/imports/api/polls/server/publications.js @@ -0,0 +1,31 @@ +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import Polls from '/imports/api/polls'; +import { logger } from '/imports/startup/server/logger'; + +Meteor.publish('polls', function (credentials) { + const { meetingId, requesterUserId, requesterToken } = credentials; + + //checking if it is allowed to see Poll Collection in general + if (isAllowedTo('subscribePoll', credentials)) { + //checking if it is allowed to see a number of votes (presenter only) + if (isAllowedTo('subscribeAnswers', credentials)) { + logger.info('publishing Poll for presenter: ' + meetingId + ' ' + requesterUserId + ' ' + requesterToken); + return Polls.find({ + 'poll_info.meetingId': meetingId, + 'poll_info.users': requesterUserId, + }); + } else { + logger.info('publishing Poll for viewer: ' + meetingId + ' ' + requesterUserId + ' ' + requesterToken); + return Polls.find({ + 'poll_info.meetingId': meetingId, + 'poll_info.users': requesterUserId, + }, { + fields: { + 'poll_info.poll.answers.num_votes': 0, + }, + }); + } + } else { + this.error(new Meteor.Error(402, "The user was not authorized to subscribe for 'polls'")); + } +}); diff --git a/bigbluebutton-html5/imports/api/presentations/index.js b/bigbluebutton-html5/imports/api/presentations/index.js new file mode 100755 index 0000000000..bd409675ab --- /dev/null +++ b/bigbluebutton-html5/imports/api/presentations/index.js @@ -0,0 +1 @@ +export default new Mongo.Collection('presentations'); diff --git a/bigbluebutton-html5/server/methods/publishSwitchToNextSlideMessage.js b/bigbluebutton-html5/imports/api/presentations/server/methods/publishSwitchToNextSlideMessage.js old mode 100644 new mode 100755 similarity index 53% rename from bigbluebutton-html5/server/methods/publishSwitchToNextSlideMessage.js rename to bigbluebutton-html5/imports/api/presentations/server/methods/publishSwitchToNextSlideMessage.js index d0e69a0109..57f6fa5597 --- a/bigbluebutton-html5/server/methods/publishSwitchToNextSlideMessage.js +++ b/bigbluebutton-html5/imports/api/presentations/server/methods/publishSwitchToNextSlideMessage.js @@ -1,33 +1,41 @@ +import { publish } from '/imports/startup/server/helpers'; +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { appendMessageHeader } from '/imports/startup/server/helpers'; +import Presentations from '/imports/api/presentations'; +import Slides from '/imports/api/slides'; +import { redisConfig } from '/config'; + Meteor.methods({ - publishSwitchToNextSlideMessage(meetingId, userId, authToken) { + publishSwitchToNextSlideMessage(credentials) { + const { meetingId, requesterUserId, requesterToken } = credentials; let currentPresentationDoc, currentSlideDoc, message, nextSlideDoc; - currentPresentationDoc = Meteor.Presentations.findOne({ + currentPresentationDoc = Presentations.findOne({ meetingId: meetingId, 'presentation.current': true, }); if (currentPresentationDoc != null) { - currentSlideDoc = Meteor.Slides.findOne({ + currentSlideDoc = Slides.findOne({ meetingId: meetingId, presentationId: currentPresentationDoc.presentation.id, 'slide.current': true, }); if (currentSlideDoc != null) { - nextSlideDoc = Meteor.Slides.findOne({ + nextSlideDoc = Slides.findOne({ meetingId: meetingId, presentationId: currentPresentationDoc.presentation.id, 'slide.num': currentSlideDoc.slide.num + 1, }); - if ((nextSlideDoc != null) && isAllowedTo('switchSlide', meetingId, userId, authToken)) { + if ((nextSlideDoc != null) && isAllowedTo('switchSlide', credentials)) { message = { payload: { page: nextSlideDoc.slide.id, meeting_id: meetingId, - } + }, }; message = appendMessageHeader('go_to_slide', message); - return publish(Meteor.config.redis.channels.toBBBApps.presentation, message); + return publish(redisConfig.channels.toBBBApps.presentation, message); } } } - } + }, }); diff --git a/bigbluebutton-html5/server/methods/publishSwitchToPreviousSlideMessage.js b/bigbluebutton-html5/imports/api/presentations/server/methods/publishSwitchToPreviousSlideMessage.js old mode 100644 new mode 100755 similarity index 53% rename from bigbluebutton-html5/server/methods/publishSwitchToPreviousSlideMessage.js rename to bigbluebutton-html5/imports/api/presentations/server/methods/publishSwitchToPreviousSlideMessage.js index f690a05b27..1fbeb4b838 --- a/bigbluebutton-html5/server/methods/publishSwitchToPreviousSlideMessage.js +++ b/bigbluebutton-html5/imports/api/presentations/server/methods/publishSwitchToPreviousSlideMessage.js @@ -1,33 +1,41 @@ +import { publish } from '/imports/startup/server/helpers'; +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { appendMessageHeader } from '/imports/startup/server/helpers'; +import Presentations from '/imports/api/presentations'; +import Slides from '/imports/api/slides'; +import { redisConfig } from '/config'; + Meteor.methods({ - publishSwitchToPreviousSlideMessage(meetingId, userId, authToken) { + publishSwitchToPreviousSlideMessage(credentials) { + const { meetingId, requesterUserId, requesterToken } = credentials; let currentPresentationDoc, currentSlideDoc, message, previousSlideDoc; - currentPresentationDoc = Meteor.Presentations.findOne({ + currentPresentationDoc = Presentations.findOne({ meetingId: meetingId, 'presentation.current': true, }); if (currentPresentationDoc != null) { - currentSlideDoc = Meteor.Slides.findOne({ + currentSlideDoc = Slides.findOne({ meetingId: meetingId, presentationId: currentPresentationDoc.presentation.id, 'slide.current': true, }); if (currentSlideDoc != null) { - previousSlideDoc = Meteor.Slides.findOne({ + previousSlideDoc = Slides.findOne({ meetingId: meetingId, presentationId: currentPresentationDoc.presentation.id, 'slide.num': currentSlideDoc.slide.num - 1, }); - if ((previousSlideDoc != null) && isAllowedTo('switchSlide', meetingId, userId, authToken)) { + if ((previousSlideDoc != null) && isAllowedTo('switchSlide', credentials)) { message = { payload: { page: previousSlideDoc.slide.id, meeting_id: meetingId, - } + }, }; message = appendMessageHeader('go_to_slide', message); - return publish(Meteor.config.redis.channels.toBBBApps.presentation, message); + return publish(redisConfig.channels.toBBBApps.presentation, message); } } } - } + }, }); diff --git a/bigbluebutton-html5/imports/api/presentations/server/modifiers/addPresentationToCollection.js b/bigbluebutton-html5/imports/api/presentations/server/modifiers/addPresentationToCollection.js new file mode 100755 index 0000000000..b63ef1b78f --- /dev/null +++ b/bigbluebutton-html5/imports/api/presentations/server/modifiers/addPresentationToCollection.js @@ -0,0 +1,25 @@ +import Presentations from '/imports/api/presentations'; + +export function addPresentationToCollection(meetingId, presentationObject) { + let entry, id, presentationObj; + + //check if the presentation is already in the collection + presentationObj = Presentations.findOne({ + meetingId: meetingId, + 'presentation.id': presentationObject.id, + }); + if (presentationObj == null) { + entry = { + meetingId: meetingId, + presentation: { + id: presentationObject.id, + name: presentationObject.name, + current: presentationObject.current, + }, + }; + return id = Presentations.insert(entry); + + //logger.info "presentation added id =[#{id}]:#{presentationObject.id} in #{meetingId}. + // Presentations.size is now #{Presentations.find({meetingId: meetingId}).count()}" + } +}; diff --git a/bigbluebutton-html5/imports/api/presentations/server/modifiers/clearPresentationsCollection.js b/bigbluebutton-html5/imports/api/presentations/server/modifiers/clearPresentationsCollection.js new file mode 100755 index 0000000000..2fb5af1d18 --- /dev/null +++ b/bigbluebutton-html5/imports/api/presentations/server/modifiers/clearPresentationsCollection.js @@ -0,0 +1,14 @@ +import Presentations from '/imports/api/presentations'; +import { logger } from '/imports/startup/server/logger'; + +// called on server start and meeting end +export function clearPresentationsCollection() { + const meetingId = arguments[0]; + if (meetingId != null) { + return Presentations.remove({ + meetingId: meetingId, + }, logger.info(`cleared Presentations Collection (meetingId: ${meetingId}!`)); + } else { + return Presentations.remove({}, logger.info('cleared Presentations Collection(all meetings)!')); + } +}; diff --git a/bigbluebutton-html5/imports/api/presentations/server/modifiers/eventHandlers.js b/bigbluebutton-html5/imports/api/presentations/server/modifiers/eventHandlers.js new file mode 100644 index 0000000000..20f9503aa4 --- /dev/null +++ b/bigbluebutton-html5/imports/api/presentations/server/modifiers/eventHandlers.js @@ -0,0 +1,148 @@ +import { eventEmitter } from '/imports/startup/server'; +import { removePresentationFromCollection } from './removePresentationFromCollection'; +import { addPresentationToCollection } from './addPresentationToCollection'; +import { displayThisSlide } from '/imports/api/slides/server/modifiers/displayThisSlide'; +import { addSlideToCollection } from '/imports/api/slides/server/modifiers/addSlideToCollection'; +import { appendMessageHeader, publish } from '/imports/startup/server/helpers'; +import Slides from '/imports/api/slides'; +import Presentations from '/imports/api/presentations'; +import { logger } from '/imports/startup/server/logger'; +import { redisConfig } from '/config'; + +eventEmitter.on('presentation_page_resized_message', function (arg) { + const payload = arg.payload; + const page = payload.page; + if (page != null && page.id != null && page.height_ratio != null + && page.width_ratio != null && page.x_offset != null && page.y_offset != null) { + const slideId = page.id; + const heightRatio = page.height_ratio; + const widthRatio = page.width_ratio; + const xOffset = page.x_offset; + const yOffset = page.y_offset; + const presentationId = slideId.split('/')[0]; + + // In the case when we don't resize, but switch a slide, this message + // follows a 'presentation_page_changed' and all these properties are already set. + let currentSlide = Slides.findOne( + { presentationId: presentationId, + 'slide.current': true, }); + if (currentSlide) { + currentSlide = currentSlide.slide; + } + + if (currentSlide != null && (currentSlide.height_ratio != heightRatio || + currentSlide.width_ratio != widthRatio || + currentSlide.x_offset != xOffset || + currentSlide.y_offset != yOffset)) { + Slides.update({ + presentationId: presentationId, + 'slide.current': true, + }, { + $set: { + 'slide.height_ratio': heightRatio, + 'slide.width_ratio': widthRatio, + 'slide.x_offset': xOffset, + 'slide.y_offset': yOffset, + }, + }); + } + } + + return arg.callback(); +}); + +eventEmitter.on('presentation_page_changed_message', function (arg) { + const newSlide = arg.payload.page; + const meetingId = arg.payload.meeting_id; + if (newSlide != null && newSlide.id != null && meetingId != null) { + displayThisSlide(meetingId, newSlide.id, newSlide); + } + + return arg.callback(); +}); + +eventEmitter.on('presentation_removed_message', function (arg) { + const meetingId = arg.payload.meeting_id; + const presentationId = arg.payload.presentation_id; + if (meetingId != null && presentationId != null) { + removePresentationFromCollection(meetingId, presentationId); + } + + return arg.callback(); +}); + +eventEmitter.on('presentation_shared_message', function (arg) { + const payload = arg.payload; + const meetingId = payload.meeting_id; + if (payload.presentation != null && payload.presentation.id != null && meetingId != null) { + const presentationId = payload.presentation.id; + + // change the currently displayed presentation to presentation.current = false + Presentations.update({ + 'presentation.current': true, + meetingId: meetingId, + }, { + $set: { + 'presentation.current': false, + }, + }); + + //update(if already present) entirely the presentation with the fresh data + removePresentationFromCollection(meetingId, presentationId); + addPresentationToCollection(meetingId, payload.presentation); + const pages = payload.presentation.pages; + for (j = 0; j < pages.length; j++) { + const slide = pages[j]; + addSlideToCollection( + meetingId, + presentationId, + slide + ); + } + } + + return arg.callback(); +}); + +eventEmitter.on('get_presentation_info_reply', function (arg) { + if (arg.payload.requester_id === 'nodeJSapp') { + const payload = arg.payload; + const meetingId = payload.meeting_id; + const presentations = payload.presentations; + for (let k = 0; k < payload.presentations.length; k++) { + const presentation = presentations[k]; + addPresentationToCollection(meetingId, presentation); + const pages = presentation.pages; + for (let l = 0; l < pages.length; l++) { + const page = pages[l]; + + //add the slide to the collection + addSlideToCollection(meetingId, presentation.id, page); + + //request for shapes + const whiteboardId = `${presentation.id}/${page.num}`; + + //logger.info "the whiteboard_id here is:" + whiteboardId + + const replyTo = `${meetingId}/nodeJSapp`; + let message = { + payload: { + meeting_id: meetingId, + requester_id: 'nodeJSapp', + whiteboard_id: whiteboardId, + reply_to: replyTo, + }, + }; + if (!!whiteboardId && !!meetingId) { + message = appendMessageHeader('request_whiteboard_annotation_history_request', message); + publish(redisConfig.channels.toBBBApps.whiteboard, message); + } else { + logger.info('did not have enough information to send a user_leaving_request'); + } + } + } + + return arg.callback(); + } +}); + diff --git a/bigbluebutton-html5/imports/api/presentations/server/modifiers/removePresentationFromCollection.js b/bigbluebutton-html5/imports/api/presentations/server/modifiers/removePresentationFromCollection.js new file mode 100755 index 0000000000..9246621573 --- /dev/null +++ b/bigbluebutton-html5/imports/api/presentations/server/modifiers/removePresentationFromCollection.js @@ -0,0 +1,18 @@ +import Slides from '/imports/api/slides'; +import Presentations from '/imports/api/presentations'; +import { logger } from '/imports/startup/server/logger'; + +export function removePresentationFromCollection(meetingId, presentationId) { + let id, presentationObject; + presentationObject = Presentations.findOne({ + meetingId: meetingId, + 'presentation.id': presentationId, + }); + if (presentationObject != null) { + Slides.remove({ + presentationId: presentationId, + }, logger.info(`cleared Slides Collection (presentationId: ${presentationId}!`)); + Presentations.remove(presentationObject._id); + return logger.info(`----removed presentation[${presentationId}] from ${meetingId}`); + } +}; diff --git a/bigbluebutton-html5/imports/api/presentations/server/publications.js b/bigbluebutton-html5/imports/api/presentations/server/publications.js new file mode 100755 index 0000000000..ba6d95022f --- /dev/null +++ b/bigbluebutton-html5/imports/api/presentations/server/publications.js @@ -0,0 +1,10 @@ +import Presentations from '/imports/api/presentations'; +import { logger } from '/imports/startup/server/logger'; + +Meteor.publish('presentations', function (credentials) { + const { meetingId } = credentials; + logger.info(`publishing presentations for ${meetingId}`); + return Presentations.find({ + meetingId: meetingId, + }); +}); diff --git a/bigbluebutton-html5/imports/api/shapes/index.js b/bigbluebutton-html5/imports/api/shapes/index.js new file mode 100755 index 0000000000..f15f19a892 --- /dev/null +++ b/bigbluebutton-html5/imports/api/shapes/index.js @@ -0,0 +1 @@ +export default new Mongo.Collection('shapes'); diff --git a/bigbluebutton-html5/imports/api/shapes/server/modifiers/addShapeToCollection.js b/bigbluebutton-html5/imports/api/shapes/server/modifiers/addShapeToCollection.js new file mode 100755 index 0000000000..7710aeeb47 --- /dev/null +++ b/bigbluebutton-html5/imports/api/shapes/server/modifiers/addShapeToCollection.js @@ -0,0 +1,89 @@ +import Shapes from '/imports/api/shapes'; +import { logger } from '/imports/startup/server/logger'; + +export function addShapeToCollection(meetingId, whiteboardId, shapeObject) { + let entry, id, removeTempTextShape; + if (shapeObject != null && shapeObject.shape_type === 'text') { + logger.info(`we are dealing with a text shape and the event is:${shapeObject.status}`); + entry = { + meetingId: meetingId, + whiteboardId: whiteboardId, + shape: { + type: shapeObject.shape.type, + textBoxHeight: shapeObject.shape.textBoxHeight, + backgroundColor: shapeObject.shape.backgroundColor, + fontColor: shapeObject.shape.fontColor, + status: shapeObject.shape.status, + dataPoints: shapeObject.shape.dataPoints, + x: shapeObject.shape.x, + textBoxWidth: shapeObject.shape.textBoxWidth, + whiteboardId: shapeObject.shape.whiteboardId, + fontSize: shapeObject.shape.fontSize, + id: shapeObject.shape.id, + y: shapeObject.shape.y, + calcedFontSize: shapeObject.shape.calcedFontSize, + text: shapeObject.shape.text, + background: shapeObject.shape.background, + }, + }; + if (shapeObject.status === 'textEdited' || shapeObject.status === 'textPublished') { + // only keep the final version of the text shape + removeTempTextShape = function (callback) { + Shapes.remove({ + 'shape.id': shapeObject.shape.id, + }); + return callback(); + }; + + return removeTempTextShape(() => { + // display as the prestenter is typing + let id; + id = Shapes.insert(entry); + return logger.info(`${shapeObject.status} substituting the temp shapes with the newer one`); + }); + } + + // the mouse button was released - the drawing is complete + // TODO: pencil messages currently don't send draw_end and are labeled all as DRAW_START + } else if (shapeObject != null && (shapeObject.status === 'DRAW_START' || + shapeObject.status === 'DRAW_UPDATE' || shapeObject.status === 'DRAW_END')) { + shape = Shapes.findOne({ + 'shape.id': shapeObject.shape.id, + }); + if (shape != null) { + return id = Shapes.update({ + 'shape.id': shapeObject.shape.id, + }, { + $set: { + 'shape.shape.points': shapeObject.shape.points, + }, + }); + } else { + entry = { + meetingId: meetingId, + whiteboardId: whiteboardId, + shape: { + wb_id: shapeObject.wb_id, + shape_type: shapeObject.shape_type, + status: shapeObject.status, + id: shapeObject.id, + shape: { + type: shapeObject.shape.type, + status: shapeObject.shape.status, + points: shapeObject.shape.points, + whiteboardId: shapeObject.shape.whiteboardId, + id: shapeObject.shape.id, + square: shapeObject.shape.square, + transparency: shapeObject.shape.transparency, + thickness: shapeObject.shape.thickness, + color: shapeObject.shape.color, + result: shapeObject.shape.result, + num_respondents: shapeObject.shape.num_respondents, + num_responders: shapeObject.shape.num_responders, + }, + }, + }; + return id = Shapes.insert(entry); + } + } +}; diff --git a/bigbluebutton-html5/imports/api/shapes/server/modifiers/clearShapesCollection.js b/bigbluebutton-html5/imports/api/shapes/server/modifiers/clearShapesCollection.js new file mode 100755 index 0000000000..2db8eb1043 --- /dev/null +++ b/bigbluebutton-html5/imports/api/shapes/server/modifiers/clearShapesCollection.js @@ -0,0 +1,18 @@ +import Shapes from '/imports/api/shapes'; +import { logger } from '/imports/startup/server/logger'; + +// called on server start and meeting end +export function clearShapesCollection() { + const meetingId = arguments[0]; + if (meetingId != null) { + return Shapes.remove({ + meetingId: meetingId, + }, () => { + logger.info(`cleared Shapes Collection (meetingId: ${meetingId}!`); + }); + } else { + return Shapes.remove({}, () => { + logger.info('cleared Shapes Collection (all meetings)!'); + }); + } +}; diff --git a/bigbluebutton-html5/imports/api/shapes/server/modifiers/eventHandlers.js b/bigbluebutton-html5/imports/api/shapes/server/modifiers/eventHandlers.js new file mode 100644 index 0000000000..c4c1307431 --- /dev/null +++ b/bigbluebutton-html5/imports/api/shapes/server/modifiers/eventHandlers.js @@ -0,0 +1,54 @@ +import { eventEmitter } from '/imports/startup/server'; +import { addShapeToCollection } from '/imports/api/shapes/server/modifiers/addShapeToCollection'; +import { removeAllShapesFromSlide } from '/imports/api/shapes/server/modifiers/removeAllShapesFromSlide'; +import { removeShapeFromSlide } from '/imports/api/shapes/server/modifiers/removeShapeFromSlide'; + +eventEmitter.on('get_whiteboard_shapes_reply', function (arg) { + if (arg.payload.requester_id === 'nodeJSapp') { + const meetingId = arg.payload.meeting_id; + const shapes = arg.payload.shapes; + const shapesLength = shapes.length; + for (let m = 0; m < shapesLength; m++) { + let shape = shapes[m]; + let whiteboardId = shape.wb_id; + addShapeToCollection(meetingId, whiteboardId, shape); + } + + return arg.callback(); + } +}); + +eventEmitter.on('send_whiteboard_shape_message', function (arg) { + const payload = arg.payload; + const meetingId = payload.meeting_id; + + //Meteor stringifies an array of JSONs (...shape.result) in this message + //parsing the String and reassigning the value + if (payload.shape.shape_type === 'poll_result' && + typeof payload.shape.shape.result === 'string') { + payload.shape.shape.result = JSON.parse(payload.shape.shape.result); + } + + const shape = payload.shape; + if (!!shape && !!shape.wb_id) { + const whiteboardId = shape.wb_id; + addShapeToCollection(meetingId, whiteboardId, shape); + } + + return arg.callback(); +}); + +eventEmitter.on('whiteboard_cleared_message', function (arg) { + const meetingId = arg.payload.meeting_id; + const whiteboardId = arg.payload.whiteboard_id; + removeAllShapesFromSlide(meetingId, whiteboardId); + return arg.callback(); +}); + +eventEmitter.on('undo_whiteboard_request', function (arg) { + const meetingId = arg.payload.meeting_id; + const whiteboardId = arg.payload.whiteboard_id; + const shapeId = arg.payload.shape_id; + removeShapeFromSlide(meetingId, whiteboardId, shapeId); + return arg.callback(); +}); diff --git a/bigbluebutton-html5/imports/api/shapes/server/modifiers/removeAllShapesFromSlide.js b/bigbluebutton-html5/imports/api/shapes/server/modifiers/removeAllShapesFromSlide.js new file mode 100755 index 0000000000..1ac936997a --- /dev/null +++ b/bigbluebutton-html5/imports/api/shapes/server/modifiers/removeAllShapesFromSlide.js @@ -0,0 +1,18 @@ +import Shapes from '/imports/api/shapes'; +import { logger } from '/imports/startup/server/logger'; + +export function removeAllShapesFromSlide(meetingId, whiteboardId) { + logger.info(`removeAllShapesFromSlide__${whiteboardId}`); + + if ((meetingId != null) && (whiteboardId != null) && (Shapes.find({ + meetingId: meetingId, + whiteboardId: whiteboardId, + }) != null)) { + return Shapes.remove({ + meetingId: meetingId, + whiteboardId: whiteboardId, + }, () => { + logger.info('clearing all shapes from slide'); + }); + } +}; diff --git a/bigbluebutton-html5/imports/api/shapes/server/modifiers/removeShapeFromSlide.js b/bigbluebutton-html5/imports/api/shapes/server/modifiers/removeShapeFromSlide.js new file mode 100755 index 0000000000..1617a2becb --- /dev/null +++ b/bigbluebutton-html5/imports/api/shapes/server/modifiers/removeShapeFromSlide.js @@ -0,0 +1,22 @@ +import Shapes from '/imports/api/shapes'; +import { logger } from '/imports/startup/server/logger'; + +export function removeShapeFromSlide(meetingId, whiteboardId, shapeId) { + let shapeToRemove; + if (meetingId != null && whiteboardId != null && shapeId != null) { + shapeToRemove = Shapes.findOne({ + meetingId: meetingId, + whiteboardId: whiteboardId, + 'shape.id': shapeId, + }); + if (shapeToRemove != null) { + Shapes.remove(shapeToRemove._id); + logger.info(`----removed shape[${shapeId}] from ${whiteboardId}`); + return logger.info(`remaining shapes on the slide: ${ + Shapes.find({ + meetingId: meetingId, + whiteboardId: whiteboardId, + }).count()}`); + } + } +}; diff --git a/bigbluebutton-html5/imports/api/shapes/server/publications.js b/bigbluebutton-html5/imports/api/shapes/server/publications.js new file mode 100755 index 0000000000..781c00df19 --- /dev/null +++ b/bigbluebutton-html5/imports/api/shapes/server/publications.js @@ -0,0 +1,8 @@ +import Shapes from '/imports/api/shapes'; + +Meteor.publish('shapes', function (credentials) { + const { meetingId } = credentials; + return Shapes.find({ + meetingId: meetingId, + }); +}); diff --git a/bigbluebutton-html5/imports/api/slides/index.js b/bigbluebutton-html5/imports/api/slides/index.js new file mode 100755 index 0000000000..1834357cc4 --- /dev/null +++ b/bigbluebutton-html5/imports/api/slides/index.js @@ -0,0 +1 @@ +export default new Mongo.Collection('slides'); diff --git a/bigbluebutton-html5/imports/api/slides/server/modifiers/addSlideToCollection.js b/bigbluebutton-html5/imports/api/slides/server/modifiers/addSlideToCollection.js new file mode 100755 index 0000000000..319bcd3701 --- /dev/null +++ b/bigbluebutton-html5/imports/api/slides/server/modifiers/addSlideToCollection.js @@ -0,0 +1,31 @@ +import Slides from '/imports/api/slides'; + +export function addSlideToCollection(meetingId, presentationId, slideObject) { + if (Slides.findOne({ + meetingId: meetingId, + 'slide.id': slideObject.id, + }) == null) { + const entry = { + meetingId: meetingId, + presentationId: presentationId, + slide: { + height_ratio: slideObject.height_ratio, + y_offset: slideObject.y_offset, + num: slideObject.num, + x_offset: slideObject.x_offset, + current: slideObject.current, + img_uri: slideObject.svg_uri != null ? slideObject.svg_uri : slideObject.png_uri, + txt_uri: slideObject.txt_uri, + id: slideObject.id, + width_ratio: slideObject.width_ratio, + swf_uri: slideObject.swf_uri, + thumb_uri: slideObject.thumb_uri, + }, + }; + const id = Slides.insert(entry); + return id; + + //logger.info "added slide id =[#{id}]:#{slideObject.id} in #{meetingId}. Now there + // are #{Slides.find({meetingId: meetingId}).count()} slides in the meeting" + } +}; diff --git a/bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesCollection.js b/bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesCollection.js new file mode 100755 index 0000000000..ecfa73af39 --- /dev/null +++ b/bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesCollection.js @@ -0,0 +1,14 @@ +import Slides from '/imports/api/slides'; +import { logger } from '/imports/startup/server/logger'; + +// called on server start and meeting end +export function clearSlidesCollection() { + const meetingId = arguments[0]; + if (meetingId != null) { + return Slides.remove({ + meetingId: meetingId, + }, logger.info(`cleared Slides Collection (meetingId: ${meetingId}!`)); + } else { + return Slides.remove({}, logger.info('cleared Slides Collection (all meetings)!')); + } +}; diff --git a/bigbluebutton-html5/imports/api/slides/server/modifiers/displayThisSlide.js b/bigbluebutton-html5/imports/api/slides/server/modifiers/displayThisSlide.js new file mode 100755 index 0000000000..ad8bed79e6 --- /dev/null +++ b/bigbluebutton-html5/imports/api/slides/server/modifiers/displayThisSlide.js @@ -0,0 +1,31 @@ +import Slides from '/imports/api/slides'; + +export function displayThisSlide(meetingId, newSlideId, slideObject) { + + // grab the presentationId part of the slideId + const presentationId = newSlideId.split('/')[0]; + + // change current to false for the old slide + Slides.update({ + presentationId: presentationId, + 'slide.current': true, + }, { + $set: { + 'slide.current': false, + }, + }); + + //change current to true for the new slide and update its ratios and offsets + Slides.update({ + presentationId: presentationId, + 'slide.id': newSlideId, + }, { + $set: { + 'slide.current': true, + 'slide.height_ratio': slideObject.height_ratio, + 'slide.width_ratio': slideObject.width_ratio, + 'slide.x_offset': slideObject.x_offset, + 'slide.y_offset': slideObject.y_offset, + }, + }); +}; diff --git a/bigbluebutton-html5/imports/api/slides/server/publications.js b/bigbluebutton-html5/imports/api/slides/server/publications.js new file mode 100755 index 0000000000..be05ff47c3 --- /dev/null +++ b/bigbluebutton-html5/imports/api/slides/server/publications.js @@ -0,0 +1,10 @@ +import Slides from '/imports/api/slides'; +import { logger } from '/imports/startup/server/logger'; + +Meteor.publish('slides', function (credentials) { + const { meetingId } = credentials; + logger.info(`publishing slides for ${meetingId}`); + return Slides.find({ + meetingId: meetingId, + }); +}); diff --git a/bigbluebutton-html5/imports/api/users/index.js b/bigbluebutton-html5/imports/api/users/index.js new file mode 100755 index 0000000000..1ed8abaa31 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/index.js @@ -0,0 +1 @@ +export default new Mongo.Collection('users'); diff --git a/bigbluebutton-html5/server/methods/kickUser.js b/bigbluebutton-html5/imports/api/users/server/methods/kickUser.js old mode 100644 new mode 100755 similarity index 53% rename from bigbluebutton-html5/server/methods/kickUser.js rename to bigbluebutton-html5/imports/api/users/server/methods/kickUser.js index d868bcb10a..77594b689c --- a/bigbluebutton-html5/server/methods/kickUser.js +++ b/bigbluebutton-html5/imports/api/users/server/methods/kickUser.js @@ -1,20 +1,25 @@ +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { appendMessageHeader, publish } from '/imports/startup/server/helpers'; +import { redisConfig } from '/config'; + Meteor.methods({ //meetingId: the meeting where the user is //toKickUserId: the userid of the user to kick //requesterUserId: the userid of the user that wants to kick //authToken: the authToken of the user that wants to kick - kickUser(meetingId, toKickUserId, requesterUserId, authToken) { + kickUser(credentials, toKickUserId) { + const { meetingId, requesterUserId, requesterToken } = credentials; let message; - if (isAllowedTo('kickUser', meetingId, requesterUserId, authToken)) { + if (isAllowedTo('kickUser', credentials)) { message = { payload: { userid: toKickUserId, ejected_by: requesterUserId, meeting_id: meetingId, - } + }, }; message = appendMessageHeader('eject_user_from_meeting_request_message', message); - return publish(Meteor.config.redis.channels.toBBBApps.users, message); + return publish(redisConfig.channels.toBBBApps.users, message); } }, -}); \ No newline at end of file +}); diff --git a/bigbluebutton-html5/server/methods/listenOnlyRequestToggle.js b/bigbluebutton-html5/imports/api/users/server/methods/listenOnlyRequestToggle.js old mode 100644 new mode 100755 similarity index 53% rename from bigbluebutton-html5/server/methods/listenOnlyRequestToggle.js rename to bigbluebutton-html5/imports/api/users/server/methods/listenOnlyRequestToggle.js index 173ba77b94..4420526160 --- a/bigbluebutton-html5/server/methods/listenOnlyRequestToggle.js +++ b/bigbluebutton-html5/imports/api/users/server/methods/listenOnlyRequestToggle.js @@ -1,18 +1,26 @@ +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { appendMessageHeader, publish } from '/imports/startup/server/helpers'; +import Meetings from '/imports/api/meetings'; +import Users from '/imports/api/users'; +import { logger } from '/imports/startup/server/logger'; +import { redisConfig } from '/config'; + Meteor.methods({ // meetingId: the meetingId of the meeting the user is in // toSetUserId: the userId of the user joining // requesterUserId: the userId of the requester // requesterToken: the authToken of the requester - listenOnlyRequestToggle(meetingId, userId, authToken, isJoining) { + listenOnlyRequestToggle(credentials, isJoining) { + const { meetingId, requesterUserId, requesterToken } = credentials; let message, userObject, username, voiceConf, meetingObject; - meetingObject = Meteor.Meetings.findOne({ + meetingObject = Meetings.findOne({ meetingId: meetingId, }); if (meetingObject != null) { voiceConf = meetingObject.voiceConf; } - userObject = Meteor.Users.findOne({ + userObject = Users.findOne({ meetingId: meetingId, userId: userId, }); @@ -21,32 +29,32 @@ Meteor.methods({ } if (isJoining) { - if (isAllowedTo('joinListenOnly', meetingId, userId, authToken)) { + if (isAllowedTo('joinListenOnly', credentials)) { message = { payload: { userid: userId, meeting_id: meetingId, voice_conf: voiceConf, name: username, - } + }, }; message = appendMessageHeader('user_connected_to_global_audio', message); - Meteor.log.info(`publishing a user listenOnly toggleRequest ${isJoining} request for ${userId}`); - publish(Meteor.config.redis.channels.toBBBApps.meeting, message); + logger.info(`publishing a user listenOnly toggleRequest ${isJoining} request for ${userId}`); + publish(redisConfig.channels.toBBBApps.meeting, message); } } else { - if (isAllowedTo('leaveListenOnly', meetingId, userId, authToken)) { + if (isAllowedTo('leaveListenOnly', credentials)) { message = { payload: { userid: userId, meeting_id: meetingId, voice_conf: voiceConf, name: username, - } + }, }; message = appendMessageHeader('user_disconnected_from_global_audio', message); - Meteor.log.info(`publishing a user listenOnly toggleRequest ${isJoining} request for ${userId}`); - publish(Meteor.config.redis.channels.toBBBApps.meeting, message); + logger.info(`publishing a user listenOnly toggleRequest ${isJoining} request for ${userId}`); + publish(redisConfig.channels.toBBBApps.meeting, message); } } }, diff --git a/bigbluebutton-html5/imports/api/users/server/methods/muteUser.js b/bigbluebutton-html5/imports/api/users/server/methods/muteUser.js new file mode 100755 index 0000000000..8f5f2cd8bd --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/methods/muteUser.js @@ -0,0 +1,42 @@ +import { publish } from '/imports/startup/server/helpers'; +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { appendMessageHeader } from '/imports/startup/server/helpers'; +import { updateVoiceUser } from '/imports/api/users/server/modifiers/updateVoiceUser'; +import { logger } from '/imports/startup/server/logger'; +import { redisConfig } from '/config'; + +Meteor.methods({ + // meetingId: the meetingId of the meeting the user[s] is in + // toMuteUserId: the userId of the user to be muted + // requesterUserId: the userId of the requester + // requesterToken: the authToken of the requester + muteUser(credentials, toMuteUserId) { + const { meetingId, requesterUserId, requesterToken } = credentials; + const action = function () { + if (toMuteUserId === requesterUserId) { + return 'muteSelf'; + } else { + return 'muteOther'; + } + }; + + if (isAllowedTo(action(), credentials)) { + let message = { + payload: { + user_id: toMuteUserId, + meeting_id: meetingId, + mute: true, + requester_id: requesterUserId, + }, + }; + message = appendMessageHeader('mute_user_request_message', message); + logger.info(`publishing a user mute request for ${toMuteUserId}`); + publish(redisConfig.channels.toBBBApps.users, message); + updateVoiceUser(meetingId, { + web_userid: toMuteUserId, + talking: false, + muted: true, + }); + } + }, +}); diff --git a/bigbluebutton-html5/server/methods/setUserPresenter.js b/bigbluebutton-html5/imports/api/users/server/methods/setUserPresenter.js old mode 100644 new mode 100755 similarity index 50% rename from bigbluebutton-html5/server/methods/setUserPresenter.js rename to bigbluebutton-html5/imports/api/users/server/methods/setUserPresenter.js index 4fa835f63b..4cf9e47b14 --- a/bigbluebutton-html5/server/methods/setUserPresenter.js +++ b/bigbluebutton-html5/imports/api/users/server/methods/setUserPresenter.js @@ -1,3 +1,8 @@ +import { publish } from '/imports/startup/server/helpers'; +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { appendMessageHeader } from '/imports/startup/server/helpers'; +import { redisConfig } from '/config'; + Meteor.methods({ //meetingId: the meeting where the user is //newPresenterId: the userid of the new presenter @@ -5,23 +10,23 @@ Meteor.methods({ //newPresenterName: user name of the new presenter //authToken: the authToken of the user that wants to kick setUserPresenter( - meetingId, + credentials, newPresenterId, - requesterSetPresenter, - newPresenterName, - authToken) { + newPresenterName) { + const { meetingId, requesterSetPresenter, requesterToken } = credentials; let message; - if (isAllowedTo('setPresenter', meetingId, requesterSetPresenter, authToken)) { + if (isAllowedTo('setPresenter', credentials)) { message = { payload: { new_presenter_id: newPresenterId, new_presenter_name: newPresenterName, meeting_id: meetingId, assigned_by: requesterSetPresenter, - } + }, }; + + message = appendMessageHeader('assign_presenter_request_message', message); + return publish(redisConfig.channels.toBBBApps.users, message); } - message = appendMessageHeader('assign_presenter_request_message', message); - return publish(Meteor.config.redis.channels.toBBBApps.users, message); - } + }, }); diff --git a/bigbluebutton-html5/server/methods/unmuteUser.js b/bigbluebutton-html5/imports/api/users/server/methods/unmuteUser.js old mode 100644 new mode 100755 similarity index 53% rename from bigbluebutton-html5/server/methods/unmuteUser.js rename to bigbluebutton-html5/imports/api/users/server/methods/unmuteUser.js index b528f1f786..0c2fc29fe7 --- a/bigbluebutton-html5/server/methods/unmuteUser.js +++ b/bigbluebutton-html5/imports/api/users/server/methods/unmuteUser.js @@ -1,12 +1,18 @@ -Meteor.methods({ +import { publish } from '/imports/startup/server/helpers'; +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { appendMessageHeader } from '/imports/startup/server/helpers'; +import { updateVoiceUser } from '/imports/api/users/server/modifiers/updateVoiceUser'; +import { logger } from '/imports/startup/server/logger'; +import { redisConfig } from '/config'; +Meteor.methods({ // meetingId: the meetingId of the meeting the user[s] is in // toMuteUserId: the userId of the user to be unmuted // requesterUserId: the userId of the requester // requesterToken: the authToken of the requester - unmuteUser(meetingId, toMuteUserId, requesterUserId, requesterToken) { - let action, message; - action = function () { + unmuteUser(credentials, toMuteUserId) { + const { meetingId, requesterUserId, requesterToken } = credentials; + const action = function () { if (toMuteUserId === requesterUserId) { return 'unmuteSelf'; } else { @@ -15,22 +21,22 @@ Meteor.methods({ }; if (isAllowedTo(action(), meetingId, requesterUserId, requesterToken)) { - message = { + let message = { payload: { user_id: toMuteUserId, meeting_id: meetingId, mute: false, requester_id: requesterUserId, - } + }, }; message = appendMessageHeader('mute_user_request_message', message); - Meteor.log.info(`publishing a user unmute request for ${toMuteUserId}`); - publish(Meteor.config.redis.channels.toBBBApps.users, message); + logger.info(`publishing a user unmute request for ${toMuteUserId}`); + publish(redisConfig.channels.toBBBApps.users, message); updateVoiceUser(meetingId, { web_userid: toMuteUserId, talking: false, muted: false, }); } - } + }, }); diff --git a/bigbluebutton-html5/imports/api/users/server/methods/userLogout.js b/bigbluebutton-html5/imports/api/users/server/methods/userLogout.js new file mode 100755 index 0000000000..b16d651cf5 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/methods/userLogout.js @@ -0,0 +1,16 @@ +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { requestUserLeaving } from '/imports/api/users/server/modifiers/requestUserLeaving'; +import { logger } from '/imports/startup/server/logger'; + +Meteor.methods({ + // meetingId: the meeting where the user is + // userId: the userid of the user logging out + // authToken: the authToken of the user + userLogout(credentials) { + if (isAllowedTo('logoutSelf', credentials)) { + const { meetingId, requesterUserId, requesterToken } = credentials; + logger.info(`a user is logging out from ${meetingId}:${userId}`); + return requestUserLeaving(meetingId, userId); + } + }, +}); diff --git a/bigbluebutton-html5/imports/api/users/server/methods/userSetEmoji.js b/bigbluebutton-html5/imports/api/users/server/methods/userSetEmoji.js new file mode 100755 index 0000000000..ecd15c32d7 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/methods/userSetEmoji.js @@ -0,0 +1,25 @@ +import { publish } from '/imports/startup/server/helpers'; +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { appendMessageHeader } from '/imports/startup/server/helpers'; +import { redisConfig } from '/config'; + +Meteor.methods({ + userSetEmoji(credentials, toRaiseUserId, status) { + const { meetingId, requesterUserId, requesterToken } = credentials; + let message; + if (isAllowedTo('setEmojiStatus', credentials)) { + message = { + payload: { + emoji_status: status, + userid: toRaiseUserId, + meeting_id: meetingId, + }, + }; + + message = appendMessageHeader('user_emoji_status_message', message); + + // publish to pubsub + publish(redisConfig.channels.toBBBApps.users, message); + } + }, +}); diff --git a/bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js b/bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js new file mode 100755 index 0000000000..63c78636e0 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js @@ -0,0 +1,34 @@ +import { logger } from '/imports/startup/server/logger'; +import { redisConfig } from '/config'; +import { createDummyUser } from '/imports/api/users/server/modifiers/createDummyUser'; +import { publish } from '/imports/startup/server/helpers'; + +Meteor.methods({ + // Construct and send a message to bbb-web to validate the user + validateAuthToken(credentials) { + const { meetingId, requesterUserId, requesterToken } = credentials; + logger.info('sending a validate_auth_token with', { + userid: requesterUserId, + authToken: requesterToken, + meetingid: meetingId, + }); + let message = { + payload: { + auth_token: requesterToken, + userid: requesterUserId, + meeting_id: meetingId, + }, + header: { + timestamp: new Date().getTime(), + reply_to: `${meetingId}/${requesterUserId}`, + name: 'validate_auth_token', + }, + }; + if ((requesterToken != null) && (requesterUserId != null) && (meetingId != null)) { + createDummyUser(meetingId, requesterUserId, requesterToken); + return publish(redisConfig.channels.toBBBApps.meeting, message); + } else { + return logger.info('did not have enough information to send a validate_auth_token message'); + } + }, +}); diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/clearUsersCollection.js b/bigbluebutton-html5/imports/api/users/server/modifiers/clearUsersCollection.js new file mode 100755 index 0000000000..ba64b345bc --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/clearUsersCollection.js @@ -0,0 +1,26 @@ +import Users from '/imports/api/users'; +import { logger } from '/imports/startup/server/logger'; + +// called on server start and on meeting end +export function clearUsersCollection() { + const meetingId = arguments[0]; + if (meetingId != null) { + return Users.remove({ + meetingId: meetingId, + }, err => { + if (err != null) { + return logger.error(`_error ${JSON.stringify(err)} while removing users from ${meetingId}`); + } else { + return logger.info(`_cleared Users Collection (meetingId: ${meetingId})!`); + } + }); + } else { + return Users.remove({}, err => { + if (err != null) { + return logger.error(`_error ${JSON.stringify(err)} while removing users from all meetings`); + } else { + return logger.info('_cleared Users Collection (all meetings)!'); + } + }); + } +}; diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/createDummyUser.js b/bigbluebutton-html5/imports/api/users/server/modifiers/createDummyUser.js new file mode 100755 index 0000000000..e8b5d7cb1f --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/createDummyUser.js @@ -0,0 +1,24 @@ +import Users from '/imports/api/users'; +import { logger } from '/imports/startup/server/logger'; + +export function createDummyUser(meetingId, userId, authToken) { + if (Users.findOne({ + userId: userId, + meetingId: meetingId, + authToken: authToken, + }) != null) { + const msg = `html5 user userId:[${userId}] from [${meetingId}] tried to revalidate token`; + return logger.info(msg); + } else { + return Users.insert({ + meetingId: meetingId, + userId: userId, + authToken: authToken, + clientType: 'HTML5', + validated: false, //will be validated on validate_auth_token_reply + }, (err, id) => { + const res = Users.find({ meetingId: meetingId, }).count(); + return logger.info(`_added a dummy html5 user userId=[${userId}] Users.size is now ${res}`); + }); + } +}; diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/eventHandlers.js b/bigbluebutton-html5/imports/api/users/server/modifiers/eventHandlers.js new file mode 100644 index 0000000000..69b194e3fd --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/eventHandlers.js @@ -0,0 +1,219 @@ +import { logger } from '/imports/startup/server/logger'; +import { eventEmitter } from '/imports/startup/server'; +import { handleEndOfMeeting } from '/imports/api/meetings/server/modifiers/eventHandlers'; +import { userJoined } from './userJoined'; +import { setUserLockedStatus } from './setUserLockedStatus'; +import { markUserOffline } from './markUserOffline'; +import Users from '../..'; + +eventEmitter.on('user_eject_from_meeting', function (arg) { + handleRemoveUserEvent(arg); +}); + +eventEmitter.on('disconnect_user_message', function (arg) { + handleRemoveUserEvent(arg); +}); + +eventEmitter.on('end_and_kick_all_message', function (arg) { + handleEndOfMeeting(arg); +}); + +eventEmitter.on('disconnect_all_users_message', function (arg) { + handleEndOfMeeting(arg); +}); + +eventEmitter.on('user_left_message', function (arg) { + handleRemoveUserEvent(arg); +}); + +eventEmitter.on('validate_auth_token_reply', function (arg) { + const meetingId = arg.payload.meeting_id; + const userId = arg.payload.userid; + const user = Users.findOne({ + userId: userId, + meetingId: meetingId, + }); + const validStatus = arg.payload.valid; + + // if the user already exists in the db + if (user != null && user.clientType === 'HTML5') { + //if the html5 client user was validated successfully, add a flag + return Users.update({ + userId: userId, + meetingId: meetingId, + }, { + $set: { + validated: validStatus, + }, + }, (err, numChanged) => { + if (numChanged.insertedId != null) { + let funct = function (cbk) { + let user = Users.findOne({ + userId: userId, + meetingId: meetingId, + }); + let val; + if (user != null) { + val = user.validated; + } + + logger.info(`user.validated for ${userId} in meeting ${meetingId} just became ${val}`); + return cbk(); + }; + + return funct(arg.callback); + } else { + return arg.callback(); + } + }); + } else { + logger.info('a non-html5 user got validate_auth_token_reply.'); + return arg.callback(); + } +}); + +eventEmitter.on('user_joined_message', function (arg) { + const meetingId = arg.payload.meeting_id; + const payload = arg.payload; + let userObj = payload.user; + let dbUser = Users.findOne({ + userId: userObj.userid, + meetingId: meetingId, + }); + + // On attempting reconnection of Flash clients (in voiceBridge) we receive + // an extra user_joined_message. Ignore it as it will add an extra user + // in the user list, creating discrepancy with the list in the Flash client + if (dbUser != null && dbUser.user != null && dbUser.user.connection_status === 'offline') { + if (payload.user != null && payload.user.phone_user) { + logger.error('offline AND phone user'); + return arg.callback(); //return without joining the user + } + } else { + if (dbUser != null && dbUser.clientType === 'HTML5') { + // typically html5 users will be in + // the db [as a dummy user] before the joining message + let status = dbUser.validated; + logger.info(`in user_joined_message the validStatus of the user was ${status}`); + userObj.timeOfJoining = arg.header.current_time; + } + + return userJoined(meetingId, userObj, arg.callback); + } + + return arg.callback(); +}); + +eventEmitter.on('get_users_reply', function (arg) { + if (arg.payload.requester_id === 'nodeJSapp') { + console.log('get_users_reply handling'); + let users = arg.payload.users; + const meetingId = arg.payload.meeting_id; + + //TODO make the serialization be split per meeting. This will allow us to + // use N threads vs 1 and we'll take advantage of Mongo's concurrency tricks + + // Processing the users recursively with a callback to notify us, + // ensuring that we update the users collection serially + let processUser = function () { + let user = users.pop(); + if (user != null) { + user.timeOfJoining = arg.header.current_time; + if (user.emoji_status !== 'none' && typeof user.emoji_status === 'string') { + user.set_emoji_time = new Date(); + return userJoined(meetingId, user, processUser); + } else { + return userJoined(meetingId, user, processUser); + } + } else { + return arg.callback(); // all meeting arrays (if any) have been processed + } + }; + + return processUser(); + } else { + arg.callback(); + } +}); + +eventEmitter.on('user_emoji_status_message', function (arg) { + const userId = arg.payload.userid; + const meetingId = arg.payload.meeting_id; + const emojiStatus = arg.payload.emoji_status; + if (userId != null && meetingId != null) { + const setEmojiTime = new Date(); + Users.update({ + 'user.userid': userId, + }, { + $set: { + 'user.set_emoji_time': setEmojiTime, + 'user.emoji_status': emojiStatus, + }, + }, (err, numUpdated) => { + return logger.info(` Updating emoji numUpdated=${numUpdated}, err=${err}`); + }); + } + + return arg.callback(); +}); + +eventEmitter.on('user_locked_message', function (arg) { + handleLockEvent(arg); +}); + +eventEmitter.on('user_unlocked_message', function (arg) { + handleLockEvent(arg); +}); + +eventEmitter.on('presenter_assigned_message', function (arg) { + const meetingId = arg.payload.meeting_id; + const newPresenterId = arg.payload.new_presenter_id; + if (newPresenterId != null) { + // reset the previous presenter + Users.update({ + 'user.presenter': true, + meetingId: meetingId, + }, { + $set: { + 'user.presenter': false, + }, + }, (err, numUpdated) => { + return logger.info(` Updating old presenter numUpdated=${numUpdated}, err=${err}`); + }); + + // set the new presenter + Users.update({ + 'user.userid': newPresenterId, + meetingId: meetingId, + }, { + $set: { + 'user.presenter': true, + }, + }, (err, numUpdated) => { + return logger.info(` Updating new presenter numUpdated=${numUpdated}, err=${err}`); + }); + } + + return arg.callback(); +}); + +const handleRemoveUserEvent = function (arg) { + if (arg.payload.user != null && + arg.payload.user.userid != null && + arg.payload.meeting_id != null) { + const meetingId = arg.payload.meeting_id; + const userId = arg.payload.user.userid; + return markUserOffline(meetingId, userId, arg.callback); + } else { + logger.info('could not perform handleRemoveUserEvent'); + return arg.callback(); + } +}; + +const handleLockEvent = function (arg) { + const userId = arg.payload.userid; + const isLocked = arg.payload.locked; + const meetingId = arg.payload.meeting_id; + setUserLockedStatus(meetingId, userId, isLocked); + return arg.callback(); +}; diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/handleLockingMic.js b/bigbluebutton-html5/imports/api/users/server/modifiers/handleLockingMic.js new file mode 100755 index 0000000000..0348411c09 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/handleLockingMic.js @@ -0,0 +1,26 @@ +import Users from '/imports/api/users'; + +// when new lock settings including disableMic are set, +// all viewers that are in the audio bridge with a mic should be muted and locked +export function handleLockingMic(meetingId, newSettings) { + // send mute requests for the viewer users joined with mic + let i, results, userObject; + userObjects = Users.find({ + meetingId: meetingId, + 'user.role': 'VIEWER', + 'user.listenOnly': false, + 'user.locked': true, + 'user.voiceUser.joined': true, + 'user.voiceUser.muted': false, + }).fetch(); + + _userObjects_length = userObjects.length; + results = []; + for (i = 0; i < _userObjects_length; i++) { + userObject = userObjects[i]; + results.push(Meteor.call('muteUser', meetingId, userObject.userId, userObject.userId, + userObject.authToken, true)); //true for muted + } + + return results; +}; diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/markUserOffline.js b/bigbluebutton-html5/imports/api/users/server/modifiers/markUserOffline.js new file mode 100755 index 0000000000..e425a13233 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/markUserOffline.js @@ -0,0 +1,63 @@ +import Users from '/imports/api/users'; +import { logger } from '/imports/startup/server/logger'; + +// Only callable from server +// Received information from BBB-Apps that a user left +// Need to update the collection +// params: meetingid, userid as defined in BBB-Apps +// callback +export function markUserOffline(meetingId, userId, callback) { + // mark the user as offline. remove from the collection on meeting_end #TODO + let user = Users.findOne({ + meetingId: meetingId, + userId: userId, + }); + + if (user != null && user.clientType === 'HTML5') { + logger.info(`marking html5 user [${userId}] as offline in meeting[${meetingId}]`); + return Users.update({ + meetingId: meetingId, + userId: userId, + }, { + $set: { + 'user.connection_status': 'offline', + 'user.voiceUser.talking': false, + 'user.voiceUser.joined': false, + 'user.voiceUser.muted': false, + 'user.time_of_joining': 0, + 'user.listenOnly': false, //TODO make this user: {} + }, + }, (err, numChanged) => { + let funct; + if (err != null) { + logger.error(`_unsucc update (mark as offline) of user ${user.user.name} ${userId} err=${JSON.stringify(err)}`); + return callback(); + } else { + funct = function (cbk) { + logger.info(`_marking as offline html5 user ${user.user.name} ${userId} numChanged=${numChanged}`); + return cbk(); + }; + + return funct(callback); + } + }); + } else { + return Users.remove({ + meetingId: meetingId, + userId: userId, + }, (err, numDeletions) => { + let funct; + if (err != null) { + logger.error(`_unsucc deletion of user ${user != null ? user.user.name : void 0} ${userId} err=${JSON.stringify(err)}`); + return callback(); + } else { + funct = function (cbk) { + logger.info(`_deleting info for user ${user != null ? user.user.name : void 0} ${userId} numDeletions=${numDeletions}`); + return cbk(); + }; + + return funct(callback); + } + }); + } +}; diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/requestUserLeaving.js b/bigbluebutton-html5/imports/api/users/server/modifiers/requestUserLeaving.js new file mode 100755 index 0000000000..3fa45db3e4 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/requestUserLeaving.js @@ -0,0 +1,62 @@ +import { publish } from '/imports/startup/server/helpers'; +import Meetings from '/imports/api/meetings'; +import Users from '/imports/api/users'; +import { logger } from '/imports/startup/server/logger'; +import { redisConfig } from '/config'; + +// Corresponds to a valid action on the HTML clientside +// After authorization, publish a user_leaving_request in redis +// params: meetingid, userid as defined in BBB-App +export function requestUserLeaving(meetingId, userId) { + let listenOnlyMessage, message, userObject, meetingObject, voiceConf; + userObject = Users.findOne({ + meetingId: meetingId, + userId: userId, + }); + meetingObject = Meetings.findOne({ + meetingId: meetingId, + }); + if (meetingObject != null) { + voiceConf = meetingObject.voiceConf; + } + + if ((userObject != null) && (voiceConf != null) && (userId != null) && (meetingId != null)) { + let lOnly = false; + if (userObject.hasOwnProperty('user') && userObject.user.hasOwnProperty('listenOnly')) { + lOnly = userObject.user.listenOnly; + } + + // end listenOnly audio for the departing user + if (null != lOnly && lOnly) { + listenOnlyMessage = { + payload: { + userid: userId, + meeting_id: meetingId, + voice_conf: voiceConf, + name: userObject.user.name, + }, + header: { + timestamp: new Date().getTime(), + name: 'user_disconnected_from_global_audio', + }, + }; + publish(redisConfig.channels.toBBBApps.meeting, listenOnlyMessage); + } + + // remove user from meeting + message = { + payload: { + meeting_id: meetingId, + userid: userId, + }, + header: { + timestamp: new Date().getTime(), + name: 'user_leaving_request', + }, + }; + logger.info(`sending a user_leaving_request for ${meetingId}:${userId}`); + return publish(redisConfig.channels.toBBBApps.users, message); + } else { + return logger.info('did not have enough information to send a user_leaving_request'); + } +}; diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/setUserLockedStatus.js b/bigbluebutton-html5/imports/api/users/server/modifiers/setUserLockedStatus.js new file mode 100755 index 0000000000..7e651538e5 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/setUserLockedStatus.js @@ -0,0 +1,38 @@ +import Users from '/imports/api/users'; +import { logger } from '/imports/startup/server/logger'; + +// change the locked status of a user (lock settings) +export function setUserLockedStatus(meetingId, userId, isLocked) { + let userObject; + userObject = Users.findOne({ + meetingId: meetingId, + userId: userId, + }); + if (userObject != null) { + Users.update({ + userId: userId, + meetingId: meetingId, + }, { + $set: { + 'user.locked': isLocked, + }, + }, (err, numChanged) => { + if (err != null) { + return logger.error(`_error ${err} while updating user ${userId} with lock settings`); + } else { + return logger.info(`_setting user locked status for:[${userId}] from [${meetingId}] locked=${isLocked}`); + } + }); + + // if the user is sharing audio, he should be muted upon locking involving disableMic + if (userObject.user.role === 'VIEWER' && !userObject.user.listenOnly && + userObject.user.voiceUser.joined && !userObject.user.voiceUser.muted && isLocked) { + // TODO why are we doing Meteor.call here?! Anton + return Meteor.call('muteUser', meetingId, userObject.userId, userObject.userId, + userObject.authToken, true); //true for muted + } + } else { + let tempMsg = '(unsuccessful-no such user) setting user locked status for userid:'; + return logger.error(`${tempMsg}[${userId}] from [${meetingId}] locked=${isLocked}`); + } +}; diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/updateVoiceUser.js b/bigbluebutton-html5/imports/api/users/server/modifiers/updateVoiceUser.js new file mode 100755 index 0000000000..de194a0b7e --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/updateVoiceUser.js @@ -0,0 +1,97 @@ +import Users from '/imports/api/users'; +import { logger } from '/imports/startup/server/logger'; + +//update a voiceUser - a helper method +export function updateVoiceUser(meetingId, voiceUserObject, callback) { + let userObject; + userObject = Users.findOne({ + userId: voiceUserObject.web_userid, + }); + if (userObject != null) { + if (voiceUserObject.talking != null) { + Users.update({ + meetingId: meetingId, + userId: voiceUserObject.web_userid, + }, { + $set: { + 'user.voiceUser.talking': voiceUserObject.talking, + }, + }, (err, numChanged) => { + if (err != null) { + logger.error(`_unsucc update of voiceUser ${voiceUserObject.web_userid} [talking] err=${JSON.stringify(err)}`); + } + + return callback(); + }); + } // talking + if (voiceUserObject.joined != null) { + Users.update({ + meetingId: meetingId, + userId: voiceUserObject.web_userid, + }, { + $set: { + 'user.voiceUser.joined': voiceUserObject.joined, + }, + }, (err, numChanged) => { + if (err != null) { + logger.error( + `_unsucc update of voiceUser ${voiceUserObject.web_userid} [joined] err=${JSON.stringify(err)}` + ); + } + + return callback(); + }); + } // joined + if (voiceUserObject.locked != null) { + Users.update({ + meetingId: meetingId, + userId: voiceUserObject.web_userid, + }, { + $set: { + 'user.voiceUser.locked': voiceUserObject.locked, + }, + }, (err, numChanged) => { + if (err != null) { + logger.error(`_unsucc update of voiceUser ${voiceUserObject.web_userid} [locked] err=${JSON.stringify(err)}`); + } + + return callback(); + }); + } // locked + if (voiceUserObject.muted != null) { + Users.update({ + meetingId: meetingId, + userId: voiceUserObject.web_userid, + }, { + $set: { + 'user.voiceUser.muted': voiceUserObject.muted, + }, + }, (err, numChanged) => { + if (err != null) { + logger.error(`_unsucc update of voiceUser ${voiceUserObject.web_userid} [muted] err=${JSON.stringify(err)}`); + } + + return callback(); + }); + } // muted + if (voiceUserObject.listen_only != null) { + return Users.update({ + meetingId: meetingId, + userId: voiceUserObject.web_userid, + }, { + $set: { + 'user.listenOnly': voiceUserObject.listen_only, + }, + }, (err, numChanged) => { + if (err != null) { + logger.error(`_unsucc update of voiceUser ${voiceUserObject.web_userid} [listenOnly] err=${JSON.stringify(err)}`); + } + + return callback(); + }); + } // listenOnly + } else { + logger.error('ERROR! did not find such voiceUser!'); + return callback(); + } +}; diff --git a/bigbluebutton-html5/imports/api/users/server/modifiers/userJoined.js b/bigbluebutton-html5/imports/api/users/server/modifiers/userJoined.js new file mode 100755 index 0000000000..a739c56406 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/modifiers/userJoined.js @@ -0,0 +1,158 @@ +import Chat from '/imports/api/chat'; +import Users from '/imports/api/users'; +import Meetings from '/imports/api/meetings'; +import { logger } from '/imports/startup/server/logger'; + +export function userJoined(meetingId, user, callback) { + let userObject, userId, welcomeMessage, meetingObject; + userId = user.userid; + userObject = Users.findOne({ + userId: user.userid, + meetingId: meetingId, + }); + + // the collection already contains an entry for this user + // because the user is reconnecting OR + // in the case of an html5 client user we added a dummy user on + // register_user_message (to save authToken) + if (userObject != null && userObject.authToken != null) { + Users.update({ + userId: user.userid, + meetingId: meetingId, + }, { + $set: { + user: { + userid: user.userid, + presenter: user.presenter, + name: user.name, + _sort_name: user.name.toLowerCase(), + phone_user: user.phone_user, + set_emoji_time: user.set_emoji_time, + emoji_status: user.emoji_status, + has_stream: user.has_stream, + role: user.role, + listenOnly: user.listenOnly, + extern_userid: user.extern_userid, + locked: user.locked, + time_of_joining: user.timeOfJoining, + connection_status: 'online', // TODO consider other default value + voiceUser: { + web_userid: user.voiceUser.web_userid, + callernum: user.voiceUser.callernum, + userid: user.voiceUser.userid, + talking: user.voiceUser.talking, + joined: user.voiceUser.joined, + callername: user.voiceUser.callername, + locked: user.voiceUser.locked, + muted: user.voiceUser.muted, + }, + webcam_stream: user.webcam_stream, + }, + }, + }, err => { + let funct; + if (err != null) { + logger.error(`_error ${err} when trying to insert user ${userId}`); + return callback(); + } else { + funct = function (cbk) { + logger.info(`_(case1) UPDATING USER ${user.userid}, authToken= ${userObject.authToken}, locked=${user.locked}, username=${user.name}`); + return cbk(); + }; + + return funct(callback); + } + }); + meetingObject = Meetings.findOne({ + meetingId: meetingId, + }); + if (meetingObject != null) { + welcomeMessage = Meteor.config.defaultWelcomeMessage.replace(/%%CONFNAME%%/, + meetingObject.meetingName); + } + + welcomeMessage = welcomeMessage + Meteor.config.defaultWelcomeMessageFooter; + + // add the welcome message if it's not there already OR update time_of_joining + return Chat.upsert({ + meetingId: meetingId, + userId: userId, + 'message.chat_type': 'SYSTEM_MESSAGE', + 'message.to_userid': userId, + }, { + meetingId: meetingId, + userId: userId, + message: { + chat_type: 'SYSTEM_MESSAGE', + message: welcomeMessage, + from_color: '0x3399FF', + to_userid: userId, + from_userid: 'SYSTEM_MESSAGE', + from_username: '', + from_time: (user != null && user.timeOfJoining != null) ? user.timeOfJoining.toString() : void 0, + }, + }, err => { + if (err != null) { + return logger.error(`_error ${err} when trying to insert welcome message for ${userId}`); + } else { + return logger.info(`_added/updated a system message in chat for user ${userId}`); + } + + // note that we already called callback() when updating the user. Adding + // the welcome message in the chat is not as vital and we can afford to + // complete it when possible, without blocking the serial event messages processing + }); + } else { + // logger.info "NOTE: got user_joined_message #{user.name} #{user.userid}" + return Users.upsert({ + meetingId: meetingId, + userId: userId, + }, { + meetingId: meetingId, + userId: userId, + user: { + userid: user.userid, + presenter: user.presenter, + name: user.name, + _sort_name: user.name.toLowerCase(), + phone_user: user.phone_user, + emoji_status: user.emoji_status, + set_emoji_time: user.set_emoji_time, + has_stream: user.has_stream, + role: user.role, + listenOnly: user.listenOnly, + extern_userid: user.extern_userid, + locked: user.locked, + time_of_joining: user.timeOfJoining, + connection_status: '', + voiceUser: { + web_userid: user.voiceUser.web_userid, + callernum: user.voiceUser.callernum, + userid: user.voiceUser.userid, + talking: user.voiceUser.talking, + joined: user.voiceUser.joined, + callername: user.voiceUser.callername, + locked: user.voiceUser.locked, + muted: user.voiceUser.muted, + }, + webcam_stream: user.webcam_stream, + }, + }, (err, numChanged) => { + let funct; + if (numChanged.insertedId != null) { + funct = function (cbk) { + logger.info( + `_joining user (case2) userid=[${userId}]:${user.name}. Users.size is now ${Users.find({ + meetingId: meetingId, + }).count()}` + ); + return cbk(); + }; + + return funct(callback); + } else { + return callback(); + } + }); + } +}; diff --git a/bigbluebutton-html5/imports/api/users/server/publications.js b/bigbluebutton-html5/imports/api/users/server/publications.js new file mode 100755 index 0000000000..b15358e0d9 --- /dev/null +++ b/bigbluebutton-html5/imports/api/users/server/publications.js @@ -0,0 +1,77 @@ +import Users from '/imports/api/users'; +import { isAllowedTo } from '/imports/startup/server/userPermissions'; +import { logger } from '/imports/startup/server/logger'; +import { requestUserLeaving } from '/imports/api/users/server/modifiers/requestUserLeaving'; + +// Publish only the online users that are in the particular meetingId +// Also contains reconnection and connection_status info +Meteor.publish('users', function (credentials) { + const meetingId = credentials.meetingId; + const userid = credentials.requesterUserId; + const authToken = credentials.requesterToken; + + logger.info(`attempt publishing users for ${meetingId}, ${userid}, ${authToken}`); + const userObject = Users.findOne({ + userId: userid, + meetingId: meetingId, + }); + + if (!!userObject && !!userObject.user) { + let username = 'UNKNOWN'; + if (isAllowedTo('subscribeUsers', credentials)) { + logger.info(`${userid} was allowed to subscribe to 'users'`); + username = userObject.user.name; + + // offline -> online + if (userObject.user.connection_status !== 'online') { + Meteor.call('validateAuthToken', credentials); + setConnectionStatus(meetingId, userid, 'online'); + } + + this._session.socket.on('close', Meteor.bindEnvironment((function (_this) { + return function () { + logger.info(`a user lost connection: session.id=${_this._session.id}` + + ` userId = ${userid}, username=${username}, meeting=${meetingId}`); + setConnectionStatus(meetingId, userid, 'offline'); + return requestUserLeaving(meetingId, userid); + }; + })(this))); + + return getUsers(meetingId); + } else { + logger.warn('was not authorized to subscribe to users'); + return this.error(new Meteor.Error(402, 'User was not authorized to subscribe to users')); + } + } else { //subscribing before the user was added to the collection + Meteor.call('validateAuthToken', credentials); + logger.error(`there was no user ${userid} in ${meetingId}. Sending validateAuthToken`); + return getUsers(meetingId); + } +}); + +const getUsers = function (meetingId) { + //publish the users which are not offline + return Users.find({ + meetingId: meetingId, + 'user.connection_status': { + $in: ['online', ''], + }, + }, { + fields: { + authToken: false, + }, + }); +}; + +const setConnectionStatus = function (meetingId, userId, statusStr) { + Users.update({ + meetingId: meetingId, + userId: userId, + }, { + $set: { + 'user.connection_status': statusStr, + }, + }, (err, numChanged) => { + logger.info(`User ${userId} in ${meetingId} goes ${statusStr}`); + }); +}; diff --git a/bigbluebutton-html5/imports/api/verto/index.js b/bigbluebutton-html5/imports/api/verto/index.js new file mode 100755 index 0000000000..f88655087e --- /dev/null +++ b/bigbluebutton-html5/imports/api/verto/index.js @@ -0,0 +1,57 @@ +import Meetings from '/imports/api/users'; + +function joinAudio(options) { + // joinVertoCall() +} + +function watchVideo(options) { + // joinVertoCall() +} + +function joinVertoCall(options) { + let extension = null; + if (options.extension) { + extension = options.extension; + } else { + extension = Meetings.findOne().voiceConf; + } + + if (!isWebRTCAvailable()) { + return; + } + + if (!Meteor.config.useSIPAudio) { + const vertoServerCredentials = { + vertoPort: Meteor.config.vertoPort, + hostName: Meteor.config.vertoServerAddress, + login: conferenceIdNumber, + password: Meteor.config.freeswitchProfilePassword, + }; + + let wasCallSuccessful = false; + let debuggerCallback = function (message) { + console.log('CALLBACK: ' + JSON.stringify(message)); + + // + // Beginning of hacky method to make Firefox media calls succeed. + // Always fail the first time. Retry on failure. + // + if (!!navigator.mozGetUserMedia && message.errorcode == 1001) { + const logCallback = function (m) { + console.log('CALLBACK: ' + JSON.stringify(m)); + }; + + callIntoConference_verto(extension, conferenceUsername, conferenceIdNumber, logCallback, + 'webcam', options, vertoServerCredentials); + } + + // + // End of hacky method + // + }; + + callIntoConference_verto(extension, conferenceUsername, conferenceIdNumber, debuggerCallback, + 'webcam', options, vertoServerCredentials); + return; + } +} diff --git a/bigbluebutton-html5/imports/locales/en.json b/bigbluebutton-html5/imports/locales/en.json new file mode 100644 index 0000000000..30b65b368f --- /dev/null +++ b/bigbluebutton-html5/imports/locales/en.json @@ -0,0 +1,3 @@ +{ + "app.home.greeting": "Welcome {name}! Your presentation will begin shortly..." +} diff --git a/bigbluebutton-html5/imports/locales/index.js b/bigbluebutton-html5/imports/locales/index.js new file mode 100644 index 0000000000..f7abe1b3cb --- /dev/null +++ b/bigbluebutton-html5/imports/locales/index.js @@ -0,0 +1,7 @@ +import en from './en.json'; +import ptBR from './pt-BR.json'; + +export default { + en: en, + 'pt-BR': ptBR, +}; diff --git a/bigbluebutton-html5/imports/locales/pt-BR.json b/bigbluebutton-html5/imports/locales/pt-BR.json new file mode 100644 index 0000000000..963b6fc018 --- /dev/null +++ b/bigbluebutton-html5/imports/locales/pt-BR.json @@ -0,0 +1,3 @@ +{ + "app.home.greeting": "Bem-vindo {name}! Sua aprensentação começará em breve..." +} diff --git a/bigbluebutton-html5/imports/startup/client/routes.js b/bigbluebutton-html5/imports/startup/client/routes.js new file mode 100755 index 0000000000..e2b7872313 --- /dev/null +++ b/bigbluebutton-html5/imports/startup/client/routes.js @@ -0,0 +1,36 @@ +import React from 'react'; +import { Router, Route, Redirect, IndexRoute, + IndexRedirect, useRouterHistory } from 'react-router'; +import { createHistory } from 'history'; + +// route components +import AppContainer from '../../ui/components/app/container'; +import {setCredentials, subscribeForData} from '../../ui/components/app/service'; +import UserListContainer from '../../ui/components/user-list/UserListContainer'; +import ChatContainer from '../../ui/components/chat/ChatContainer'; + +const browserHistory = useRouterHistory(createHistory)({ + basename: '/html5client', +}); + +export const renderRoutes = () => ( +
' breakline character for Flash +export const translateHTML5ToFlash = function (message) { + let result = message; + result = result.replace(new RegExp(CARRIAGE_RETURN, 'g'), BREAK_LINE); + result = result.replace(new RegExp(NEW_LINE, 'g'), BREAK_LINE); + return result; +}; diff --git a/bigbluebutton-html5/imports/startup/server/index.js b/bigbluebutton-html5/imports/startup/server/index.js new file mode 100644 index 0000000000..56fa4c1ff6 --- /dev/null +++ b/bigbluebutton-html5/imports/startup/server/index.js @@ -0,0 +1,16 @@ +import { logger } from '/imports/startup/server/logger'; +import '/server/server'; +import { RedisPubSub } from '/imports/startup/server/RedisPubSub'; +import { EventQueue } from '/imports/startup/server/EventQueue'; +import { clearCollections } from '/imports/startup/server/helpers'; + +Meteor.startup(function () { + clearCollections(); + logger.info('server start'); +}); + +export const myQueue = new EventQueue(); + +export const eventEmitter = new (Npm.require('events').EventEmitter); + +export const redisPubSub = new RedisPubSub(); diff --git a/bigbluebutton-html5/imports/startup/server/logger.js b/bigbluebutton-html5/imports/startup/server/logger.js new file mode 100644 index 0000000000..498598a885 --- /dev/null +++ b/bigbluebutton-html5/imports/startup/server/logger.js @@ -0,0 +1,15 @@ +// Setting up a logger +const log = {}; +if (process != null && process.env != null && process.env.NODE_ENV == 'production') { + log.path = '/var/log/bigbluebutton/bbbnode.log'; +} else { + log.path = `${process.env.PWD}/log/development.log`; +} + +export let logger = new Winston.Logger({ + transports: [ + new Winston.transports.Console(), new Winston.transports.File({ + filename: log.path, + }), + ], +}); diff --git a/bigbluebutton-html5/server/user_permissions.js b/bigbluebutton-html5/imports/startup/server/userPermissions.js similarity index 63% rename from bigbluebutton-html5/server/user_permissions.js rename to bigbluebutton-html5/imports/startup/server/userPermissions.js index 99730f4a1d..2a45440152 100755 --- a/bigbluebutton-html5/server/user_permissions.js +++ b/bigbluebutton-html5/imports/startup/server/userPermissions.js @@ -1,6 +1,8 @@ -let moderator, presenter, viewer; +import Users from '/imports/api/users'; +import Meetings from '/imports/api/meetings'; +import { logger } from '/imports/startup/server/logger'; -presenter = { +const presenter = { switchSlide: true, //poll @@ -10,7 +12,7 @@ presenter = { // holds the values for whether the moderator user is allowed to perform an action (true) // or false if not allowed. Some actions have dynamic values depending on the current lock settings -moderator = { +const moderator = { // audio listen only joinListenOnly: true, leaveListenOnly: true, @@ -51,7 +53,7 @@ moderator = { // holds the values for whether the viewer user is allowed to perform an action (true) // or false if not allowed. Some actions have dynamic values depending on the current lock settings -viewer = function (meetingId, userId) { +const viewer = function (meetingId, userId) { let meeting, user; return { @@ -68,8 +70,8 @@ viewer = function (meetingId, userId) { // muting muteSelf: true, - unmuteSelf: !((meeting = Meteor.Meetings.findOne({ meetingId: meetingId })) != null && meeting.roomLockSettings.disableMic) || - !((user = Meteor.Users.findOne({ meetingId: meetingId, userId: userId })) != null && user.user.locked), + unmuteSelf: !((meeting = Meetings.findOne({ meetingId: meetingId })) != null && meeting.roomLockSettings.disableMic) || + !((user = Users.findOne({ meetingId: meetingId, userId: userId })) != null && user.user.locked), logoutSelf: true, @@ -78,12 +80,12 @@ viewer = function (meetingId, userId) { subscribeChat: true, //chat - chatPublic: !((meeting = Meteor.Meetings.findOne({ meetingId: meetingId })) != null && meeting.roomLockSettings.disablePublicChat) || - !((user = Meteor.Users.findOne({ meetingId: meetingId, userId: userId })) != null && user.user.locked) || + chatPublic: !((meeting = Meetings.findOne({ meetingId: meetingId })) != null && meeting.roomLockSettings.disablePublicChat) || + !((user = Users.findOne({ meetingId: meetingId, userId: userId })) != null && user.user.locked) || (user != null && user.user.presenter), - chatPrivate: !((meeting = Meteor.Meetings.findOne({ meetingId: meetingId })) != null && meeting.roomLockSettings.disablePrivateChat) || - !((user = Meteor.Users.findOne({ meetingId: meetingId, userId: userId })) != null && user.user.locked) || + chatPrivate: !((meeting = Meetings.findOne({ meetingId: meetingId })) != null && meeting.roomLockSettings.disablePrivateChat) || + !((user = Users.findOne({ meetingId: meetingId, userId: userId })) != null && user.user.locked) || (user != null && user.user.presenter), //poll @@ -98,9 +100,13 @@ viewer = function (meetingId, userId) { // carries out the decision making for actions affecting users. For the list of // actions and the default value - see 'viewer' and 'moderator' in the beginning of the file -this.isAllowedTo = function (action, meetingId, userId, authToken) { +export function isAllowedTo(action, credentials) { + const meetingId = credentials.meetingId; + const userId = credentials.requesterUserId; + const authToken = credentials.requesterToken; + let user, validated; - user = Meteor.Users.findOne({ + user = Users.findOne({ meetingId: meetingId, userId: userId, }); @@ -108,47 +114,47 @@ this.isAllowedTo = function (action, meetingId, userId, authToken) { validated = user.validated; } - Meteor.log.info(`in isAllowedTo: action-${action}, userId=${userId}, authToken=${authToken} validated:${validated}`); - user = Meteor.Users.findOne({ + logger.info(`in isAllowedTo: action-${action}, userId=${userId}, authToken=${authToken} validated:${validated}`); + user = Users.findOne({ meetingId: meetingId, userId: userId, }); - // Meteor.log.info "user=" + JSON.stringify user + // logger.info "user=" + JSON.stringify user if ((user != null) && authToken === user.authToken) { // check if the user is who he claims to be if (user.validated && user.clientType === 'HTML5') { // PRESENTER // check presenter specific actions or fallback to regular viewer actions if (user.user != null && user.user.presenter) { - Meteor.log.info('user permissions presenter case'); + logger.info('user permissions presenter case'); return presenter[action] || viewer(meetingId, userId)[action] || false; // VIEWER } else if (user.user != null && user.user.role === 'VIEWER') { - Meteor.log.info('user permissions viewer case'); + logger.info('user permissions viewer case'); return viewer(meetingId, userId)[action] || false; // MODERATOR } else if (user.user != null && user.user.role === 'MODERATOR') { - Meteor.log.info('user permissions moderator case'); + logger.info('user permissions moderator case'); return moderator[action] || false; } else { - Meteor.log.warn(`UNSUCCESSFULL ATTEMPT FROM userid=${userId} to perform:${action}`); + logger.warn(`UNSUCCESSFULL ATTEMPT FROM userid=${userId} to perform:${action}`); return false; } } else { // user was not validated if (action === 'logoutSelf') { // on unsuccessful sign-in - Meteor.log.warn('a user was successfully removed from the meeting following an unsuccessful login'); + logger.warn('a user was successfully removed from the meeting following an unsuccessful login'); return true; } return false; } } else { - Meteor.log.error(`in meetingId=${meetingId} userId=${userId} tried to perform ${action} without permission${'\n..while the authToken was ' + + logger.error(`in meetingId=${meetingId} userId=${userId} tried to perform ${action} without permission${'\n..while the authToken was ' + (user != null && user.authToken != null ? user.authToken : void 0) + " and the user's object is " + (JSON.stringify(user))}`); return false; diff --git a/bigbluebutton-html5/imports/ui/Button.jsx b/bigbluebutton-html5/imports/ui/Button.jsx deleted file mode 100755 index 7cc3f4c1ee..0000000000 --- a/bigbluebutton-html5/imports/ui/Button.jsx +++ /dev/null @@ -1,66 +0,0 @@ -import React from 'react'; -import CustomPropTypes from './utils/propTypes.js'; - -const { PropTypes } = React; -const TYPES = [ - 'button', 'reset', 'submit', -]; - -export let Button = React.createClass({ - propTypes: { - disabled: PropTypes.bool, - - /** - * You can use a custom element for this component - */ - componentClass: CustomPropTypes.elementType, - - /** - * Defines HTML button type Attribute - * @type {("button"|"reset"|"submit")} - * @defaultValue 'button' - */ - type: PropTypes.oneOf(TYPES), - }, - - getDefaultProps() { - return { - disabled: false, - type: 'button', - }; - }, - - render() { - let renderFuncName = this.props.href || this.props.target ? - 'renderAnchor' : 'renderButton'; - - return this[renderFuncName](); - }, - - renderAnchor() { - let Component = this.props.componentClass || 'a'; - let href = this.props.href || '#'; - - return ( -
-
- );
- },
-});
diff --git a/bigbluebutton-html5/imports/ui/chat/ChatInputControls.jsx b/bigbluebutton-html5/imports/ui/chat/ChatInputControls.jsx
deleted file mode 100755
index 7ef61b6de5..0000000000
--- a/bigbluebutton-html5/imports/ui/chat/ChatInputControls.jsx
+++ /dev/null
@@ -1,158 +0,0 @@
-import React from 'react';
-
-export let ChatInputControls = React.createClass({
- //#TODO MessageFontSize dynamic change
- componentDidMount: function () {
- $('.panel-footer').resizable({
- handles: 'n',
- minHeight: 70,
- resize(event, ui) {
- let ref;
- if ($('.panel-footer').css('top') === '0px') {
- $('.panel-footer').height(70); // prevents the element from shrinking vertically for 1-2 px
- } else {
- $('.panel-footer').css('top', `${parseInt($('.panel-footer').css('top'))}${1}px`);
- }
-
- $('#chatbody').height($('#chat').height() - $('.panel-footer').height() - 45);
- return $('#chatbody').scrollTop((ref = $('#chatbody')[0]) != null ? ref.scrollHeight : void 0);
- },
-
- start(event, ui) {
- $('#newMessageInput').css('overflow', '');
- return $('.panel-footer').resizable('option', 'maxHeight', Math.max($('.panel-footer').height(), $('#chat').height() / 2));
- },
-
- stop(event, ui) {
- return setInSession('chatInputMinHeight', $('.panel-footer').height() + 1);
- },
- });
-
- $('#newMessageInput').on('keydown paste cut', () => {
- return setTimeout(() => {
- return this.adjustChatInputHeight();
- }, 0);
- });
- },
-
- sendMessage: function () {
- let chattingWith, color, message, ref, toUsername;
- message = linkify($('#newMessageInput').val()); // get the message from the input box
- if (!((message != null ? message.length : void 0) > 0 && (/\S/.test(message)))) { // check the message has content and it is not whitespace
- return; // do nothing if invalid message
- }
-
- color = '0x000000'; //"0x#{getInSession("messageColor")}"
- if ((chattingWith = getInSession('inChatWith')) !== 'PUBLIC_CHAT') {
- toUsername = (ref = Meteor.Users.findOne({
- userId: chattingWith,
- })) != null ? ref.user.name : void 0;
- BBB.sendPrivateChatMessage(color, 'en', message, chattingWith, toUsername);
- } else {
- BBB.sendPublicChatMessage(color, 'en', message);
- }
-
- return $('#newMessageInput').val(''); // Clear message box
- },
-
- adjustChatInputHeight: function () {
- let projectedHeight, ref;
- if (isLandscape()) {
- $('#newMessageInput').css('height', 'auto');
- projectedHeight = $('#newMessageInput')[0].scrollHeight + 23;
- if (projectedHeight !== $('.panel-footer').height() && projectedHeight >= getInSession('chatInputMinHeight')) {
- $('#newMessageInput').css('overflow', 'hidden'); // prevents a scroll bar
-
- // resizes the chat input area
- $('.panel-footer').css('top', `${-(projectedHeight - 70)}px`);
- $('.panel-footer').css('height', `${projectedHeight}px`);
-
- $('#newMessageInput').height($('#newMessageInput')[0].scrollHeight);
-
- // resizes the chat messages container
- $('#chatbody').height($('#chat').height() - projectedHeight - 45);
- $('#chatbody').scrollTop((ref = $('#chatbody')[0]) != null ? ref.scrollHeight : void 0);
- }
-
- return $('#newMessageInput').css('height', '');
- } else if (isPortrait()) {
- $('.panel-footer').attr('style', '');
- $('#chatbody').attr('style', '');
- return $('#newMessageInput').attr('style', '');
- }
- },
-
- handleClick: function () {
- $('#sendMessageButton').blur();
- this.sendMessage();
- return this.adjustChatInputHeight();
- },
-
- // user pressed a button inside the chatbox
- keyPressedHandler: function (event) {
- let key;
- key = event.charCode ? event.charCode : (event.keyCode ? event.keyCode : 0);
- if (event.shiftKey && (key === 13)) {
- event.preventDefault();
-
- // append a '\r' carriage return character to the input box dropping the cursor to a new line
- document.getElementById('newMessageInput').value += CARRIAGE_RETURN; // Change newline character
- return;
- }
-
- if (key === 13) { // Check for pressing enter to submit message
- event.preventDefault();
- this.sendMessage();
- $('#newMessageInput').val('');
- return false;
- }
- },
-
- publicChatDisabled: function () {
- let presenter, publicChatIsDisabled, ref, ref1, ref2, userIsLocked;
- userIsLocked = (ref = Meteor.Users.findOne({
- userId: getInSession('userId'),
- })) != null ? ref.user.locked : void 0;
- publicChatIsDisabled = (ref1 = Meteor.Meetings.findOne({})) != null ? ref1.roomLockSettings.disablePublicChat : void 0;
- presenter = (ref2 = Meteor.Users.findOne({
- userId: getInSession('userId'),
- })) != null ? ref2.user.presenter : void 0;
- return userIsLocked && publicChatIsDisabled && !presenter;
- },
-
- privateChatDisabled: function () {
- let presenter, privateChatIsDisabled, ref, ref1, ref2, userIsLocked;
- userIsLocked = (ref = Meteor.Users.findOne({
- userId: getInSession('userId'),
- })) != null ? ref.user.locked : void 0;
- privateChatIsDisabled = (ref1 = Meteor.Meetings.findOne({})) != null ? ref1.roomLockSettings.disablePrivateChat : void 0;
- presenter = (ref2 = Meteor.Users.findOne({
- userId: getInSession('userId'),
- })) != null ? ref2.user.presenter : void 0;
- return userIsLocked && privateChatIsDisabled && !presenter;
- },
-
- getInputControls: function () {
- if (this.props.inPrivateChat && this.privateChatDisabled() || !this.props.inPrivateChat && this.publicChatDisabled()) {
- return (
-
- );
- } else {
- return (
-
- {this.inPrivateChat() ?
-
- : null }
-
- {this.data.user_exists ?
-
-
- -
- {this.getCombinedMessagesForChat(this.data.chatMessages).map((message) =>
-
- The user has left } -
-
-
- : null }
-
-
-
-
- );
- }
- },
-
- render() {
- return (
-
- { this.getInputControls() }
-
- );
- },
-});
diff --git a/bigbluebutton-html5/imports/ui/chat/ChatMessage.jsx b/bigbluebutton-html5/imports/ui/chat/ChatMessage.jsx
deleted file mode 100755
index 83353be83e..0000000000
--- a/bigbluebutton-html5/imports/ui/chat/ChatMessage.jsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import React from 'react';
-
-export let ChatMessage = React.createClass({
- sanitizeAndFormat: function (str) {
- let res;
- if (typeof str === 'string') { // First, replace replace all tags with the ascii equivalent (excluding those involved in anchor tags)
- res = str.replace(/&/g, '&').replace(/<(?![au\/])/g, '<').replace(/\/([^au])>/g, '$1>').replace(/([^=])"(?!>)/g, '$1"');
- res = this.toClickable(res);
- return res = this.activateBreakLines(res);
- }
- },
-
- toClickable: function (str) {
- let res;
- if (typeof str === 'string') {
- res = str.replace(/
-
- );
- } else {
- return (
-
-
- );
- }
- },
-
- render() {
- var messageColor = { color: colourToHex(this.props.message.message.from_color) };
- var floatLeft = { float: 'left' };
- function createMarkup(str) { return { __html: str }; };
-
- return (
- -
-
- {this.autoscroll()}
-
-
-
- );
- },
-});
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
new file mode 100644
index 0000000000..623306db37
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
@@ -0,0 +1,59 @@
+import React, { Component, PropTypes } from 'react';
+import styles from './styles.scss';
+
+import Button from '../button/component';
+
+export default class ActionsBar extends Component {
+ constructor(props) {
+ super(props);
+ }
+
+ handleClick() {
+ console.log('dummy handler');
+ }
+
+ render() {
+ return (
+
- {this.props.privateChatName}
-
-
+
+ );
+ }
+}
diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
new file mode 100644
index 0000000000..eb106b4a73
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/actions-bar/container.jsx
@@ -0,0 +1,22 @@
+import React, { Component, PropTypes } from 'react';
+import { createContainer } from 'meteor/react-meteor-data';
+
+import ActionsBar from './component';
+
+class ActionsBarContainer extends Component {
+ constructor(props) {
+ super(props);
+ }
+
+ render() {
+ return (
+
+
+
+
+
+
+
+
+
+
+
+ {this.renderNavBar()}
+ {this.renderMedia()}
+ {this.renderActionsBar()}
+
+ {this.renderSidebar()}
+
+ You are chatting with {this.props.currentChat}
+
+ );
+ }
+}
diff --git a/bigbluebutton-html5/imports/ui/components/chat/ChatContainer.jsx b/bigbluebutton-html5/imports/ui/components/chat/ChatContainer.jsx
new file mode 100644
index 0000000000..453be391c8
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/chat/ChatContainer.jsx
@@ -0,0 +1,31 @@
+import React, { Component, PropTypes } from 'react';
+import { createContainer } from 'meteor/react-meteor-data';
+
+import Chat from './Chat';
+
+class ChatContainer extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ currentChat: null,
+ };
+ }
+
+ componentDidMount() {
+ const chatID = this.props.params.id || 'public';
+ this.setState({ currentChat: chatID });
+ }
+
+ render() {
+ const { chatID, ...props } = this.props.params;
+ return (
+
+
+ );
+ }
+
+ renderOverlay() {
+ const { overlay } = this.props;
+
+ if (overlay) {
+ return (
+
+
+
+ {content}
+
+
+
+ );
+ }
+
+ return false;
+ }
+
+ render() {
+ return (
+
+
+
+ {overlay}
+
+
+ {this.props.children}
+ {this.renderContent()}
+ {this.renderOverlay()}
+
+ );
+ }
+}
+
+Media.propTypes = propTypes;
diff --git a/bigbluebutton-html5/imports/ui/components/media/container.jsx b/bigbluebutton-html5/imports/ui/components/media/container.jsx
new file mode 100644
index 0000000000..0145e3153b
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/media/container.jsx
@@ -0,0 +1,51 @@
+import React, { Component, PropTypes } from 'react';
+import { createContainer } from 'meteor/react-meteor-data';
+
+import Media from './component';
+
+import Button from '../button/component';
+
+import WhiteboardContainer from '../whiteboard/container';
+import VideoDockContainer from '../video-dock/container';
+
+const defaultProps = {
+ overlay: hello
,
+ };
+ this.openModal = this.openModal.bind(this);
+ this.closeModal = this.closeModal.bind(this);
+ this.handleModalCloseRequest = this.handleModalCloseRequest.bind(this);
+ this.handleSaveClicked = this.handleSaveClicked.bind(this);
+ this.afterOpenModal = this.afterOpenModal.bind(this);
+ this.setTitle = this.setTitle.bind(this);
+ }
+
+ setTitle(title) {
+ this.setState({ title: title });
+ }
+
+ openModal() {
+ this.setState({ modalIsOpen: true });
+ }
+
+ closeModal() {
+ this.setState({ modalIsOpen: false });
+ }
+
+ afterOpenModal() {}
+
+ handleModalCloseRequest() {
+ // opportunity to validate something and keep the modal open even if it
+ // requested to be closed
+ this.setState({ modalIsOpen: false });
+ }
+
+ handleSaveClicked(e) {
+ alert('Save button was clicked');
+ }
+
+ getContent() {
+ return (parent content
);
+ }
+
+ render() {
+ return (
+
+ +
+ {this.getContent()}
+
+
+
+ );
+ }
+};
+
+SettingsModal.defaultProps = { title: 'Settings' };
diff --git a/bigbluebutton-html5/imports/ui/components/modals/settings/styles.scss b/bigbluebutton-html5/imports/ui/components/modals/settings/styles.scss
new file mode 100755
index 0000000000..b51390a9a8
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/modals/settings/styles.scss
@@ -0,0 +1,33 @@
+.settingsMenuLeft {
+ border-right: 2px solid grey;
+ float: left;
+ width: 30%;
+}
+
+.settingsMenuRight {
+ float: right;
+ padding-left: 10px;
+ width: 70%;
+}
+
+.settingsSubmenuItem {
+ color: black;
+ padding: 5px;
+}
+
+.settingsSubmenuItemActive {
+ border-right: 5px solid blue;
+ color: blue;
+}
+
+.fontSizeButton {
+ padding: 0px;
+ margin: 5px;
+ background-color: white;
+ color: grey;
+ border: 2px solid grey;
+ width: 30px;
+ height: 30px;
+ text-align: center;
+ border-radius: 15px;
+}
diff --git a/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/ApplicationMenu.jsx b/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/ApplicationMenu.jsx
new file mode 100755
index 0000000000..6974d314e4
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/ApplicationMenu.jsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import Modal from 'react-modal';
+import Icon from '/imports/ui/components/icon/component';
+import Button from '/imports/ui/components/button/component';
+import BaseMenu from './BaseMenu';
+import ReactDOM from 'react-dom';
+import FontControl from '/imports/api/FontControl';
+
+export default class ApplicationMenu extends BaseMenu {
+ constructor(props) {
+ super(props);
+ this.state = {
+ currentFontSize: FontControl.fontSizeEnum.MEDIUM,
+ };
+ }
+
+ getContent() {
+ return (
+
+
+ -
+ {this.submenus.map((value, index) => (
+
-
+
+ {value.props.title} +
+ ))}
+
{this.createMenu()}
+
+
+
+ );
+ }
+};
diff --git a/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx b/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx
new file mode 100755
index 0000000000..cb9f2e40be
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import Modal from 'react-modal';
+import Icon from '/imports/ui/components/icon/component';
+import Button from '/imports/ui/components/button/component';
+import BaseMenu from './BaseMenu';
+import {joinVoiceCall} from '/imports/api/phone';
+
+export default class AudioMenu extends BaseMenu {
+ constructor(props) {
+ super(props);
+ }
+
+ getContent() {
+ const useSIPAudio = true;
+ const isListenOnly = true;
+ return (
+ Audio notifications for chat
+audio not
+fsdfds
+Push notifications for chat
+push not
++
+
+ Font size
+
+ {FontControl.getFontSizeName.call(this)}
+
+
+
+
+
+
+
+ );
+ }
+};
diff --git a/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/BaseMenu.jsx b/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/BaseMenu.jsx
new file mode 100755
index 0000000000..61e0ee04eb
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/BaseMenu.jsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import Modal from 'react-modal';
+import Icon from '/imports/ui/components/icon/component';
+import Button from '/imports/ui/components/button/component';
+
+export default class BaseMenu extends React.Component {
+ constructor(props) {
+ super(props);
+ }
+
+ getContent() {
+ return (inside audio menu
+ +parent content
);
+ }
+
+ render() {
+ return (
+
+
+ );
+ }
+};
diff --git a/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/SessionMenu.jsx b/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/SessionMenu.jsx
new file mode 100755
index 0000000000..037890e4d2
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/SessionMenu.jsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import Modal from 'react-modal';
+import Icon from '/imports/ui/components/icon/component';
+import Button from '/imports/ui/components/button/component';
+import BaseMenu from './BaseMenu';
+
+export default class SessionMenu extends BaseMenu {
+ constructor(props) {
+ super(props);
+ }
+
+ getContent() {
+ return (
+ {this.props.title}
+
+ {this.getContent()}
+
+ inside session menu
+ );
+ }
+};
diff --git a/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/UsersMenu.jsx b/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/UsersMenu.jsx
new file mode 100755
index 0000000000..04db3c7d69
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/UsersMenu.jsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import Modal from 'react-modal';
+import Icon from '/imports/ui/components/icon/component';
+import Button from '/imports/ui/components/button/component';
+import BaseMenu from './BaseMenu';
+
+export default class UsersMenu extends BaseMenu {
+ constructor(props) {
+ super(props);
+ }
+
+ getContent() {
+ return (
+ inside users menu
+ );
+ }
+};
diff --git a/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/VideoMenu.jsx b/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/VideoMenu.jsx
new file mode 100755
index 0000000000..e7784f1830
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/modals/settings/submenus/VideoMenu.jsx
@@ -0,0 +1,17 @@
+import React from 'react';
+import Modal from 'react-modal';
+import Icon from '/imports/ui/components/icon/component';
+import Button from '/imports/ui/components/button/component';
+import BaseMenu from './BaseMenu';
+
+export default class VideoMenu extends BaseMenu {
+ constructor(props) {
+ super(props);
+ }
+
+ getContent() {
+ return (
+ inside video menu
+ );
+ }
+};
diff --git a/bigbluebutton-html5/imports/ui/components/modals/styles.scss b/bigbluebutton-html5/imports/ui/components/modals/styles.scss
new file mode 100755
index 0000000000..4f3c87a022
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/modals/styles.scss
@@ -0,0 +1,37 @@
+.modalHeaderButtonContainer {
+ float: right;
+}
+
+.modalButton {
+ background: none;
+ border-radius: 25px;
+ color: #008CBA;
+ margin: 15px;
+ padding-bottom: 10px;
+ padding-left: 25px;
+ padding-right: 25px;
+ padding-top: 10px;
+ text-align: center;
+ width: 100px;
+}
+
+.close {
+ background: none;
+ color: #008CBA;
+ margin: 15px;
+}
+
+.done {
+ background: #008CBA;
+ color: white;
+}
+
+.modalHeaderTitle {
+ color: black;
+ float: left;
+ margin-top: 20px;
+}
+
+.modalHorizontalRule {
+ clear: both;
+}
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
new file mode 100755
index 0000000000..ae3c823095
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx
@@ -0,0 +1,57 @@
+import React, { Component, PropTypes } from 'react';
+import styles from './styles.scss';
+import { withRouter } from 'react-router';
+import Button from '../button/component';
+
+const propTypes = {
+ presentationTitle: PropTypes.string.isRequired,
+ hasUnreadMessages: PropTypes.bool.isRequired,
+};
+
+const defaultProps = {
+ presentationTitle: 'Default Room Title',
+ hasUnreadMessages: false,
+};
+
+class NavBar extends Component {
+ constructor(props) {
+ super(props);
+
+ this.handleToggleUserList = this.handleToggleUserList.bind(this);
+ }
+
+ handleToggleUserList() {
+ /*
+ TODO: Find out how to get the current route here
+ so we can change the click behavior
+ */
+ this.props.router.push('/users');
+ }
+
+ render() {
+ const { presentationTitle } = this.props;
+ return (
+
+
+ );
+ }
+}
+
+NavBar.propTypes = propTypes;
+NavBar.defaultProps = defaultProps;
+
+export default withRouter(NavBar);
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx
new file mode 100644
index 0000000000..0b6b4a8c85
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/container.jsx
@@ -0,0 +1,25 @@
+import React, { Component, PropTypes } from 'react';
+import { createContainer } from 'meteor/react-meteor-data';
+
+import NavBar from './component';
+
+class NavBarContainer extends Component {
+ constructor(props) {
+ super(props);
+ }
+
+ render() {
+ return (
+
+
+
+
+
+ {presentationTitle}
+
+
+
+
+ {poll.answers.map((pollAnswer, index) => {
+ return (
+
+ );
+ })}
+
+ );
+ }
+};
diff --git a/bigbluebutton-html5/imports/ui/components/polling/container.jsx b/bigbluebutton-html5/imports/ui/components/polling/container.jsx
new file mode 100755
index 0000000000..922ba44a98
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/polling/container.jsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import PollingService from './service';
+import { createContainer } from 'meteor/react-meteor-data';
+import PollingComponent from './component';
+
+class PollingContainer extends React.Component {
+ render() {
+ if (this.props.pollExists) {
+ return
+
+ );
+ }
+}
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/UserListContainer.jsx b/bigbluebutton-html5/imports/ui/components/user-list/UserListContainer.jsx
new file mode 100644
index 0000000000..cc5ca14fad
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/user-list/UserListContainer.jsx
@@ -0,0 +1,22 @@
+import React, { Component, PropTypes } from 'react';
+import { createContainer } from 'meteor/react-meteor-data';
+
+import UserList from './UserList';
+
+class UserListContainer extends Component {
+ constructor(props) {
+ super(props);
+ }
+
+ render() {
+ return (
+ -
+
- USER-LIST +
- + Open Public chat + +
- + Open Private Chat With Fred + +
- + Open Private Chat With Tiago + +
+
+ );
+ }
+}
diff --git a/bigbluebutton-html5/imports/ui/components/video-dock/container.jsx b/bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
new file mode 100644
index 0000000000..0c1da84811
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
@@ -0,0 +1,22 @@
+import React, { Component, PropTypes } from 'react';
+import { createContainer } from 'meteor/react-meteor-data';
+
+import VideoDock from './component';
+
+class VideoDockContainer extends Component {
+ constructor(props) {
+ super(props);
+ }
+
+ render() {
+ return (
+
+
+ );
+ }
+}
diff --git a/bigbluebutton-html5/imports/ui/components/whiteboard/container.jsx b/bigbluebutton-html5/imports/ui/components/whiteboard/container.jsx
new file mode 100644
index 0000000000..6e2fd8d04a
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/components/whiteboard/container.jsx
@@ -0,0 +1,22 @@
+import React, { Component, PropTypes } from 'react';
+import { createContainer } from 'meteor/react-meteor-data';
+
+import Whiteboard from './component';
+
+class WhiteboardContainer extends Component {
+ constructor(props) {
+ super(props);
+ }
+
+ render() {
+ return (
+
+
+ Today is {' '}
+ Here is some button examples
+
+
+ + + +
++ + + + +
++ + + + +
++ + + + +
+
+
+
+
+
+
- {_number}
-
- );
- }
- },
-
- render() {
- return (
-
- );
- },
-});
diff --git a/bigbluebutton-html5/imports/ui/stylesheets/chat.less b/bigbluebutton-html5/imports/ui/stylesheets/chat.less
deleted file mode 100755
index af19a081db..0000000000
--- a/bigbluebutton-html5/imports/ui/stylesheets/chat.less
+++ /dev/null
@@ -1,318 +0,0 @@
-@import "variables";
-
-@media @desktop-portrait, @landscape {
- .privateChatTab {
- order: 1;
- -webkit-order: 1;
- -ms-flex-order: 1;
- -ms-order: 1;
- border-bottom: 1px solid #E5E5E5;
- min-width: 205px;
- height: 45px;
- min-height: 45px;
- .btn {
- &:hover {
- color: #3896D3;
- background-color:white;
- border-bottom: 1px solid #E5E5E5;
- }
- &:focus {
- background-color:white;
- border-bottom: 1px solid #E5E5E5;
- }
- padding: 0.625rem 0.5rem 0.6875rem 0.5rem;
- background-color: inherit;
- margin: 0;
- height: 45px;
- outline: none;
- min-width: 50px;
- }
- span {
- position: relative;
- font-size: 18px;
- left: 2px;
- }
- i {
- position: relative;
- right: 2px;
- font-size: 18px;
- }
- }
- .privateChatName {
- width: calc(~'100% - 105px');
- min-width: 101px;
- text-align: right;
- float: right;
- padding: 0.65rem 1.25rem 0.6rem 0.3rem;
- font-family: "Helvetica Neue",Helvetica,Roboto,Arial,sans-serif;
- font-size: 18px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
-}
-
-.toPublic .unreadChatNumber {
- @media @desktop-portrait, @landscape {
- padding: 2px;
- position: absolute;
- top: 31%;
- left: 100%;
- margin: 0;
- }
-}
-
-#chat {
- @media @landscape {
- -webkit-flex: 1 1;
- -moz-flex: 1 1;
- -ms-flex: 1 1;
- flex: 1 1;
- height: 100%;
- border-top: 0px;
- border-right: 0px;
- border-top-left-radius: 0px;
- overflow: hidden;
- }
- @media @mobile-portrait-with-keyboard, @mobile-portrait {
- border-top: none;
- }
- order: 3;
-}
-
-.chat {
- list-style: none;
- margin: 0px;
- padding: 0px;
- height: 100%;
- @media @desktop-portrait, @landscape {
- li {
- margin: 0px;
- padding: 15px;
- // &:nth-child(even) {
- // background-color: rgb(245,245,245);
- // }
- table {
- width: 100%;
- }
- }
- }
- word-wrap: break-word;
-
-}
-.chatBodyContainer {
- @media @desktop-portrait, @landscape {
- display: -moz-flex;
- display: -ms-flexbox;
- display: -ms-flex;
- display: -webkit-flex;
- display: flex;
- -webkit-flex-flow: column;
- flex-flow: column;
- height: calc(~'100% - 70px');
- width: 100%;
- }
-}
-#chatbody {
- // text will not be hidden as it won't exceed the container boundaries,
- // but the element will still be given horizontal scroll bars
- overflow-x: hidden;
- @media @desktop-portrait, @landscape {
- order: 2;
- -webkit-order: 2;
- -ms-flex-order: 2;
- -ms-order: 2;
- shrink: 1;
- -webkit-shrink: 1;
- -moz-shrink: 1;
- grow:1;
- -webkit-grow: 1;
- -moz-grow: 1;
- height: calc(~'100% - 45px');
- }
- overflow-y: auto;
- padding-left: 0px;
- padding-right: 0px;
- @media @desktop-portrait, @mobile-portrait {
- max-height: 46vw; // for longer chatbody a scrollbar appears
- overflow-y: scroll;
- }
-}
-
-.chat-input-wrapper {
- padding-top:10px;
- padding-left:10px;
- padding-right:10px;
-}
-
-.disabledChat {
- background-color: grey;
- width: 100% !important;
-}
-
-#fontSizeTable {
- border: 1px solid white;
- height: @settingsSectionHeight;
- margin-bottom: 0px;
- overflow: hidden;
- @media @phone-portrait-with-keyboard, @phone-portrait {
- width: 100px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- width: calc(~'100% - 70px');
- }
- @media @desktop-portrait, @phone-landscape, @tablet-landscape, @desktop-landscape {
- width: calc(~'100% - 70px');
- }
- #displayLabel {
- height: @fontSizeControlMaxHeight;
- padding: 0;
- width: @fontSizeControlMaxWidth;
- }
- tr {
- td {
- padding: 0;
- text-align: center;
- }
- }
- .displayButtons {
- @media @phone-portrait-with-keyboard, @phone-portrait {
- height: 35px;
- width: 35px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- height: 70px;
- width: 84px;
- }
- @media @desktop-portrait, @phone-landscape, @tablet-landscape, @desktop-landscape {
- height: 35px;
- width: 84px;
- }
- margin: 0px;
- padding: 0px;
- text-align: center;
- i {
- @media @phone-portrait-with-keyboard, @phone-portrait {
- font-size: 16px; // overrides the value from Foundation
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- font-size: 30px; // overrides the value from Foundation
- }
- @media @desktop-portrait, @phone-landscape, @tablet-landscape, @desktop-landscape {
- font-size: 16px; // overrides the value from Foundation
- }
- }
- }
- #displayLabel {
- text-align: center;
- }
-}
-
-#newMessageInput {
- display: block;
- float: left;
- width: 75%;
- resize: none;
- padding-top: 0px;
- padding-bottom: 0px;
-
- border:1px solid extract(@lightGrey, 3);
- margin: 0px;
-
- @media @landscape {
- height: 100%; /* same height as send button */
- }
- @media @mobile-portrait {
- font-size: 4vw;
- height: 8vw;
- }
- @media @mobile-portrait-with-keyboard {
- font-size: 4.5vh;
- height: 25vh;
- }
- @media @desktop-portrait {
- font-size: 25px;
- height: @chatControlsHeight;
- }
-}
-
-.panel-footer {
- bottom: 0px;
- position: relative;
- background: extract(@white, 1);
- padding: 0;
- border-top: 1px solid extract(@lightGrey, 3);
-}
-
-#sendMessageButton {
- width: 25%;
- color: extract(@white, 1);
- background-color: #3896D3;
- font-weight: bold;
- height: @chatControlsHeight;
- margin: 0px;
- border: 1px solid extract(@lightGrey, 3);
- @media @desktop-portrait {
- font-size: 30px;
- &:hover {
- background: #3A82D4;
- }
- padding-left: 7%;
- }
- @media @phone-portrait {
- font-size: 20px;
- padding-left: 5%;
- }
- @media @tablet-portrait {
- font-size: 25px;
- padding-left: 7%;
- }
- @media @phone-portrait-with-keyboard {
- font-size: 20px;
- padding-left: 7%;
- }
- @media @tablet-portrait-with-keyboard {
- font-size: 25px;
- padding-left: 7%;
- }
- @media @landscape {
- padding: 0px;
- position: absolute;
- bottom: 10px;
- &:hover {
- background: #3A82D4;
- }
- }
- @media @phone-landscape {
- font-size: 14px;
- }
- @media @tablet-landscape {
- font-size: 18px;
- }
- @media @desktop-landscape {
- font-size: 15px;
- }
-}
-
-.timestamp {
- text-align: right;
-}
-
-#chatbar-contents {
- @media @landscape {
- min-width: 140px;
- }
-}
-
-.button-group {
- @media @landscape {
- height: 100%;
- }
-}
-
-#chatInput {
- @media @landscape {
- height: 100%;
- padding-bottom: 10px;
- }
-}
diff --git a/bigbluebutton-html5/imports/ui/stylesheets/mixins.less b/bigbluebutton-html5/imports/ui/stylesheets/mixins.less
deleted file mode 100755
index 4ec3ad0465..0000000000
--- a/bigbluebutton-html5/imports/ui/stylesheets/mixins.less
+++ /dev/null
@@ -1,12 +0,0 @@
-.radius(@size: 4px) {
- -moz-border-radius: @size;
- -webkit-border-radius: @size;
- border-radius: @size;
-}
-
-.linear-gradient(@color1, @color2) {
- background: -moz-linear-gradient(@color1, @color2); /* For Firefox 3.6 to 15 */
- background: -o-linear-gradient(@color1, @color2); /* For Opera 11.1 to 12.0 */
- background: -webkit-linear-gradient(@color1, @color2); /* For Safari 5.1 to 6.0 */
- background: linear-gradient(@color1, @color2); /* Standard syntax (must be last) */
-}
diff --git a/bigbluebutton-html5/imports/ui/stylesheets/modals.less b/bigbluebutton-html5/imports/ui/stylesheets/modals.less
deleted file mode 100755
index 84530cf011..0000000000
--- a/bigbluebutton-html5/imports/ui/stylesheets/modals.less
+++ /dev/null
@@ -1,303 +0,0 @@
-@import "variables";
-
-#settingsModal {
- display: none;
- padding: 0px;
-
- @media @phone-landscape, @tablet-landscape,
- @phone-portrait-with-keyboard, @phone-portrait,
- @tablet-portrait-with-keyboard, @tablet-portrait {
- min-height: 0; // overrides the value from Foundation
- }
-
- p {
- margin-bottom: 0px;
- }
- @media @desktop-portrait, @desktop-landscape {
- width: 430px;
- top: 20% !important;
- }
- @media @phone-landscape {
- // in landscape, we don't use margins for centering the window
- margin-left: 0;
- margin-right: 0;
-
- top: 2px;
- @media (max-device-width: 600px) { // extremely small screen
- width: calc(~'100% - 100px');
- left: 50px;
- }
- @media (min-device-width: 601px) {
- width: 400px;
- left: calc(~'50% - 200px');
- }
- }
- @media @tablet-landscape {
- top: 55px;
- width: 600px;
- }
- @media @phone-portrait-with-keyboard, @phone-portrait {
- left: 20px;
- top: 10px;
- width: calc(~'100% - 40px');
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- left: 50px;
- top: 55px;
- width: calc(~'100% - 100px');
- }
-
- .bar {
- @media @phone-portrait-with-keyboard, @phone-portrait,
- @tablet-portrait-with-keyboard, @tablet-portrait,
- @tablet-landscape, @desktop-landscape, @desktop-portrait {
- padding: 10px;
- }
- @media @phone-landscape {
- padding-top: 5px;
- }
- }
- .topBar {
- @media @phone-portrait-with-keyboard, @phone-portrait {
- height: 50px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- height: 55px;
- }
- @media @phone-landscape {
- height: 35px;
- padding-top: 5px;
- padding-bottom: 5px;
- }
- @media @tablet-landscape {
- height: 50px;
- }
- @media @desktop-landscape, @desktop-portrait {
- height: 55px;
- }
- border-bottom: 1px solid grey;
- p {
- text-align: center;
- }
- }
- .bottomBar {
- border-top: 1px solid grey;
- text-align: right;
- @media @phone-portrait-with-keyboard, @phone-portrait {
- height: 50px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- height: 55px;
- }
- @media @phone-landscape {
- height: 40px;
- }
- @media @tablet-landscape {
- height: 50px;
- }
- @media @desktop-portrait, @desktop-landscape {
- height: 55px;
- }
- }
- .settingsBody {
- padding-top: 1px;
- padding-bottom: 1px;
- padding-left: 5px;
- padding-right: 5px;
- text-align: center;
- @media @phone-portrait-with-keyboard, @phone-portrait {
- font-size: 15px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- font-size: 27px;
- height: calc(~'100% - 110px');
- }
- @media @phone-landscape {
- font-size: 14px;
- }
- @media @tablet-landscape {
- font-size: 20px;
- }
- }
- .modalTitle {
- font-style: bold;
- @media @phone-portrait-with-keyboard, @phone-portrait {
- font-size: 18px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- font-size: 25px;
- }
- @media @phone-landscape {
- font-size: 15px;
- }
- @media @tablet-landscape {
- font-size: 25px;
- }
- @media @desktop-landscape, @desktop-portrait {
- font-size: 25px;
- }
- }
- .joinAudioButton {
- @media @phone-portrait-with-keyboard, @phone-portrait {
- height: 40px;
- width: 40px;
- margin-bottom: 5px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- height: 50px;
- width: 50px;
- margin-bottom: 5px;
- }
- @media @phone-landscape {
- height: 40px;
- width: 40px;
- margin-bottom: 5px;
- }
- @media @tablet-landscape {
- height: 50px;
- width: 50px;
- margin-bottom: 5px;
- }
- @media @desktop-portrait, @desktop-landscape {
- height: 55px;
- width: 55px;
- margin-bottom: 5px;
- }
- }
-}
-.desktopSettingsFieldset {
- margin-top: 0;
- margin-bottom: 0;
- margin-left: auto;
- margin-right: auto;
- padding: 0px;
- width: calc(~'100% - 20px');
-
- #audioButtonContainer {
- height: @settingsSectionHeight;
- }
-
- @media @mobile-portrait-with-keyboard, @mobile-portrait {
- height: 30%;
- .settingsButton {
- width: 80%;
- height: 80%;
- }
- }
- .settingsButton {
- padding: 0;
- i {
- @media @phone-landscape {
- font-size: 15px;
- }
- @media @tablet-landscape {
- font-size: 25px;
- }
- @media @phone-portrait-with-keyboard, @phone-portrait {
- font-size: 27px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- font-size: 35px;
- }
- @media @desktop-landscape, @desktop-portrait {
- font-size: 30px;
- }
- }
- }
-}
-#closeSettings {
- border-radius: 3px;
- padding: 5px 10px 5px 10px;
-
- @media @desktop-portrait, @desktop-landscape {
- font-size: 16px;
- width: 80px;
- height: 35px;
- margin-bottom: 0px; // overrides the value from Foundation
- }
- @media @phone-landscape {
- font-size: 20px;
- margin-bottom: 0px; // overrides the value from Foundation
- bottom: 2px;
- right: 5px;
- }
- @media @tablet-landscape {
- font-size: 25px;
- margin-bottom: 0px; // overrides the value from Foundation
- bottom: 5px;
- }
- @media @phone-portrait-with-keyboard, @phone-portrait {
- font-size: 25px;
- margin-bottom: 0px; // overrides the value from Foundation
- bottom: 5px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- font-size: 30px;
- margin-bottom: 0px; // overrides the value from Foundation
- bottom: 5px;
- }
-}
-
-#logoutModal {
- margin-top: 0px;
- margin-right: 0px;
- top: 5% !important;
- right: 5%;
- position: fixed;
- text-align: center;
- @media @desktop-landscape {
- width: 20%;
- }
- @media @phone-landscape {
- width: 50%;
- height: 50%;
- min-height: 0; // overrides the value from Foundation
- left: 45%;
- }
- @media @tablet-landscape {
- width: 30%;
- height: 40%;
- p {
- font-size: 120%;
- }
- }
- @media @desktop-portrait {
- width: 40%;
- }
- @media @phone-portrait-with-keyboard, @phone-portrait {
- width: 90%;
- height: 40%;
- min-height: 0; // overrides the value from Foundation
- left: 5%;
- p {
- font-size: 150%;
- }
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- width: 90%;
- height: 20%;
- min-height: 0; // overrides the value from Foundation
- left: 5%;
- p {
- font-size: 150%;
- }
- }
- .logoutButton {
- padding: 0px;
- @media @desktop-portrait, @landscape {
- width: 50px;
- height: 30px;
- }
- @media @mobile-portrait-with-keyboard, @mobile-portrait {
- width: 20%;
- font-size: 150%;
- }
- background-color: rgb(229, 229, 229);
- color: rgb(121, 121, 121);
- font-weight: bold;
- border-radius: 10px;
- margin-left: 5px;
- margin-right: 5px;
- }
- #yes { border: 2px solid rgb(71, 164, 255); }
-}
diff --git a/bigbluebutton-html5/imports/ui/stylesheets/style.less b/bigbluebutton-html5/imports/ui/stylesheets/style.less
deleted file mode 100755
index 1056765b7a..0000000000
--- a/bigbluebutton-html5/imports/ui/stylesheets/style.less
+++ /dev/null
@@ -1,1129 +0,0 @@
-@import "variables";
-@import "mixins";
-
-#testing {
- width: 100%;
- height: 100%;
-}
-
-
-body {
- background: extract(@white, 3);
- bottom: 0;
- color: extract(@darkGrey, 1);
- left: 0;
- right: 0;
-
- // makes text selectable in Chrome (overrides inline style)
- -webkit-user-select: all !important;
-
- @media @landscape {
- height: 100%;
- position: absolute;
- top: 0;
- }
- @media @desktop-landscape {
- min-width: 768px;
- }
- @media @mobile-portrait-with-keyboard, @desktop-portrait, @mobile-portrait {
- position: relative;
- top: 0;
- }
- @media @mobile-portrait-with-keyboard, @mobile-portrait {
- overflow-x: hidden;
- }
-}
-
-.component {
- background: extract(@white, 1);
- border: 1px solid extract(@lightGrey, 3);
- float: left;
-}
-
-.heading {
- margin-left:5px
-}
-
-@media @mobile-portrait {
- .menuToggledOn .unreadChat {
- display: none;
- }
-}
-
-.navbarButton {
- color: #469DCF;
- &:hover, &:focus {
- i {
- color: #2A5E7C;
- }
- }
- @media @phone-portrait-with-keyboard, @phone-portrait, @phone-landscape {
- padding-top: 2px !important;
- padding-bottom: 2px !important;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait, @tablet-landscape {
- padding-top: 4px !important;
- padding-bottom: 4px !important;
- }
- .unreadChat {
- position: absolute;
- z-index: 1;
- background:red;
- border-radius:80%;
- @media @desktop-portrait, @landscape {
- top: 20%;
- left: 65%;
- width:19%;
- height:20%;
- }
- @media @mobile-portrait {
- top: 14%;
- left: 70%;
- width:25%;
- height:25%;
- }
- }
-
- i {
-
- // phone
- @media @phone-portrait-with-keyboard, @phone-portrait {
- font-size: 42px;
- }
- @media @phone-landscape {
- &.ion-navicon {
- font-size: 35px;
- }
- &:not(.ion-navicon) {
- font-size: 29px;
- }
- }
-
- // tablet
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- font-size: 47px;
- }
- @media @tablet-landscape {
- &.ion-navicon {
- font-size: 37px;
- }
- &:not(.ion-navicon) {
- font-size: 30px;
- }
- }
-
- // desktop
- @media @desktop-landscape {
- &.ion-navicon {
- font-size: 34px;
- }
- &:not(.ion-navicon) {
- font-size: 30px;
- }
- }
- @media @desktop-portrait {
- font-size: 35px;
- }
- }
-}
-
-.myNavbar {
- border-bottom: 1px;
- @media @desktop-portrait, @landscape {
- background-color: white;
- border-bottom: 1px solid extract(@lightGrey, 1);
- }
-
- @media @mobile-portrait-with-keyboard, @mobile-portrait {
- background-color: white;
- }
- .btn {
-
- @media @tablet-landscape {
- height: 50px;
- width: 51.2px;
- }
- @media @phone-landscape {
- height: 47px;
- width: 47px;
- }
- @media @desktop-landscape {
- height: 50px;
- width: 51.2px;
- }
- @media @desktop-portrait {
- height: 50px;
- width: 51.2px;
- }
-
- @media @desktop-portrait, @landscape {
- top: 0 !important;
- padding-left: 1% !important;
- padding-right: 1% !important;
- background-color: white;
- &:not(.toggleMenuButton):not(.toggleUserlistButton) {
- border-bottom: 1px solid extract(@lightGrey, 1);
- }
- }
- @media @mobile-portrait-with-keyboard, @mobile-portrait {
- .linear-gradient(rgb(72,76,85), rgb(65,68,77));
- }
- @media @phone-portrait-with-keyboard, @phone-portrait {
- height: 50px !important;
- width: 50px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- height: 55px !important;
- width: 55px;
- }
- .push-menu-icon {
- .icon-bar {
- margin-left: auto;
- margin-right: auto;
- margin-bottom: 8px;
- margin-top: 8px;
- display: block;
- border-radius: 1px;
- background-color: extract(@white, 1);
- width: 50px;
- height: 10px;
- }
- margin-top: auto;
- margin-bottom: auto;
- }
- // overriding the default button styling:
- &.toggleUserlistButton, &.toggleMenuButton {
- background: transparent;
- }
- span { background-color: #469DCF; }
- }
-
- @media @tablet-landscape {
- height: 50px;
- }
- @media @phone-landscape {
- height: 47px;
- }
-
- @media @desktop-landscape {
- height: 50px;
- }
- @media @phone-portrait-with-keyboard, @phone-portrait {
- height: 50px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- height: 55px;
- }
- @media @desktop-portrait {
- min-width: 400px;
- height: 50px;
- }
-
- .navbarTitle {
- font-weight: bold;
- text-align: center;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- position: absolute;
- color: extract(@darkGrey, 1);
- @media @mobile-portrait-with-keyboard, @mobile-portrait {
- margin-left: auto;
- margin-right: auto;
- }
- @media @phone-portrait-with-keyboard, @phone-portrait {
- height: 50px;
- padding-top: 25px; // half the height
- font-size: 18px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- height: 55px;
- padding-top: 27.5px; // half the height
- font-size: 21px;
- }
- @media @tablet-landscape {
- font-size: 18px;
- height: 50px;
- padding-top: 25px; // half the height
- }
- @media @phone-landscape {
- font-size: 18px;
- height: 47px;
- padding-top: 23.5px; // half the height
- }
- @media @desktop-landscape {
- font-size: 16px;
- height: 50px;
- padding-top: 25px; // half the height
- }
- @media @desktop-portrait {
- height: 50px;
- padding-top: 25px; // half the height
- }
- @media @landscape, @desktop-portrait {
- padding-left: 15px;
- padding-right: 15px;
- }
- &.defaultTitle {
- @media @landscape, @desktop-portrait {
- left: 51.2px;
- }
- @media @phone-portrait, @phone-portrait-with-keyboard {
- left: 50px;
- padding-left: 10px;
- padding-right: 10px;
- }
- @media @tablet-portrait, @tablet-portrait-with-keyboard {
- left: 55px;
- padding-left: 11px;
- padding-right: 11px;
- }
-
- @media @landscape {
- max-width: calc(~'100% - 174px'); // leaves room for 3 buttons (including margins)
- }
- @media @desktop-portrait {
- max-width: calc(~'100% - 102.4px'); // leaves room for 2 buttons
- }
- @media @phone-portrait, @phone-portrait-with-keyboard {
- width: calc(~'100% - 100px');
- }
- @media @tablet-portrait, @tablet-portrait-with-keyboard {
- width: calc(~'100% - 110px');
- }
- }
- &.shiftedTitle {
- @media @landscape, @desktop-portrait {
- left: 102.4px;
- }
- @media @phone-portrait, @phone-portrait-with-keyboard {
- left: 100px;
- padding-left: 10px;
- padding-right: 60px;
- }
- @media @tablet-portrait, @tablet-portrait-with-keyboard {
- left: 110px;
- padding-left: 11px;
- padding-right: 66px;
- }
-
- @media @landscape {
- max-width: calc(~'100% - 225px'); // leaves room for 4 buttons (including margins)
- }
- @media @desktop-portrait {
- max-width: calc(~'100% - 153.6px'); // leaves for 3 buttons
- }
- @media @phone-portrait, @phone-portrait-with-keyboard {
- width: calc(~'100% - 150px');
- }
- @media @tablet-portrait, @tablet-portrait-with-keyboard {
- width: calc(~'100% - 165px');
- }
- }
- }
-}
-
-.recordingStatus {
- background: none !important;
- border: none;
- margin-left: 10px;
- padding: 0 !important;
- .false { color: maroon; }
- .true { color: green; }
-}
-
-.ScrollableWindowX {
- width: 100%;
- overflow-x: scroll;
-}
-
-.ScrollableWindowY {
- overflow-y:auto;
-}
-
-.table > thead > tr > th,
-.table > tbody > tr > th,
-.table > tfoot > tr > th,
-.table > thead > tr > td,
-.table > tbody > tr > td,
-.table > tfoot > tr > td {
- border-top: 0px;
-}
-
-.meetingTitle {
- text-align: center;
- font-weight: bold;
- line-height: 2em;
- margin: 0;
- color: extract(@darkGrey, 1);
- @media @tablet-landscape {
- font-size: 18px;
- height: 50px;
- }
- @media @phone-landscape {
- font-size: 19px;
- height: 47px;
- }
- @media @phone-portrait, @phone-portrait-with-keyboard {
- font-size: 18px;
- padding-top: 8px;
- }
- @media @tablet-portrait, @tablet-portrait-with-keyboard {
- font-size: 20px;
- padding-top: 7px;
- }
-
- @media @mobile-portrait, @mobile-portrait-with-keyboard {
- background-color: white;
- height: 50px;
- }
- @media @desktop-portrait {
- background-color: white;
- padding-top: 10px;
- }
- @media @landscape {
- border-bottom: 1px solid extract(@lightGrey, 1);
- padding-bottom: 5px;
- padding-top: 5px;
- }
-
- @media @desktop-portrait, @desktop-landscape {
- font-size: 18px;
- height: 50px;
- }
-}
-
-#container {
- @media @landscape {
- display: -moz-flex;
- display: -ms-flexbox;
- display: -ms-flex;
- display: -webkit-flex;
- display: flex;
- -webkit-flex-flow: row;
- flex-flow: row;
- }
- width: 100%;
- height: 100%;
- background-color: extract(@white, 3);
- &.moved-to-right, &.moved-to-left {
- @media @mobile-portrait-with-keyboard, @desktop-portrait, @mobile-portrait {
- z-index: 1; // same level as notifications
- .shield {
- position: fixed;
- left: 0;
- top: 0;
- right: 0;
- bottom: 0;
- background-color: black;
- opacity: 0;
- cursor: pointer;
- }
- }
- }
-}
-
-.fullScreenPresentation {
- width: 90% !important;
- height: 90% !important;
-}
-
-.halfScreen {
- width: 44% !important;
- height: 80% !important;
-}
-
-.quarterScreen {
- width: 22% !important;
- height: 80% !important;
-}
-
-.navbarSection {
- @media @landscape {
- min-width: 256px;
- width: 33%;
- }
-}
-
-.slideButton {
- padding: 0px;
- line-height: 50px;
-
- @media @mobile-portrait-with-keyboard, @desktop-portrait, @mobile-portrait {
- display: block;
- width: 100%;
- background-color: transparent;
- color: #788897;
- border-bottom: 1px solid extract(@lightGrey, 5);
- margin-top: 0;
- margin-bottom: 0;
- &:hover {
- background-color: white;
- span{
- color: #788897;
- }
- }
- i {
- margin-left: 5%;
- color: #3B97D3;
- }
- i, span {
- float: left;
- }
- span {
- margin-left: 20px;
- }
- }
- @media @phone-portrait-with-keyboard, @phone-portrait {
- height: 50px;
- font-size: 18px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- height: 50px;
- font-size: 18px;
- }
- @media @desktop-portrait {
- height: 50px;
- font-size: 20px;
- }
-
- i {
- @media @phone-landscape {
- font-size: 29px;
- }
- @media @desktop-portrait, @desktop-landscape, @tablet-landscape {
- font-size: 30px;
- }
- @media @phone-portrait-with-keyboard, @phone-portrait {
- font-size: 30px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- font-size: 25px;
- }
- }
-}
-
-.titleArea {
- width: 100%;
- background-color: white;
- @media @mobile-portrait-with-keyboard, @mobile-portrait {
- height: 50px;
- }
- @media @desktop-portrait {
- height: 50px;
- }
-}
-
-/* Notifications */
-#browser-icon-container {
- float: left;
- max-height: 35px !important;
- max-width: 35px !important;
- path {
- margin: auto;
- }
-}
-
-.invisible {
- display: none;
-}
-
-#main {
- @media @landscape {
- -webkit-flex: 1 1;
- -moz-flex: 1 1;
- -ms-flex: 1 1;
- flex: 1 1;
- height: 100%;
- }
- @media @mobile-portrait-with-keyboard, @desktop-portrait, @mobile-portrait {
- height: 100%;
- }
-}
-
-#panels {
- display: -moz-flex;
- display: -ms-flexbox;
- display: -ms-flex;
- display: -webkit-flex;
- display: flex;
- @media @landscape {
- -webkit-flex-flow: row;
- flex-flow: row;
- }
- @media @mobile-portrait-with-keyboard, @desktop-portrait, @mobile-portrait {
- -webkit-flex-flow: column;
- flex-flow: column;
- }
- width: 100%;
- @media @desktop-landscape {
- height: calc(~'100% - 50px'); // 50px for narbar height
- }
- @media @phone-landscape, @tablet-landscape {
- height: calc(~'100% - 47px'); // 47px for narbar height
- }
-}
-
-.signOutIcon {
- @media @landscape {
- height: 28px;
- width: 75px;
- margin-left: 10px;
- }
-}
-
-.rightNavbarSection {
- float: right;
- @media @mobile-portrait-with-keyboard, @desktop-portrait, @mobile-portrait {
- display: none;
- }
-}
-
-.audioNavbarSection {
- position: absolute;
- top: 0;
- @media @landscape, @desktop-portrait {
- left: 51.2px;
- }
- @media @phone-portrait, @phone-portrait-with-keyboard {
- left: 50px;
- width: 50px;
- }
- @media @tablet-portrait, @tablet-portrait-with-keyboard {
- left: 55px;
- width: 55px;
- }
- .muteIcon:hover {
- color: #2A5E7C;
- }
-}
-
-.muteIcon, .leaveAudioButton {
- @media @mobile-portrait, @mobile-portrait-with-keyboard {
- display: block;
- margin-left: auto;
- margin-right: auto;
- }
-}
-
-.toggleMenuButton {
- float: right;
- @media @landscape {
- display: none;
- }
- @media @mobile-portrait, @mobile-portrait-with-keyboard {
- .linear-gradient(rgb(72,76,85), rgb(65,68,77));
- }
-}
-
-.pressedButton {
- i {
- color: extract(@azure, 2);
- }
-}
-
-.toggleUserlistButton, .toggleMenuButton {
- outline: none;
-}
-
-.settingsIcon {
- @media @landscape {
- width: 57px;
- margin-right: 5px;
- }
-}
-
-#menu {
- height: 100%;
- @media @mobile-portrait-with-keyboard, @desktop-portrait, @mobile-portrait {
- background-color: white;
- }
- @media @landscape {
- display: none;
- }
-}
-
-#notificationArea {
-
- height: auto;
- overflow-y: hidden;
- position: absolute;
- text-align: center;
- z-index: 1; // in front of the whiteboard
-
- // Phone
- @media @phone-landscape, @phone-portrait-with-keyboard, @phone-portrait {
- margin-left: 5px;
- margin-right: 5px;
- width: calc(~'100% - 10px');
- }
- @media @phone-landscape {
- top: 5px;
- }
- @media @phone-portrait-with-keyboard, @phone-portrait {
- top: 3px;
- }
-
- // Tablet
- @media @tablet-landscape, @tablet-portrait-with-keyboard, @tablet-portrait {
- top: 5px;
- margin-left: 5px;
- margin-right: 5px;
- width: calc(~'100% - 10px');
- }
-
- // Desktop
- @media @desktop-landscape, @desktop-portrait {
- top: 5px;
- margin-left: 5px;
- margin-right: 5px;
- width: calc(~'100% - 10px');
- }
-}
-
-.bbbNotification {
-
- margin-bottom: 0; // overrides the value from Foundation
-
- // Phone
- @media @phone-landscape, @phone-portrait-with-keyboard, @phone-portrait {
- font-size: 18px; // same size as the navbar title
- padding-top: 10px;
- padding-bottom: 10px;
- padding-left: 25px;
- padding-right: 25px;
- }
-
- // Tablet
- @media @tablet-landscape {
- font-size: 18px; // same size as the navbar title
- padding-top: 10px;
- padding-bottom: 10px;
- padding-left: 35px;
- padding-right: 35px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- font-size: 21px; // same size as the navbar title
- padding-top: 11px;
- padding-bottom: 11px;
- padding-left: 38px;
- padding-right: 38px;
- }
-
- // Desktop
- @media @desktop-landscape, @desktop-portrait {
- font-size: 14px;
- padding-top: 11px;
- padding-bottom: 11px;
- padding-left: 33px;
- padding-right: 33px;
- }
-
- .close {
-
- // overriding the values from Foundation
- margin-bottom: 0;
- padding: 0;
-
- // Phone
- @media @phone-landscape, @phone-portrait-with-keyboard, @phone-portrait {
- font-size: 35px;
- top: 19px;
- right: 4px;
- }
-
- // Tablet
- @media @tablet-landscape {
- font-size: 40px;
- top: 17px;
- right: 10px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- font-size: 45px;
- top: 18px;
- right: 11px;
- }
-
- // Desktop
- @media @desktop-landscape, @desktop-portrait {
- font-size: 30px;
- top: 19px;
- right: 10px;
- }
- }
-}
-
-.top-bar {
- line-height: 0;
-}
-
-.btn {
- @media @mobile-portrait-with-keyboard, @mobile-portrait {
- padding: 0px;
- line-height: 50px;
- }
-}
-
-/* Sliding Menu */
-
-@media @desktop-portrait {
- .userlistMenu {
- position: fixed;
- left: -400px;
- width: 400px !important; // overrides any width value set manually in landscape
- &.menuOut {
- left: 0px;
- }
- }
- .settingsMenu {
- position: fixed;
- right: -400px;
- width: 400px;
- &.menuOut {
- right: 0px;
- }
- }
-}
-
-.userlistMenu {
- height: 100%;
- z-index: 1000;
- @media @tablet-landscape {
- width: 200px;
- }
- @media @phone-landscape {
- width: 200px;
- }
- @media @desktop-landscape {
- width: 300px;
- }
- @media @mobile-portrait-with-keyboard, @mobile-portrait {
- @userListMenuPortaitWidth: (2/3 * 100vw);
-
- position: fixed;
- left: -@userListMenuPortaitWidth;
- width: @userListMenuPortaitWidth;
-
- transition: transform 0.3s linear;
- -moz-transition: transform 0.3s linear;
- -webkit-transition: transform 0.3s linear;
- -ms-transition: transform 0.3s linear;
- -o-transition: transform 0.3s linear;
-
- .user-list-item {
- transition: transform 0.7s;
- -moz-transition: -moz-transform 0.7s;
- -webkit-transition: -webkit-transform 0.7s;
- -o-transition: -o-transform 0.7s;
-
- transform: translateX(-@userListMenuPortaitWidth);
- -moz-transform: translateX(-@userListMenuPortaitWidth);
- -webkit-transform: translateX(-@userListMenuPortaitWidth);
- -ms-transform: translateX(-@userListMenuPortaitWidth);
- -o-transform: translateX(-@userListMenuPortaitWidth);
- }
-
- &.menuOut {
- transform: translateX(@userListMenuPortaitWidth);
- -moz-transform: translateX(@userListMenuPortaitWidth);
- -webkit-transform: translateX(@userListMenuPortaitWidth);
- -ms-transform: translateX(@userListMenuPortaitWidth);
- -o-transform: translateX(@userListMenuPortaitWidth);
-
- .user-list-item {
- transform: translateX(0);
- -moz-transform: translateX(0);
- -webkit-transform: translateX(0);
- -ms-transform: translateX(0);
- -o-transform: translateX(0);
- }
-
- .generateUserItemAnimation(@n, @i: 1) when (@i =< @n) {
- .user-list-item:nth-child(@{i}) {
- transform: @i * 50ms;
- transition-delay: @i * 50ms;
- -moz-transition-delay: @i * 50ms;
- -webkit-transition-delay: @i * 50ms;
- -o-transition-delay: @i * 50ms;
- }
- .generateUserItemAnimation(@n, (@i + 1));
- }
-
- .generateUserItemAnimation(20);
- }
- }
-}
-
-.settingsMenu {
- height: 100%;
- z-index: 1000;
- position: fixed;
- transform: translateX(100vw);
- width: 70vw;
-
- transition: transform 0.3s linear;
- -moz-transition: transform 0.3s linear;
- -webkit-transition: transform 0.3s linear;
- -ms-transition: transform 0.3s linear;
- -o-transition: transform 0.3s linear;
-
- &.menuOut {
- transform: translate(0vw, 0);
- -moz-transform: translate(0vw, 0);
- -webkit-transform: translate(0vw, 0);
- -ms-transform: translate(0vw, 0);
- -o-transform: translate(0vw, 0);
- }
-
- @media @mobile-portrait-with-keyboard, @mobile-portrait {
- &.menuOut {
- transform: translate(30vw, 0);
- -moz-transform: translate(30vw, 0);
- -webkit-transform: translate(30vw, 0);
- -ms-transform: translate(30vw, 0);
- -o-transform: translate(30vw, 0);
- }
- }
-}
-
-.hiddenInLandscape {
- @media @landscape {
- display: none;
- }
-}
-
-.shield {
- position: fixed;
- left: 0;
- top: 0;
- bottom: 0;
- right: 0;
- background-color: black;
- opacity: 0;
- z-index: 999;
- cursor: pointer;
- @media @landscape {
- display: none;
- }
- &:not(.darken):not(.animatedShield) {
- display: none;
- }
-}
-
-.darken {
- animation: darken 0.3s linear;
- animation-fill-mode: forwards;
-}
-
-@keyframes darken {
- 0% {
- opacity: 0;
- }
- 100% {
- opacity: 0.8;
- }
-}
-
-.ui-resizable-handle {
- @media @mobile-portrait, @desktop-portrait, @mobile-portrait-with-keyboard {
- display: none; // hides the sizing handle everywhere except the landscape mode
- }
-}
-
-.left-drawer {
- z-index: 1000;
- position: fixed;
- width: 60vw;
- left: -60vw;
- height: 100%;
-}
-
-.right-drawer {
- z-index: 1000;
- position: fixed;
- transform: translateX(100vw);
- height: 100%;
- .linear-gradient(rgb(65,68,77), rgb(58,60,69));
- width: 60vw;
-}
-
-/*********************************/
-/*Loading Spinning Bar's Styling */
-/*********************************/
-#floatingCirclesG{
- top: calc(~'50% - 60px');
- position:relative;
- width:128px;
- height:128px;
- margin:auto;
- transform:scale(0.6);
- -o-transform:scale(0.6);
- -ms-transform:scale(0.6);
- -webkit-transform:scale(0.6);
- -moz-transform:scale(0.6);
-}
-
-.f_circleG{
- position:absolute;
- background-color:rgb(238,238,238);
- height:23px;
- width:23px;
- border-radius:12px;
- -o-border-radius:12px;
- -ms-border-radius:12px;
- -webkit-border-radius:12px;
- -moz-border-radius:12px;
- animation-name:f_fadeG;
- -o-animation-name:f_fadeG;
- -ms-animation-name:f_fadeG;
- -webkit-animation-name:f_fadeG;
- -moz-animation-name:f_fadeG;
- animation-duration:0.672s;
- -o-animation-duration:0.672s;
- -ms-animation-duration:0.672s;
- -webkit-animation-duration:0.672s;
- -moz-animation-duration:0.672s;
- animation-iteration-count:infinite;
- -o-animation-iteration-count:infinite;
- -ms-animation-iteration-count:infinite;
- -webkit-animation-iteration-count:infinite;
- -moz-animation-iteration-count:infinite;
- animation-direction:normal;
- -o-animation-direction:normal;
- -ms-animation-direction:normal;
- -webkit-animation-direction:normal;
- -moz-animation-direction:normal;
-}
-
-#frotateG_01{
- left:0;
- top:52px;
- animation-delay:0.2495s;
- -o-animation-delay:0.2495s;
- -ms-animation-delay:0.2495s;
- -webkit-animation-delay:0.2495s;
- -moz-animation-delay:0.2495s;
-}
-
-#frotateG_02{
- left:15px;
- top:15px;
- animation-delay:0.336s;
- -o-animation-delay:0.336s;
- -ms-animation-delay:0.336s;
- -webkit-animation-delay:0.336s;
- -moz-animation-delay:0.336s;
-}
-
-#frotateG_03{
- left:52px;
- top:0;
- animation-delay:0.4225s;
- -o-animation-delay:0.4225s;
- -ms-animation-delay:0.4225s;
- -webkit-animation-delay:0.4225s;
- -moz-animation-delay:0.4225s;
-}
-
-#frotateG_04{
- right:15px;
- top:15px;
- animation-delay:0.509s;
- -o-animation-delay:0.509s;
- -ms-animation-delay:0.509s;
- -webkit-animation-delay:0.509s;
- -moz-animation-delay:0.509s;
-}
-
-#frotateG_05{
- right:0;
- top:52px;
- animation-delay:0.5955s;
- -o-animation-delay:0.5955s;
- -ms-animation-delay:0.5955s;
- -webkit-animation-delay:0.5955s;
- -moz-animation-delay:0.5955s;
-}
-
-#frotateG_06{
- right:15px;
- bottom:15px;
- animation-delay:0.672s;
- -o-animation-delay:0.672s;
- -ms-animation-delay:0.672s;
- -webkit-animation-delay:0.672s;
- -moz-animation-delay:0.672s;
-}
-
-#frotateG_07{
- left:52px;
- bottom:0;
- animation-delay:0.7585s;
- -o-animation-delay:0.7585s;
- -ms-animation-delay:0.7585s;
- -webkit-animation-delay:0.7585s;
- -moz-animation-delay:0.7585s;
-}
-
-#frotateG_08{
- left:15px;
- bottom:15px;
- animation-delay:0.845s;
- -o-animation-delay:0.845s;
- -ms-animation-delay:0.845s;
- -webkit-animation-delay:0.845s;
- -moz-animation-delay:0.845s;
-}
-
-@keyframes f_fadeG{
- 0%{
- background-color:rgb(0,0,0);
- }
-
- 100%{
- background-color:rgb(238,238,238);
- }
-}
-
-@-o-keyframes f_fadeG{
- 0%{
- background-color:rgb(0,0,0);
- }
-
- 100%{
- background-color:rgb(238,238,238);
- }
-}
-
-@-ms-keyframes f_fadeG{
- 0%{
- background-color:rgb(0,0,0);
- }
-
- 100%{
- background-color:rgb(238,238,238);
- }
-}
-
-@-webkit-keyframes f_fadeG{
- 0%{
- background-color:rgb(0,0,0);
- }
-
- 100%{
- background-color:rgb(238,238,238);
- }
-}
-
-@-moz-keyframes f_fadeG{
- 0%{
- background-color:rgb(0,0,0);
- }
-
- 100%{
- background-color:rgb(238,238,238);
- }
-}
-/*********************************/
-/*End of Spinning Bar's Styling */
-/*********************************/
diff --git a/bigbluebutton-html5/imports/ui/stylesheets/users.less b/bigbluebutton-html5/imports/ui/stylesheets/users.less
deleted file mode 100755
index feb3b71f13..0000000000
--- a/bigbluebutton-html5/imports/ui/stylesheets/users.less
+++ /dev/null
@@ -1,340 +0,0 @@
-@import "variables";
-@import "mixins";
-
-.statusIcon {
- font-size: 18px;
-}
-
-#usericons {
- float: right;
- padding: 0 5px;
- text-align: right;
- color: white;
- span i {
- @media @landscape, @desktop-portrait {
- margin-right: 10px;
- font-size: 20px;
- }
- }
-}
-.unreadChatNumber {
- @media @landscape, @desktop-portrait{
- float: left;
- margin-top: 5px;
- width: 28px;
- height: 18px;
- border-radius: 41%;
- font-size: 12px;
- color: #fff;
- text-align: center;
- background: #3896D3;
- }
-}
-
-.usernameEntry {
- cursor: pointer;
- line-height: 1.1;
- float:left;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- width: calc(~'100% - 120px');
- // 120px is size of the icon list with all icons enabled (lock, cam, mic/listen)
-
- @media @landscape {
- min-height: 30px;
- font-size: 4.5mm;
- }
- @media @desktop-portrait {
- min-height: 30px;
- font-size: 4.5mm;
- }
- @media @phone-portrait, @phone-portrait-with-keyboard {
- font-size: 15px;
- }
- @media @tablet-portrait, @tablet-portrait-with-keyboard {
- font-size: 17px;
- }
-}
-
-#users {
- border-radius: 0px;
- @media @landscape {
- width: 100%;
- border-left: 0px;
- border-top: 0px;
- }
- @media @mobile-portrait-with-keyboard, @desktop-portrait, @mobile-portrait {
- width: 100%;
- height: 100%;
- border: none;
- background-color: #34495E;
- }
- order: 0;
- height: 100%;
-}
-
-.darkening-in {
- opacity: 0;
- animation: darken-in 0.5s;
- animation-fill-mode: forwards;
-}
-
-@keyframes darken-in {
- 0% {
- opacity: 0;
- }
- 100% {
- opacity: 0.5;
- }
-}
-
-#user-contents {
- overflow-y: auto;
-
- @media @phone-landscape {
- height: calc(~'100% - 46px');
- }
- @media @tablet-landscape, @desktop-landscape,
- @mobile-portrait, @mobile-portrait-with-keyboard, @desktop-portrait {
- height: calc(~'100% - 50px'); /* user-contents = user-contens - meetingTitle */
- }
- @media @landscape, @desktop-portrait{
- background-color: #34495E;
- }
- .userlist {
- max-height: 100% !important;
- height: 100%;
-
- #content{
- .setPresenter{
- color: #A0A0A0;
- }
-
- @media @desktop-landscape, @desktop-portrait {
- .kickUser, .setPresenter{
- cursor: pointer;
- opacity:0;
- color: #fff;
- cursor: pointer;
- display: none;
- -webkit-animation: fadeInAnimation .5s;
- animation: fadeInAnimation .5s;
- }
- }
- }
- #content:hover {
- @media @landscape, @desktop-portrait {
- background-color: #2C4155;
-
- .kickUser, .setPresenter{
- display: inline;
- opacity:1;
- }
- }
- }
- #content {
- span:hover {
- @media @mobile-portrait-with-keyboard, @desktop-portrait, @mobile-portrait {
- background: transparent;
- }
- }
- margin-top: 10px;
- &:first-child { margin-top: 0px; }
- overflow: hidden;
- width: 100%;
- @media @mobile-portrait, @mobile-portrait-with-keyboard {
- /*background: #E6F0FA;*/
- background: transparent;
- color: white;
- }
- }
-
- @media @landscape {
- padding:10px;
- max-height:83vh;
- }
- @media @desktop-portrait {
- padding-top: 10px;
- padding-left: 10px;
- padding-right: 10px;
- color: white;
- }
- @media @desktop-portrait, @mobile-portrait {
- max-height: 58vw; //for longer userlist a scrollbar appears
- padding-top: 10px;
- }
- }
-}
-
-.userCurrent {
- font-weight: bold;
-}
-
-.toggleUserlistButton, .toggleMenuButton {
- span {
- @media @tablet-landscape {
- width: 26px;
- }
- @media @phone-landscape {
- width: 35px;
- }
- @media @desktop-landscape {
- width: 26px;
- }
-
- @media @landscape, @desktop-portrait {
- margin-left: auto;
- margin-right: auto;
- height: 8%;
- }
- }
-}
-
-// changing mute/unmute icons on hover:
-.muteIcon .ion-ios-mic-outline:hover:before {
- content: "\f45f";
-}
-.muteIcon .ion-ios-mic:hover:before {
- content: "\f45f";
-}
-.muteIcon .ion-ios-mic-off:hover:before {
- content: "\f461";
-}
-
-.userName {
- color: #E6E6E6;
- line-height: 1.5;
-}
-
-.status {
- float: left;
- width: 15px;
- min-width: 15px;
- height: 27px;
- margin-right: 15px;
- font-size: 18px;
- color: #FFFFFF;
- span {
- padding-left: 5px;
- }
-}
-
-@-webkit-keyframes fadeInAnimation {
- 0% {
- opacity: 0;
- }
- 100% {
- opacity: 1;
- }
-}
-
-.table-user-fixed() {
- background-color: transparent;
- color: #fff;
- border: 0;
- margin: 0;
- padding: 0;
- table-layout: fixed;
- width: 100%;
- font-size: 16px;
-
- @media @mobile-portrait {
- font-size: 14px;
- }
-}
-
-
-// Everything is using EM to be easier to shrink sizes on mobile
-.user-list {
- .table-user-fixed;
- margin-bottom: 0.625em;
-
- &-item {
- background-color: transparent !important; //need this here to reset bg-color
-
- @media @desktop-landscape, @desktop-portrait {
- .kickUser, .setPresenter{
- opacity:0;
- color: #fff;
- cursor: pointer;
- display: none;
- -webkit-animation: fadeInAnimation .5s;
- animation: fadeInAnimation .5s;
- }
- }
-
- &:hover{
- background-color: #2C4155 !important;
-
- @media @landscape, @desktop-portrait {
- background-color: #2C4155;
-
- .kickUser, .setPresenter{
- display: inline;
- opacity:1;
- }
- }
- }
-
- &-status {
- color: inherit;
- width: 1.6em;
- font-size: 1.25em;
- text-align: center;
- padding: 0;
- }
-
- &-name {
- color: inherit;
- width: auto;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- font-size: 1em;
- padding: 0.625em;
- cursor: pointer;
-
- .is-current & {
- font-weight: bold;
- }
-
- .has-messages & {
- padding-right: 30px;
- position: relative;
- }
- }
-
- &-messages {
- position: absolute;
- width: 28px;
- height: 18px;
- border-radius: 41%;
- font-size: 12px;
- color: #fff;
- text-align: center;
- background: #3896D3;
- right: 0;
- top: 9px;
- }
-
- &-sharing {
- padding-right: 10px;
- color: inherit;
- width: 7.2em;
- padding: 0.625em 0.625em 0.625em 0;
-
- &-list {
- .table-user-fixed;
-
- td, th {
- padding: 0;
- width: 25%;
- color: inherit;
- font-size: 1.25em;
- text-align: right;
- }
- }
- }
- }
-}
diff --git a/bigbluebutton-html5/imports/ui/stylesheets/variables.less b/bigbluebutton-html5/imports/ui/stylesheets/variables.less
deleted file mode 100755
index 43fd3ba3a8..0000000000
--- a/bigbluebutton-html5/imports/ui/stylesheets/variables.less
+++ /dev/null
@@ -1,40 +0,0 @@
-/* colors sorted by brightness */
-@white: #fff, #f5f5f5, #eee;
-@lightGrey: #d7d7d7, #cccdd1, #ccc, #999, #E4E5E7;
-@darkGrey: #666, #60636a, #40434c, #32353e;
-@azure: #54a7db, #0099FF;
-@black: #000;
-@yellow: #E3E1B8, #F9DF6B;
-
-/* media queries */
-
-/* standard landscape view: landscape browser window + landscape device screen */
-@landscape: ~"all and (orientation: landscape) and (min-device-aspect-ratio: 1/1)";
-
-/* keyboard is open on a mobile device: landscape browser window + portrait device screen */
-@mobile-portrait-with-keyboard: ~"all and (orientation: landscape) and (max-device-aspect-ratio: 1/1)";
-
-/* narrowed desktop window: portrait browser window + landscape device screen */
-@desktop-portrait: ~"all and (orientation: portrait) and (min-device-aspect-ratio: 1/1)";
-
-/* mobile device in portrait orientation: portrait browser window + portrait device screen */
-@mobile-portrait: ~"all and (orientation: portrait) and (max-device-aspect-ratio: 1/1)";
-
-/* more specific media queries */
-@phone-portrait: ~"all and (orientation: portrait) and (max-device-aspect-ratio: 1/1) and (max-device-width: 480px)";
-@phone-portrait-with-keyboard: ~"all and (orientation: landscape) and (max-device-aspect-ratio: 1/1) and (max-device-width: 480px)";
-
-@tablet-portrait: ~"all and (orientation: portrait) and (max-device-aspect-ratio: 1/1) and (min-device-width: 481px)";
-@tablet-portrait-with-keyboard: ~"all and (orientation: landscape) and (max-device-aspect-ratio: 1/1) and (min-device-width: 481px)";
-
-@phone-landscape: ~"all and (orientation: landscape) and (min-device-aspect-ratio: 1/1) and (max-device-width: 959px)";
-@tablet-landscape: ~"all and (orientation: landscape) and (min-device-aspect-ratio: 1/1) and (min-device-width: 960px) and (max-device-width: 1366px)";
-@desktop-landscape: ~"all and (orientation: landscape) and (min-device-aspect-ratio: 1/1) and (min-device-width: 1367px)";
-
-
-
-/* variables for dimensions */
-@chatControlsHeight: 60px; // height of the chatbox and send chat button
-@settingsSectionHeight: 60px;
-@fontSizeControlMaxWidth: 170px;
-@fontSizeControlMaxHeight: 60px;
diff --git a/bigbluebutton-html5/imports/ui/stylesheets/variables/_all.scss b/bigbluebutton-html5/imports/ui/stylesheets/variables/_all.scss
new file mode 100644
index 0000000000..7afa57ddc1
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/stylesheets/variables/_all.scss
@@ -0,0 +1,3 @@
+@import "./breakpoints";
+@import "./palette";
+@import "./typography";
diff --git a/bigbluebutton-html5/imports/ui/stylesheets/variables/breakpoints.scss b/bigbluebutton-html5/imports/ui/stylesheets/variables/breakpoints.scss
new file mode 100644
index 0000000000..66e389d353
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/stylesheets/variables/breakpoints.scss
@@ -0,0 +1,67 @@
+// We use these functions to get the ranges for the media queries variables.
+@function lower-bound($range){
+ @if length($range) <= 0 {
+ @return 0;
+ }
+ @return nth($range,1);
+}
+
+@function upper-bound($range) {
+ @if length($range) < 2 {
+ @return 999999999999;
+ }
+ @return nth($range, 2);
+}
+
+
+$small-range: (0em, 40em);
+/* 0, 640px */
+$medium-range: (40.063em, 64em);
+/* 641px, 1024px */
+$large-range: (64.063em, 90em);
+/* 1025px, 1440px */
+$xlarge-range: (90.063em, 120em);
+/* 1441px, 1920px */
+$xxlarge-range: (120.063em);
+/* 1921px */
+
+$screen: "only screen";
+$landscape: "#{$screen} and (orientation: landscape)";
+$portrait: "#{$screen} and (orientation: portrait)";
+$small-up: $screen;
+$small-only: "#{$screen} and (max-width: #{upper-bound($small-range)})";
+$medium-up: "#{$screen} and (min-width:#{lower-bound($medium-range)})";
+$medium-only: "#{$screen} and (min-width:#{lower-bound($medium-range)}) and (max-width:#{upper-bound($medium-range)})";
+$large-up: "#{$screen} and (min-width:#{lower-bound($large-range)})";
+$large-only: "#{$screen} and (min-width:#{lower-bound($large-range)}) and (max-width:#{upper-bound($large-range)})";
+$xlarge-up: "#{$screen} and (min-width:#{lower-bound($xlarge-range)})";
+$xlarge-only: "#{$screen} and (min-width:#{lower-bound($xlarge-range)}) and (max-width:#{upper-bound($xlarge-range)})";
+$xxlarge-up: "#{$screen} and (min-width:#{lower-bound($xxlarge-range)})";
+$xxlarge-only: "#{$screen} and (min-width:#{lower-bound($xxlarge-range)}) and (max-width:#{upper-bound($xxlarge-range)})";
+
+$breakpoints: (
+ 'screen': $screen,
+ 'landscape': $landscape,
+ 'portrait': $portrait,
+ 'small': $small-only,
+ 'medium': $medium-only,
+ 'large': $large-only,
+ 'xlarge': $xlarge-only,
+ 'xxlarge': $xxlarge-only,
+);
+
+@mixin mq($media) {
+ // If the key exists in the map
+ @if map-has-key($breakpoints, $media) {
+ // Prints a media query based on the value
+ @media #{map-get($breakpoints, $media)} {
+ @content;
+ }
+ }
+ // If the key doesn't exist in the map we create a media with the argument
+ @else {
+ @media #{$media} {
+ @content;
+ }
+ }
+}
diff --git a/bigbluebutton-html5/imports/ui/stylesheets/variables/palette.scss b/bigbluebutton-html5/imports/ui/stylesheets/variables/palette.scss
new file mode 100644
index 0000000000..dca4b5bb43
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/stylesheets/variables/palette.scss
@@ -0,0 +1,17 @@
+$color-white: #F3F6F9 !default;
+
+$color-gray: #353B42 !default;
+$color-gray-dark: #2A2D33 !default;
+$color-gray-light: #8B9AA8 !default;
+
+$color-primary: #299AD5 !default;
+$color-success: #4DC0A2 !default;
+$color-danger: #F0615F !default;
+
+$color-background: #2A2D36 !default;
+
+$color-text: #8A95A5 !default;
+$color-heading: #4E525E !default;
+
+$color-link: #3E9DD6 !default;
+$color-link-hover: darken($color-link, 15%) !default;
diff --git a/bigbluebutton-html5/imports/ui/stylesheets/variables/typography.scss b/bigbluebutton-html5/imports/ui/stylesheets/variables/typography.scss
new file mode 100644
index 0000000000..4fbba09dba
--- /dev/null
+++ b/bigbluebutton-html5/imports/ui/stylesheets/variables/typography.scss
@@ -0,0 +1,17 @@
+$font-family-sans-serif: 'Source Sans Pro', Helvetica, Arial, sans-serif !default;
+$font-family-serif: Georgia, "Times New Roman", Times, serif !default;
+$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default;
+
+$font-family-base: $font-family-sans-serif !default;
+
+$font-size-base: 1rem !default;
+$font-size-large: 1.25rem !default;
+$font-size-small: .875rem !default;
+
+$line-height-base: 1.428571429 !default; // 20/14
+$line-height-computed: floor(($font-size-base * $line-height-base)) !default;
+
+$headings-font-family: inherit !default;
+$headings-font-weight: 500 !default;
+$headings-line-height: 1.1 !default;
+$headings-color: inherit !default;
diff --git a/bigbluebutton-html5/imports/ui/stylesheets/whiteboard.less b/bigbluebutton-html5/imports/ui/stylesheets/whiteboard.less
deleted file mode 100755
index 99a16edd54..0000000000
--- a/bigbluebutton-html5/imports/ui/stylesheets/whiteboard.less
+++ /dev/null
@@ -1,685 +0,0 @@
-@import "variables";
-
-#whiteboard {
- padding: 0 !important;
- min-width: 0;
-
- @media @landscape {
- border-top: 0px;
- border-left: 0px;
- border-right: 0px;
- border-top-left-radius: 0;
- border-top-right-radius: 0;
- width: 70%;
- height: 100%;
- }
- @media @mobile-portrait-with-keyboard, @desktop-portrait, @mobile-portrait {
- -webkit-order: 1;
- order: 1;
- width: 100% !important; // overrides any width value set manually in landscape
- }
- &:-webkit-full-screen {
- width: 100%;
- height: 100%;
- margin-top: 0px;
- #whiteboard-container {
- height: 100%;
- }
- #whiteboard-paper {
- height: 100%;
- }
- }
- &:-moz-full-screen {
- width: 100%;
- height: 100%;
- margin-top: 0px;
- #whiteboard-container {
- height: 100%;
- }
- #whiteboard-paper {
- height: 100%;
- }
- }
- &:fullscreen {
- width: 100%;
- height: 100%;
- margin-top: 0px;
- #whiteboard-container {
- height: 100%;
- }
- #whiteboard-paper {
- height: 100%;
- }
- }
-}
-
-#whiteboard-paper {
- background-color: white !important;
- margin-left: auto;
- margin-right: auto;
- width: 100%;
- #svggroup {
- display: block;
- height: 100% !important;
- width: 100% !important;
- }
-}
-
-#whiteboard-container {
- position: relative; // makes the fullscreen button's absolute position work
- min-height: 60px; //For the case when the slide is not loaded and a raise hand button overlaps the hamburger button in portrait views
- border-bottom: 1px solid #d7d7d7;
- @media @landscape {
- display: -moz-flex;
- display: -ms-flexbox;
- display: -ms-flex;
- display: -webkit-flex;
- display: flex;
- align-items: center;
- -webkit-align-items: center;
- -ms-align-items: center;
- }
-}
-
-#whiteboard-controls {
- width: 100%;
- height: 70px;
-
- button, .btn {
- outline: none; // overwriting default Foundation's outline
- margin: 0;
- padding: 0;
- height: 50px;
- width: 50px;
- border-radius: 50%;
- background-color: #3896D3;
- border-color: #007095;
- font-size: 30px;
- -webkit-transition: background .3s;
- transition: background .3s;
-
- &:focus,
- &:hover {
- background-color: #3A82D4;
- }
- }
-}
-
-.whiteboard-buttons {
- &-left {
- float: left;
- width: 20%;
- }
-
- &-right {
- float: right;
- width: 20%;
- }
-
- &-center {
- margin: 0 auto;
- text-align: center;
- width: 60%;
- }
-
- &-slide {
- margin-top: 10px;
- margin-bottom: 10px;
- background-color: #3896D3;
- border-color: #007095;
- display: inline-block;
- border-radius: 50px;
-
- .current {
- color: extract(@white, 1);
- font-weight: bold;
- vertical-align: super;
- }
- }
-}
-
-/******************************/
-/* Upload Menu Styling */
-/******************************/
-
-.presenter-uploader {
- @presenteUploaderBg: #eee;
- @presenteUploaderColor: rgba(0, 0, 0, .5);
- @presenteUploaderColorHover: #3A82D4;
-
- &-control {
- max-height: 75vh;
- max-width: 20vw;
- min-width: 300px;
- position: relative;
- margin-top: 10px;
- margin-bottom: 10px;
- margin-left: 10px;
- &-btn {
- .presenter-uploader-container & {
- float: left;
- background-color: @presenteUploaderBg !important;
- border-color: transparent !important;
- color: @presenteUploaderColor !important;
- &:focus,
- &:hover {
- color: @presenteUploaderColorHover;
- }
- }
- }
- }
-
- &-container {
- overflow: hidden;
- color: @presenteUploaderColor;
- background-color: @presenteUploaderBg;
- padding: 10px 10px;
- border-radius: 10px 10px 10px 10px;
- display: none;
- transition: all .3s;
- position: absolute;
- bottom: 0;
-
- .is-open & {
- display: block;
- z-index: 1;
- box-shadow: 2px 2px 6px rgba(0, 0, 0, .2);
- }
- }
-
- &-tip {
- padding: 10px 10px 10px 60px;
- font-size: 9px;
- font-weight: bold;
- margin: -10px;
- text-align: right;
- min-height: 50px;
- }
-
- &-dropzone {
- margin-bottom: 10px;
- opacity: .4;
- transition: opacity 3s;
- text-align: center;
- border: 3px dashed;
- border-radius: 10px;
- padding: 50px;
- transition: all .3s;
- cursor: pointer;
- position: relative;
-
- &:focus,
- &:hover,
- &.hover {
- opacity: .8;
- background-color: rgba(0, 0, 0, .1);
- }
-
- &-icon,
- &-label {
- display: block;
- color: inherit;
- }
-
- &-icon {
- font-size: 70px;
- line-height: 1;
- }
-
- &-label {
- color: inherit;
- text-transform: uppercase;
- font-size: 11px;
- font-weight: bold;
- }
-
- &-fileinput {
- cursor: pointer;
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- opacity: 0;
- }
- }
-
- &-file {
- &-list {
- &::-webkit-scrollbar{width:5px;height:5px}
- &::-webkit-scrollbar-button{width:0;height:0}
- &::-webkit-scrollbar-thumb{background:rgba(0,0,0,.25);border:none;border-radius:50px}
- &::-webkit-scrollbar-thumb:hover{background:rgba(0,0,0,.5)}
- &::-webkit-scrollbar-thumb:active{background:rgba(0,0,0,.25)}
- &::-webkit-scrollbar-track{background:rgba(0,0,0,.25);border:none;border-radius:50px}
- &::-webkit-scrollbar-track:hover{background:rgba(0,0,0,.25)}
- &::-webkit-scrollbar-track:active{background:rgba(0,0,0,.25)}
- &::-webkit-scrollbar-corner{background:0 0}
-
- display: block;
- margin: -10px;
- margin-bottom: 10px;
- list-style: none;
- overflow-y: auto;
- overflow-x: hidden;
- max-height: 200px;
- background:
- linear-gradient(@presenteUploaderBg 30%, rgba(255,255,255,0)),
- linear-gradient(rgba(255,255,255,0), @presenteUploaderBg 70%) 0 100%,
- radial-gradient(50% 0, farthest-side, rgba(0,0,0,.2), rgba(0,0,0,0)),
- radial-gradient(50% 100%,farthest-side, rgba(0,0,0,.2), rgba(0,0,0,0)) 0 100%;
- background:
- linear-gradient(@presenteUploaderBg 30%, rgba(255,255,255,0)),
- linear-gradient(rgba(255,255,255,0), @presenteUploaderBg 70%) 0 100%,
- radial-gradient(farthest-side at 50% 0, rgba(0,0,0,.2), rgba(0,0,0,0)),
- radial-gradient(farthest-side at 50% 100%, rgba(0,0,0,.2), rgba(0,0,0,0)) 0 100%;
- background-repeat: no-repeat;
- background-color: @presenteUploaderBg;
- background-size: 100% 40px, 100% 40px, 100% 14px, 100% 14px;
- background-attachment: local, local, scroll, scroll;
- }
-
- &-item {
- color: @presenteUploaderColor;
- display: table;
- table-layout: fixed;
- width: 100%;
- padding: 10px;
- border-bottom: 1px solid darken(@presenteUploaderBg, 10%);
- border-top: 1px solid lighten(@presenteUploaderBg, 10%);
-
- &:nth-child(odd) {
- background-color: rgba(255, 255, 255, .5);
- }
-
- &.current {
- background-color: fade(@presenteUploaderColorHover, 15%);
- }
-
- &.is-uploading {
- background-image: -webkit-linear-gradient(-45deg, fade(@presenteUploaderColorHover, 15%) 25%,transparent 25%,transparent 50%, fade(@presenteUploaderColorHover, 15%) 50%, fade(@presenteUploaderColorHover, 15%) 75%,transparent 75%,transparent);
- background-image: -o-linear-gradient(-45deg, fade(@presenteUploaderColorHover, 15%) 25%,transparent 25%,transparent 50%, fade(@presenteUploaderColorHover, 15%) 50%, fade(@presenteUploaderColorHover, 15%) 75%,transparent 75%,transparent);
- background-image: linear-gradient(-45deg, fade(@presenteUploaderColorHover, 15%) 25%,transparent 25%,transparent 50%, fade(@presenteUploaderColorHover, 15%) 50%, fade(@presenteUploaderColorHover, 15%) 75%,transparent 75%,transparent);
- -webkit-background-size: 40px 40px;
- background-size: 40px 40px;
-
- -webkit-animation: progress-bar-stripes 2s linear infinite;
- -o-animation: progress-bar-stripes 2s linear infinite;
- animation: progress-bar-stripes 2s linear infinite;
- pointer-events: none;
- }
-
- &-name,
- &-actions {
- vertical-align: middle;
- }
-
- &-name {
- display: table-cell;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- font-size: 11px;
- font-weight: 600;
- cursor: pointer;
-
- .is-uploading & {
- opacity: .4;
- }
-
- :not(.current) &:hover,
- :not(.current) &:focus {
- text-decoration: underline;
- color: @presenteUploaderColorHover;
- }
- }
-
- &-actions,
- &-progress {
- display: table-cell;
- width: 65px;
- text-align: right;
- }
-
- &-actions {
- .is-uploading & {
- display: none;
- }
-
- > i {
- display: inline-block;
- width: 30px;
- height: 30px;
- text-align: center;
- cursor: pointer;
- font-size: 20px;
- line-height: 30px;
- transition: background .3s;
-
- &:focus,
- &:hover {
- color: @presenteUploaderColorHover;
- }
-
- &:active {
- background-color: fade(@presenteUploaderColor, 5%);
- border-radius: 4px;
- -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
- box-shadow: inset 0 1px 2px rgba(0,0,0,.1);
- }
- }
- }
-
- &-progress {
- color: #3A82D4;
- font-weight: bold;
- }
- }
- }
-}
-
-@-webkit-keyframes progress-bar-stripes {
- from { background-position: 0 0; }
- to { background-position: 40px 0; }
-}
-
-@keyframes progress-bar-stripes {
- from { background-position: 0 0; }
- to { background-position: 40px 0; }
-}
-/******************************/
-/* End of Upload Menu Styling */
-/******************************/
-
-
-.presenter-whiteboard {
- height: calc(~'100% - 70px');
-}
-
-.poll-whiteboard {
- height: calc(~'100% - 70px');
-}
-
-.polling {
- width: 100%;
- height: 70px;
- text-align: center;
- padding-top:10px;
- padding-bottom:10px;
- font-size: 0; /* to remove default 4px gaps between the buttons caused by display: inline-block */
-}
-
-.pollButtons {
- color: extract(@white, 1);
- background-color: #3896D3;
- font-weight: bold;
- border: 1px solid extract(@lightGrey, 3);
- height: 100%;
- padding-left: 0; /*overwriting the default foundation padding */
- padding-right: 0; /*overwriting the default foundation padding */
- margin-bottom: 0; /*overwriting the default foundation margin */
- max-width: calc(~'100%/6'); /* the actual width and margins are calculated in the code */
- /* truncating the text inside the buttons */
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- /* the end of truncating */
- span {
- max-width: 80%;
- }
- &:hover {
- background: #3A82D4;
- }
-}
-
-.viewer-whiteboard {
- height: 100%;
-}
-
-.vertically-centered {
- position: relative;
- top: 50%;
- transform: translateY(-50%);
-}
-
-.whiteboardFullscreenButton {
- @media @desktop-landscape, @phone-landscape, @tablet-landscape,
- @phone-portrait-with-keyboard, @phone-portrait, @desktop-portrait {
- height: 50px;
- width: 50px;
- }
- @media @desktop-landscape {
- top: 5px;
- right: 5px;
- }
- @media @phone-landscape {
- top: 4px;
- right: 4px;
- }
- @media @tablet-landscape {
- top: 5px;
- right: 5px;
- }
- @media @phone-portrait-with-keyboard, @phone-portrait {
- top: 4px;
- right: 4px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- height: 53px;
- width: 53px;
- top: 3px;
- line-height: 54px;
- right: 5px;
- }
- @media @desktop-portrait {
- top: 5px;
- right: 5px;
- }
-}
-
-.exitFullscreenButton {
- top: 10px;
- right: 10px;
- height: 50px;
- width: 50px;
-}
-
-.soaringButton {
- @media @desktop-portrait{
- margin-top: -60px;
- }
- position: absolute;
- margin-bottom: 0;
- padding: 0;
- border-radius: 50%;
- background: #3896D3;
- opacity: 0.55;
- &:hover {
- background: #3A82D4;
- }
- &:focus {
- background: #3896D3;
- outline:0;
- }
- i {
- @media @phone-landscape {
- font-size: 29px;
- }
- @media @desktop-portrait, @desktop-landscape, @tablet-landscape {
- font-size: 30px;
- }
- @media @phone-portrait-with-keyboard, @phone-portrait {
- font-size: 35px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- font-size: 40px;
- }
- color: white;
- }
-}
-
-.iconChrome {
- i {
- font-size: 200%;
- position: relative;
- top: 1px;
- }
-}
-
-.iconFirefox {
- i {
- font-size: 500%;
- }
-}
-
-// Emojis FAB
-
-.activeEmojiButton {
- background-color: #3896D3;
- border: 2px solid #34495E;
- svg {
- position: relative;
- top: -2px;
- left: -2px;
- }
-}
-
-.FABContainer {
- &.closedFAB {
- .activeEmojiButton,
- .inactiveEmojiButton {
- pointer-events: none;
- cursor: default;
- }
- }
-}
-
-.FABTriggerButton, .inactiveEmojiButton {
- background-color: #3896D3;
-}
-
-.FABTriggerButton:hover {
- background-color: #3896D3;
-}
-
-.FABTriggerButton {
- position: absolute;
- right: 4px;
- bottom: 4px;
- @media @desktop-landscape, @phone-landscape, @tablet-landscape,
- @phone-portrait-with-keyboard, @phone-portrait, @desktop-portrait {
- height: 50px;
- width: 50px;
- }
- @media @tablet-portrait-with-keyboard, @tablet-portrait {
- height: 53px;
- width: 53px;
- }
-}
-
-.openedFAB {
- .FABTriggerButton {
- i {
- opacity: 0.5;
- }
- }
- button:nth-child(2), button:nth-child(3) {
- animation: increaseOpacity 0.15s forwards;
- }
- button:nth-child(4), button:nth-child(5) {
- animation: increaseOpacity 0.15s forwards;
- animation-delay: 0.075s;
- }
- button:nth-child(6), button:nth-child(7) {
- animation: increaseOpacity 0.15s forwards;
- animation-delay: 0.15s;
- }
-}
-
-.closedFAB {
- button:nth-child(2), button:nth-child(3) {
- animation: decreaseOpacity 0.15s forwards;
- animation-delay: 0.15s;
- }
- button:nth-child(4), button:nth-child(5) {
- animation: decreaseOpacity 0.15s forwards;
- animation-delay: 0.075s;
- }
- button:nth-child(6), button:nth-child(7) {
- animation: decreaseOpacity 0.15s forwards;
- }
-}
-
-.FABContainer > button:nth-child(n + 2):hover {
- background-color: #34495E;
-}
-
-.FABContainer {
- &.noPresentation{
- right: 60px;
- .FABTriggerButton {
- @media @mobile-portrait, @tablet-portrait{
- .vertically-centered;
- }
- }
- }
-
- button {
- padding: 0;
- margin: 0;
- font-size: 30px;
- border-radius: 50%;
- z-index: 100;
- &:focus {
- outline:0;
- }
- }
- & > button:nth-child(n + 2) {
- position: absolute;
- height: 50px;
- width: 50px;
- opacity: 0;
- }
- & > button:nth-child(2) {
- right: 70px;
- bottom: 6px;
- }
- & > button:nth-child(3) {
- right: 70px;
- bottom: 59px;
- }
- & > button:nth-child(4) {
- right: 130px;
- bottom: 6px;
- }
- & > button:nth-child(5) {
- right: 130px;
- bottom: 59px;
- }
- & > button:nth-child(6) {
- right: 190px;
- bottom: 6px;
- }
- & > button:nth-child(7) {
- right: 190px;
- bottom: 59px;
- }
-}
-
-.generateIncreaseOpacityAnimation (@i) when (@i < 105) {
- @p: ~"@{i}%"; // local variable: iterator + a percent sign
- @{p} {
- opacity: @i * 0.01;
- }
- .generateIncreaseOpacityAnimation(@i + 5);
-}
-
-@keyframes increaseOpacity {
- .generateIncreaseOpacityAnimation(0);
-}
-
-@keyframes decreaseOpacity {
- 100% {
- opacity: 0;
- }
-}
diff --git a/bigbluebutton-html5/imports/ui/userlist/README.md b/bigbluebutton-html5/imports/ui/userlist/README.md
deleted file mode 100644
index 57ba110783..0000000000
--- a/bigbluebutton-html5/imports/ui/userlist/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# TODO
-- [x] Migrate user lock status, currently is just a dummy boolean.
-- [x] Migrate set presenter functionality to a service.
-- [x] Migrate kick user functionality to a service.
-- [x] Migrate open private chat to a service.
-- [x] Migrate user lock settings to a service.
-
-# Known Issues
-
- 1. For an unknown reason the chats in session `getSession('chats')` does not populate correctly when the (user_list) blaze template is not rendered. This causes that the badges for unread messages never appear.
- 2. Cascade animation missing on mobile sidebar.
diff --git a/bigbluebutton-html5/imports/ui/userlist/UserList.jsx b/bigbluebutton-html5/imports/ui/userlist/UserList.jsx
deleted file mode 100755
index c7e11aa5cc..0000000000
--- a/bigbluebutton-html5/imports/ui/userlist/UserList.jsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-import {UserListItem} from './UserListItem.jsx';
-
-export let UserList = React.createClass({
- render() {
- return (
- | {icons[key]} | ); - })} -
-
- {this.emojiIcons().map((emoji) =>
-
- )}
-
- );
- },
-});
diff --git a/bigbluebutton-html5/imports/ui/whiteboard/EmojisSVG.jsx b/bigbluebutton-html5/imports/ui/whiteboard/EmojisSVG.jsx
deleted file mode 100755
index 905371a141..0000000000
--- a/bigbluebutton-html5/imports/ui/whiteboard/EmojisSVG.jsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import React from 'react';
-
-export let EmojisSVG = React.createClass({
- render() {
- if (this.props.emoji == 'happy-face') {
- return (
- );
- } else if (this.props.emoji == 'neutral-face') {
- return (
-
- );
- } else if (this.props.emoji == 'confused-face') {
- return (
-
- );
- } else if (this.props.emoji == 'sad-face') {
- return (
-
- );
- } else if (this.props.emoji == 'clock') {
- return (
-
- );
- } else if (this.props.emoji == 'hand') {
- return (
-
-
-
- );
- } else {
- console.log("This shouldn't be happening");
- return ();
- }
- },
-});
diff --git a/bigbluebutton-html5/imports/ui/whiteboard/Polling.jsx b/bigbluebutton-html5/imports/ui/whiteboard/Polling.jsx
deleted file mode 100755
index 13fdbb001e..0000000000
--- a/bigbluebutton-html5/imports/ui/whiteboard/Polling.jsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import React from 'react';
-import { Button } from '../shared/Button.jsx';
-
-export let Polling = React.createClass({
- //#TODO Move this to parent later?
- mixins: [ReactMeteorData],
- getMeteorData() {
- let poll;
- poll = BBB.getCurrentPoll(getInSession('userId'));
- return {
- poll: poll,
- };
- },
-
- componentDidMount: function () {
- return scaleWhiteboard();
- },
-
- componentWillUnmount: function () {
- setTimeout(scaleWhiteboard, 0);
- },
-
- getStyledAnswers(poll) {
- let number, buttonStyle, answers;
- if (poll != null) {
- number = poll.poll_info.poll.answers.length;
- buttonStyle = {
- width: 'calc(75%/' + number + ')',
- marginLeft: 'calc(25%/' + number * 2 + ')',
- marginRight: 'calc(25%/ ' + number * 2 + ')',
- };
- answers = poll.poll_info.poll.answers;
- for (j = 0; j < number; j++) {
- answers[j].style = buttonStyle;
- }
-
- return answers;
- }
- },
-
- handleClick: function (label, answer) {
- return BBB.sendPollResponseMessage(label, answer);
- },
-
- render() {
- return (
-
- {this.data.poll ? this.getStyledAnswers(this.data.poll).map((question) =>
-
- );
- },
-});
diff --git a/bigbluebutton-html5/imports/ui/whiteboard/PresentationList.jsx b/bigbluebutton-html5/imports/ui/whiteboard/PresentationList.jsx
deleted file mode 100755
index 66a9d7436c..0000000000
--- a/bigbluebutton-html5/imports/ui/whiteboard/PresentationList.jsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import React from 'react';
-import classNames from 'classnames';
-
-export let PresentationList = React.createClass({
- handleShow(name) {
- return console.info('Should show the file `' + name + '`');
- },
-
- handleDelete(name) {
- return console.info('Should delete the file `' + name + '`');
- },
-
- render() {
- return (
- -
- {this.props.files ? this.props.files.map((file) =>
-
- - - {file.name} - - - {file.percUploaded} - - - ) - : null } - - {this.props.presentations ? this.props.presentations.map((presentation) => -
- - - {presentation.name} - - - {presentation.current ? null : - - } - - - - ) - : null } -
-
- );
- },
-});
diff --git a/bigbluebutton-html5/imports/ui/whiteboard/UploaderControls.jsx b/bigbluebutton-html5/imports/ui/whiteboard/UploaderControls.jsx
deleted file mode 100755
index 1174e9d2e0..0000000000
--- a/bigbluebutton-html5/imports/ui/whiteboard/UploaderControls.jsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import React from 'react';
-import classNames from 'classnames';
-import { Button } from '../shared/Button.jsx';
-import { PresentationList } from './PresentationList.jsx';
-
-export let UploaderControls = React.createClass({
- getDefaultProps: function () {
- return {
- isOpen: new ReactiveVar(false),
- files: new ReactiveList({
- sort(a, b) {
- // Put the ones who still uploading first
- let ref, ref1;
- return (ref = a.isUploading === b.isUploading) != null ? ref : {
- 0: (ref1 = a.isUploading) != null ? ref1 : -{
- 1: 1,
- },
- };
- },
- }),
- };
- },
-
- mixins: [ReactMeteorData],
- getMeteorData() {
- let presentations;
- presentations = Meteor.Presentations.find({}, {
- sort: {
- 'presentation.current': -1,
- 'presentation.name': 1,
- },
- fields: {
- presentation: 1,
- },
- }).fetch();
-
- return {
- presentations: presentations,
- };
- },
-
- fakeUpload(file, list) {
- return setTimeout((() => {
- file.uploadedSize = file.uploadedSize + (Math.floor(Math.random() * file.size + file.uploadedSize) / 10);
- file.percUploaded = Math.round((file.uploadedSize / file.size) * 100) + '%';
- if (!(file.size > file.uploadedSize)) {
- file.uploadedSize = file.size;
- file.isUploading = false;
- }
-
- list.update(file.name, file);
- this.forceUpdate();
- if (file.isUploading === true) {
- return this.fakeUpload(file, list);
- } else {
- list.remove(file.name); // TODO: Here we should remove and update te presentation on mongo
- this.forceUpdate();
- return;
- }
- }), 200);
- },
-
- isOpen() {
- return this.props.isOpen.get() ? 'is-open' : '';
- },
-
- files() {
- return this.props.files ? this.props.files.fetch() : null;
- },
-
- presentations() {
- return this.data.presentations.map(x => {
- return x.presentation;
- });
- },
-
- handleInput(event) {
- let files;
- event.preventDefault();
- files = (event.dataTransfer || event.target).files;
- return _.each(files, file => {
- file.isUploading = true;
- file.uploadedSize = 0;
- file.percUploaded = '0';
- this.props.files.insert(file.name, file);
- return this.fakeUpload(file, this.props.files);
- });
- },
-
- handleDragLeave(event) {
- event.preventDefault();
- return $(event.currentTarget).removeClass('hover');
- },
-
- handleDragOver(event) {
- event.preventDefault();
- $(event.currentTarget).addClass('hover');
- },
-
- handleClose() {
- this.props.isOpen.set(false);
- this.forceUpdate();
- },
-
- handleOpen() {
- this.props.isOpen.set(true);
- this.forceUpdate();
- },
-
- render() {
- return (
-
-
- );
- },
-});
diff --git a/bigbluebutton-html5/imports/ui/whiteboard/Whiteboard.jsx b/bigbluebutton-html5/imports/ui/whiteboard/Whiteboard.jsx
deleted file mode 100755
index 0627e3b15d..0000000000
--- a/bigbluebutton-html5/imports/ui/whiteboard/Whiteboard.jsx
+++ /dev/null
@@ -1,123 +0,0 @@
-import React from 'react';
-import classNames from 'classnames';
-import { Slide } from './Slide.jsx';
-import { EmojiContainer } from './EmojiContainer.jsx';
-import { Polling } from './Polling.jsx';
-import { Button } from '../shared/Button.jsx';
-import { WhiteboardControls } from './WhiteboardControls.jsx';
-
-export let Whiteboard = React.createClass({
- mixins: [ReactMeteorData],
- getMeteorData() {
- let poll_started, is_presenter, is_mobile, whiteboard_size;
- if (BBB.isPollGoing(getInSession('userId'))) {
- poll_started = true;
- } else {
- poll_started = false;
- }
-
- if (BBB.isUserPresenter(getInSession('userId'))) {
- is_presenter = true;
- } else {
- is_presenter = false;
- }
-
- is_mobile = isMobile();
- if (BBB.isUserPresenter(getInSession('userId'))) {
- whiteboard_size = 'presenter-whiteboard';
- } else {
- if (BBB.isPollGoing(getInSession('userId'))) {
- whiteboard_size = 'poll-whiteboard';
- } else {
- whiteboard_size = 'viewer-whiteboard';
- }
- }
-
- return {
- whiteboard_size: whiteboard_size,
- is_mobile: is_mobile,
- is_presenter: is_presenter,
- poll_started: poll_started,
- };
- },
-
- isPollStarted() {
- if (BBB.isPollGoing(getInSession('userId'))) {
- return true;
- } else {
- return false;
- }
- },
-
- componentDidMount() {
- $('#whiteboard').resizable({
- handles: 'e',
- minWidth: 150,
- resize() {
- return adjustChatInputHeight();
- },
-
- start() {
- if ($('#chat').width() / $('#panels').width() > 0.2) { // chat shrinking can't make it smaller than one fifth of the whiteboard-chat area
- return $('#whiteboard').resizable('option', 'maxWidth', $('#panels').width() - 200); // gives the chat enough space (200px)
- } else {
- return $('#whiteboard').resizable('option', 'maxWidth', $('#whiteboard').width());
- }
- },
-
- stop() {
- $('#whiteboard').css('width', `${100 * $('#whiteboard').width() / $('#panels').width()}%`); // transforms width to %
- return $('#whiteboard').resizable('option', 'maxWidth', null);
- },
- });
-
- // whiteboard element needs to be available
- Meteor.NotificationControl = new NotificationControl('notificationArea');
-
- return $(document).foundation(); // initialize foundation javascript
- },
-
- handleWhiteboardFullScreen() {
- return enterWhiteboardFullscreen();
- },
-
- handleExitFullScreen() {
- if (document.exitFullscreen) {
- return document.exitFullscreen();
- } else if (document.mozCancelFullScreen) {
- return document.mozCancelFullScreen();
- } else if (document.webkitExitFullscreen) {
- return document.webkitExitFullscreen();
- }
- },
-
- isFullScreen() {
- if ($('.fullscreenButton').hasClass('exitFullscreenButton')) {
- return true;
- } else {
- return false;
- }
- },
-
- render() {
- return (
-
-
-
-
-
-
- Drop files here
or click to upload -
-
- or click to upload -
- UPLOAD ANY OFFICE DOCUMENT OR PORTABLE DOCUMENT FORMAT (PDF) FILE.
-
- FOR BEST RESULTS UPLOAD PDF. -
- - FOR BEST RESULTS UPLOAD PDF. -
-
- );
- },
-});
diff --git a/bigbluebutton-html5/imports/ui/whiteboard/WhiteboardControls.jsx b/bigbluebutton-html5/imports/ui/whiteboard/WhiteboardControls.jsx
deleted file mode 100755
index 24cdced41a..0000000000
--- a/bigbluebutton-html5/imports/ui/whiteboard/WhiteboardControls.jsx
+++ /dev/null
@@ -1,75 +0,0 @@
-import React from 'react';
-import { Button } from '../shared/Button.jsx';
-import { UploaderControls } from './UploaderControls.jsx';
-
-export let WhiteboardControls = React.createClass({
- mixins: [ReactMeteorData],
- getMeteorData() {
- let currentPresentation, currentSlide, currentSlideNum, ref, ref1, totalSlideNum;
- currentSlideNum = 0;
- totalSlideNum = 0;
- currentPresentation = Meteor.Presentations.findOne({
- 'presentation.current': true,
- });
- if (currentPresentation != null) {
- currentSlide = Meteor.Slides.findOne({
- presentationId: currentPresentation.presentation.id,
- 'slide.current': true,
- });
- if (currentSlide != null) {
- currentSlideNum = currentSlide.slide.num;
- }
-
- totalSlides = Meteor.Slides.find({ presentationId: currentPresentation.presentation.id });
- if (totalSlides != null) {
- totalSlideNum = totalSlides.count();
- }
- }
-
- return {
- currentSlideNum: currentSlideNum,
- totalSlideNum: totalSlideNum,
- };
- },
-
- componentDidMount() {
- setTimeout(scaleWhiteboard, 0);
- },
-
- componentWillUnmount() {
- setTimeout(scaleWhiteboard, 0);
- },
-
- handlePrevious() {
- BBB.goToPreviousPage();
- },
-
- handleNext() {
- BBB.goToNextPage();
- },
-
- render() {
- return (
-
-
-
- {this.data.is_presenter ?
-
-
-
- );
- },
-});
diff --git a/bigbluebutton-html5/lib/router.js b/bigbluebutton-html5/lib/router.js
deleted file mode 100755
index 324f22da83..0000000000
--- a/bigbluebutton-html5/lib/router.js
+++ /dev/null
@@ -1,148 +0,0 @@
-this.Router.configure({
- layoutTemplate: 'layout',
-});
-
-this.Router.map(function () {
- // this is how we handle login attempts
- this.route('main', {
- path: '/html5client/:meeting_id/:user_id/:auth_token',
- where: 'client',
- onBeforeAction() {
- let applyNewSessionVars, authToken, meetingId, userId;
- meetingId = this.params.meeting_id;
- userId = this.params.user_id;
- authToken = this.params.auth_token;
- setInSession('loginUrl', this.originalUrl);
-
- // catch if any of the user's meeting data is invalid
- if ((authToken == null) || (meetingId == null) || (userId == null)) {
- // if their data is invalid, redirect the user to the logout page
- document.location = getInSession('logoutURL');
- } else {
- Meteor.call('validateAuthToken', meetingId, userId, authToken);
- applyNewSessionVars = function () {
- setInSession('authToken', authToken);
- setInSession('meetingId', meetingId);
- setInSession('userId', userId);
- return Router.go('/html5client');
- };
-
- clearSessionVar(applyNewSessionVars);
- }
-
- return this.next();
- },
- });
-
- // the user successfully logged in
- this.route('signedin', {
- path: '/html5client',
- where: 'client',
- action() {
- let authToken, meetingId, onErrorFunction, userId;
- meetingId = getInSession('meetingId');
- userId = getInSession('userId');
- authToken = getInSession('authToken');
- onErrorFunction = function (error, result) {
- console.log('ONERRORFUNCTION');
-
- //make sure the user is not let through
- Meteor.call('userLogout', meetingId, userId, authToken);
-
- clearSessionVar();
-
- // Attempt to log back in
- if (error == null) {
- window.location.href = getInSession('loginUrl') || getInSession('logoutURL');
- }
- };
-
- Meteor.subscribe('chat', meetingId, userId, authToken, {
- onError: onErrorFunction,
- onReady: (_this => {
- return function () {
- return Meteor.subscribe('shapes', meetingId, {
- onReady: function () {
- return Meteor.subscribe('slides', meetingId, {
- onReady: function () {
- return Meteor.subscribe('meetings', meetingId, {
- onReady: function () {
- return Meteor.subscribe('presentations', meetingId, {
- onReady: function () {
- return Meteor.subscribe('users', meetingId, userId, authToken, {
- onError: onErrorFunction,
- onReady: function () {
- return Meteor.subscribe('whiteboard-clean-status', meetingId, {
- onReady: function () {
- return Meteor.subscribe('bbb_poll', meetingId, userId, authToken, {
- onReady: function () {
- return Meteor.subscribe('bbb_cursor', meetingId, {
- onReady: function () {
- let a, handleLogourUrlError;
-
- // done subscribing, start rendering the client and set default settings
- _this.render('main');
- onLoadComplete();
- handleLogourUrlError = function () {
- alert('Error: could not find the logoutURL');
- setInSession('logoutURL', document.location.hostname);
- };
-
- // obtain the logoutURL
- a = $.ajax({
- dataType: 'json',
- url: '/bigbluebutton/api/enter',
- });
- a.done(data => {
- if (data.response.logoutURL != null) { // for a meeting with 0 users
- setInSession('logoutURL', data.response.logoutURL);
- } else {
- if (data.response.logoutUrl != null) { // for a running meeting
- setInSession('logoutURL', data.response.logoutUrl);
- } else {
- return handleLogourUrlError();
- }
- }
- });
- return a.fail((data, textStatus, errorThrown) => {
- return handleLogourUrlError();
- });
- },
- });
- },
- });
- },
- });
- },
- });
- },
- });
- },
- });
- },
- });
- },
- });
- };
- })(this),
- });
- return this.render('loading');
- },
- });
-
- // endpoint - is the html5client running (ready to handle a user)
- this.route('meteorEndpoint', {
- path: '/check',
- where: 'server',
- action() {
- this.response.writeHead(200, {
- 'Content-Type': 'application/json',
- });
-
- // reply that the html5client is running
- this.response.end(JSON.stringify({
- html5clientStatus: 'running',
- }));
- },
- });
-});
diff --git a/bigbluebutton-html5/package.json b/bigbluebutton-html5/package.json
index b95ccdde51..280b8d417b 100644
--- a/bigbluebutton-html5/package.json
+++ b/bigbluebutton-html5/package.json
@@ -3,26 +3,38 @@
"description": "BigBlueButton HTML5 Client",
"scripts": {
"start": "cd app;./start.sh",
- "preinstall": "sudo npm install -g grunt-cli",
+ "preinstall": "npm install -g grunt-cli",
"test": "cd app;JASMINE_BROWSER=PhantomJS JASMINE_MIRROR_PORT=3000 meteor run --test",
"lint": "node_modules/jscs/bin/jscs *",
"autofix": "node_modules/jscs/bin/jscs * --fix"
},
"dependencies": {
"classnames": "^2.2.3",
+ "history": "^2.1.1",
"react": "^15.0.1",
"react-addons-pure-render-mixin": "^15.0.1",
- "react-dom": "^15.0.1"
+ "react-dom": "^15.0.1",
+ "react-intl": "^2.1.2",
+ "react-modal": "^1.2.1",
+ "react-router": "^2.4.0",
+ "underscore": "~1.8.3"
},
"devDependencies": {
+ "autoprefixer": "^6.3.6",
"coffeelint": "^1.6.0",
"grunt": "^0.4.5",
- "jscs": "~2.11.0",
+ "grunt-concurrent": "~2.2.1",
+ "grunt-contrib-watch": "~1.0.0",
+ "grunt-force-task": "~2.0.0",
"grunt-jscs": "~2.8.0",
"grunt-shell": "~1.2.1",
+ "jscs": "~2.11.0",
"load-grunt-tasks": "~3.4.1",
- "grunt-force-task": "~2.0.0",
- "grunt-contrib-watch": "~1.0.0",
- "grunt-concurrent": "~2.2.1"
+ "grunt-newer": "~1.2.0"
+ },
+ "cssModules": {
+ "extensions": [
+ "scss"
+ ]
}
}
diff --git a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.eot b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.eot
new file mode 100755
index 0000000000..b14e0e812c
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.eot differ
diff --git a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.svg b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.svg
new file mode 100755
index 0000000000..ca7881cb5d
--- /dev/null
+++ b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.svg
@@ -0,0 +1,39 @@
+
+
+
\ No newline at end of file
diff --git a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.ttf b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.ttf
new file mode 100755
index 0000000000..a0378609ad
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.ttf differ
diff --git a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff
new file mode 100755
index 0000000000..7a4620e9a7
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff differ
diff --git a/bigbluebutton-html5/public/fonts/SourceSansPro/OFL.txt b/bigbluebutton-html5/public/fonts/SourceSansPro/OFL.txt
new file mode 100755
index 0000000000..00585f4ed8
--- /dev/null
+++ b/bigbluebutton-html5/public/fonts/SourceSansPro/OFL.txt
@@ -0,0 +1,92 @@
+Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-Black.ttf b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-Black.ttf
new file mode 100755
index 0000000000..cb89a2d171
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-Black.ttf differ
diff --git a/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-BlackItalic.ttf b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-BlackItalic.ttf
new file mode 100755
index 0000000000..c719243c0d
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-BlackItalic.ttf differ
diff --git a/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-Bold.ttf b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-Bold.ttf
new file mode 100755
index 0000000000..50d81bdad5
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-Bold.ttf differ
diff --git a/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-BoldItalic.ttf b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-BoldItalic.ttf
new file mode 100755
index 0000000000..d20dd0c5ec
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-BoldItalic.ttf differ
diff --git a/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-ExtraLight.ttf b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-ExtraLight.ttf
new file mode 100755
index 0000000000..bb4176c6ff
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-ExtraLight.ttf differ
diff --git a/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-ExtraLightItalic.ttf b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-ExtraLightItalic.ttf
new file mode 100755
index 0000000000..2c34f3b8dc
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-ExtraLightItalic.ttf differ
diff --git a/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-Italic.ttf b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-Italic.ttf
new file mode 100755
index 0000000000..e5a1a86e63
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-Italic.ttf differ
diff --git a/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-Light.ttf b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-Light.ttf
new file mode 100755
index 0000000000..5f64679f6b
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-Light.ttf differ
diff --git a/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-LightItalic.ttf b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-LightItalic.ttf
new file mode 100755
index 0000000000..88a6778d24
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-LightItalic.ttf differ
diff --git a/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-Regular.ttf b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-Regular.ttf
new file mode 100755
index 0000000000..91e9ea5757
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-Regular.ttf differ
diff --git a/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-Semibold.ttf b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-Semibold.ttf
new file mode 100755
index 0000000000..5020594826
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-Semibold.ttf differ
diff --git a/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-SemiboldItalic.ttf b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-SemiboldItalic.ttf
new file mode 100755
index 0000000000..2c5ad3008c
Binary files /dev/null and b/bigbluebutton-html5/public/fonts/SourceSansPro/SourceSansPro-SemiboldItalic.ttf differ
diff --git a/bigbluebutton-html5/public/packages/ionicons/fonts/ionicons.ttf b/bigbluebutton-html5/public/packages/ionicons/fonts/ionicons.ttf
deleted file mode 100755
index c4e4632486..0000000000
Binary files a/bigbluebutton-html5/public/packages/ionicons/fonts/ionicons.ttf and /dev/null differ
diff --git a/bigbluebutton-html5/public/packages/ionicons/fonts/ionicons.woff b/bigbluebutton-html5/public/packages/ionicons/fonts/ionicons.woff
deleted file mode 100755
index 5f3a14e0a5..0000000000
Binary files a/bigbluebutton-html5/public/packages/ionicons/fonts/ionicons.woff and /dev/null differ
diff --git a/bigbluebutton-html5/server/collection_methods/cursor.js b/bigbluebutton-html5/server/collection_methods/cursor.js
deleted file mode 100755
index 8cc37b7499..0000000000
--- a/bigbluebutton-html5/server/collection_methods/cursor.js
+++ /dev/null
@@ -1,47 +0,0 @@
-this.initializeCursor = function (meetingId) {
- return Meteor.Cursor.upsert({
- meetingId: meetingId,
- }, {
- meetingId: meetingId,
- x: 0,
- y: 0,
- }, (err, numChanged) => {
- if (err) {
- return Meteor.log.error(`err upserting cursor for ${meetingId}`);
- } else {
- // Meteor.log.info "ok upserting cursor for #{meetingId}"
- }
- });
-};
-
-this.updateCursorLocation = function (meetingId, cursorObject) {
- return Meteor.Cursor.update({
- meetingId: meetingId,
- }, {
- $set: {
- x: cursorObject.x,
- y: cursorObject.y,
- },
- }, (err, numChanged) => {
- if (err != null) {
- return Meteor.log.error(`_unsucc update of cursor for ${meetingId} ${JSON.stringify(cursorObject)} err=${JSON.stringify(err)}`);
- } else {
- // Meteor.log.info "updated cursor for #{meetingId} #{JSON.stringify cursorObject}"
- }
- });
-};
-
-// called on server start and meeting end
-this.clearCursorCollection = function (meetingId) {
- if (meetingId != null) {
- return Meteor.Cursor.remove({
- meetingId: meetingId,
- }, () => {
- return Meteor.log.info(`cleared Cursor Collection (meetingId: ${meetingId})!`);
- });
- } else {
- return Meteor.Cursor.remove({}, () => {
- return Meteor.log.info('cleared Cursor Collection (all meetings)!');
- });
- }
-};
diff --git a/bigbluebutton-html5/server/collection_methods/meetings.js b/bigbluebutton-html5/server/collection_methods/meetings.js
deleted file mode 100755
index 2422ccc372..0000000000
--- a/bigbluebutton-html5/server/collection_methods/meetings.js
+++ /dev/null
@@ -1,92 +0,0 @@
-this.addMeetingToCollection = function (meetingId, name, intendedForRecording, voiceConf, duration, callback) {
- //check if the meeting is already in the collection
-
- Meteor.Meetings.upsert({
- meetingId: meetingId,
- }, {
- $set: {
- meetingName: name,
- intendedForRecording: intendedForRecording,
- currentlyBeingRecorded: false,
- voiceConf: voiceConf,
- duration: duration,
- roomLockSettings: {
- // by default the lock settings will be disabled on meeting create
- disablePrivateChat: false,
- disableCam: false,
- disableMic: false,
- lockOnJoin: Meteor.config.lockOnJoin,
- lockedLayout: false,
- disablePublicChat: false,
- lockOnJoinConfigurable: false // TODO
- },
- },
- }, (_this => {
- return function (err, numChanged) {
- let funct;
- if (numChanged.insertedId != null) {
- funct = function (cbk) {
- Meteor.log.info(`__added MEETING ${meetingId}`);
- return cbk();
- };
-
- return funct(callback);
- } else {
- Meteor.log.error('nothing happened');
- return callback();
- }
- };
- })(this));
-
- // initialize the cursor in the meeting
- return initializeCursor(meetingId);
-};
-
-this.clearMeetingsCollection = function (meetingId) {
- if (meetingId != null) {
- return Meteor.Meetings.remove({
- meetingId: meetingId,
- }, Meteor.log.info(`cleared Meetings Collection (meetingId: ${meetingId}!`));
- } else {
- return Meteor.Meetings.remove({}, Meteor.log.info('cleared Meetings Collection (all meetings)!'));
- }
-};
-
-//clean up upon a meeting's end
-this.removeMeetingFromCollection = function (meetingId, callback) {
- let funct;
- if (Meteor.Meetings.findOne({
- meetingId: meetingId,
- }) != null) {
- Meteor.log.info(`end of meeting ${meetingId}. Clear the meeting data from all collections`);
-
- // delete all users in the meeting
- clearUsersCollection(meetingId);
-
- // delete all slides in the meeting
- clearSlidesCollection(meetingId);
-
- // delete all shapes in the meeting
- clearShapesCollection(meetingId);
-
- // delete all presentations in the meeting
- clearPresentationsCollection(meetingId);
-
- // delete all chat messages in the meeting
- clearChatCollection(meetingId);
-
- // delete the meeting
- clearMeetingsCollection(meetingId);
-
- // delete the cursor for the meeting
- clearCursorCollection(meetingId);
- return callback();
- } else {
- funct = function (localCallback) {
- Meteor.log.error(`Error! There was no such meeting ${meetingId}`);
- return localCallback();
- };
-
- return funct(callback);
- }
-};
diff --git a/bigbluebutton-html5/server/collection_methods/poll.js b/bigbluebutton-html5/server/collection_methods/poll.js
deleted file mode 100755
index 6d595e3dea..0000000000
--- a/bigbluebutton-html5/server/collection_methods/poll.js
+++ /dev/null
@@ -1,65 +0,0 @@
-this.addPollToCollection = function (poll, requester_id, users, meetingId) {
- let _users, answer, entry, i, j, user;
-
- //copying all the userids into an array
- _users = [];
- _users_length = users.length;
- for (i = 0; i < _users_length; i++) {
- user = users[i];
- _users.push(user.user.userid);
- }
-
- //adding the initial number of votes for each answer
- _answers = poll.answers;
- _answers_length = _answers.length;
- for (j = 0; j < _answers_length; j++) {
- answer = _answers[j];
- answer.num_votes = 0;
- }
-
- //adding the initial number of responders and respondents to the poll, which will be displayed for presenter (in HTML5 client) when he starts the poll
- poll.num_responders = -1;
- poll.num_respondents = -1;
-
- //adding all together and inserting into the Polls collection
- entry = {
- poll_info: {
- meetingId: meetingId,
- poll: poll,
- requester: requester_id,
- users: _users,
- },
- };
- Meteor.log.info(`added poll _id=[${poll.id}]:meetingId=[${meetingId}].`);
- return Meteor.Polls.insert(entry);
-};
-
-this.clearPollCollection = function (meetingId, poll_id) {
- if (meetingId != null && poll_id != null && Meteor.Polls.findOne({
- 'poll_info.meetingId': meetingId,
- 'poll_info.poll.id': poll_id,
- }) != null) {
- return Meteor.Polls.remove({
- 'poll_info.meetingId': meetingId,
- 'poll_info.poll.id': poll_id,
- }, Meteor.log.info(`cleared Polls Collection (meetingId: ${meetingId}, pollId: ${poll_id}!)`));
- } else {
- return Meteor.Polls.remove({}, Meteor.log.info('cleared Polls Collection (all meetings)!'));
- }
-};
-
-this.updatePollCollection = function (poll, meetingId, requesterId) {
- if ((poll.answers != null) && (poll.num_responders != null) && (poll.num_respondents != null) && (poll.id != null) && (meetingId != null) && (requesterId != null)) {
- return Meteor.Polls.update({
- 'poll_info.meetingId': meetingId,
- 'poll_info.requester': requesterId,
- 'poll_info.poll.id': poll.id,
- }, {
- $set: {
- 'poll_info.poll.answers': poll.answers,
- 'poll_info.poll.num_responders': poll.num_responders,
- 'poll_info.poll.num_respondents': poll.num_respondents,
- },
- }, Meteor.log.info(`updating Polls Collection (meetingId: ${meetingId}, pollId: ${poll.id}!)`));
- }
-};
diff --git a/bigbluebutton-html5/server/collection_methods/presentations.js b/bigbluebutton-html5/server/collection_methods/presentations.js
deleted file mode 100755
index 3bb11a4da3..0000000000
--- a/bigbluebutton-html5/server/collection_methods/presentations.js
+++ /dev/null
@@ -1,48 +0,0 @@
-this.addPresentationToCollection = function (meetingId, presentationObject) {
- let entry, id, presentationObj;
-
- //check if the presentation is already in the collection
- presentationObj = Meteor.Presentations.findOne({
- meetingId: meetingId,
- 'presentation.id': presentationObject.id,
- });
- if (presentationObj == null) {
- entry = {
- meetingId: meetingId,
- presentation: {
- id: presentationObject.id,
- name: presentationObject.name,
- current: presentationObject.current,
- },
- };
- return id = Meteor.Presentations.insert(entry);
-
- //Meteor.log.info "presentation added id =[#{id}]:#{presentationObject.id} in #{meetingId}. Presentations.size is now #{Meteor.Presentations.find({meetingId: meetingId}).count()}"
- }
-};
-
-this.removePresentationFromCollection = function (meetingId, presentationId) {
- let id, presentationObject;
- presentationObject = Meteor.Presentations.findOne({
- meetingId: meetingId,
- 'presentation.id': presentationId,
- });
- if (presentationObject != null) {
- Meteor.Slides.remove({
- presentationId: presentationId,
- }, Meteor.log.info(`cleared Slides Collection (presentationId: ${presentationId}!`));
- Meteor.Presentations.remove(presentationObject._id);
- return Meteor.log.info(`----removed presentation[${presentationId}] from ${meetingId}`);
- }
-};
-
-// called on server start and meeting end
-this.clearPresentationsCollection = function (meetingId) {
- if (meetingId != null) {
- return Meteor.Presentations.remove({
- meetingId: meetingId,
- }, Meteor.log.info(`cleared Presentations Collection (meetingId: ${meetingId}!`));
- } else {
- return Meteor.Presentations.remove({}, Meteor.log.info('cleared Presentations Collection (all meetings)!'));
- }
-};
diff --git a/bigbluebutton-html5/server/collection_methods/shapes.js b/bigbluebutton-html5/server/collection_methods/shapes.js
deleted file mode 100755
index d2cfeb417c..0000000000
--- a/bigbluebutton-html5/server/collection_methods/shapes.js
+++ /dev/null
@@ -1,168 +0,0 @@
-// --------------------------------------------------------------------------------------------
-// Private methods on server
-// --------------------------------------------------------------------------------------------
-this.addShapeToCollection = function (meetingId, whiteboardId, shapeObject) {
- let entry, id, removeTempTextShape;
- if (shapeObject != null && shapeObject.shape_type === 'text') {
- Meteor.log.info(`we are dealing with a text shape and the event is:${shapeObject.status}`);
- entry = {
- meetingId: meetingId,
- whiteboardId: whiteboardId,
- shape: {
- type: shapeObject.shape.type,
- textBoxHeight: shapeObject.shape.textBoxHeight,
- backgroundColor: shapeObject.shape.backgroundColor,
- fontColor: shapeObject.shape.fontColor,
- status: shapeObject.shape.status,
- dataPoints: shapeObject.shape.dataPoints,
- x: shapeObject.shape.x,
- textBoxWidth: shapeObject.shape.textBoxWidth,
- whiteboardId: shapeObject.shape.whiteboardId,
- fontSize: shapeObject.shape.fontSize,
- id: shapeObject.shape.id,
- y: shapeObject.shape.y,
- calcedFontSize: shapeObject.shape.calcedFontSize,
- text: shapeObject.shape.text,
- background: shapeObject.shape.background,
- },
- };
- if (shapeObject.status === 'textEdited' || shapeObject.status === 'textPublished') {
- // only keep the final version of the text shape
- removeTempTextShape = function (callback) {
- Meteor.Shapes.remove({
- 'shape.id': shapeObject.shape.id,
- });
- return callback();
- };
-
- return removeTempTextShape(() => {
- // display as the prestenter is typing
- let id;
- id = Meteor.Shapes.insert(entry);
- return Meteor.log.info(`${shapeObject.status} substituting the temp shapes with the newer one`);
- });
- }
-
- // the mouse button was released - the drawing is complete
- // TODO: pencil messages currently don't send draw_end and are labeled all as DRAW_START
- } else if (shapeObject != null && (shapeObject.status === 'DRAW_START' || shapeObject.status === 'DRAW_UPDATE' || shapeObject.status === 'DRAW_END')) {
- shape = Meteor.Shapes.findOne({
- 'shape.id': shapeObject.shape.id,
- });
- if (shape != null) {
- return id = Meteor.Shapes.update({
- 'shape.id': shapeObject.shape.id,
- }, {
- $set: {
- 'shape.shape.points': shapeObject.shape.points,
- },
- });
- } else {
- entry = {
- meetingId: meetingId,
- whiteboardId: whiteboardId,
- shape: {
- wb_id: shapeObject.wb_id,
- shape_type: shapeObject.shape_type,
- status: shapeObject.status,
- id: shapeObject.id,
- shape: {
- type: shapeObject.shape.type,
- status: shapeObject.shape.status,
- points: shapeObject.shape.points,
- whiteboardId: shapeObject.shape.whiteboardId,
- id: shapeObject.shape.id,
- square: shapeObject.shape.square,
- transparency: shapeObject.shape.transparency,
- thickness: shapeObject.shape.thickness,
- color: shapeObject.shape.color,
- result: shapeObject.shape.result,
- num_respondents: shapeObject.shape.num_respondents,
- num_responders: shapeObject.shape.num_responders,
- },
- },
- };
- return id = Meteor.Shapes.insert(entry);
- }
- }
-};
-
-this.removeAllShapesFromSlide = function (meetingId, whiteboardId) {
- Meteor.log.info(`removeAllShapesFromSlide__${whiteboardId}`);
- if ((meetingId != null) && (whiteboardId != null) && (Meteor.Shapes.find({
- meetingId: meetingId,
- whiteboardId: whiteboardId,
- }) != null)) {
- return Meteor.Shapes.remove({
- meetingId: meetingId,
- whiteboardId: whiteboardId,
- }, () => {
- Meteor.log.info('clearing all shapes from slide');
-
- // After shapes are cleared, wait 1 second and set cleaning off
- // Why would we wait 1 second? (Alex)
- return Meteor.setTimeout(() => {
- return Meteor.WhiteboardCleanStatus.update({
- meetingId: meetingId,
- }, {
- $set: {
- in_progress: false,
- },
- });
- }, 0);
- });
- }
-};
-
-this.removeShapeFromSlide = function (meetingId, whiteboardId, shapeId) {
- let shapeToRemove;
- if (meetingId != null && whiteboardId != null && shapeId != null) {
- shapeToRemove = Meteor.Shapes.findOne({
- meetingId: meetingId,
- whiteboardId: whiteboardId,
- 'shape.id': shapeId,
- });
- if (shapeToRemove != null) {
- Meteor.Shapes.remove(shapeToRemove._id);
- Meteor.log.info(`----removed shape[${shapeId}] from ${whiteboardId}`);
- return Meteor.log.info(`remaining shapes on the slide: ${
- Meteor.Shapes.find({
- meetingId: meetingId,
- whiteboardId: whiteboardId,
- }).count()}`);
- }
- }
-};
-
-// called on server start and meeting end
-this.clearShapesCollection = function (meetingId) {
- if (meetingId != null) {
- return Meteor.Shapes.remove({
- meetingId: meetingId,
- }, () => {
- Meteor.log.info(`cleared Shapes Collection (meetingId: ${meetingId}!`);
- return Meteor.WhiteboardCleanStatus.update({
- meetingId: meetingId,
- }, {
- $set: {
- in_progress: false,
- },
- });
- });
- } else {
- return Meteor.Shapes.remove({}, () => {
- Meteor.log.info('cleared Shapes Collection (all meetings)!');
- return Meteor.WhiteboardCleanStatus.update({
- meetingId: meetingId,
- }, {
- $set: {
- in_progress: false,
- },
- });
- });
- }
-};
-
-// --------------------------------------------------------------------------------------------
-// end Private methods on server
-// --------------------------------------------------------------------------------------------
diff --git a/bigbluebutton-html5/server/collection_methods/slides.js b/bigbluebutton-html5/server/collection_methods/slides.js
deleted file mode 100755
index e25e041f5b..0000000000
--- a/bigbluebutton-html5/server/collection_methods/slides.js
+++ /dev/null
@@ -1,74 +0,0 @@
-// --------------------------------------------------------------------------------------------
-// Private methods on server
-// --------------------------------------------------------------------------------------------
-this.displayThisSlide = function (meetingId, newSlideId, slideObject) {
- let presentationId;
- presentationId = newSlideId.split('/')[0]; // grab the presentationId part of the slideId
- // change current to false for the old slide
- Meteor.Slides.update({
- presentationId: presentationId,
- 'slide.current': true,
- }, {
- $set: {
- 'slide.current': false,
- },
- });
-
- //change current to true for the new slide and update its ratios and offsets
- Meteor.Slides.update({
- presentationId: presentationId,
- 'slide.id': newSlideId,
- }, {
- $set: {
- 'slide.current': true,
- 'slide.height_ratio': slideObject.height_ratio,
- 'slide.width_ratio': slideObject.width_ratio,
- 'slide.x_offset': slideObject.x_offset,
- 'slide.y_offset': slideObject.y_offset,
- },
- });
-};
-
-this.addSlideToCollection = function (meetingId, presentationId, slideObject) {
- let entry, id;
- if (Meteor.Slides.findOne({
- meetingId: meetingId,
- 'slide.id': slideObject.id,
- }) == null) {
- entry = {
- meetingId: meetingId,
- presentationId: presentationId,
- slide: {
- height_ratio: slideObject.height_ratio,
- y_offset: slideObject.y_offset,
- num: slideObject.num,
- x_offset: slideObject.x_offset,
- current: slideObject.current,
- img_uri: slideObject.svg_uri != null ? slideObject.svg_uri : slideObject.png_uri,
- txt_uri: slideObject.txt_uri,
- id: slideObject.id,
- width_ratio: slideObject.width_ratio,
- swf_uri: slideObject.swf_uri,
- thumb_uri: slideObject.thumb_uri,
- },
- };
- return id = Meteor.Slides.insert(entry);
-
- //Meteor.log.info "added slide id =[#{id}]:#{slideObject.id} in #{meetingId}. Now there are #{Meteor.Slides.find({meetingId: meetingId}).count()} slides in the meeting"
- }
-};
-
-// called on server start and meeting end
-this.clearSlidesCollection = function (meetingId) {
- if (meetingId != null) {
- return Meteor.Slides.remove({
- meetingId: meetingId,
- }, Meteor.log.info(`cleared Slides Collection (meetingId: ${meetingId}!`));
- } else {
- return Meteor.Slides.remove({}, Meteor.log.info('cleared Slides Collection (all meetings)!'));
- }
-};
-
-// --------------------------------------------------------------------------------------------
-// end Private methods on server
-// --------------------------------------------------------------------------------------------
diff --git a/bigbluebutton-html5/server/collection_methods/users.js b/bigbluebutton-html5/server/collection_methods/users.js
deleted file mode 100755
index 667de0f8e0..0000000000
--- a/bigbluebutton-html5/server/collection_methods/users.js
+++ /dev/null
@@ -1,463 +0,0 @@
-// Only callable from server
-// Received information from BBB-Apps that a user left
-// Need to update the collection
-// params: meetingid, userid as defined in BBB-Apps
-// callback
-this.markUserOffline = function (meetingId, userId, callback) {
- // mark the user as offline. remove from the collection on meeting_end #TODO
- let user;
- user = Meteor.Users.findOne({
- meetingId: meetingId,
- userId: userId,
- });
- if (user != null && user.clientType === 'HTML5') {
- Meteor.log.info(`marking html5 user [${userId}] as offline in meeting[${meetingId}]`);
- return Meteor.Users.update({
- meetingId: meetingId,
- userId: userId,
- }, {
- $set: {
- 'user.connection_status': 'offline',
- 'user.voiceUser.talking': false,
- 'user.voiceUser.joined': false,
- 'user.voiceUser.muted': false,
- 'user.time_of_joining': 0,
- 'user.listenOnly': false,
- },
- }, (err, numChanged) => {
- let funct;
- if (err != null) {
- Meteor.log.error(`_unsucc update (mark as offline) of user ${user.user.name} ${userId} err=${JSON.stringify(err)}`);
- return callback();
- } else {
- funct = function (cbk) {
- Meteor.log.info(`_marking as offline html5 user ${user.user.name} ${userId} numChanged=${numChanged}`);
- return cbk();
- };
-
- return funct(callback);
- }
- });
- } else {
- return Meteor.Users.remove({
- meetingId: meetingId,
- userId: userId,
- }, (err, numDeletions) => {
- let funct;
- if (err != null) {
- Meteor.log.error(`_unsucc deletion of user ${user != null ? user.user.name : void 0} ${userId} err=${JSON.stringify(err)}`);
- return callback();
- } else {
- funct = function (cbk) {
- Meteor.log.info(`_deleting info for user ${user != null ? user.user.name : void 0} ${userId} numDeletions=${numDeletions}`);
- return cbk();
- };
-
- return funct(callback);
- }
- });
- }
-};
-
-// Corresponds to a valid action on the HTML clientside
-// After authorization, publish a user_leaving_request in redis
-// params: meetingid, userid as defined in BBB-App
-this.requestUserLeaving = function (meetingId, userId) {
- let listenOnlyMessage, message, userObject, meetingObject, voiceConf;
- userObject = Meteor.Users.findOne({
- meetingId: meetingId,
- userId: userId,
- });
- meetingObject = Meteor.Meetings.findOne({
- meetingId: meetingId,
- });
- if (meetingObject != null) {
- voiceConf = meetingObject.voiceConf;
- }
-
- if ((userObject != null) && (voiceConf != null) && (userId != null) && (meetingId != null)) {
- let lOnly;
- lOnly = userObject.user.listenOnly;
- // end listenOnly audio for the departing user
- if (null != lOnly && lOnly) {
- listenOnlyMessage = {
- payload: {
- userid: userId,
- meeting_id: meetingId,
- voice_conf: voiceConf,
- name: userObject.user.name,
- },
- header: {
- timestamp: new Date().getTime(),
- name: 'user_disconnected_from_global_audio',
- },
- };
- publish(Meteor.config.redis.channels.toBBBApps.meeting, listenOnlyMessage);
- }
-
- // remove user from meeting
- message = {
- payload: {
- meeting_id: meetingId,
- userid: userId,
- },
- header: {
- timestamp: new Date().getTime(),
- name: 'user_leaving_request',
- },
- };
- Meteor.log.info(`sending a user_leaving_request for ${meetingId}:${userId}`);
- return publish(Meteor.config.redis.channels.toBBBApps.users, message);
- } else {
- return Meteor.log.info('did not have enough information to send a user_leaving_request');
- }
-};
-
-//update a voiceUser - a helper method
-this.updateVoiceUser = function (meetingId, voiceUserObject, callback) {
- let userObject;
- userObject = Meteor.Users.findOne({
- userId: voiceUserObject.web_userid,
- });
- if (userObject != null) {
- if (voiceUserObject.talking != null) {
- Meteor.Users.update({
- meetingId: meetingId,
- userId: voiceUserObject.web_userid,
- }, {
- $set: {
- 'user.voiceUser.talking': voiceUserObject.talking,
- },
- }, (err, numChanged) => {
- if (err != null) {
- Meteor.log.error(`_unsucc update of voiceUser ${voiceUserObject.web_userid} [talking] err=${JSON.stringify(err)}`);
- }
-
- return callback();
- });
- } // talking
- if (voiceUserObject.joined != null) {
- Meteor.Users.update({
- meetingId: meetingId,
- userId: voiceUserObject.web_userid,
- }, {
- $set: {
- 'user.voiceUser.joined': voiceUserObject.joined,
- },
- }, (err, numChanged) => {
- if (err != null) {
- Meteor.log.error(
- `_unsucc update of voiceUser ${voiceUserObject.web_userid} [joined] err=${JSON.stringify(err)}`
- );
- }
-
- return callback();
- });
- } // joined
- if (voiceUserObject.locked != null) {
- Meteor.Users.update({
- meetingId: meetingId,
- userId: voiceUserObject.web_userid,
- }, {
- $set: {
- 'user.voiceUser.locked': voiceUserObject.locked,
- },
- }, (err, numChanged) => {
- if (err != null) {
- Meteor.log.error(`_unsucc update of voiceUser ${voiceUserObject.web_userid} [locked] err=${JSON.stringify(err)}`);
- }
-
- return callback();
- });
- } // locked
- if (voiceUserObject.muted != null) {
- Meteor.Users.update({
- meetingId: meetingId,
- userId: voiceUserObject.web_userid,
- }, {
- $set: {
- 'user.voiceUser.muted': voiceUserObject.muted,
- },
- }, (err, numChanged) => {
- if (err != null) {
- Meteor.log.error(`_unsucc update of voiceUser ${voiceUserObject.web_userid} [muted] err=${JSON.stringify(err)}`);
- }
-
- return callback();
- });
- } // muted
- if (voiceUserObject.listen_only != null) {
- return Meteor.Users.update({
- meetingId: meetingId,
- userId: voiceUserObject.web_userid,
- }, {
- $set: {
- 'user.listenOnly': voiceUserObject.listen_only,
- },
- }, (err, numChanged) => {
- if (err != null) {
- Meteor.log.error(`_unsucc update of voiceUser ${voiceUserObject.web_userid} [listenOnly] err=${JSON.stringify(err)}`);
- }
-
- return callback();
- });
- } // listenOnly
- } else {
- Meteor.log.error('ERROR! did not find such voiceUser!');
- return callback();
- }
-};
-
-this.userJoined = function (meetingId, user, callback) {
- let userObject, userId, welcomeMessage, meetingObject;
- userId = user.userid;
- userObject = Meteor.Users.findOne({
- userId: user.userid,
- meetingId: meetingId,
- });
-
- // the collection already contains an entry for this user
- // because the user is reconnecting OR
- // in the case of an html5 client user we added a dummy user on
- // register_user_message (to save authToken)
- if (userObject != null && userObject.authToken != null) {
- Meteor.Users.update({
- userId: user.userid,
- meetingId: meetingId,
- }, {
- $set: {
- user: {
- userid: user.userid,
- presenter: user.presenter,
- name: user.name,
- _sort_name: user.name.toLowerCase(),
- phone_user: user.phone_user,
- set_emoji_time: user.set_emoji_time,
- emoji_status: user.emoji_status,
- has_stream: user.has_stream,
- role: user.role,
- listenOnly: user.listenOnly,
- extern_userid: user.extern_userid,
- locked: user.locked,
- time_of_joining: user.timeOfJoining,
- connection_status: 'online', // TODO consider other default value
- voiceUser: {
- web_userid: user.voiceUser.web_userid,
- callernum: user.voiceUser.callernum,
- userid: user.voiceUser.userid,
- talking: user.voiceUser.talking,
- joined: user.voiceUser.joined,
- callername: user.voiceUser.callername,
- locked: user.voiceUser.locked,
- muted: user.voiceUser.muted,
- },
- webcam_stream: user.webcam_stream,
- },
- },
- }, err => {
- let funct;
- if (err != null) {
- Meteor.log.error(`_error ${err} when trying to insert user ${userId}`);
- return callback();
- } else {
- funct = function (cbk) {
- Meteor.log.info(`_(case1) UPDATING USER ${user.userid}, authToken= ${userObject.authToken}, locked=${user.locked}, username=${user.name}`);
- return cbk();
- };
-
- return funct(callback);
- }
- });
- meetingObject = Meteor.Meetings.findOne({
- meetingId: meetingId,
- });
- if (meetingObject != null) {
- welcomeMessage = Meteor.config.defaultWelcomeMessage.replace(/%%CONFNAME%%/, meetingObject.meetingName);
- }
-
- welcomeMessage = welcomeMessage + Meteor.config.defaultWelcomeMessageFooter;
-
- // add the welcome message if it's not there already OR update time_of_joining
- return Meteor.Chat.upsert({
- meetingId: meetingId,
- userId: userId,
- 'message.chat_type': 'SYSTEM_MESSAGE',
- 'message.to_userid': userId,
- }, {
- meetingId: meetingId,
- userId: userId,
- message: {
- chat_type: 'SYSTEM_MESSAGE',
- message: welcomeMessage,
- from_color: '0x3399FF',
- to_userid: userId,
- from_userid: 'SYSTEM_MESSAGE',
- from_username: '',
- from_time: (user != null && user.timeOfJoining != null) ? user.timeOfJoining.toString() : void 0,
- },
- }, err => {
- if (err != null) {
- return Meteor.log.error(`_error ${err} when trying to insert welcome message for ${userId}`);
- } else {
- return Meteor.log.info(`_added/updated a system message in chat for user ${userId}`);
- }
-
- // note that we already called callback() when updating the user. Adding
- // the welcome message in the chat is not as vital and we can afford to
- // complete it when possible, without blocking the serial event messages processing
- });
- } else {
- // Meteor.log.info "NOTE: got user_joined_message #{user.name} #{user.userid}"
- return Meteor.Users.upsert({
- meetingId: meetingId,
- userId: userId,
- }, {
- meetingId: meetingId,
- userId: userId,
- user: {
- userid: user.userid,
- presenter: user.presenter,
- name: user.name,
- _sort_name: user.name.toLowerCase(),
- phone_user: user.phone_user,
- emoji_status: user.emoji_status,
- set_emoji_time: user.set_emoji_time,
- has_stream: user.has_stream,
- role: user.role,
- listenOnly: user.listenOnly,
- extern_userid: user.extern_userid,
- locked: user.locked,
- time_of_joining: user.timeOfJoining,
- connection_status: '',
- voiceUser: {
- web_userid: user.voiceUser.web_userid,
- callernum: user.voiceUser.callernum,
- userid: user.voiceUser.userid,
- talking: user.voiceUser.talking,
- joined: user.voiceUser.joined,
- callername: user.voiceUser.callername,
- locked: user.voiceUser.locked,
- muted: user.voiceUser.muted,
- },
- webcam_stream: user.webcam_stream,
- },
- }, (err, numChanged) => {
- let funct;
- if (numChanged.insertedId != null) {
- funct = function (cbk) {
- Meteor.log.info(
- `_joining user (case2) userid=[${userId}]:${user.name}. Users.size is now ${Meteor.Users.find({
- meetingId: meetingId,
- }).count()}`
- );
- return cbk();
- };
-
- return funct(callback);
- } else {
- return callback();
- }
- });
- }
-};
-
-this.createDummyUser = function (meetingId, userId, authToken) {
- if (Meteor.Users.findOne({
- userId: userId,
- meetingId: meetingId,
- authToken: authToken,
- }) != null) {
- return Meteor.log.info(`html5 user userId:[${userId}] from [${meetingId}] tried to revalidate token`);
- } else {
- return Meteor.Users.insert({
- meetingId: meetingId,
- userId: userId,
- authToken: authToken,
- clientType: 'HTML5',
- validated: false //will be validated on validate_auth_token_reply
- }, (err, id) => {
- return Meteor.log.info(`_added a dummy html5 user with: userId=[${userId}] Users.size is now ${Meteor.Users.find({
- meetingId: meetingId,
-}).count()}`);
- });
- }
-};
-
-// when new lock settings including disableMic are set,
-// all viewers that are in the audio bridge with a mic should be muted and locked
-this.handleLockingMic = function (meetingId, newSettings) {
- // send mute requests for the viewer users joined with mic
- let i, results, userObject;
- userObjects = Meteor.Users.find({
- meetingId: meetingId,
- 'user.role': 'VIEWER',
- 'user.listenOnly': false,
- 'user.locked': true,
- 'user.voiceUser.joined': true,
- 'user.voiceUser.muted': false,
- }).fetch();
-
- _userObjects_length = userObjects.length;
- results = [];
- for (i = 0; i < _userObjects_length; i++) {
- userObject = userObjects[i];
- results.push(Meteor.call('muteUser', meetingId, userObject.userId, userObject.userId, userObject.authToken, true)); //true for muted
- }
-
- return results;
-};
-
-// change the locked status of a user (lock settings)
-this.setUserLockedStatus = function (meetingId, userId, isLocked) {
- let userObject;
- userObject = Meteor.Users.findOne({
- meetingId: meetingId,
- userId: userId,
- });
- if (userObject != null) {
- Meteor.Users.update({
- userId: userId,
- meetingId: meetingId,
- }, {
- $set: {
- 'user.locked': isLocked,
- },
- }, (err, numChanged) => {
- if (err != null) {
- return Meteor.log.error(`_error ${err} while updating user ${userId} with lock settings`);
- } else {
- return Meteor.log.info(`_setting user locked status for userid:[${userId}] from [${meetingId}] locked=${isLocked}`);
- }
- });
-
- // if the user is sharing audio, he should be muted upon locking involving disableMic
- if (userObject.user.role === 'VIEWER' && !userObject.user.listenOnly && userObject.user.voiceUser.joined && !userObject.user.voiceUser.muted && isLocked) {
- return Meteor.call('muteUser', meetingId, userObject.userId, userObject.userId, userObject.authToken, true); //true for muted
- }
- } else {
- return Meteor.log.error(`(unsuccessful-no such user) setting user locked status for userid:[${userId}] from [${meetingId}] locked=${isLocked}`);
- }
-};
-
-// called on server start and on meeting end
-this.clearUsersCollection = function (meetingId) {
- if (meetingId != null) {
- return Meteor.Users.remove({
- meetingId: meetingId,
- }, err => {
- if (err != null) {
- return Meteor.log.error(`_error ${JSON.stringify(err)} while removing users from meeting ${meetingId}`);
- } else {
- return Meteor.log.info(`_cleared Users Collection (meetingId: ${meetingId})!`);
- }
- });
- } else {
- return Meteor.Users.remove({}, err => {
- if (err != null) {
- return Meteor.log.error(`_error ${JSON.stringify(err)} while removing users from all meetings!`);
- } else {
- return Meteor.log.info('_cleared Users Collection (all meetings)!');
- }
- });
- }
-};
diff --git a/bigbluebutton-html5/server/helpers.js b/bigbluebutton-html5/server/helpers.js
deleted file mode 100644
index 23c7f20833..0000000000
--- a/bigbluebutton-html5/server/helpers.js
+++ /dev/null
@@ -1,9 +0,0 @@
-this.appendMessageHeader = function(eventName, messageObj) {
- let header;
- header = {
- timestamp: new Date().getTime(),
- name: eventName,
- };
- messageObj.header = header;
- return messageObj;
-};
diff --git a/bigbluebutton-html5/server/methods/deletePrivateChatMessages.js b/bigbluebutton-html5/server/methods/deletePrivateChatMessages.js
deleted file mode 100644
index 77b8a1c4c6..0000000000
--- a/bigbluebutton-html5/server/methods/deletePrivateChatMessages.js
+++ /dev/null
@@ -1,13 +0,0 @@
-Meteor.methods({
- deletePrivateChatMessages(userId, contact_id) {
- // if authorized pass through
- let contact, requester;
- requester = Meteor.Users.findOne({
- userId: userId,
- });
- contact = Meteor.Users.findOne({
- _id: contact_id,
- });
- return deletePrivateChatMessages(requester.userId, contact.userId);
- }
-});
diff --git a/bigbluebutton-html5/server/methods/muteUser.js b/bigbluebutton-html5/server/methods/muteUser.js
deleted file mode 100644
index fadb2b05d3..0000000000
--- a/bigbluebutton-html5/server/methods/muteUser.js
+++ /dev/null
@@ -1,35 +0,0 @@
-Meteor.methods({
- // meetingId: the meetingId of the meeting the user[s] is in
- // toMuteUserId: the userId of the user to be muted
- // requesterUserId: the userId of the requester
- // requesterToken: the authToken of the requester
- muteUser(meetingId, toMuteUserId, requesterUserId, requesterToken) {
- let action, message;
- action = function () {
- if (toMuteUserId === requesterUserId) {
- return 'muteSelf';
- } else {
- return 'muteOther';
- }
- };
-
- if (isAllowedTo(action(), meetingId, requesterUserId, requesterToken)) {
- message = {
- payload: {
- user_id: toMuteUserId,
- meeting_id: meetingId,
- mute: true,
- requester_id: requesterUserId,
- }
- };
- message = appendMessageHeader('mute_user_request_message', message);
- Meteor.log.info(`publishing a user mute request for ${toMuteUserId}`);
- publish(Meteor.config.redis.channels.toBBBApps.users, message);
- updateVoiceUser(meetingId, {
- web_userid: toMuteUserId,
- talking: false,
- muted: true,
- });
- }
- }
-});
diff --git a/bigbluebutton-html5/server/methods/publishVoteMessage.js b/bigbluebutton-html5/server/methods/publishVoteMessage.js
deleted file mode 100644
index b1a8a56d59..0000000000
--- a/bigbluebutton-html5/server/methods/publishVoteMessage.js
+++ /dev/null
@@ -1,42 +0,0 @@
-Meteor.methods({
- publishVoteMessage(meetingId, pollAnswerId, requesterUserId, requesterToken) {
- let _poll_id, eventName, message, result;
- if (isAllowedTo('subscribePoll', meetingId, requesterUserId, requesterToken)) {
- eventName = 'vote_poll_user_request_message';
- result = Meteor.Polls.findOne({
- 'poll_info.users': requesterUserId,
- 'poll_info.meetingId': meetingId,
- 'poll_info.poll.answers.id': pollAnswerId,
- }, {
- fields: {
- 'poll_info.poll.id': 1,
- _id: 0,
- },
- });
- _poll_id = result.poll_info.poll.id;
- if ((eventName != null) && (meetingId != null) && (requesterUserId != null) && (_poll_id != null) && (pollAnswerId != null)) {
- message = {
- payload: {
- meeting_id: meetingId,
- user_id: requesterUserId,
- poll_id: _poll_id,
- question_id: 0,
- answer_id: pollAnswerId,
- },
- };
- Meteor.Polls.update({
- 'poll_info.users': requesterUserId,
- 'poll_info.meetingId': meetingId,
- 'poll_info.poll.answers.id': pollAnswerId,
- }, {
- $pull: {
- 'poll_info.users': requesterUserId,
- },
- });
- message = appendMessageHeader(eventName, message);
- Meteor.log.info('publishing Poll response to redis');
- return publish(Meteor.config.redis.channels.toBBBApps.polling, message);
- }
- }
- }
-});
diff --git a/bigbluebutton-html5/server/methods/sendChatMessagetoServer.js b/bigbluebutton-html5/server/methods/sendChatMessagetoServer.js
deleted file mode 100644
index 34c0fc8ca6..0000000000
--- a/bigbluebutton-html5/server/methods/sendChatMessagetoServer.js
+++ /dev/null
@@ -1,39 +0,0 @@
-Meteor.methods({
-// meetingId: the id of the meeting
- // chatObject: the object including info on the chat message, including the text
- // requesterUserId: the userId of the user sending chat
- // requesterToken: the authToken of the requester
- sendChatMessagetoServer(meetingId, chatObject, requesterUserId, requesterToken) {
- let action, chatType, eventName, message, recipient;
- chatType = chatObject.chat_type;
- recipient = chatObject.to_userid;
- eventName = null;
- action = function () {
- if (chatType === 'PUBLIC_CHAT') {
- eventName = 'send_public_chat_message';
- return 'chatPublic';
- } else {
- eventName = 'send_private_chat_message';
- if (recipient === requesterUserId) {
- return 'chatSelf'; //not allowed
- } else {
- return 'chatPrivate';
- }
- }
- };
-
- if (isAllowedTo(action(), meetingId, requesterUserId, requesterToken) && chatObject.from_userid === requesterUserId) {
- chatObject.message = translateHTML5ToFlash(chatObject.message);
- message = {
- payload: {
- message: chatObject,
- meeting_id: meetingId,
- requester_id: chatObject.from_userid,
- },
- };
- message = appendMessageHeader(eventName, message);
- Meteor.log.info('publishing chat to redis');
- publish(Meteor.config.redis.channels.toBBBApps.chat, message);
- }
- }
-});
diff --git a/bigbluebutton-html5/server/methods/userLogout.js b/bigbluebutton-html5/server/methods/userLogout.js
deleted file mode 100644
index 065a65c147..0000000000
--- a/bigbluebutton-html5/server/methods/userLogout.js
+++ /dev/null
@@ -1,11 +0,0 @@
-Meteor.methods({
- // meetingId: the meeting where the user is
- // userId: the userid of the user logging out
- // authToken: the authToken of the user
- userLogout(meetingId, userId, authToken) {
- if (isAllowedTo('logoutSelf', meetingId, userId, authToken)) {
- Meteor.log.info(`a user is logging out from ${meetingId}:${userId}`);
- return requestUserLeaving(meetingId, userId);
- }
- }
-});
diff --git a/bigbluebutton-html5/server/methods/userSetEmoji.js b/bigbluebutton-html5/server/methods/userSetEmoji.js
deleted file mode 100644
index 4ae30af4ec..0000000000
--- a/bigbluebutton-html5/server/methods/userSetEmoji.js
+++ /dev/null
@@ -1,18 +0,0 @@
-Meteor.methods({
- userSetEmoji(meetingId, toRaiseUserId, raisedByUserId, raisedByToken, status) {
- let message;
- if (isAllowedTo('setEmojiStatus', meetingId, raisedByUserId, raisedByToken)) {
- message = {
- payload: {
- emoji_status: status,
- userid: toRaiseUserId,
- meeting_id: meetingId,
- }
- };
-
- message = appendMessageHeader('user_emoji_status_message', message);
- // publish to pubsub
- publish(Meteor.config.redis.channels.toBBBApps.users, message);
- }
- }
-});
diff --git a/bigbluebutton-html5/server/publish.js b/bigbluebutton-html5/server/publish.js
deleted file mode 100755
index 356f78a81b..0000000000
--- a/bigbluebutton-html5/server/publish.js
+++ /dev/null
@@ -1,170 +0,0 @@
-// Publish only the online users that are in the particular meetingId
-// On the client side we pass the meetingId parameter
-Meteor.publish('users', function (meetingId, userid, authToken) {
- let user, userObject, username;
- Meteor.log.info(`attempt publishing users for ${meetingId}, ${userid}, ${authToken}`);
- userObject = Meteor.Users.findOne({
- userId: userid,
- meetingId: meetingId,
- });
- if (userObject != null) {
- Meteor.log.info('found it from the first time ' + userid);
- if (isAllowedTo('subscribeUsers', meetingId, userid, authToken)) {
- Meteor.log.info(`${userid} was allowed to subscribe to 'users'`);
- user = userObject.user;
- if (user != null) {
- username = user.name;
-
- // offline -> online
- if (user.connection_status !== 'online') {
- Meteor.call('validateAuthToken', meetingId, userid, authToken);
- }
- } else {
- username = 'UNKNOWN';
- }
-
- Meteor.Users.update({
- meetingId: meetingId,
- userId: userid,
- }, {
- $set: {
- 'user.connection_status': 'online',
- },
- });
- Meteor.log.info(`username of the subscriber: ${username}, connection_status becomes online`);
- this._session.socket.on('close', Meteor.bindEnvironment((function (_this) {
- return function () {
- Meteor.log.info(`
-a user lost connection: session.id=${_this._session.id} userId = ${userid}, username=${username}, meeting=${meetingId}`);
- Meteor.Users.update({
- meetingId: meetingId,
- userId: userid,
- }, {
- $set: {
- 'user.connection_status': 'offline',
- },
- });
- Meteor.log.info(`username of the user losing connection: ${username}, connection_status: becomes offline`);
- return requestUserLeaving(meetingId, userid);
- };
- })(this)));
-
- //publish the users which are not offline
- return Meteor.Users.find({
- meetingId: meetingId,
- 'user.connection_status': {
- $in: ['online', ''],
- },
- }, {
- fields: {
- authToken: false,
- },
- });
- } else {
- Meteor.log.warn("was not authorized to subscribe to 'users'");
- return this.error(new Meteor.Error(402, "The user was not authorized to subscribe to 'users'"));
- }
- } else { //subscribing before the user was added to the collection
- Meteor.call('validateAuthToken', meetingId, userid, authToken);
- Meteor.log.error(`there was no such user ${userid} in ${meetingId}`);
- return Meteor.Users.find({
- meetingId: meetingId,
- 'user.connection_status': {
- $in: ['online', ''],
- },
- }, {
- fields: {
- authToken: false,
- },
- });
- }
-});
-
-Meteor.publish('chat', function (meetingId, userid, authToken) {
- if (isAllowedTo('subscribeChat', meetingId, userid, authToken)) {
- Meteor.log.info(`publishing chat for ${meetingId} ${userid} ${authToken}`);
- return Meteor.Chat.find({
- $or: [
- {
- 'message.chat_type': 'PUBLIC_CHAT',
- meetingId: meetingId,
- }, {
- 'message.from_userid': userid,
- meetingId: meetingId,
- }, {
- 'message.to_userid': userid,
- meetingId: meetingId,
- },
- ],
- });
- } else {
- this.error(new Meteor.Error(402, "The user was not authorized to subscribe for 'chats'"));
- }
-});
-
-Meteor.publish('bbb_poll', function (meetingId, userid, authToken) {
- //checking if it is allowed to see Poll Collection in general
- if (isAllowedTo('subscribePoll', meetingId, userid, authToken)) {
- //checking if it is allowed to see a number of votes (presenter only)
- if (isAllowedTo('subscribeAnswers', meetingId, userid, authToken)) {
- Meteor.log.info('publishing Poll for presenter: ' + meetingId + ' ' + userid + ' ' + authToken);
- return Meteor.Polls.find({
- 'poll_info.meetingId': meetingId,
- 'poll_info.users': userid,
- });
- } else {
- Meteor.log.info('publishing Poll for viewer: ' + meetingId + ' ' + userid + ' ' + authToken);
- return Meteor.Polls.find({
- 'poll_info.meetingId': meetingId,
- 'poll_info.users': userid,
- }, {
- fields: {
- 'poll_info.poll.answers.num_votes': 0,
- },
- });
- }
- } else {
- this.error(new Meteor.Error(402, "The user was not authorized to subscribe for 'bbb_poll'"));
- }
-});
-
-Meteor.publish('shapes', function (meetingId) {
- return Meteor.Shapes.find({
- meetingId: meetingId,
- });
-});
-
-Meteor.publish('slides', function (meetingId) {
- Meteor.log.info(`publishing slides for ${meetingId}`);
- return Meteor.Slides.find({
- meetingId: meetingId,
- });
-});
-
-Meteor.publish('meetings', function (meetingId) {
- Meteor.log.info(`publishing meetings for ${meetingId}`);
- return Meteor.Meetings.find({
- meetingId: meetingId,
- });
-});
-
-Meteor.publish('presentations', function (meetingId) {
- Meteor.log.info(`publishing presentations for ${meetingId}`);
- return Meteor.Presentations.find({
- meetingId: meetingId,
- });
-});
-
-Meteor.publish('bbb_cursor', function (meetingId) {
- Meteor.log.info(`publishing cursor for ${meetingId}`);
- return Meteor.Cursor.find({
- meetingId: meetingId,
- });
-});
-
-Meteor.publish('whiteboard-clean-status', function (meetingId) {
- Meteor.log.info(`whiteboard clean status ${meetingId}`);
- return Meteor.WhiteboardCleanStatus.find({
- meetingId: meetingId,
- });
-});
diff --git a/bigbluebutton-html5/server/redispubsub.js b/bigbluebutton-html5/server/redispubsub.js
deleted file mode 100755
index 3d28b691e4..0000000000
--- a/bigbluebutton-html5/server/redispubsub.js
+++ /dev/null
@@ -1,818 +0,0 @@
-const bind = function (fn, me) { return function () { return fn.apply(me, arguments); }; }, indexOf = [].indexOf || function (item) {
- for (let i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1;
-};
-
-Meteor.methods({
- // Construct and send a message to bbb-web to validate the user
- validateAuthToken(meetingId, userId, authToken) {
- let message;
- Meteor.log.info('sending a validate_auth_token with', {
- userid: userId,
- authToken: authToken,
- meetingid: meetingId,
- });
- message = {
- payload: {
- auth_token: authToken,
- userid: userId,
- meeting_id: meetingId,
- },
- header: {
- timestamp: new Date().getTime(),
- reply_to: `${meetingId}/${userId}`,
- name: 'validate_auth_token',
- },
- };
- if ((authToken != null) && (userId != null) && (meetingId != null)) {
- createDummyUser(meetingId, userId, authToken);
- return publish(Meteor.config.redis.channels.toBBBApps.meeting, message);
- } else {
- return Meteor.log.info('did not have enough information to send a validate_auth_token message');
- }
- },
-});
-
-Meteor.RedisPubSub = (function () {
- class RedisPubSub {
- constructor(callback) {
- this._addToQueue = bind(this._addToQueue, this);
- this._onSubscribe = bind(this._onSubscribe, this);
- Meteor.log.info('constructor RedisPubSub');
- this.pubClient = redis.createClient();
- this.subClient = redis.createClient();
- Meteor.log.info(`Subscribing message on channel: ${Meteor.config.redis.channels.fromBBBApps}`);
- this.subClient.on('psubscribe', Meteor.bindEnvironment(this._onSubscribe));
- this.subClient.on('pmessage', Meteor.bindEnvironment(this._addToQueue));
- this.subClient.psubscribe(Meteor.config.redis.channels.fromBBBApps);
- callback(this);
- }
-
- _onSubscribe(channel, count) {
- let message;
- Meteor.log.info(`Subscribed to ${channel}`);
-
- //grab data about all active meetings on the server
- message = {
- header: {
- name: 'get_all_meetings_request',
- },
- payload: {} // I need this, otherwise bbb-apps won't recognize the message
- };
- return publish(Meteor.config.redis.channels.toBBBApps.meeting, message);
- }
-
- _addToQueue(pattern, channel, jsonMsg) {
- let eventName, message, messagesWeIgnore;
- message = JSON.parse(jsonMsg);
- eventName = message.header.name;
- messagesWeIgnore = [
- 'BbbPubSubPongMessage',
- 'bbb_apps_is_alive_message',
- 'broadcast_layout_message',];
- if (indexOf.call(messagesWeIgnore, eventName) < 0) {
- // Uncomment for DEVELOPMENT purposes only
- // Otherwise dynamic shapes' updates will slow down significantly
- // Meteor.log.info(`Q ${eventName} ${Meteor.myQueue.total()}`);
- return Meteor.myQueue.add({
- pattern: pattern,
- channel: channel,
- jsonMsg: jsonMsg,
- });
- }
- }
- }
-
- return RedisPubSub;
-})();
-
-// --------------------------------------------------------------------------------------------
-// Private methods on server
-// --------------------------------------------------------------------------------------------
-
-// message should be an object
-this.publish = function (channel, message) {
- Meteor.log.info(`redis outgoing message ${message.header.name}`, {
- channel: channel,
- message: message,
- });
- if (Meteor.redisPubSub != null) {
- return Meteor.redisPubSub.pubClient.publish(channel, JSON.stringify(message), (err, res) => {
- if (err) {
- return Meteor.log.info('error', {
- error: err,
- });
- }
- });
- } else {
- return Meteor.log.info('ERROR!! Meteor.redisPubSub was undefined');
- }
-};
-
-const handleVoiceEvent = function(arg) {
- let _voiceUser, meetingId;
- meetingId = arg.payload.meeting_id;
- _voiceUser = payload.user.voiceUser;
- voiceUserObj = {
- web_userid: _voiceUser.web_userid,
- listen_only: arg.payload.listen_only,
- talking: _voiceUser.talking,
- joined: _voiceUser.joined,
- locked: _voiceUser.locked,
- muted: _voiceUser.muted,
- };
- return updateVoiceUser(meetingId, voiceUserObj, arg.callback);
-};
-
-const handleLockEvent = function(arg) {
- let userId, isLocked;
- userId = arg.payload.userid;
- isLocked = arg.payload.locked;
- setUserLockedStatus(meetingId, userId, isLocked);
- return arg.callback();
-};
-
-const handleEndOfMeeting = function(arg) {
- let meetingId;
- meetingId = arg.payload.meeting_id;
- Meteor.log.info(`DESTROYING MEETING ${meetingId}`);
- return removeMeetingFromCollection(meetingId, arg.callback);
-};
-
-
-const handleChatEvent = function (arg) {
- let messageObject, meetingId;
- messageObject = arg.payload.message;
- meetingId = arg.payload.meeting_id;
-
- // use current_time instead of message.from_time so that the chats from Flash and HTML5 have uniform times
- messageObject.from_time = arg.header.current_time;
- addChatToCollection(meetingId, messageObject);
- return arg.callback();
-};
-
-
-// To ensure that we process the redis json event messages serially we use a
-// callback. This callback is to be called when the Meteor collection is
-// updated with the information coming in the payload of the json message. The
-// callback signalizes to the queue that we are done processing the current
-// message in the queue and are ready to move on to the next one. If we do not
-// use the callback mechanism we may encounter a race condition situation
-// due to not following the order of events coming through the redis pubsub.
-// for example: a user_left event reaching the collection before a user_joined
-// for the same user.
-registerHandlers = function (emitter) {
- console.log("REGISTER HANDLERS", emitter);
-
- emitter.on('get_users_reply', function (arg) {
- if (arg.payload.requester_id === 'nodeJSapp') {
- let users, processUser, meetingId;
- console.log("get_users_reply handling");
- users = arg.payload.users;
- meetingId = arg.payload.meeting_id;
-
- //TODO make the serialization be split per meeting. This will allow us to
- // use N threads vs 1 and we'll take advantage of Mongo's concurrency tricks
-
- // Processing the users recursively with a callback to notify us,
- // ensuring that we update the users collection serially
- processUser = function () {
- let user;
- user = users.pop();
- if (user != null) {
- user.timeOfJoining = arg.header.current_time;
- if (user.emoji_status !== 'none' && typeof user.emoji_status === 'string') {
- user.set_emoji_time = new Date();
- return userJoined(meetingId, user, processUser);
- } else {
- return userJoined(meetingId, user, processUser);
- }
- } else {
- return arg.callback(); // all meeting arrays (if any) have been processed
- }
- };
-
- return processUser();
- }
- else {
- arg.callback();
- }
- });
-
- emitter.on('meeting_created_message', function(arg) {
- meetingName = arg.payload.name;
- intendedForRecording = arg.payload.recorded;
- voiceConf = arg.payload.voice_conf;
- duration = arg.payload.duration;
- meetingId = arg.payload.meeting_id;
- return addMeetingToCollection(meetingId, meetingName, intendedForRecording, voiceConf, duration, arg.callback);
- });
-
- emitter.on('get_all_meetings_reply', function(arg) {
- let listOfMeetings, processMeeting;
- Meteor.log.info("Let's store some data for the running meetings so that when an HTML5 client joins everything is ready!");
- Meteor.log.info(JSON.stringify(arg.payload));
- listOfMeetings = arg.payload.meetings;
-
- // Processing the meetings recursively with a callback to notify us,
- // ensuring that we update the meeting collection serially
- processMeeting = function () {
- let meeting;
- meeting = listOfMeetings.pop();
- if (meeting != null) {
- return addMeetingToCollection(meeting.meetingID, meeting.meetingName, meeting.recorded, meeting.voiceBridge, meeting.duration, processMeeting);
- } else {
- return arg.callback(); // all meeting arrays (if any) have been processed
- }
- };
- return processMeeting();
- });
-
- emitter.on('user_left_voice_message', function(arg) {
- handleVoiceEvent(arg);
- });
-
- emitter.on('user_joined_voice_message', function(arg) {
- handleVoiceEvent(arg);
- });
-
- emitter.on('user_voice_talking_message', function(arg) {
- handleVoiceEvent(arg);
- });
-
- emitter.on('user_voice_muted_message', function(arg) {
- handleVoiceEvent(arg);
- });
-
- emitter.on('user_listening_only', function(arg) {
- let voiceUserObj, meetingId;
- voiceUserObj = {
- web_userid: arg.payload.userid,
- listen_only: arg.payload.listen_only,
- };
- meetingId = arg.payload.meeting_id;
- return updateVoiceUser(meetingId, voiceUserObj, arg.callback);
- });
-
- emitter.on('user_left_message', function(arg) {
- if (arg.payload.user != null && arg.payload.user.userid != null && arg.payload.meeting_id != null) {
- let userId, meetingId;
- meetingId = arg.payload.meeting_id;
- userId = arg.payload.user.userid;
- return markUserOffline(meetingId, userId, arg.callback);
- } else {
- return arg.callback();
- }
-
- });
-
- emitter.on('validate_auth_token_reply', function(arg) {
- let userId, user, validStatus, payload, meetingId;
- meetingId = arg.payload.meeting_id;
- userId = arg.payload.userid;
- user = Meteor.Users.findOne({
- userId: userId,
- meetingId: meetingId,
- });
- validStatus = arg.payload.valid;
-
- // if the user already exists in the db
- if (user != null && user.clientType === 'HTML5') {
- //if the html5 client user was validated successfully, add a flag
- return Meteor.Users.update({
- userId: userId,
- meetingId: meetingId,
- }, {
- $set: {
- validated: validStatus,
- },
- }, (err, numChanged) => {
- let funct;
- if (numChanged.insertedId != null) {
- funct = function (cbk) {
- let user, val;
- user = Meteor.Users.findOne({
- userId: userId,
- meetingId: meetingId,
- });
- if (user != null) {
- val = user.validated;
- }
-
- Meteor.log.info(`user.validated for user ${userId} in meeting ${user.meetingId} just became ${val}`);
- return cbk();
- };
-
- return funct(arg.callback);
- } else {
- return arg.callback();
- }
- });
- } else {
- Meteor.log.info('a non-html5 user got validate_auth_token_reply.');
- return arg.callback();
- }
- });
-
- emitter.on('user_joined_message', function(arg) {
- let userObj, dbUser, meetingId, payload;
- meetingId = arg.payload.meeting_id;
- payload = arg.payload;
- userObj = payload.user;
- dbUser = Meteor.Users.findOne({
- userId: userObj.userid,
- meetingId: meetingId,
- });
-
- // On attempting reconnection of Flash clients (in voiceBridge) we receive
- // an extra user_joined_message. Ignore it as it will add an extra user
- // in the user list, creating discrepancy with the list in the Flash client
- if ((dbUser != null && dbUser.user != null && dbUser.user.connection_status === 'offline') && (payload.user != null && payload.user.phone_user)) {
- Meteor.log.error('offline AND phone user');
- return arg.callback(); //return without joining the user
- } else {
- if (dbUser != null && dbUser.clientType === 'HTML5') {
- let status;
- // typically html5 users will be in
- // the db [as a dummy user] before the joining message
- status = dbUser.validated;
- Meteor.log.info(`in user_joined_message the validStatus of the user was ${status}`);
- userObj.timeOfJoining = arg.header.current_time;
- return userJoined(meetingId, userObj, arg.callback);
- } else {
- return userJoined(meetingId, userObj, arg.callback);
- }
- }
- });
-
- // for now not handling these serially #TODO
- emitter.on('presenter_assigned_message', function(arg) {
- let newPresenterId, meetingId;
- meetingId = arg.payload.meeting_id;
- newPresenterId = arg.payload.new_presenter_id;
- if (newPresenterId != null) {
- // reset the previous presenter
- Meteor.Users.update({
- 'user.presenter': true,
- meetingId: meetingId,
- }, {
- $set: {
- 'user.presenter': false,
- },
- }, (err, numUpdated) => {
- return Meteor.log.info(` Updating old presenter numUpdated=${numUpdated}, err=${err}`);
- });
-
- // set the new presenter
- Meteor.Users.update({
- 'user.userid': newPresenterId,
- meetingId: meetingId,
- }, {
- $set: {
- 'user.presenter': true,
- },
- }, (err, numUpdated) => {
- return Meteor.log.info(` Updating new presenter numUpdated=${numUpdated}, err=${err}`);
- });
- }
-
- return arg.callback();
- });
-
- emitter.on('user_emoji_status_message', function(arg) {
- let userId, meetingId, emojiStatus;
- userId = arg.payload.userid;
- meetingId = arg.payload.meeting_id;
- emojiStatus = arg.payload.emoji_status;
- if (userId != null && meetingId != null) {
- let set_emoji_time;
- set_emoji_time = new Date();
- Meteor.Users.update({
- 'user.userid': userId,
- }, {
- $set: {
- 'user.set_emoji_time': set_emoji_time,
- 'user.emoji_status': emojiStatus,
- },
- }, (err, numUpdated) => {
- return Meteor.log.info(` Updating emoji numUpdated=${numUpdated}, err=${err}`);
- });
- }
- return arg.callback();
- });
-
- emitter.on('user_locked_message', function (arg) {
- handleLockEvent(arg);
- });
-
- emitter.on('user_unlocked_message', function (arg) {
- handleLockEvent(arg);
- });
-
- emitter.on('meeting_ended_message', function (arg) {
- handleEndOfMeeting(arg);
- });
-
- emitter.on('meeting_destroyed_event', function (arg) {
- handleEndOfMeeting(arg);
- });
-
- emitter.on('end_and_kick_all_message', function (arg) {
- handleEndOfMeeting(arg);
- });
-
- emitter.on('disconnect_all_users_message', function (arg) {
- handleEndOfMeeting(arg);
- });
-
- emitter.on('get_chat_history_reply', function (arg) {
- if (arg.payload.requester_id === 'nodeJSapp') { //TODO extract this check
- let meetingId;
- meetingId = arg.payload.meeting_id;
- if (Meteor.Meetings.findOne({
- MeetingId: meetingId,
- }) == null) {
- let chatHistory, _chat_history_length, chatMessage;
- chatHistory = arg.payload.chat_history;
- _chat_history_length = chatHistory.length;
- for (i = 0; i < _chat_history_length; i++) {
- chatMessage = chatHistory[i];
- addChatToCollection(meetingId, chatMessage);
- }
- }
- }
- return arg.callback();
- });
-
- emitter.on('send_public_chat_message', function (arg) {
- handleChatEvent(arg);
- });
-
- emitter.on('send_private_chat_message', function (arg) {
- handleChatEvent(arg);
- });
-
- emitter.on('presentation_shared_message', function (arg) {
- let payload, meetingId;
- payload = arg.payload;
- meetingId = payload.meeting_id;
- if (payload.presentation != null && payload.presentation.id != null && meetingId != null) {
- let presentationId, pages, slide;
- presentationId = payload.presentation.id;
-
- // change the currently displayed presentation to presentation.current = false
- Meteor.Presentations.update({
- 'presentation.current': true,
- meetingId: meetingId,
- }, {
- $set: {
- 'presentation.current': false,
- },
- });
-
- //update(if already present) entirely the presentation with the fresh data
- removePresentationFromCollection(meetingId, presentationId);
- addPresentationToCollection(meetingId, payload.presentation);
- pages = payload.presentation.pages;
- for (j = 0; j < pages.length; j++) {
- slide = pages[j];
- addSlideToCollection(
- meetingId,
- presentationId,
- slide
- );
- }
- }
- return arg.callback();
- });
-
- emitter.on('get_presentation_info_reply', function (arg) {
- if (arg.payload.requester_id === 'nodeJSapp') {
- let presentations, payload, k, presentation, pages, page, l, meetingId, whiteboardId, replyTo, message;
- payload = arg.payload;
- meetingId = payload.meeting_id;
- presentations = payload.presentations;
- for (k = 0; k < payload.presentations.length; k++) {
- presentation = presentations[k];
- addPresentationToCollection(meetingId, presentation);
- pages = presentation.pages;
- for (l = 0; l < pages.length; l++) {
- page = pages[l];
-
- //add the slide to the collection
- addSlideToCollection(meetingId, presentation.id, page);
-
- //request for shapes
- whiteboardId = `${presentation.id}/${page.num}`;
-
- //Meteor.log.info "the whiteboard_id here is:" + whiteboardId
-
- replyTo = `${meetingId}/nodeJSapp`;
- message = {
- payload: {
- meeting_id: meetingId,
- requester_id: 'nodeJSapp',
- whiteboard_id: whiteboardId,
- reply_to: replyTo,
- },
- header: {
- timestamp: new Date().getTime(),
- name: 'request_whiteboard_annotation_history_request',
- },
- };
- if (whiteboardId != null && meetingId != null) {
- publish(Meteor.config.redis.channels.toBBBApps.whiteboard, message);
- } else {
- Meteor.log.info('did not have enough information to send a user_leaving_request');
- }
- }
- }
-
- return arg.callback();
- }
- });
-
- emitter.on('presentation_page_changed_message', function (arg) {
- let newSlide, meetingId;
- newSlide = arg.payload.page;
- meetingId = arg.payload.meeting_id;
- if (newSlide != null && newSlide.id != null && meetingId != null) {
- displayThisSlide(meetingId, newSlide.id, newSlide);
- }
- return arg.callback();
- });
-
- emitter.on('presentation_removed_message', function (arg) {
- let presentationId, meetingId;
- meetingId = arg.payload.meeting_id;
- presentationId = arg.payload.presentation_id;
- if (meetingId != null && presentationId != null) {
- removePresentationFromCollection(meetingId, presentationId);
- }
- return arg.callback();
- });
-
- emitter.on('get_whiteboard_shapes_reply', function (arg) {
- if (arg.payload.requester_id === 'nodeJSapp') {
- let meetingId, shapes, shapes_length, m, shape, whiteboardId;
- meetingId = arg.payload.meeting_id;
- // Create a whiteboard clean status or find one for the current meeting
- if (Meteor.WhiteboardCleanStatus.findOne({
- meetingId: meetingId,
- }) == null) {
- Meteor.WhiteboardCleanStatus.insert({
- meetingId: meetingId,
- in_progress: false,
- });
- }
-
- shapes = payload.shapes;
- shapes_length = shapes.length;
- for (m = 0; m < shapes_length; m++) {
- shape = shapes[m];
- whiteboardId = shape.wb_id;
- addShapeToCollection(meetingId, whiteboardId, shape);
- }
-
- return arg.callback();
- }
- });
-
- emitter.on('send_whiteboard_shape_message', function (arg) {
- let payload, shape, whiteboardId, meetingId;
- payload = arg.payload;
- meetingId = payload.meeting_id;
- //Meteor stringifies an array of JSONs (...shape.result) in this message
- //parsing the String and reassigning the value
- if (payload.shape.shape_type === 'poll_result' && typeof payload.shape.shape.result === 'string') {
- payload.shape.shape.result = JSON.parse(payload.shape.shape.result);
- }
-
- shape = payload.shape;
- if (shape != null && shape.wb_id != null) {
- whiteboardId = shape.wb_id;
- }
-
- addShapeToCollection(meetingId, whiteboardId, shape);
- return arg.callback();
- });
-
- emitter.on('presentation_cursor_updated_message', function (arg) {
- let cursor, meetingId;
- meetingId = arg.payload.meeting_id;
- cursor = {
- x: arg.payload.x_percent,
- y: arg.payload.y_percent,
- };
-
- // update the location of the cursor on the whiteboard
- updateCursorLocation(meetingId, cursor);
- return arg.callback();
- });
-
- emitter.on('whiteboard_cleared_message', function (arg) {
- let whiteboardId, meetingId;
- meetingId = arg.payload.meeting_id;
- whiteboardId = arg.payload.whiteboard_id;
- Meteor.WhiteboardCleanStatus.update({
- meetingId: meetingId,
- }, {
- $set: {
- in_progress: true,
- },
- });
- removeAllShapesFromSlide(meetingId, whiteboardId);
- return arg.callback();
- });
-
- emitter.on('undo_whiteboard_request', function (arg) {
- let whiteboardId, meetingId, shapeId;
- meetingId = arg.payload.meeting_id;
- whiteboardId = arg.payload.whiteboard_id;
- shapeId = arg.payload.shape_id;
- removeShapeFromSlide(meetingId, whiteboardId, shapeId);
- return arg.callback();
- });
-
- emitter.on('presentation_page_resized_message', function (arg) {
- let page, payload;
- payload = arg.payload;
- page = payload.page;
- if (page != null && page.id != null && page.height_ratio != null
- && page.width_ratio != null && page.x_offset != null && page.y_offset != null) {
- let slideId, heightRatio, widthRatio, xOffset, yOffset, presentationId, currentSlide;
- slideId = page.id;
- heightRatio = page.height_ratio;
- widthRatio = page.width_ratio;
- xOffset = page.x_offset;
- yOffset = page.y_offset;
- presentationId = slideId.split('/')[0];
-
- // In the case when we don't resize, but switch a slide, this message
- // follows a 'presentation_page_changed' and all these properties are already set.
- currentSlide = Meteor.Slides.findOne(
- { presentationId: presentationId,
- 'slide.current': true, });
- if (currentSlide) {
- currentSlide = currentSlide.slide;
- }
-
- if (currentSlide != null && (currentSlide.height_ratio != heightRatio || currentSlide.width_ratio != widthRatio
- || currentSlide.x_offset != xOffset || currentSlide.y_offset != yOffset)) {
- Meteor.Slides.update({
- presentationId: presentationId,
- 'slide.current': true,
- }, {
- $set: {
- 'slide.height_ratio': heightRatio,
- 'slide.width_ratio': widthRatio,
- 'slide.x_offset': xOffset,
- 'slide.y_offset': yOffset,
- },
- });
- }
- }
-
- return arg.callback();
- });
-
- emitter.on('recording_status_changed_message', function (arg) {
- let intendedForRecording, currentlyBeingRecorded, meetingId;
- intendedForRecording = arg.payload.recorded;
- currentlyBeingRecorded = arg.payload.recording;
- meetingId = arg.payload.meeting_id;
-
- Meteor.Meetings.update({
- meetingId: meetingId,
- intendedForRecording: intendedForRecording,
- }, {
- $set: {
- currentlyBeingRecorded: currentlyBeingRecorded,
- },
- });
- return arg.callback();
- });
-
- emitter.on('new_permission_settings', function (arg) {
- let meetingObject, meetingId, oldSettings, newSettings, payload;
- meetingId = arg.payload.meeting_id;
- payload = arg.payload;
-
- meetingObject = Meteor.Meetings.findOne({
- meetingId: meetingId,
- });
- if (meetingObject != null && payload != null) {
- oldSettings = meetingObject.roomLockSettings;
- newSettings = payload.permissions;
-
- // if the disableMic setting was turned on
- if (oldSettings != null && !oldSettings.disableMic && newSettings.disableMic) {
- handleLockingMic(meetingId, newSettings);
- }
-
- // substitute with the new lock settings
- Meteor.Meetings.update({
- meetingId: meetingId,
- }, {
- $set: {
- 'roomLockSettings.disablePrivateChat': newSettings.disablePrivateChat,
- 'roomLockSettings.disableCam': newSettings.disableCam,
- 'roomLockSettings.disableMic': newSettings.disableMic,
- 'roomLockSettings.lockOnJoin': newSettings.lockOnJoin,
- 'roomLockSettings.lockedLayout': newSettings.lockedLayout,
- 'roomLockSettings.disablePublicChat': newSettings.disablePublicChat,
- 'roomLockSettings.lockOnJoinConfigurable': newSettings.lockOnJoinConfigurable,
- },
- });
- }
-
- return arg.callback();
- });
-
- emitter.on('poll_show_result_message', function (arg) {
- let payload, meetingId, poll_id;
- payload = arg.payload;
- meetingId = payload.meeting_id;
- if (payload != null && payload.poll != null && payload.poll.id != null && meetingId != null) {
- poll_id = payload.poll.id;
- clearPollCollection(meetingId, poll_id);
- }
-
- return arg.callback();
- });
-
- emitter.on('poll_started_message', function (arg) {
- let payload, meetingId, users;
- payload = arg.payload;
- meetingId = payload.meeting_id;
-
- if (payload != null && meetingId != null && payload.requester_id != null && payload.poll != null) {
- if (Meteor.Meetings.findOne({
- meetingId: meetingId,
- }) != null) {
- users = Meteor.Users.find({
- meetingId: meetingId,
- }, {
- fields: {
- 'user.userid': 1,
- _id: 0,
- },
- }).fetch();
- addPollToCollection(
- payload.poll,
- payload.requester_id,
- users,
- meetingId
- );
- }
- }
-
- return arg.callback();
- });
-
-
-
- emitter.on('poll_stopped_message', function (arg) {
- let meetingId, payload, poll_id;
- payload = arg.payload;
- meetingId = payload.meeting_id;
-
- if (meetingId != null && payload != null && payload.poll_id != null) {
- poll_id = payload.poll_id;
- clearPollCollection(meetingId, poll_id);
- }
- return arg.callback();
- });
-
- emitter.on('user_voted_poll_message', function (arg) {
- let payload, meetingId, pollObj, requesterId;
- payload = arg.payload;
- meetingId = payload.meeting_id;
- if (payload != null && payload.poll != null && meetingId != null && payload.presenter_id != null) {
- pollObj = payload.poll;
- requesterId = payload.presenter_id;
- updatePollCollection(pollObj, meetingId, requesterId);
- return arg.callback();
- }
- });
-
- // TODO how to handle the rest of the messages - is there a wild card?
- // we need a way of calling the callback
- // emitter.on('' , function (arg) {
- // console.log("**********************************" + arg.eventName);
- // arg.callback();
- // });
-
-
- emitter.on('meeting_state_message' , function (arg) {
- // do nothing
- arg.callback();
- });
-
- emitter.on('user_registered_message' , function (arg) {
- // do nothing
- arg.callback();
- });
- //eject_voice_user_message
-
-};
-
diff --git a/bigbluebutton-html5/server/server.js b/bigbluebutton-html5/server/server.js
index c2fdc6714a..5f63be938f 100755
--- a/bigbluebutton-html5/server/server.js
+++ b/bigbluebutton-html5/server/server.js
@@ -1,106 +1,79 @@
-const indexOf = [].indexOf || function (item) {
- for (let i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1;
-};
+import '/imports/startup/server';
-Meteor.startup(() => {
- Meteor.log.info('server start');
+import '/imports/api/chat/server/publications';
+import '/imports/api/chat/server/methods/sendChatMessagetoServer';
+import '/imports/api/chat/server/modifiers/addChatToCollection';
+import '/imports/api/chat/server/modifiers/clearChatCollection';
- //remove all data
- Meteor.WhiteboardCleanStatus.remove({});
- clearUsersCollection();
- clearChatCollection();
- clearMeetingsCollection();
- clearShapesCollection();
- clearSlidesCollection();
- clearPresentationsCollection();
- clearPollCollection();
- clearCursorCollection();
+import '/imports/api/cursor/server/publications';
+import '/imports/api/cursor/server/modifiers/clearCursorCollection';
+import '/imports/api/cursor/server/modifiers/initializeCursor';
+import '/imports/api/cursor/server/modifiers/updateCursorLocation';
- const eventEmitter = new (Npm.require('events').EventEmitter);
- registerHandlers(eventEmitter);
+import '/imports/api/deskshare/server/publications';
+import '/imports/api/deskshare/server/modifiers/clearDeskshareCollection';
+import '/imports/api/deskshare/server/modifiers/handleDeskShareChange';
+import '/imports/api/deskshare/server/modifiers/handleIncomingDeskshareMessage';
+import '/imports/api/meetings/server/publications';
+import '/imports/api/meetings/server/modifiers/addMeetingToCollection';
+import '/imports/api/meetings/server/modifiers/clearMeetingsCollection';
+import '/imports/api/meetings/server/modifiers/removeMeetingFromCollection';
- // create create a PubSub connection, start listening
- Meteor.redisPubSub = new Meteor.RedisPubSub(function () {
- return Meteor.log.info('created pubsub');
- });
+import '/imports/api/polls/server/publications';
+import '/imports/api/polls/server/methods/publishVoteMessage';
+import '/imports/api/polls/server/modifiers/addPollToCollection';
+import '/imports/api/polls/server/modifiers/clearPollCollection';
+import '/imports/api/polls/server/modifiers/updatePollCollection';
- Meteor.myQueue = new PowerQueue({
- // autoStart:true
- // isPaused: true
- });
+import '/imports/api/presentations/server/publications';
+import '/imports/api/presentations/server/methods/publishSwitchToNextSlideMessage';
+import '/imports/api/presentations/server/methods/publishSwitchToPreviousSlideMessage';
+import '/imports/api/presentations/server/modifiers/addPresentationToCollection';
+import '/imports/api/presentations/server/modifiers/clearPresentationsCollection';
+import '/imports/api/presentations/server/modifiers/removePresentationFromCollection';
- Meteor.myQueue.taskHandler = function (data, next, failures) {
- let eventName, parsedMsg, length, lengthString;
- parsedMsg = JSON.parse(data.jsonMsg);
+import '/imports/api/shapes/server/publications';
+import '/imports/api/shapes/server/modifiers/addShapeToCollection';
+import '/imports/api/shapes/server/modifiers/clearShapesCollection';
+import '/imports/api/shapes/server/modifiers/removeAllShapesFromSlide';
+import '/imports/api/shapes/server/modifiers/removeShapeFromSlide';
- if (parsedMsg != null) {
- eventName = parsedMsg.header.name;
- length = Meteor.myQueue.length();
- lengthString = function () {
- if (length > 0) {
- return `In the queue we have ${length} event(s) to process.`;
- } else return "";
- }() || "";
- Meteor.log.info(`in callback after handleRedisMessage ${eventName}. ${lengthString}`);
- }
- console.log("in taskHandler:" + eventName);
+import '/imports/api/slides/server/publications';
+import '/imports/api/slides/server/modifiers/addSlideToCollection';
+import '/imports/api/slides/server/modifiers/clearSlidesCollection';
+import '/imports/api/slides/server/modifiers/displayThisSlide';
- if (failures > 0) {
- return Meteor.log.error(`got a failure on taskHandler ${eventName} ${failures}`);
- // TODO should we stop or instead return next?
- } else {
- logRedisMessage(eventName, data.jsonMsg);
- return eventEmitter.emit(eventName, {
- payload: parsedMsg.payload,
- header: parsedMsg.header,
+import '/imports/api/users/server/publications';
+import '/imports/api/users/server/methods/kickUser';
+import '/imports/api/users/server/methods/listenOnlyRequestToggle';
+import '/imports/api/users/server/methods/muteUser';
+import '/imports/api/users/server/methods/setUserPresenter';
+import '/imports/api/users/server/methods/unmuteUser';
+import '/imports/api/users/server/methods/userLogout';
+import '/imports/api/users/server/methods/userSetEmoji';
+import '/imports/api/users/server/methods/validateAuthToken';
+import '/imports/api/users/server/modifiers/clearUsersCollection';
+import '/imports/api/users/server/modifiers/createDummyUser';
+import '/imports/api/users/server/modifiers/handleLockingMic';
+import '/imports/api/users/server/modifiers/markUserOffline';
+import '/imports/api/users/server/modifiers/requestUserLeaving';
+import '/imports/api/users/server/modifiers/setUserLockedStatus';
+import '/imports/api/users/server/modifiers/updateVoiceUser';
+import '/imports/api/users/server/modifiers/userJoined';
- callback: () => {
- console.log("ready for next message");
- return next();
- },
- });
- }
- };
-
- const logRedisMessage = function (eventName, json) {
- // Avoid cluttering the log with json messages carrying little or repetitive
- // information. Comment out a message type in the array to be able to see it
- // in the log upon restarting of the Meteor process.
- notLoggedEventTypes = [
- 'keep_alive_reply',
- 'page_resized_message',
- 'presentation_page_resized_message',
- 'presentation_cursor_updated_message',
- 'get_presentation_info_reply',
+import '/imports/api/chat/server/modifiers/eventHandlers';
+import '/imports/api/cursor/server/modifiers/eventHandlers';
+import '/imports/api/meetings/server/modifiers/eventHandlers';
+import '/imports/api/phone/server/eventHandlers';
+import '/imports/api/polls/server/modifiers/eventHandlers';
+import '/imports/api/presentations/server/modifiers/eventHandlers';
+import '/imports/api/shapes/server/modifiers/eventHandlers';
+import '/imports/api/users/server/modifiers/eventHandlers';
- //"get_users_reply"
- 'get_chat_history_reply',
+import '/imports/startup/server/EventQueue';
+import '/imports/startup/server/helpers';
+import '/imports/startup/server/logger';
+import '/imports/startup/server/RedisPubSub';
+import '/imports/startup/server/userPermissions';
- //"get_all_meetings_reply"
- 'get_whiteboard_shapes_reply',
- 'presentation_shared_message',
- 'presentation_conversion_done_message',
- 'presentation_conversion_progress_message',
- 'presentation_page_generated_message',
-
- //"presentation_page_changed_message"
- 'BbbPubSubPongMessage',
- 'bbb_apps_is_alive_message',
- 'user_voice_talking_message',
- 'meeting_state_message',
- 'get_recording_status_reply',];
-
- // LOG in the meteor console
- if (eventName, indexOf.call(notLoggedEventTypes, eventName) < 0) {
- // Uncomment for DEVELOPMENT purposes only
- // Otherwise dynamic shapes' updates will slow down significantly
- /*
- Meteor.log.info(`redis incoming message ${eventName} `, {
- message: json,
- });
- */
- }
- };
-
-});
diff --git a/bigbluebutton-html5/settings-development.json b/bigbluebutton-html5/settings-development.json
new file mode 100755
index 0000000000..cd55a59386
--- /dev/null
+++ b/bigbluebutton-html5/settings-development.json
@@ -0,0 +1,6 @@
+{
+ "public": {
+ "mode": "development"
+ },
+ "rootURL": "http://127.0.0.1/html5client"
+}
diff --git a/bigbluebutton-html5/settings-production.json b/bigbluebutton-html5/settings-production.json
new file mode 100755
index 0000000000..2bb1505c54
--- /dev/null
+++ b/bigbluebutton-html5/settings-production.json
@@ -0,0 +1,7 @@
+{
+ "public": {
+ "mode": "production"
+ },
+ "rootURL": "http://127.0.0.1/html5client",
+ "home": "/usr/share/meteor"
+}
diff --git a/bigbluebutton-html5/tests/jasmine/client/integration/templates/usersList/usersListSpec.js b/bigbluebutton-html5/tests/jasmine/client/integration/templates/usersList/usersListSpec.js
index 24509c249d..49a233fd59 100755
--- a/bigbluebutton-html5/tests/jasmine/client/integration/templates/usersList/usersListSpec.js
+++ b/bigbluebutton-html5/tests/jasmine/client/integration/templates/usersList/usersListSpec.js
@@ -1,6 +1,6 @@
var emptyUsersCollection = function () {
- Meteor.Users.find().map(function (item) {
- Meteor.Users.remove({ _id: item._id });
+ Users.find().map(function (item) {
+ Users.remove({ _id: item._id });
});
};
@@ -16,8 +16,8 @@ var renderUsersListTemplate = function () {
// TODO: try to use Meteor methods instead
var removeUserFromCollection = function (id) {
- Meteor.Users.find().map(function (item) {
- if (item.userId == id) Meteor.Users.remove({ _id: item._id });
+ Users.find().map(function (item) {
+ if (item.userId == id) Users.remove({ _id: item._id });
});
};
@@ -41,7 +41,7 @@ describe('usersList template', function () {
presenter: false,
},
};
- Meteor.Users.insert(document1);
+ Users.insert(document1);
var div = renderUsersListTemplate();
expect($(div).find('.glyphicon-picture')[0]).not.toBeDefined();
@@ -55,7 +55,7 @@ describe('usersList template', function () {
presenter: true,
},
};
- Meteor.Users.insert(document1);
+ Users.insert(document1);
var div = renderUsersListTemplate();
expect($(div).find('.glyphicon-picture')[0]).toBeDefined();
@@ -69,7 +69,7 @@ describe('usersList template', function () {
name: 'Maxim',
},
};
- Meteor.Users.insert(document1);
+ Users.insert(document1);
var div = renderUsersListTemplate();
expect($(div).find('.userNameEntry').html().trim()).toEqual('Maxim');
@@ -98,9 +98,9 @@ describe('usersList template', function () {
},
};
- Meteor.Users.insert(document1);
- Meteor.Users.insert(document2);
- Meteor.Users.insert(document3);
+ Users.insert(document1);
+ Users.insert(document2);
+ Users.insert(document3);
var div = renderUsersListTemplate();
expect($(div).find('.userNameEntry').size()).toEqual(3);
@@ -157,21 +157,21 @@ describe('usersList template', function () {
},
};
- Meteor.Users.insert(document1);
+ Users.insert(document1);
var div = renderUsersListTemplate();
expect($(div).find('.userNameEntry').size()).toEqual(1);
expect($(div).find('.userNameEntry:eq(0)').html().trim()).toEqual('Maxim');
- Meteor.Users.insert(document2);
- Meteor.Users.insert(document3);
+ Users.insert(document2);
+ Users.insert(document3);
expect($(div).find('.userNameEntry').size()).toEqual(3);
expect($(div).find('.userNameEntry:eq(0)').html().trim()).toEqual('Maxim');
expect($(div).find('.userNameEntry:eq(1)').html().trim()).toEqual('Anton');
expect($(div).find('.userNameEntry:eq(2)').html().trim()).toEqual('Danny');
- Meteor.Users.insert(document4);
+ Users.insert(document4);
expect($(div).find('.userNameEntry').size()).toEqual(4);
expect($(div).find('.userNameEntry:eq(0)').html().trim()).toEqual('Maxim');
@@ -186,9 +186,9 @@ describe('usersList template', function () {
expect($(div).find('.userNameEntry:eq(0)').html().trim()).toEqual('Maxim');
expect($(div).find('.userNameEntry:eq(1)').html().trim()).toEqual('Danny');
- Meteor.Users.insert(document5);
- Meteor.Users.insert(document6);
- Meteor.Users.insert(document7);
+ Users.insert(document5);
+ Users.insert(document6);
+ Users.insert(document7);
expect($(div).find('.userNameEntry:eq(0)').html().trim()).toEqual('Maxim');
expect($(div).find('.userNameEntry:eq(1)').html().trim()).toEqual('Danny');
@@ -220,9 +220,9 @@ describe('usersList template', function () {
},
};
- Meteor.Users.insert(document1);
- Meteor.Users.insert(document2);
- Meteor.Users.insert(document3);
+ Users.insert(document1);
+ Users.insert(document2);
+ Users.insert(document3);
var div = renderUsersListTemplate();
expect($(div).find('.userNameEntry:eq(0)').html().trim()).toEqual('Maxim');
@@ -254,9 +254,9 @@ describe('usersList template', function () {
},
};
- Meteor.Users.insert(document1);
- Meteor.Users.insert(document2);
- Meteor.Users.insert(document3);
+ Users.insert(document1);
+ Users.insert(document2);
+ Users.insert(document3);
var div = renderUsersListTemplate();
expect($(div).find('.glyphicon-headphones')).toBeDefined();
diff --git a/bigbluebutton-html5/tests/jasmine/client/integration/templates/whiteboard/whiteboardSpec.js b/bigbluebutton-html5/tests/jasmine/client/integration/templates/whiteboard/whiteboardSpec.js
index 7adb2c9f6d..4275cd7de0 100755
--- a/bigbluebutton-html5/tests/jasmine/client/integration/templates/whiteboard/whiteboardSpec.js
+++ b/bigbluebutton-html5/tests/jasmine/client/integration/templates/whiteboard/whiteboardSpec.js
@@ -1,24 +1,24 @@
var emptyMeetingsCollection = function () {
- Meteor.Meetings.find().map(function (item) {
- Meteor.Meetings.remove({ _id: item._id });
+ Meetings.find().map(function (item) {
+ Meetings.remove({ _id: item._id });
});
};
var emptyPresentationsCollection = function () {
- Meteor.Presentations.find().map(function (item) {
- Meteor.Presentations.remove({ _id: item._id });
+ Presentations.find().map(function (item) {
+ Presentations.remove({ _id: item._id });
});
};
var emptySlidesCollection = function () {
- Meteor.Slides.find().map(function (item) {
- Meteor.Slides.remove({ _id: item._id });
+ Slides.find().map(function (item) {
+ Slides.remove({ _id: item._id });
});
};
var emptyShapesCollection = function () {
- Meteor.Shapes.find().map(function (item) {
- Meteor.Shapes.remove({ _id: item._id });
+ Shapes.find().map(function (item) {
+ Shapes.remove({ _id: item._id });
});
};
@@ -59,7 +59,7 @@ describe('whiteboard template', function () {
meetingId: 'meeting001',
meetingName: 'first meeting',
};
- Meteor.Meetings.insert(meeting1);
+ Meetings.insert(meeting1);
var presentation1 = {
meetingId: 'meeting001',
@@ -69,7 +69,7 @@ describe('whiteboard template', function () {
current: true,
},
};
- Meteor.Presentations.insert(presentation1);
+ Presentations.insert(presentation1);
var slide1 = {
meetingId: 'meeting001',
@@ -85,7 +85,7 @@ describe('whiteboard template', function () {
png_uri: 'http://bigbluebutton.org/wp-content/uploads/2013/05/bbb-overview.png',
},
};
- Meteor.Slides.insert(slide1);
+ Slides.insert(slide1);
var div = document.createElement('DIV');
Blaze.render(Template.main, div);
diff --git a/bigbluebutton-html5/tests/jasmine/server/unit/CollectionMethodsSpec.js b/bigbluebutton-html5/tests/jasmine/server/unit/CollectionMethodsSpec.js
index a423709bc1..784517fcdf 100755
--- a/bigbluebutton-html5/tests/jasmine/server/unit/CollectionMethodsSpec.js
+++ b/bigbluebutton-html5/tests/jasmine/server/unit/CollectionMethodsSpec.js
@@ -12,12 +12,12 @@ describe('Collections', function () {
//----------------------------------------------------------------------
it('should all be correctly handled by remove() after calling clearCollections()', function () {
- spyOn(Meteor.Users, 'remove');
- spyOn(Meteor.Chat, 'remove');
- spyOn(Meteor.Meetings, 'remove');
- spyOn(Meteor.Shapes, 'remove');
- spyOn(Meteor.Slides, 'remove');
- spyOn(Meteor.Presentations, 'remove');
+ spyOn(Users, 'remove');
+ spyOn(Chat, 'remove');
+ spyOn(Meetings, 'remove');
+ spyOn(Shapes, 'remove');
+ spyOn(Slides, 'remove');
+ spyOn(Presentations, 'remove');
clearUsersCollection();
clearChatCollection();
@@ -26,12 +26,12 @@ describe('Collections', function () {
clearSlidesCollection();
clearPresentationsCollection();
- expect(Meteor.Users.remove).toHaveBeenCalled();
- expect(Meteor.Chat.remove).toHaveBeenCalled();
- expect(Meteor.Meetings.remove).toHaveBeenCalled();
- expect(Meteor.Shapes.remove).toHaveBeenCalled();
- expect(Meteor.Slides.remove).toHaveBeenCalled();
- expect(Meteor.Presentations.remove).toHaveBeenCalled();
+ expect(Users.remove).toHaveBeenCalled();
+ expect(Chat.remove).toHaveBeenCalled();
+ expect(Meetings.remove).toHaveBeenCalled();
+ expect(Shapes.remove).toHaveBeenCalled();
+ expect(Slides.remove).toHaveBeenCalled();
+ expect(Presentations.remove).toHaveBeenCalled();
});
//----------------------------------------------------------------------
@@ -39,12 +39,12 @@ describe('Collections', function () {
//----------------------------------------------------------------------
it('should be handled correctly by insert() on calling addChatToCollection() in case of private chat', function () {
- spyOn(Meteor.Users, 'findOne').and.callFake(function (doc) {
+ spyOn(Users, 'findOne').and.callFake(function (doc) {
if (doc.userId == 'user001') return { userId: 'user001' };
else if (doc.userId == 'user002') return { userUd: 'user002' };
});
- spyOn(Meteor.Chat, 'insert');
+ spyOn(Chat, 'insert');
addChatToCollection('meeting001', {
from_time: '123',
@@ -59,7 +59,7 @@ describe('Collections', function () {
from_lang: 'en',
});
- expect(Meteor.Chat.insert).toHaveBeenCalledWith({
+ expect(Chat.insert).toHaveBeenCalledWith({
meetingId: 'meeting001',
message: {
chat_type: 'PRIVATE_CHAT',
@@ -77,12 +77,12 @@ describe('Collections', function () {
});
it('should be handled correctly by insert() on calling addChatToCollection() in case of public chat', function () {
- spyOn(Meteor.Users, 'findOne').and.callFake(function (doc) {
+ spyOn(Users, 'findOne').and.callFake(function (doc) {
if (doc.userId == 'user001') return { _id: 'dbid001' };
else if (doc.userId == 'user002') return { _id: 'dbid002' };
});
- spyOn(Meteor.Chat, 'insert');
+ spyOn(Chat, 'insert');
addChatToCollection('meeting001', {
from_time: '123',
@@ -97,7 +97,7 @@ describe('Collections', function () {
from_lang: 'en',
});
- expect(Meteor.Chat.insert).toHaveBeenCalledWith({
+ expect(Chat.insert).toHaveBeenCalledWith({
meetingId: 'meeting001',
message: {
chat_type: 'PUBLIC_CHAT',
@@ -119,25 +119,25 @@ describe('Collections', function () {
//----------------------------------------------------------------------
it('should not be updated on calling addMeetingToCollection() if the meeting is already in the collection', function () {
- spyOn(Meteor.Meetings, 'findOne').and.callFake(function (doc) {
+ spyOn(Meetings, 'findOne').and.callFake(function (doc) {
if (doc.meetingId == 'meeting001') return { meetingId: 'meeting001' };
else return undefined;
});
- spyOn(Meteor.Meetings, 'insert');
+ spyOn(Meetings, 'insert');
addMeetingToCollection('meeting001', 'Demo Meeting', false, '12345', '0');
- expect(Meteor.Meetings.insert).not.toHaveBeenCalled();
+ expect(Meetings.insert).not.toHaveBeenCalled();
});
it('should be handled correctly by insert() on calling addMeetingToCollection() with a brand new meeting', function () {
- spyOn(Meteor.Meetings, 'findOne').and.returnValue(undefined);//collection is empty
- spyOn(Meteor.Meetings, 'insert');
+ spyOn(Meetings, 'findOne').and.returnValue(undefined);//collection is empty
+ spyOn(Meetings, 'insert');
addMeetingToCollection('meeting001', 'Demo Meeting', false, '12345', '0');
- expect(Meteor.Meetings.insert).toHaveBeenCalledWith({
+ expect(Meetings.insert).toHaveBeenCalledWith({
meetingId: 'meeting001',
meetingName: 'Demo Meeting',
intendedForRecording: false,
@@ -148,26 +148,26 @@ describe('Collections', function () {
});
it('should not be touched on calling removeMeetingFromCollection() if there is no wanted meeting in the collection', function () {
- spyOn(Meteor.Meetings, 'findOne').and.returnValue(undefined);//collection is empty
- spyOn(Meteor.Meetings, 'remove');
+ spyOn(Meetings, 'findOne').and.returnValue(undefined);//collection is empty
+ spyOn(Meetings, 'remove');
removeMeetingFromCollection('meeting001');
- expect(Meteor.Meetings.remove).not.toHaveBeenCalled();
+ expect(Meetings.remove).not.toHaveBeenCalled();
});
//TODO: emulate a find() call
/*it("should be correctly updated after the removeMeetingFromCollection() call", function () {
- spyOn(Meteor.Meetings, "findOne").and.callFake(function(doc) {
+ spyOn(Meetings, "findOne").and.callFake(function(doc) {
if(doc.meetingId == "meeting001") return { _id: "id001", meetingId: "meeting001" };
else return undefined;
});
- spyOn(Meteor.Meetings, "remove");
+ spyOn(Meetings, "remove");
removeMeetingFromCollection("meeting001");
- expect(Meteor.Meetings.remove).toHaveBeenCalled();
+ expect(Meetings.remove).toHaveBeenCalled();
});*/
//----------------------------------------------------------------------
@@ -176,12 +176,12 @@ describe('Collections', function () {
// addShapeToCollection()
it('should be handled correctly by insert() on calling addShapeToCollection() with a text', function () {
- spyOn(Meteor.Shapes, 'find').and.returnValue({
+ spyOn(Shapes, 'find').and.returnValue({
count: function () {
return 1;
},
});
- spyOn(Meteor.Shapes, 'insert');
+ spyOn(Shapes, 'insert');
addShapeToCollection('meeting001', 'whiteboard001', {
shape_type: 'text',
@@ -205,7 +205,7 @@ describe('Collections', function () {
},
});
- expect(Meteor.Shapes.insert).toHaveBeenCalledWith({
+ expect(Shapes.insert).toHaveBeenCalledWith({
meetingId: 'meeting001',
whiteboardId: 'whiteboard001',
shape: {
@@ -229,12 +229,12 @@ describe('Collections', function () {
});
it('should be handled correctly by insert() on calling addShapeToCollection() with a finished standard shape', function () {
- spyOn(Meteor.Shapes, 'find').and.returnValue({
+ spyOn(Shapes, 'find').and.returnValue({
count: function () {
return 1;
},
});
- spyOn(Meteor.Shapes, 'insert');
+ spyOn(Shapes, 'insert');
addShapeToCollection('meeting001', 'whiteboard001', {
wb_id: 'whiteboard001',
@@ -254,7 +254,7 @@ describe('Collections', function () {
},
});
- expect(Meteor.Shapes.insert).toHaveBeenCalledWith({
+ expect(Shapes.insert).toHaveBeenCalledWith({
meetingId: 'meeting001',
whiteboardId: 'whiteboard001',
shape: {
@@ -278,12 +278,12 @@ describe('Collections', function () {
});
it('should be handled correctly by insert() on calling addShapeToCollection() with a pencil being used', function () {
- spyOn(Meteor.Shapes, 'find').and.returnValue({
+ spyOn(Shapes, 'find').and.returnValue({
count: function () {
return 1;
},
});
- spyOn(Meteor.Shapes, 'insert');
+ spyOn(Shapes, 'insert');
addShapeToCollection('meeting001', 'whiteboard001', {
wb_id: 'whiteboard001',
@@ -303,7 +303,7 @@ describe('Collections', function () {
},
});
- expect(Meteor.Shapes.insert).toHaveBeenCalledWith({
+ expect(Shapes.insert).toHaveBeenCalledWith({
meetingId: 'meeting001',
whiteboardId: 'whiteboard001',
shape: {
@@ -328,26 +328,26 @@ describe('Collections', function () {
// removeAllShapesFromSlide()
it('should not be touched on calling removeAllShapesFromSlide() with undefined meetingId', function () {
- spyOn(Meteor.Shapes, 'remove');
+ spyOn(Shapes, 'remove');
removeAllShapesFromSlide(undefined, 'whiteboard001');
- expect(Meteor.Shapes.remove).not.toHaveBeenCalled();
+ expect(Shapes.remove).not.toHaveBeenCalled();
});
it('should not be touched on calling removeAllShapesFromSlide() with undefined whiteboardId', function () {
- spyOn(Meteor.Shapes, 'remove');
+ spyOn(Shapes, 'remove');
removeAllShapesFromSlide('meeting001', undefined);
- expect(Meteor.Shapes.remove).not.toHaveBeenCalled();
+ expect(Shapes.remove).not.toHaveBeenCalled();
});
it('should not be touched on calling removeAllShapesFromSlide() if there is no shapes on the whiteboard', function () {
- spyOn(Meteor.Shapes, 'find').and.returnValue(undefined);
- spyOn(Meteor.Shapes, 'remove');
+ spyOn(Shapes, 'find').and.returnValue(undefined);
+ spyOn(Shapes, 'remove');
removeAllShapesFromSlide('meeting001', 'whiteboard001');
- expect(Meteor.Shapes.remove).not.toHaveBeenCalled();
+ expect(Shapes.remove).not.toHaveBeenCalled();
});
it('should be cleared on calling removeAllShapesFromSlide() if there are shapes on the whiteboard', function () {
- spyOn(Meteor.Shapes, 'find').and.callFake(function (doc) {
+ spyOn(Shapes, 'find').and.callFake(function (doc) {
if (doc.meetingId === 'meeting001' && doc.whiteboardId === 'whiteboard001')
return {
fetch: function () {
@@ -357,7 +357,7 @@ describe('Collections', function () {
else return undefined;
});
- spyOn(Meteor.Shapes, 'findOne').and.callFake(function (doc) {
+ spyOn(Shapes, 'findOne').and.callFake(function (doc) {
if (doc.meetingId === 'meeting001' && doc.whiteboardId === 'whiteboard001' && doc['shape.id'] === 'shape001')
return {
_id: 'doc001',
@@ -365,14 +365,14 @@ describe('Collections', function () {
else return undefined;
});
- spyOn(Meteor.Shapes, 'remove');
+ spyOn(Shapes, 'remove');
removeAllShapesFromSlide('meeting001', 'whiteboard001');
- expect(Meteor.Shapes.remove).toHaveBeenCalledWith('doc001');
+ expect(Shapes.remove).toHaveBeenCalledWith('doc001');
});
// removeShapeFromSlide()
it('should not be touched on calling removeShapeFromSlide() with undefined meetingId', function () {
- spyOn(Meteor.Shapes, 'find').and.callFake(function (doc) {
+ spyOn(Shapes, 'find').and.callFake(function (doc) {
if (doc.meetingId === undefined && doc.whiteboardId === 'whiteboard001')
return {
count: function () {
@@ -382,7 +382,7 @@ describe('Collections', function () {
else return undefined;
});
- spyOn(Meteor.Shapes, 'findOne').and.callFake(function (doc) {
+ spyOn(Shapes, 'findOne').and.callFake(function (doc) {
if (doc.meetingId === undefined && doc.whiteboardId === 'whiteboard001' && doc['shape.id'] === 'shape001')
return {
_id: 'doc001',
@@ -390,15 +390,15 @@ describe('Collections', function () {
else return undefined;
});
- spyOn(Meteor.Shapes, 'remove');
+ spyOn(Shapes, 'remove');
removeShapeFromSlide(undefined, 'whiteboard001', 'shape001');
- expect(Meteor.Shapes.remove).not.toHaveBeenCalled();
+ expect(Shapes.remove).not.toHaveBeenCalled();
});
it('should not be touched on calling removeShapeFromSlide() with undefined whiteboardId', function () {
- spyOn(Meteor.Shapes, 'find').and.callFake(function (doc) {
+ spyOn(Shapes, 'find').and.callFake(function (doc) {
if (doc.meetingId === 'meeting001' && doc.whiteboardId === undefined)
return {
count: function () {
@@ -408,7 +408,7 @@ describe('Collections', function () {
else return undefined;
});
- spyOn(Meteor.Shapes, 'findOne').and.callFake(function (doc) {
+ spyOn(Shapes, 'findOne').and.callFake(function (doc) {
if (doc.meetingId === 'meeting001' && doc.whiteboardId === undefined && doc['shape.id'] === 'shape001')
return {
_id: 'doc001',
@@ -416,15 +416,15 @@ describe('Collections', function () {
else return undefined;
});
- spyOn(Meteor.Shapes, 'remove');
+ spyOn(Shapes, 'remove');
removeShapeFromSlide('meeting001', undefined, 'shape001');
- expect(Meteor.Shapes.remove).not.toHaveBeenCalled();
+ expect(Shapes.remove).not.toHaveBeenCalled();
});
it('should not be touched on calling removeShapeFromSlide() with undefined shapeId', function () {
- spyOn(Meteor.Shapes, 'find').and.callFake(function (doc) {
+ spyOn(Shapes, 'find').and.callFake(function (doc) {
if (doc.meetingId === 'meeting001' && doc.whiteboardId === 'whiteboard001')
return {
count: function () {
@@ -434,7 +434,7 @@ describe('Collections', function () {
else return undefined;
});
- spyOn(Meteor.Shapes, 'findOne').and.callFake(function (doc) {
+ spyOn(Shapes, 'findOne').and.callFake(function (doc) {
if (doc.meetingId === 'meeting001' && doc.whiteboardId === 'whiteboard001' && doc['shape.id'] === undefined)
return {
_id: 'doc001',
@@ -442,15 +442,15 @@ describe('Collections', function () {
else return undefined;
});
- spyOn(Meteor.Shapes, 'remove');
+ spyOn(Shapes, 'remove');
removeShapeFromSlide('meeting001', 'whiteboard001', undefined);
- expect(Meteor.Shapes.remove).not.toHaveBeenCalled();
+ expect(Shapes.remove).not.toHaveBeenCalled();
});
it('should not be touched on calling removeShapeFromSlide() if there is no wanted shape on the whiteboard', function () {
- spyOn(Meteor.Shapes, 'find').and.callFake(function (doc) {
+ spyOn(Shapes, 'find').and.callFake(function (doc) {
if (doc.meetingId === 'meeting001' && doc.whiteboardId === 'whiteboard001')
return {
count: function () {
@@ -460,7 +460,7 @@ describe('Collections', function () {
else return undefined;
});
- spyOn(Meteor.Shapes, 'findOne').and.callFake(function (doc) {
+ spyOn(Shapes, 'findOne').and.callFake(function (doc) {
if (doc.meetingId === 'meeting001' && doc.whiteboardId === 'whiteboard001' && doc['shape.id'] === 'shape001')
return undefined;
else return {
@@ -468,15 +468,15 @@ describe('Collections', function () {
};
});
- spyOn(Meteor.Shapes, 'remove');
+ spyOn(Shapes, 'remove');
removeShapeFromSlide('meeting001', 'whiteboard001', undefined);
- expect(Meteor.Shapes.remove).not.toHaveBeenCalled();
+ expect(Shapes.remove).not.toHaveBeenCalled();
});
it('should be updated correctly on calling removeShapeFromSlide() with an existing shape', function () {
- spyOn(Meteor.Shapes, 'find').and.callFake(function (doc) {
+ spyOn(Shapes, 'find').and.callFake(function (doc) {
if (doc.meetingId === 'meeting001' && doc.whiteboardId === 'whiteboard001')
return {
count: function () {
@@ -486,7 +486,7 @@ describe('Collections', function () {
else return undefined;
});
- spyOn(Meteor.Shapes, 'findOne').and.callFake(function (doc) {
+ spyOn(Shapes, 'findOne').and.callFake(function (doc) {
if (doc.meetingId === 'meeting001' && doc.whiteboardId === 'whiteboard001' && doc['shape.id'] === 'shape001')
return {
_id: 'doc001',
@@ -494,9 +494,9 @@ describe('Collections', function () {
else return undefined;
});
- spyOn(Meteor.Shapes, 'remove');
+ spyOn(Shapes, 'remove');
removeShapeFromSlide('meeting001', 'whiteboard001', 'shape001');
- expect(Meteor.Shapes.remove).toHaveBeenCalledWith('doc001');
+ expect(Shapes.remove).toHaveBeenCalledWith('doc001');
});
//----------------------------------------------------------------------
@@ -504,9 +504,9 @@ describe('Collections', function () {
//----------------------------------------------------------------------
it('should be handled correctly by insert() on calling addPresentationToCollection()', function () {
- spyOn(Meteor.Presentations, 'findOne').and.returnValue(undefined);
+ spyOn(Presentations, 'findOne').and.returnValue(undefined);
- spyOn(Meteor.Presentations, 'insert');
+ spyOn(Presentations, 'insert');
addPresentationToCollection('meeting001', {
id: 'presentation001',
@@ -514,7 +514,7 @@ describe('Collections', function () {
current: true,
});
- expect(Meteor.Presentations.insert).toHaveBeenCalledWith({
+ expect(Presentations.insert).toHaveBeenCalledWith({
meetingId: 'meeting001',
presentation: {
id: 'presentation001',
@@ -529,9 +529,9 @@ describe('Collections', function () {
});
it('should be handled correctly on calling addPresentationToCollection() when presentation is already in the collection', function () {
- spyOn(Meteor.Presentations, 'findOne').and.returnValue({ _id: 'dbid001' });
+ spyOn(Presentations, 'findOne').and.returnValue({ _id: 'dbid001' });
- spyOn(Meteor.Presentations, 'insert');
+ spyOn(Presentations, 'insert');
addPresentationToCollection('meeting001', {
id: 'presentation001',
@@ -539,7 +539,7 @@ describe('Collections', function () {
current: true,
});
- expect(Meteor.Presentations.insert).not.toHaveBeenCalledWith({
+ expect(Presentations.insert).not.toHaveBeenCalledWith({
meetingId: 'meeting001',
presentation: {
id: 'presentation001',
@@ -554,21 +554,21 @@ describe('Collections', function () {
});
it('should be handled correctly by remove() on calling removePresentationFromCollection', function () {
- spyOn(Meteor.Presentations, 'findOne').and.returnValue({ _id: 'dbid001' });
- spyOn(Meteor.Presentations, 'remove');
+ spyOn(Presentations, 'findOne').and.returnValue({ _id: 'dbid001' });
+ spyOn(Presentations, 'remove');
removePresentationFromCollection('meeting0001', 'presentation001');
- expect(Meteor.Presentations.remove).toHaveBeenCalled();
+ expect(Presentations.remove).toHaveBeenCalled();
});
it('should be handled correctly by remove() on calling removePresentationFromCollection', function () {
- spyOn(Meteor.Presentations, 'findOne').and.returnValue(undefined);
- spyOn(Meteor.Presentations, 'remove');
+ spyOn(Presentations, 'findOne').and.returnValue(undefined);
+ spyOn(Presentations, 'remove');
removePresentationFromCollection('meeting0001', 'presentation001');
- expect(Meteor.Presentations.remove).not.toHaveBeenCalled();
+ expect(Presentations.remove).not.toHaveBeenCalled();
});
//----------------------------------------------------------------------
@@ -577,64 +577,64 @@ describe('Collections', function () {
// removeSlideFromCollection()
it('should not be touched on calling removeSlideFromCollection() with undefined meetingId', function () {
- spyOn(Meteor.Slides, 'remove');
+ spyOn(Slides, 'remove');
removeSlideFromCollection(undefined, 'presentation001/2');
- expect(Meteor.Slides.remove).not.toHaveBeenCalled();
+ expect(Slides.remove).not.toHaveBeenCalled();
});
it('should not be touched on calling removeSlideFromCollection() with undefined slideId', function () {
- spyOn(Meteor.Slides, 'remove');
+ spyOn(Slides, 'remove');
removeSlideFromCollection('meeting001', undefined);
- expect(Meteor.Slides.remove).not.toHaveBeenCalled();
+ expect(Slides.remove).not.toHaveBeenCalled();
});
it('should not be touched on calling removeSlideFromCollection() with a slide that does not exist', function () {
- spyOn(Meteor.Slides, 'findOne').and.callFake(function (doc) {
+ spyOn(Slides, 'findOne').and.callFake(function (doc) {
if (doc.meetingId === 'meeting001' && doc['slide.id'] === 'slide001')
return undefined;
else return { meetingId: 'meeting001' };
});
- spyOn(Meteor.Slides, 'remove');
+ spyOn(Slides, 'remove');
removeSlideFromCollection('meeting001', 'slide001');
- expect(Meteor.Slides.remove).not.toHaveBeenCalled();
+ expect(Slides.remove).not.toHaveBeenCalled();
});
it('should be handled correctly by remove() on calling removeSlideFromCollection() with an existing slide', function () {
- spyOn(Meteor.Slides, 'findOne').and.callFake(function (doc) {
+ spyOn(Slides, 'findOne').and.callFake(function (doc) {
if (doc.meetingId === 'meeting001' && doc['slide.id'] === 'slide001')
return { _id: 'doc001' };
else return undefined;
});
- spyOn(Meteor.Slides, 'remove');
+ spyOn(Slides, 'remove');
removeSlideFromCollection('meeting001', 'slide001');
- expect(Meteor.Slides.remove).toHaveBeenCalledWith('doc001');
+ expect(Slides.remove).toHaveBeenCalledWith('doc001');
});
// addSlideToCollection()
it('should not be touched on calling addSlideToCollection() if the slide is already in the collection', function () {
- spyOn(Meteor.Slides, 'findOne').and.callFake(function (doc) {
+ spyOn(Slides, 'findOne').and.callFake(function (doc) {
if (doc.meetingId === 'meeting001' && doc['slide.id'] === 'presentation001/2')
return { _id: 'doc001' };
else return undefined;
});
- spyOn(Meteor.Slides, 'insert');
+ spyOn(Slides, 'insert');
addSlideToCollection('meeting001', 'presentation001', {
id: 'presentation001/2',
});
- expect(Meteor.Slides.insert).not.toHaveBeenCalled();
+ expect(Slides.insert).not.toHaveBeenCalled();
});
it('should be handled correctly by insert() on calling addSlideToCollection() with a brand new slide', function () {
- spyOn(Meteor.Slides, 'findOne').and.callFake(function (doc) {
+ spyOn(Slides, 'findOne').and.callFake(function (doc) {
if (doc.meetingId === 'meeting001' && doc['slide.id'] === 'presentation001/2')
return undefined;
else return { _id: 'doc001' };
});
- spyOn(Meteor.Slides, 'insert');
+ spyOn(Slides, 'insert');
addSlideToCollection('meeting001', 'presentation001', {
height_ratio: 100,
y_offset: 0,
@@ -648,7 +648,7 @@ describe('Collections', function () {
swf_uri: 'http://localhost/bigbluebutton/presentation/presentation001/slide/2',
thumb_uri: 'http://localhost/bigbluebutton/presentation/presentation001/thumbnail/1',
});
- expect(Meteor.Slides.insert).toHaveBeenCalledWith({
+ expect(Slides.insert).toHaveBeenCalledWith({
meetingId: 'meeting001',
presentationId: 'presentation001',
slide: {
diff --git a/bigbluebutton-html5/tests/jasmine/server/unit/config-stubs.js b/bigbluebutton-html5/tests/jasmine/server/unit/config-stubs.js
index 65acce6260..83ddbb1184 100644
--- a/bigbluebutton-html5/tests/jasmine/server/unit/config-stubs.js
+++ b/bigbluebutton-html5/tests/jasmine/server/unit/config-stubs.js
@@ -8,5 +8,5 @@ Logger.prototype = {
};
Logger.info = function () {};
-Meteor.log = Logger;
+//Meteor.log = Logger; //TODO this should import logger
diff --git a/bigbluebutton-web/bigbluebutton-web.eml b/bigbluebutton-web/bigbluebutton-web.eml
deleted file mode 100644
index 7c36e84c08..0000000000
--- a/bigbluebutton-web/bigbluebutton-web.eml
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
- {/* TODO: Adjust the presenter uploader for mobile views on iOS devices
- you cant upload PDFs, only images from camera/gallery */
- !isMobile() ?
-
-
-
-
-
-
-
-
- {this.data.currentSlideNum + '/' + this.data.totalSlideNum}
-
-
-
- -
-
-
-
- -