diff --git a/Dockerfile b/Dockerfile
index 665cb8f2..604aa1b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,14 @@
FROM ruby:2.5
# Install app dependencies.
-RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
+RUN apt-get update -qq && apt-get install -y build-essential libpq-dev curl
+
+ADD https://dl.yarnpkg.com/debian/pubkey.gpg /tmp/yarn-pubkey.gpg
+
+RUN apt-key add /tmp/yarn-pubkey.gpg && rm /tmp/yarn-pubkey.gpg && \
+echo 'deb http://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list && \
+curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
+apt-get update && apt-get install -y nodejs yarn
# Set an environment variable for the install location.
ENV RAILS_ROOT /usr/src/app
@@ -23,9 +30,9 @@ RUN bundle install --without development test --deployment --clean
# Adding project files.
COPY . .
-# Precompile assets.
-RUN bundle exec rake assets:clean
-RUN bundle exec rake assets:precompile
+# Precompile assets
+RUN SECRET_KEY_BASE="$(bundle exec rake secret)" bundle exec rake assets:clean
+RUN SECRET_KEY_BASE="$(bundle exec rake secret)" bundle exec rake assets:precompile
# Expose port 80.
EXPOSE 80
diff --git a/Gemfile b/Gemfile
index 2e77d0e3..46c7bbfe 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,13 +8,13 @@ git_source(:github) do |repo_name|
end
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.0.7'
+gem 'rails', '~> 5.2.3'
# Use Puma as the app server
gem 'puma', '~> 3.0'
# Use SCSS for stylesheets
-gem 'sass-rails', '~> 5.0'
+gem 'sassc-rails'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
@@ -35,11 +35,14 @@ gem 'turbolinks', '~> 5'
gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
-gem 'redis', '~> 3.0'
+# gem 'redis', '~> 3.0'
# Use ActiveModel has_secure_password
gem 'bcrypt', '~> 3.1.7'
+# Reduces boot times through caching; required in config/boot.rb
+gem 'bootsnap', '>= 1.1.0', require: false
+
# Authentication.
gem 'omniauth'
gem 'omniauth-twitter'
@@ -54,7 +57,7 @@ gem 'bigbluebutton-api-ruby'
# Front-end.
gem 'bootstrap', '~> 4.3.1'
-gem 'tabler-rubygem'
+gem 'tabler-rubygem', git: 'https://github.com/vbalazs/tabler-rubygem.git', branch: 'fix-sass'
gem 'pagy'
# For detecting the users preferred language.
diff --git a/Gemfile.lock b/Gemfile.lock
index 9bc6b0b0..e2cf0654 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,58 +23,73 @@ GIT
omniauth (>= 1.3.2)
omniauth-oauth2 (>= 1.5.0)
+GIT
+ remote: https://github.com/vbalazs/tabler-rubygem.git
+ revision: 1360795a174f6e6317eb6c81461597ddc965c2ce
+ branch: fix-sass
+ specs:
+ tabler-rubygem (0.1.4)
+ autoprefixer-rails (>= 6.0.3)
+ bootstrap (~> 4.3.1)
+
GEM
remote: https://rubygems.org/
specs:
action-cable-testing (0.5.0)
actioncable (>= 5.0)
- actioncable (5.0.7.2)
- actionpack (= 5.0.7.2)
- nio4r (>= 1.2, < 3.0)
- websocket-driver (~> 0.6.1)
- actionmailer (5.0.7.2)
- actionpack (= 5.0.7.2)
- actionview (= 5.0.7.2)
- activejob (= 5.0.7.2)
+ actioncable (5.2.3)
+ actionpack (= 5.2.3)
+ nio4r (~> 2.0)
+ websocket-driver (>= 0.6.1)
+ actionmailer (5.2.3)
+ actionpack (= 5.2.3)
+ actionview (= 5.2.3)
+ activejob (= 5.2.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (5.0.7.2)
- actionview (= 5.0.7.2)
- activesupport (= 5.0.7.2)
+ actionpack (5.2.3)
+ actionview (= 5.2.3)
+ activesupport (= 5.2.3)
rack (~> 2.0)
- rack-test (~> 0.6.3)
+ rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (5.0.7.2)
- activesupport (= 5.0.7.2)
+ actionview (5.2.3)
+ activesupport (= 5.2.3)
builder (~> 3.1)
- erubis (~> 2.7.0)
+ erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (5.0.7.2)
- activesupport (= 5.0.7.2)
+ activejob (5.2.3)
+ activesupport (= 5.2.3)
globalid (>= 0.3.6)
- activemodel (5.0.7.2)
- activesupport (= 5.0.7.2)
- activerecord (5.0.7.2)
- activemodel (= 5.0.7.2)
- activesupport (= 5.0.7.2)
- arel (~> 7.0)
- activesupport (5.0.7.2)
+ activemodel (5.2.3)
+ activesupport (= 5.2.3)
+ activerecord (5.2.3)
+ activemodel (= 5.2.3)
+ activesupport (= 5.2.3)
+ arel (>= 9.0)
+ activestorage (5.2.3)
+ actionpack (= 5.2.3)
+ activerecord (= 5.2.3)
+ marcel (~> 0.3.1)
+ activesupport (5.2.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
- arel (7.1.4)
+ arel (9.0.0)
ast (2.4.0)
- autoprefixer-rails (9.5.1.1)
+ autoprefixer-rails (9.6.1)
execjs
- bcrypt (3.1.12)
+ bcrypt (3.1.13)
bigbluebutton-api-ruby (1.7.0)
xml-simple (~> 1.1)
- bindex (0.7.0)
+ bindex (0.8.1)
+ bootsnap (1.4.4)
+ msgpack (~> 1.0)
bootstrap (4.3.1)
autoprefixer-rails (>= 9.1.0)
popper_js (>= 1.14.3, < 2)
@@ -100,26 +115,26 @@ GEM
safe_yaml (~> 1.0.0)
crass (1.0.4)
diff-lcs (1.3)
- docile (1.3.1)
- dotenv (2.7.2)
- dotenv-rails (2.7.2)
- dotenv (= 2.7.2)
+ docile (1.3.2)
+ dotenv (2.7.4)
+ dotenv-rails (2.7.4)
+ dotenv (= 2.7.4)
railties (>= 3.2, < 6.1)
- erubis (2.7.0)
+ erubi (1.8.0)
execjs (2.7.0)
factory_bot (5.0.2)
activesupport (>= 4.2.0)
factory_bot_rails (5.0.2)
factory_bot (~> 5.0.2)
railties (>= 4.2.0)
- faker (1.9.3)
+ faker (1.9.6)
i18n (>= 0.7)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
ffi (1.11.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
- hashdiff (0.3.9)
+ hashdiff (0.4.0)
hashie (3.6.0)
health_check (3.0.0)
railties (>= 5.0)
@@ -127,15 +142,15 @@ GEM
i18n (1.6.0)
concurrent-ruby (~> 1.0)
i18n-language-mapping (0.1.0)
- jaro_winkler (1.5.2)
+ jaro_winkler (1.5.3)
jbuilder (2.9.1)
activesupport (>= 4.2.0)
- jquery-rails (4.3.3)
+ jquery-rails (4.3.5)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.2.0)
- jwt (2.1.0)
+ jwt (2.2.1)
libv8 (7.3.492.27.1)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -145,17 +160,21 @@ GEM
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
+ marcel (0.3.3)
+ mimemagic (~> 0.3.2)
method_source (0.9.2)
- mini_mime (1.0.1)
+ mimemagic (0.3.3)
+ mini_mime (1.0.2)
mini_portile2 (2.4.0)
mini_racer (0.2.6)
libv8 (>= 6.9.411)
minitest (5.11.3)
+ msgpack (1.3.0)
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.1.1)
net-ldap (0.16.1)
- nio4r (2.3.1)
+ nio4r (2.4.0)
nokogiri (1.10.3)
mini_portile2 (~> 2.4.0)
oauth (0.5.4)
@@ -168,7 +187,7 @@ GEM
omniauth (1.9.0)
hashie (>= 3.4.6, < 3.7.0)
rack (>= 1.6.2, < 3)
- omniauth-google-oauth2 (0.6.1)
+ omniauth-google-oauth2 (0.7.0)
jwt (>= 2.0)
omniauth (>= 1.1.1)
omniauth-oauth2 (>= 1.5)
@@ -181,28 +200,29 @@ GEM
omniauth-twitter (1.4.0)
omniauth-oauth (~> 1.1)
rack
- pagy (3.2.0)
+ pagy (3.3.2)
parallel (1.17.0)
parser (2.6.3.0)
ast (~> 2.4.0)
pg (0.21.0)
popper_js (1.14.5)
- public_suffix (3.0.3)
+ public_suffix (3.1.1)
puma (3.12.1)
rack (2.0.7)
- rack-test (0.6.3)
- rack (>= 1.0)
- rails (5.0.7.2)
- actioncable (= 5.0.7.2)
- actionmailer (= 5.0.7.2)
- actionpack (= 5.0.7.2)
- actionview (= 5.0.7.2)
- activejob (= 5.0.7.2)
- activemodel (= 5.0.7.2)
- activerecord (= 5.0.7.2)
- activesupport (= 5.0.7.2)
+ rack-test (1.1.0)
+ rack (>= 1.0, < 3)
+ rails (5.2.3)
+ actioncable (= 5.2.3)
+ actionmailer (= 5.2.3)
+ actionpack (= 5.2.3)
+ actionview (= 5.2.3)
+ activejob (= 5.2.3)
+ activemodel (= 5.2.3)
+ activerecord (= 5.2.3)
+ activestorage (= 5.2.3)
+ activesupport (= 5.2.3)
bundler (>= 1.3.0)
- railties (= 5.0.7.2)
+ railties (= 5.2.3)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.4)
actionpack (>= 5.0.1.x)
@@ -213,31 +233,30 @@ GEM
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
- railties (5.0.7.2)
- actionpack (= 5.0.7.2)
- activesupport (= 5.0.7.2)
+ railties (5.2.3)
+ actionpack (= 5.2.3)
+ activesupport (= 5.2.3)
method_source
rake (>= 0.8.7)
- thor (>= 0.18.1, < 2.0)
+ thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (12.3.2)
random_password (0.1.1)
rb-fsevent (0.10.3)
rb-inotify (0.10.0)
ffi (~> 1.0)
- recaptcha (4.14.0)
+ recaptcha (5.0.0)
json
redcarpet (3.4.0)
- redis (3.3.5)
remote_syslog_logger (1.0.4)
syslog_protocol
rolify (5.2.0)
- rspec-core (3.8.0)
+ rspec-core (3.8.2)
rspec-support (~> 3.8.0)
- rspec-expectations (3.8.3)
+ rspec-expectations (3.8.4)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
- rspec-mocks (3.8.0)
+ rspec-mocks (3.8.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0)
rspec-rails (3.8.2)
@@ -248,31 +267,20 @@ GEM
rspec-expectations (~> 3.8.0)
rspec-mocks (~> 3.8.0)
rspec-support (~> 3.8.0)
- rspec-support (3.8.0)
- rubocop (0.70.0)
+ rspec-support (3.8.2)
+ rubocop (0.72.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.6)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
- ruby-progressbar (1.10.0)
+ ruby-progressbar (1.10.1)
safe_yaml (1.0.5)
- sass (3.7.4)
- sass-listen (~> 4.0.0)
- sass-listen (4.0.0)
- rb-fsevent (~> 0.9, >= 0.9.4)
- rb-inotify (~> 0.9, >= 0.9.7)
- sass-rails (5.0.7)
- railties (>= 4.0.0, < 6)
- sass (~> 3.1)
- sprockets (>= 2.8, < 4.0)
- sprockets-rails (>= 2.0, < 4.0)
- tilt (>= 1.1, < 3)
sassc (2.0.1)
ffi (~> 1.9)
rake
- sassc-rails (2.1.1)
+ sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
@@ -285,8 +293,7 @@ GEM
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
- spring (2.0.2)
- activesupport (>= 4.2)
+ spring (2.1.0)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
@@ -299,14 +306,12 @@ GEM
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
syslog_protocol (0.9.2)
- tabler-rubygem (0.1.4)
- autoprefixer-rails (>= 6.0.3)
term-ansicolor (1.7.1)
tins (~> 1.0)
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.9)
- tins (1.20.2)
+ tins (1.21.0)
turbolinks (5.2.0)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
@@ -320,13 +325,13 @@ GEM
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
- webmock (3.5.1)
+ webmock (3.6.0)
addressable (>= 2.3.6)
crack (>= 0.3.2)
- hashdiff
- websocket-driver (0.6.5)
+ hashdiff (>= 0.4.0, < 2.0.0)
+ websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
- websocket-extensions (0.1.3)
+ websocket-extensions (0.1.4)
xml-simple (1.1.5)
PLATFORMS
@@ -337,6 +342,7 @@ DEPENDENCIES
bcrypt (~> 3.1.7)
bigbluebutton-api-ruby
bn-ldap-authentication!
+ bootsnap (>= 1.1.0)
bootstrap (~> 4.3.1)
byebug
cancancan (~> 2.0)
@@ -361,24 +367,24 @@ DEPENDENCIES
pagy
pg (~> 0.18)
puma (~> 3.0)
- rails (~> 5.0.7)
+ rails (~> 5.2.3)
rails-controller-testing
random_password
recaptcha
redcarpet
- redis (~> 3.0)
remote_syslog_logger
rolify
rspec-rails (~> 3.7)
rubocop
- sass-rails (~> 5.0)
+ sassc-rails
shoulda-matchers (~> 3.1)
spring
spring-watcher-listen (~> 2.0.0)
sqlite3 (~> 1.3.6)
- tabler-rubygem
+ tabler-rubygem!
turbolinks (~> 5)
tzinfo-data
uglifier (>= 1.3.0)
web-console (>= 3.3.0)
webmock
+
diff --git a/app/assets/javascripts/admins.js b/app/assets/javascripts/admins.js
index 55fa3a43..0b27efe0 100644
--- a/app/assets/javascripts/admins.js
+++ b/app/assets/javascripts/admins.js
@@ -43,9 +43,9 @@ $(document).on('turbolinks:load', function(){
window.location.replace(url);
})
-
- /* COLOR SELECTORS */
+ }
+ if (controller == "admins" && action == "site_settings") {
loadColourSelectors()
}
diff --git a/app/assets/javascripts/recording.js b/app/assets/javascripts/recording.js
new file mode 100644
index 00000000..213ca957
--- /dev/null
+++ b/app/assets/javascripts/recording.js
@@ -0,0 +1,41 @@
+// BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
+//
+// Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+//
+// This program is free software; you can redistribute it and/or modify it under the
+// terms of the GNU Lesser General Public License as published by the Free Software
+// Foundation; either version 3.0 of the License, or (at your option) any later
+// version.
+//
+// BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+// PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License along
+// with BigBlueButton; if not, see .
+
+// Handle changing of settings tabs.
+$(document).on('turbolinks:load', function(){
+ var controller = $("body").data('controller');
+ var action = $("body").data('action');
+
+ if (controller == "rooms" && action == "show"
+ || controller == "rooms" && action == "update"
+ || controller == "users" && action == "recordings"
+ || controller == "admins" && action == "server_recordings"){
+ // Handle recording emails.
+ $('.email-link').each(function(){
+ $(this).click(function(){
+ var subject = $(".username").text() + " " + t('room.mailer.subject');
+ var body = t('room.mailer.body') + "\n\n" + $(this).attr("data-pres-link");
+ var autogenerated = "\n\n" + t('room.mailer.autogenerated') + "\n";
+ var footer = t('room.mailer.footer');
+
+ var url = "mailto:?subject=" + encodeURIComponent(subject) + "&body=" + encodeURIComponent(body) + encodeURIComponent(autogenerated) + encodeURIComponent(footer);
+ var win = window.open(url, '_blank');
+
+ win.focus();
+ });
+ });
+ }
+});
\ No newline at end of file
diff --git a/app/assets/javascripts/rename.js b/app/assets/javascripts/rename.js
index 20570498..a8f32c6a 100644
--- a/app/assets/javascripts/rename.js
+++ b/app/assets/javascripts/rename.js
@@ -18,7 +18,10 @@ $(document).on('turbolinks:load', function(){
var controller = $("body").data('controller');
var action = $("body").data('action');
- if(controller == "rooms" && action == "show" || controller == "rooms" && action == "update" || controller == "users" && action == "recordings"){
+ if(controller == "rooms" && action == "show"
+ || controller == "rooms" && action == "update"
+ || controller == "users" && action == "recordings"
+ || controller == "admins" && action == "server_recordings"){
// Set a room header rename event
var configure_room_header = function(room_title){
diff --git a/app/assets/javascripts/room.js.erb b/app/assets/javascripts/room.js.erb
index f5be24f0..892cf313 100644
--- a/app/assets/javascripts/room.js.erb
+++ b/app/assets/javascripts/room.js.erb
@@ -39,29 +39,18 @@ $(document).on('turbolinks:load', function(){
}, 2000)
}
});
-
- // Handle recording emails.
- $('.email-link').each(function(){
- $(this).click(function(){
- var subject = $(".username").text() + " " + t('room.mailer.subject');
- var body = t('room.mailer.body') + "\n\n" + $(this).attr("data-pres-link");
- var autogenerated = "\n\n" + t('room.mailer.autogenerated') + "\n";
- var footer = t('room.mailer.footer');
-
- var url = "mailto:?subject=" + encodeURIComponent(subject) + "&body=" + encodeURIComponent(body) + encodeURIComponent(autogenerated) + encodeURIComponent(footer);
- var win = window.open(url, '_blank');
-
- win.focus();
- });
- });
}
// Display and update all fields related to creating a room in the createRoomModal
$("#create-room-block").click(function(){
$("#create-room-name").val("")
+ $("#create-room-access-code").text("<%= I18n.t("modal.create_room.access_code_placeholder") %>")
+ $("#room_access_code").val(null)
+
$("#createRoomModal form").attr("action", $("body").data('relative-root'))
updateDropdown($(".dropdown-item[value='default']"))
$("#room_mute_on_join").prop("checked", false)
+ $("#room_anyone_can_start").prop("checked", false)
//show all elements & their children with a create-only class
$(".create-only").each(function() {
@@ -95,6 +84,16 @@ $(document).on('turbolinks:load', function(){
})
updateCurrentSettings($(this).closest("#room-block").data("room-settings"))
+
+ accessCode = $(this).closest("#room-block").data("room-access-code")
+
+ if(accessCode){
+ $("#create-room-access-code").text("<%= I18n.t("modal.create_room.access_code") %>: " + accessCode)
+ $("#room_access_code").val(accessCode)
+ } else{
+ $("#create-room-access-code").text("<%= I18n.t("modal.create_room.access_code_placeholder") %>")
+ $("#room_access_code").val(null)
+ }
})
//Update the createRoomModal to show the correct current settings
@@ -106,6 +105,12 @@ $(document).on('turbolinks:load', function(){
$("#room_mute_on_join").prop("checked", false)
}
+ if(settings.anyoneCanStart){
+ $("#room_anyone_can_start").prop("checked", true)
+ } else { //default option
+ $("#room_anyone_can_start").prop("checked", false)
+ }
+
//set dropdown value
if (settings.joinViaHtml5) {
updateDropdown($(".dropdown-item[value='html5']"))
@@ -122,3 +127,21 @@ function updateDropdown(element) {
$("#dropdown-trigger").text(element.text())
$("#room_client").val(element.val())
}
+
+function generateAccessCode(){
+ const accessCodeLength = 6
+ var validCharacters = "0123456789"
+ var accessCode = ""
+
+ for( var i = 0; i < accessCodeLength; i++){
+ accessCode += validCharacters.charAt(Math.floor(Math.random() * validCharacters.length));
+ }
+
+ $("#create-room-access-code").text("<%= I18n.t("modal.create_room.access_code") %>: " + accessCode)
+ $("#room_access_code").val(accessCode)
+}
+
+function ResetAccessCode(){
+ $("#create-room-access-code").text("<%= I18n.t("modal.create_room.access_code_placeholder") %>")
+ $("#room_access_code").val(null)
+}
diff --git a/app/assets/javascripts/search.js b/app/assets/javascripts/search.js
index de2c0f78..6869ebb5 100644
--- a/app/assets/javascripts/search.js
+++ b/app/assets/javascripts/search.js
@@ -22,7 +22,8 @@ $(document).on('turbolinks:load', function(){
(controller == "rooms" && action == "show") ||
(controller == "rooms" && action == "update") ||
(controller == "rooms" && action == "join") ||
- (controller == "users" && action == "recordings")) {
+ (controller == "users" && action == "recordings") ||
+ (controller == "admins" && action == "server_recordings")) {
// Submit search if the user hits enter
$("#search-input").keypress(function(key) {
var keyPressed = key.which
diff --git a/app/assets/javascripts/settings.js b/app/assets/javascripts/settings.js
index bacd22b4..42b7418e 100644
--- a/app/assets/javascripts/settings.js
+++ b/app/assets/javascripts/settings.js
@@ -20,7 +20,7 @@ $(document).on('turbolinks:load', function(){
var action = $("body").data('action');
// Only run on the settings page.
- if ((controller == "users" && action == "edit") || (controller == "users" && action == "update") || (controller == "admins" && action == "index")){
+ if ((controller == "users" && action == "edit") || (controller == "users" && action == "update")){
var settingsButtons = $('.setting-btn');
var settingsViews = $('.setting-view');
diff --git a/app/assets/javascripts/sort.js b/app/assets/javascripts/sort.js
index a7903de6..effa8ea6 100644
--- a/app/assets/javascripts/sort.js
+++ b/app/assets/javascripts/sort.js
@@ -18,7 +18,10 @@ $(document).on('turbolinks:load', function(){
var controller = $("body").data('controller');
var action = $("body").data('action');
- if(controller == "rooms" && action == "show" || controller == "rooms" && action == "update" || controller == "users" && action == "recordings"){
+ if(controller == "rooms" && action == "show"
+ || controller == "rooms" && action == "update"
+ || controller == "users" && action == "recordings"
+ || controller == "admins" && action == "server_recordings"){
// Choose active header
// (Name, Length or Users)
diff --git a/app/assets/stylesheets/rooms.scss b/app/assets/stylesheets/rooms.scss
index e971c0bb..1d037930 100644
--- a/app/assets/stylesheets/rooms.scss
+++ b/app/assets/stylesheets/rooms.scss
@@ -65,3 +65,7 @@
background-color: rgba(0, 0, 0, 0.04);
}
}
+
+.allow-icon-click{
+ pointer-events: auto;
+}
diff --git a/app/assets/stylesheets/utilities/_primary_themes.scss b/app/assets/stylesheets/utilities/_primary_themes.scss
index 33d48d31..c8a37695 100644
--- a/app/assets/stylesheets/utilities/_primary_themes.scss
+++ b/app/assets/stylesheets/utilities/_primary_themes.scss
@@ -84,6 +84,7 @@ a {
color: #6e7687 !important;
&:hover {
color: $primary-color !important;
+ background-color: $primary-color-lighten !important;
}
&:active {
background-color: $primary-color-lighten !important;
@@ -130,6 +131,7 @@ input:focus, select:focus {
}
& a {
+ color: $primary-color !important;
border-color: $primary-color !important;
}
diff --git a/app/controllers/admins_controller.rb b/app/controllers/admins_controller.rb
index 00ab91bc..de2fdd12 100644
--- a/app/controllers/admins_controller.rb
+++ b/app/controllers/admins_controller.rb
@@ -20,10 +20,11 @@ class AdminsController < ApplicationController
include Pagy::Backend
include Themer
include Emailer
+ include Recorder
manage_users = [:edit_user, :promote, :demote, :ban_user, :unban_user, :approve]
site_settings = [:branding, :coloring, :coloring_lighten, :coloring_darken,
- :registration_method, :room_authentication, :room_limit]
+ :registration_method, :room_authentication, :room_limit, :default_recording_visibility]
authorize_resource class: false
before_action :find_user, only: manage_users
@@ -40,11 +41,27 @@ class AdminsController < ApplicationController
@pagy, @users = pagy(user_list)
end
+ # GET /admins/site_settings
+ def site_settings
+ end
+
+ # GET /admins/server_recordings
+ def server_recordings
+ server_rooms = if Rails.configuration.loadbalanced_configuration
+ Room.includes(:owner).where(users: { provider: user_settings_provider }).pluck(:bbb_id)
+ else
+ Room.pluck(:bbb_id)
+ end
+
+ @search, @order_column, @order_direction, recs =
+ all_recordings(server_rooms, @user_domain, params.permit(:search, :column, :direction), true, true)
+ @pagy, @recordings = pagy_array(recs)
+ end
+
# MANAGE USERS
# GET /admins/edit/:user_uid
def edit_user
- render "admins/index", locals: { setting_id: "account" }
end
# POST /admins/promote/:user_uid
@@ -111,7 +128,7 @@ class AdminsController < ApplicationController
# POST /admins/branding
def branding
@settings.update_value("Branding Image", params[:url])
- redirect_to admins_path, flash: { success: I18n.t("administrator.flash.settings") }
+ redirect_to admin_site_settings_path, flash: { success: I18n.t("administrator.flash.settings") }
end
# POST /admins/color
@@ -119,23 +136,23 @@ class AdminsController < ApplicationController
@settings.update_value("Primary Color", params[:color])
@settings.update_value("Primary Color Lighten", color_lighten(params[:color]))
@settings.update_value("Primary Color Darken", color_darken(params[:color]))
- redirect_to admins_path, flash: { success: I18n.t("administrator.flash.settings") }
+ redirect_to admin_site_settings_path, flash: { success: I18n.t("administrator.flash.settings") }
end
def coloring_lighten
@settings.update_value("Primary Color Lighten", params[:color])
- redirect_to admins_path, flash: { success: I18n.t("administrator.flash.settings") }
+ redirect_to admin_site_settings_path, flash: { success: I18n.t("administrator.flash.settings") }
end
def coloring_darken
@settings.update_value("Primary Color Darken", params[:color])
- redirect_to admins_path, flash: { success: I18n.t("administrator.flash.settings") }
+ redirect_to admin_site_settings_path, flash: { success: I18n.t("administrator.flash.settings") }
end
# POST /admins/room_authentication
def room_authentication
@settings.update_value("Room Authentication", params[:value])
- redirect_to admins_path, flash: { success: I18n.t("administrator.flash.settings") }
+ redirect_to admin_site_settings_path, flash: { success: I18n.t("administrator.flash.settings") }
end
# POST /admins/registration_method/:method
@@ -144,11 +161,11 @@ class AdminsController < ApplicationController
# Only allow change to Join by Invitation if user has emails enabled
if !Rails.configuration.enable_email_verification && new_method == Rails.configuration.registration_methods[:invite]
- redirect_to admins_path,
+ redirect_to admin_site_settings_path,
flash: { alert: I18n.t("administrator.flash.invite_email_verification") }
else
@settings.update_value("Registration Method", new_method)
- redirect_to admins_path,
+ redirect_to admin_site_settings_path,
flash: { success: I18n.t("administrator.flash.registration_method_updated") }
end
end
@@ -156,13 +173,20 @@ class AdminsController < ApplicationController
# POST /admins/room_limit
def room_limit
@settings.update_value("Room Limit", params[:limit])
- redirect_to admins_path, flash: { success: I18n.t("administrator.flash.settings") }
+ redirect_to admin_site_settings_path, flash: { success: I18n.t("administrator.flash.settings") }
+ end
+
+ # POST /admins/default_recording_visibility
+ def default_recording_visibility
+ @settings.update_value("Default Recording Visibility", params[:visibility])
+ redirect_to admins_path, flash: { success: I18n.t("administrator.flash.settings") + ". " +
+ I18n.t("administrator.site_settings.recording_visibility.warning") }
end
private
def find_user
- @user = User.find_by!(uid: params[:user_uid])
+ @user = User.where(uid: params[:user_uid]).includes(:roles).first
end
def find_setting
@@ -176,21 +200,19 @@ class AdminsController < ApplicationController
# Gets the list of users based on your configuration
def user_list
- initial_list = if current_user.has_role? :super_admin
- User.where.not(id: current_user.id)
+ initial_list = if current_user.has_cached_role? :super_admin
+ User.where.not(id: current_user.id).includes(:roles)
else
- User.without_role(:super_admin).where.not(id: current_user.id)
+ User.without_role(:super_admin).where.not(id: current_user.id).includes(:roles)
end
- list = @role.present? ? initial_list.with_role(@role.to_sym) : initial_list
-
if Rails.configuration.loadbalanced_configuration
- list.where(provider: user_settings_provider)
- .admins_search(@search)
- .admins_order(@order_column, @order_direction)
+ initial_list.where(provider: user_settings_provider)
+ .admins_search(@search, @role)
+ .admins_order(@order_column, @order_direction)
else
- list.admins_search(@search)
- .admins_order(@order_column, @order_direction)
+ initial_list.admins_search(@search, @role)
+ .admins_order(@order_column, @order_direction)
end
end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d81ff084..36679840 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -121,6 +121,9 @@ class ApplicationController < ActionController::Base
meeting_logout_url: request.base_url + logout_room_path(@room),
meeting_recorded: true,
moderator_message: "#{invite_msg}\n\n#{request.base_url + room_path(@room)}",
+ host: request.host,
+ recording_default_visibility: Setting.find_or_create_by!(provider: user_settings_provider)
+ .get_value("Default Recording Visibility") == "public"
}
end
@@ -131,7 +134,7 @@ class ApplicationController < ActionController::Base
# Checks to make sure that the admin has changed his password from the default
def check_admin_password
- if current_user&.has_role?(:admin) && current_user&.greenlight_account? &&
+ if current_user&.has_cached_role?(:admin) && current_user&.greenlight_account? &&
current_user&.authenticate(Rails.configuration.admin_password_default)
flash.now[:alert] = I18n.t("default_admin",
@@ -179,10 +182,10 @@ class ApplicationController < ActionController::Base
# Checks if the user is banned and logs him out if he is
def check_user_role
- if current_user&.has_role? :denied
+ if current_user&.has_cached_role? :denied
session.delete(:user_id)
redirect_to root_path, flash: { alert: I18n.t("registration.banned.fail") }
- elsif current_user&.has_role? :pending
+ elsif current_user&.has_cached_role? :pending
session.delete(:user_id)
redirect_to root_path, flash: { alert: I18n.t("registration.approval.fail") }
end
diff --git a/app/controllers/concerns/emailer.rb b/app/controllers/concerns/emailer.rb
index 0247296c..4dc14572 100644
--- a/app/controllers/concerns/emailer.rb
+++ b/app/controllers/concerns/emailer.rb
@@ -64,13 +64,19 @@ module Emailer
def send_approval_user_signup_email(user)
return unless Rails.configuration.enable_email_verification
- UserMailer.approval_user_signup(user, admins_url, logo_image, user_color, admin_emails).deliver_now
+ admin_emails = admin_emails()
+ unless admin_emails.empty?
+ UserMailer.approval_user_signup(user, admins_url, logo_image, user_color, admin_emails).deliver_now
+ end
end
def send_invite_user_signup_email(user)
return unless Rails.configuration.enable_email_verification
- UserMailer.invite_user_signup(user, admins_url, logo_image, user_color, admin_emails).deliver_now
+ admin_emails = admin_emails()
+ unless admin_emails.empty?
+ UserMailer.invite_user_signup(user, admins_url, logo_image, user_color, admin_emails).deliver_now
+ end
end
private
diff --git a/app/models/concerns/api_concern.rb b/app/controllers/concerns/recorder.rb
similarity index 51%
rename from app/models/concerns/api_concern.rb
rename to app/controllers/concerns/recorder.rb
index dd766d25..0833e5f8 100644
--- a/app/models/concerns/api_concern.rb
+++ b/app/controllers/concerns/recorder.rb
@@ -16,14 +16,53 @@
# You should have received a copy of the GNU Lesser General Public License along
# with BigBlueButton; if not, see .
-module APIConcern
+module Recorder
extend ActiveSupport::Concern
+ include ::BbbApi
+
+ # Fetches all recordings for a room.
+ def recordings(room_bbb_id, provider, search_params = {}, ret_search_params = false)
+ res = bbb(provider).get_recordings(meetingID: room_bbb_id)
+
+ format_recordings(res, search_params, ret_search_params)
+ end
+
+ # Fetches a rooms public recordings.
+ def public_recordings(room_bbb_id, provider, search_params = {}, ret_search_params = false)
+ search, order_col, order_dir, recs = recordings(room_bbb_id, provider, search_params, ret_search_params)
+ [search, order_col, order_dir, recs.select { |r| r[:metadata][:"gl-listed"] == "true" }]
+ end
+
+ # Makes paginated API calls to get recordings
+ def all_recordings(room_bbb_ids, provider, search_params = {}, ret_search_params = false, search_name = false)
+ pag_num = Rails.configuration.pagination_number
+
+ pag_loops = room_bbb_ids.length / pag_num - 1
+
+ res = { recordings: [] }
+
+ (0..pag_loops).each do |i|
+ pag_rooms = room_bbb_ids[pag_num * i, pag_num]
+
+ # bbb.get_recordings returns an object
+ # take only the array portion of the object that is returned
+ full_res = bbb(provider).get_recordings(meetingID: pag_rooms)
+ res[:recordings].push(*full_res[:recordings])
+ end
+
+ last_pag_room = room_bbb_ids[pag_num * (pag_loops + 1), room_bbb_ids.length % pag_num]
+
+ full_res = bbb(provider).get_recordings(meetingID: last_pag_room)
+ res[:recordings].push(*full_res[:recordings])
+
+ format_recordings(res, search_params, ret_search_params, search_name)
+ end
# Format, filter, and sort recordings to match their current use in the app
- def format_recordings(api_res, search_params, ret_search_params)
+ def format_recordings(api_res, search_params, ret_search_params, search_name = false)
search = search_params[:search] || ""
order_col = search_params[:column] && search_params[:direction] != "none" ? search_params[:column] : "end_time"
- order_dir = search_params[:column] && search_params[:direction] != "none" ? search_params[:direction] : "asc"
+ order_dir = search_params[:column] && search_params[:direction] != "none" ? search_params[:direction] : "desc"
search = search.downcase
@@ -40,7 +79,7 @@ module APIConcern
r.delete(:playback)
end
- recs = filter_recordings(api_res, search)
+ recs = filter_recordings(api_res, search, search_name)
recs = sort_recordings(recs, order_col, order_dir)
if ret_search_params
@@ -50,7 +89,7 @@ module APIConcern
end
end
- def filter_recordings(api_res, search)
+ def filter_recordings(api_res, search, search_name = false)
api_res[:recordings].select do |r|
(!r[:metadata].nil? && ((!r[:metadata][:name].nil? &&
r[:metadata][:name].downcase.include?(search)) ||
@@ -59,33 +98,34 @@ module APIConcern
((r[:metadata].nil? || r[:metadata][:name].nil?) &&
r[:name].downcase.include?(search)) ||
r[:participants].include?(search) ||
- !r[:playbacks].select { |p| p[:type].downcase.include?(search) }.empty?
+ !r[:playbacks].select { |p| p[:type].downcase.include?(search) }.empty? ||
+ (search_name && Room.find_by(bbb_id: r[:meetingID]).owner.email.downcase.include?(search))
end
end
def sort_recordings(recs, order_col, order_dir)
recs = case order_col
when "end_time"
- recs.sort_by { |r| r[:endTime] }
+ recs.sort_by { |r| r[:endTime] }
when "name"
- recs.sort_by do |r|
- if !r[:metadata].nil? && !r[:metadata][:name].nil?
- r[:metadata][:name].downcase
- else
- r[:name].downcase
- end
- end
+ recs.sort_by do |r|
+ if !r[:metadata].nil? && !r[:metadata][:name].nil?
+ r[:metadata][:name].downcase
+ else
+ r[:name].downcase
+ end
+ end
when "length"
- recs.sort_by { |r| r[:playbacks].reject { |p| p[:type] == "statistics" }.first[:length] }
+ recs.sort_by { |r| r[:playbacks].reject { |p| p[:type] == "statistics" }.first[:length] }
when "users"
- recs.sort_by { |r| r[:participants] }
+ recs.sort_by { |r| r[:participants] }
when "visibility"
- recs.sort_by { |r| r[:metadata][:"gl-listed"] }
+ recs.sort_by { |r| r[:metadata][:"gl-listed"] }
when "formats"
- recs.sort_by { |r| r[:playbacks].first[:type].downcase }
- else
- recs.sort_by { |r| r[:endTime] }
- end
+ recs.sort_by { |r| r[:playbacks].first[:type].downcase }
+ else
+ recs.sort_by { |r| r[:endTime] }
+ end
if order_dir == 'asc'
recs
diff --git a/app/controllers/concerns/themer.rb b/app/controllers/concerns/themer.rb
index 97eb6b80..2893ea27 100644
--- a/app/controllers/concerns/themer.rb
+++ b/app/controllers/concerns/themer.rb
@@ -24,7 +24,7 @@ module Themer
# Uses the built in Sass Engine to lighten the color
dummy_scss = "h1 { color: $lighten; }"
- compiled = Sass::Engine.new("$lighten:lighten(#{color}, 40%);" + dummy_scss, syntax: :scss).render
+ compiled = SassC::Engine.new("$lighten:lighten(#{color}, 40%);" + dummy_scss, syntax: :scss).render
string_locater = 'color: '
color_start = compiled.index(string_locater) + string_locater.length
@@ -37,7 +37,7 @@ module Themer
# Uses the built in Sass Engine to darken the color
dummy_scss = "h1 { color: $darken; }"
- compiled = Sass::Engine.new("$darken:darken(#{color}, 10%);" + dummy_scss, syntax: :scss).render
+ compiled = SassC::Engine.new("$darken:darken(#{color}, 10%);" + dummy_scss, syntax: :scss).render
string_locater = 'color: '
color_start = compiled.index(string_locater) + string_locater.length
diff --git a/app/controllers/recordings_controller.rb b/app/controllers/recordings_controller.rb
index e1313f89..2c4446ae 100644
--- a/app/controllers/recordings_controller.rb
+++ b/app/controllers/recordings_controller.rb
@@ -50,6 +50,11 @@ class RecordingsController < ApplicationController
# Ensure the user is logged into the room they are accessing.
def verify_room_ownership
- redirect_to root_path unless @room.owned_by?(current_user)
+ if !current_user ||
+ !@room.owned_by?(current_user) ||
+ !current_user.has_cached_role?(:admin) ||
+ !current_user.has_cached_role?(:super_admin)
+ redirect_to root_path
+ end
end
end
diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb
index fde621b1..311d357c 100644
--- a/app/controllers/rooms_controller.rb
+++ b/app/controllers/rooms_controller.rb
@@ -19,12 +19,13 @@
class RoomsController < ApplicationController
include RecordingsHelper
include Pagy::Backend
+ include Recorder
before_action :validate_accepted_terms, unless: -> { !Rails.configuration.terms }
before_action :validate_verified_email, except: [:show, :join],
unless: -> { !Rails.configuration.enable_email_verification }
before_action :find_room, except: :create
- before_action :verify_room_ownership, except: [:create, :show, :join, :logout]
+ before_action :verify_room_ownership, except: [:create, :show, :join, :logout, :login]
before_action :verify_room_owner_verified, only: [:show, :join],
unless: -> { !Rails.configuration.enable_email_verification }
before_action :verify_user_not_admin, only: [:show]
@@ -35,9 +36,10 @@ class RoomsController < ApplicationController
return redirect_to current_user.main_room, flash: { alert: I18n.t("room.room_limit") } if room_limit_exceeded
- @room = Room.new(name: room_params[:name])
+ @room = Room.new(name: room_params[:name], access_code: room_params[:access_code])
@room.owner = current_user
- @room.room_settings = create_room_settings_string(room_params[:mute_on_join], room_params[:client])
+ @room.room_settings = create_room_settings_string(room_params[:mute_on_join], room_params[:client],
+ room_params[:anyone_can_start])
if @room.save
if room_params[:auto_join] == "1"
@@ -54,13 +56,15 @@ class RoomsController < ApplicationController
# GET /:room_uid
def show
+ @is_running = @room.running?
+ @anyone_can_start = JSON.parse(@room[:room_settings])["anyoneCanStart"]
+
if current_user && @room.owned_by?(current_user)
@search, @order_column, @order_direction, recs =
- @room.recordings(params.permit(:search, :column, :direction), true)
+ recordings(@room.bbb_id, @user_domain, params.permit(:search, :column, :direction), true)
@pagy, @recordings = pagy_array(recs)
- @is_running = @room.running?
else
# Get users name
@name = if current_user
@@ -72,7 +76,7 @@ class RoomsController < ApplicationController
end
@search, @order_column, @order_direction, pub_recs =
- @room.public_recordings(params.permit(:search, :column, :direction), true)
+ public_recordings(@room.bbb_id, @user_domain, params.permit(:search, :column, :direction), true)
@pagy, @public_recordings = pagy_array(pub_recs)
@@ -105,6 +109,12 @@ class RoomsController < ApplicationController
opts = default_meeting_options
unless @room.owned_by?(current_user)
+ # Don't allow users to join unless they have a valid access code or the room doesn't
+ # have an access code
+ if @room.access_code && !@room.access_code.empty? && @room.access_code != session[:access_code]
+ return redirect_to room_path(room_uid: params[:room_uid]), flash: { alert: I18n.t("room.access_code_required") }
+ end
+
# Assign join name if passed.
if params[@room.invite_path]
@join_name = params[@room.invite_path][:join_name]
@@ -117,31 +127,7 @@ class RoomsController < ApplicationController
# create or update cookie with join name
cookies.encrypted[:greenlight_name] = @join_name unless cookies.encrypted[:greenlight_name] == @join_name
- if @room.running? || @room.owned_by?(current_user)
- # Determine if the user needs to join as a moderator.
- opts[:user_is_moderator] = @room.owned_by?(current_user)
-
- # Check if the user has specified which client to use
- room_settings = JSON.parse(@room[:room_settings])
- opts[:join_via_html5] = room_settings["joinViaHtml5"] if room_settings["joinViaHtml5"]
-
- if current_user
- redirect_to @room.join_path(current_user.name, opts, current_user.uid)
- else
- join_name = params[:join_name] || params[@room.invite_path][:join_name]
- redirect_to @room.join_path(join_name, opts)
- end
- else
-
- search_params = params[@room.invite_path] || params
- @search, @order_column, @order_direction, pub_recs =
- @room.public_recordings(search_params.permit(:search, :column, :direction), true)
-
- @pagy, @public_recordings = pagy_array(pub_recs)
-
- # They need to wait until the meeting begins.
- render :wait
- end
+ join_room(opts)
end
# DELETE /:room_uid
@@ -184,6 +170,8 @@ class RoomsController < ApplicationController
update_room_attributes("settings")
# Update the rooms name if it has been changed
update_room_attributes("name") if @room.name != room_params[:name]
+ # Update the room's access code if it has changed
+ update_room_attributes("access_code") if @room.access_code != room_params[:access_code]
rescue StandardError
flash[:alert] = I18n.t("room.update_settings_error")
else
@@ -198,6 +186,15 @@ class RoomsController < ApplicationController
redirect_to @room
end
+ # POST /:room_uid/login
+ def login
+ session[:access_code] = room_params[:access_code]
+
+ flash[:alert] = I18n.t("room.access_code_required") if session[:access_code] != @room.access_code
+
+ redirect_to room_path(@room.uid)
+ end
+
private
def update_room_attributes(update_type)
@@ -205,13 +202,16 @@ class RoomsController < ApplicationController
if update_type.eql? "name"
@room.update_attributes(name: params[:room_name] || room_params[:name])
elsif update_type.eql? "settings"
- room_settings_string = create_room_settings_string(room_params[:mute_on_join], room_params[:client])
+ room_settings_string = create_room_settings_string(room_params[:mute_on_join], room_params[:client],
+ room_params[:anyone_can_start])
@room.update_attributes(room_settings: room_settings_string)
+ elsif update_type.eql? "access_code"
+ @room.update_attributes(access_code: room_params[:access_code])
end
end
end
- def create_room_settings_string(mute_res, client_res)
+ def create_room_settings_string(mute_res, client_res, start_res)
room_settings = {}
room_settings["muteOnStart"] = mute_res == "1"
@@ -221,11 +221,13 @@ class RoomsController < ApplicationController
room_settings["joinViaHtml5"] = false
end
+ room_settings["anyoneCanStart"] = start_res == "1"
+
room_settings.to_json
end
def room_params
- params.require(:room).permit(:name, :auto_join, :mute_on_join, :client)
+ params.require(:room).permit(:name, :auto_join, :mute_on_join, :client, :access_code, :anyone_can_start)
end
# Find the room from the uid.
@@ -274,7 +276,7 @@ class RoomsController < ApplicationController
end
def verify_user_not_admin
- redirect_to admins_path if current_user && current_user&.has_role?(:super_admin)
+ redirect_to admins_path if current_user && current_user&.has_cached_role?(:super_admin)
end
def auth_required
@@ -287,8 +289,38 @@ class RoomsController < ApplicationController
# Does not apply to admin
# 15+ option is used as unlimited
- return false if current_user&.has_role?(:admin) || limit == 15
+ return false if current_user&.has_cached_role?(:admin) || limit == 15
current_user.rooms.count >= limit
end
+
+ def join_room(opts)
+ room_settings = JSON.parse(@room[:room_settings])
+
+ if @room.running? || @room.owned_by?(current_user) || room_settings["anyoneCanStart"]
+
+ # Determine if the user needs to join as a moderator.
+ opts[:user_is_moderator] = @room.owned_by?(current_user) ||
+ (room_settings["anyoneCanStart"] && !@room.running?)
+
+ # Check if the user has specified which client to use
+ opts[:join_via_html5] = room_settings["joinViaHtml5"] if room_settings["joinViaHtml5"]
+
+ if current_user
+ redirect_to @room.join_path(current_user.name, opts, current_user.uid)
+ else
+ join_name = params[:join_name] || params[@room.invite_path][:join_name]
+ redirect_to @room.join_path(join_name, opts)
+ end
+ else
+ search_params = params[@room.invite_path] || params
+ @search, @order_column, @order_direction, pub_recs =
+ public_recordings(@room.bbb_id, @user_domain, search_params.permit(:search, :column, :direction), true)
+
+ @pagy, @public_recordings = pagy_array(pub_recs)
+
+ # They need to wait until the meeting begins.
+ render :wait
+ end
+ end
end
diff --git a/app/controllers/themes_controller.rb b/app/controllers/themes_controller.rb
index 3ff1b3ee..d10521ca 100644
--- a/app/controllers/themes_controller.rb
+++ b/app/controllers/themes_controller.rb
@@ -30,7 +30,7 @@ class ThemesController < ApplicationController
@file_contents = File.read(file_name)
# Include the variables and covert scss file to css
- @compiled = Sass::Engine.new("$primary-color:#{color};" \
+ @compiled = SassC::Engine.new("$primary-color:#{color};" \
"$primary-color-lighten:#{lighten_color};" \
"$primary-color-darken:#{darken_color};" +
@file_contents, syntax: :scss).render
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index dd89d633..1dd7267f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -21,6 +21,7 @@ class UsersController < ApplicationController
include Pagy::Backend
include Emailer
include Registrar
+ include Recorder
before_action :find_user, only: [:edit, :update, :destroy]
before_action :ensure_unauthenticated, only: [:new, :create]
@@ -66,6 +67,12 @@ class UsersController < ApplicationController
flash[:alert] = I18n.t("registration.deprecated.new_signin")
session[:old_twitter_user_id] = params[:old_twitter_user_id] unless params[:old_twitter_user_id].nil?
end
+
+ providers = configured_providers
+ if (!allow_user_signup? || !allow_greenlight_accounts?) && providers.count == 1 &&
+ !Rails.configuration.loadbalanced_configuration
+ return redirect_to "#{Rails.configuration.relative_url_root}/auth/#{providers.first}"
+ end
end
# GET /ldap_signin
@@ -103,6 +110,8 @@ class UsersController < ApplicationController
# PATCH /u/:user_uid/edit
def update
+ redirect_path = current_user.admin_of?(@user) ? admins_path : edit_user_path(@user)
+
if params[:setting] == "password"
# Update the users password.
errors = {}
@@ -123,7 +132,7 @@ class UsersController < ApplicationController
if errors.empty? && @user.save
# Notify the user that their account has been updated.
flash[:success] = I18n.t("info_update_success")
- redirect_to edit_user_path(@user)
+ redirect_to redirect_path
else
# Append custom errors.
errors.each { |k, v| @user.errors.add(k, v) }
@@ -132,11 +141,11 @@ class UsersController < ApplicationController
elsif user_params[:email] != @user.email && @user.update_attributes(user_params)
@user.update_attributes(email_verified: false)
flash[:success] = I18n.t("info_update_success")
- redirect_to edit_user_path(@user)
+ redirect_to redirect_path
elsif @user.update_attributes(user_params)
update_locale(@user)
flash[:success] = I18n.t("info_update_success")
- redirect_to edit_user_path(@user)
+ redirect_to redirect_path
else
render :edit, params: { settings: params[:settings] }
end
@@ -165,7 +174,8 @@ class UsersController < ApplicationController
def recordings
if current_user && current_user.uid == params[:user_uid]
@search, @order_column, @order_direction, recs =
- current_user.all_recordings(params.permit(:search, :column, :direction), true)
+ all_recordings(current_user.rooms.pluck(:bbb_id), current_user.provider,
+ params.permit(:search, :column, :direction), true)
@pagy, @recordings = pagy_array(recs)
else
redirect_to root_path
@@ -185,7 +195,7 @@ class UsersController < ApplicationController
private
def find_user
- @user = User.find_by!(uid: params[:user_uid])
+ @user = User.where(uid: params[:user_uid]).includes(:roles).first
end
def ensure_unauthenticated
diff --git a/app/helpers/admins_helper.rb b/app/helpers/admins_helper.rb
index af23f731..faf4b1cd 100644
--- a/app/helpers/admins_helper.rb
+++ b/app/helpers/admins_helper.rb
@@ -19,6 +19,18 @@
module AdminsHelper
include Pagy::Frontend
+ # Returns the action method of the current page
+ def active_page
+ route = Rails.application.routes.recognize_path(request.env['PATH_INFO'])
+
+ route[:action]
+ end
+
+ # Gets the email of the room owner to which the recording belongs to
+ def recording_owner_email(room_id)
+ Room.find_by(bbb_id: room_id).owner.email
+ end
+
def display_invite
current_page?(admins_path) && invite_registration
end
@@ -43,6 +55,15 @@ module AdminsHelper
end
end
+ def recording_default_visibility_string
+ if Setting.find_or_create_by!(provider: user_settings_provider)
+ .get_value("Default Recording Visibility") == "public"
+ I18n.t("administrator.site_settings.recording_visibility.public")
+ else
+ I18n.t("administrator.site_settings.recording_visibility.private")
+ end
+ end
+
def registration_method_string
case registration_method
when Rails.configuration.registration_methods[:open]
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ec81ac71..c71965df 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -107,7 +107,7 @@ module ApplicationHelper
# Returns the page that the logo redirects to when clicked on
def home_page
return root_path unless current_user
- return admins_path if current_user.has_role? :super_admin
+ return admins_path if current_user.has_cached_role? :super_admin
current_user.main_room
end
end
diff --git a/app/helpers/rooms_helper.rb b/app/helpers/rooms_helper.rb
index 009fd77d..26bfaf65 100644
--- a/app/helpers/rooms_helper.rb
+++ b/app/helpers/rooms_helper.rb
@@ -37,7 +37,7 @@ module RoomsHelper
# Does not apply to admin or users that aren't signed in
# 15+ option is used as unlimited
- return false if current_user&.has_role?(:admin) || limit == 15
+ return false if current_user&.has_cached_role?(:admin) || limit == 15
current_user.rooms.length >= limit
end
@@ -46,7 +46,7 @@ module RoomsHelper
# Get how many rooms need to be deleted to reach allowed room number
limit = Setting.find_or_create_by!(provider: user_settings_provider).get_value("Room Limit").to_i
- return false if current_user&.has_role?(:admin) || limit == 15
+ return false if current_user&.has_cached_role?(:admin) || limit == 15
@diff = current_user.rooms.count - limit
@diff.positive? && current_user.rooms.pluck(:id).index(room.id) + 1 > limit
diff --git a/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
index c9ab3525..dfce58c1 100644
--- a/app/helpers/sessions_helper.rb
+++ b/app/helpers/sessions_helper.rb
@@ -61,7 +61,17 @@ module SessionsHelper
# Retrieves the current user.
def current_user
- @current_user ||= User.find_by(id: session[:user_id])
+ @current_user ||= User.where(id: session[:user_id]).includes(:roles).first
+
+ if Rails.configuration.loadbalanced_configuration
+ if @current_user && !@current_user.has_role?(:super_admin) &&
+ @current_user.provider != @user_domain
+ @current_user = nil
+ session.clear
+ end
+ end
+
+ @current_user
end
def generate_checksum(user_domain, redirect_url, secret)
diff --git a/app/helpers/theming_helper.rb b/app/helpers/theming_helper.rb
index e3f073fb..05479980 100644
--- a/app/helpers/theming_helper.rb
+++ b/app/helpers/theming_helper.rb
@@ -31,7 +31,7 @@ module ThemingHelper
# Returns the user's provider in the settings context
def user_settings_provider
- if Rails.configuration.loadbalanced_configuration && current_user && !current_user&.has_role?(:super_admin)
+ if Rails.configuration.loadbalanced_configuration && current_user && !current_user&.has_cached_role?(:super_admin)
current_user.provider
elsif Rails.configuration.loadbalanced_configuration
@user_domain
diff --git a/app/models/room.rb b/app/models/room.rb
index b6862591..b3ee4713 100644
--- a/app/models/room.rb
+++ b/app/models/room.rb
@@ -19,7 +19,6 @@
require 'bbb_api'
class Room < ApplicationRecord
- include ::APIConcern
include ::BbbApi
before_create :setup
@@ -40,7 +39,7 @@ class Room < ApplicationRecord
# Checks if a room is running on the BigBlueButton server.
def running?
- bbb.is_meeting_running?(bbb_id)
+ bbb(owner.provider).is_meeting_running?(bbb_id)
end
# Determines the invite path for the room.
@@ -57,12 +56,15 @@ class Room < ApplicationRecord
attendeePW: attendee_pw,
moderatorOnlyMessage: options[:moderator_message],
muteOnStart: options[:mute_on_start] || false,
- "meta_#{META_LISTED}": false,
+ "meta_#{META_LISTED}": options[:recording_default_visibility] || false,
+ "meta_bbb-origin-version": Greenlight::Application::VERSION,
+ "meta_bbb-origin": "Greenlight",
+ "meta_bbb-origin-server-name": options[:host]
}
# Send the create request.
begin
- meeting = bbb.create_meeting(name, bbb_id, create_options)
+ meeting = bbb(owner.provider).create_meeting(name, bbb_id, create_options)
# Update session info.
unless meeting[:messageKey] == 'duplicateWarning'
update_attributes(sessions: sessions + 1,
@@ -85,10 +87,10 @@ class Room < ApplicationRecord
options[:user_is_moderator] ||= false
options[:meeting_recorded] ||= false
- return call_invalid_res unless bbb
+ return call_invalid_res unless bbb(owner.provider)
# Get the meeting info.
- meeting_info = bbb.get_meeting_info(bbb_id, nil)
+ meeting_info = bbb(owner.provider).get_meeting_info(bbb_id, nil)
# Determine the password to use when joining.
password = if options[:user_is_moderator]
@@ -102,7 +104,7 @@ class Room < ApplicationRecord
join_opts[:userID] = uid if uid
join_opts[:joinViaHtml5] = options[:join_via_html5] if options[:join_via_html5]
- bbb.join_meeting_url(bbb_id, name, password, join_opts)
+ bbb(owner.provider).join_meeting_url(bbb_id, name, password, join_opts)
end
# Notify waiting users that a meeting has started.
@@ -112,7 +114,7 @@ class Room < ApplicationRecord
# Retrieves all the users in a room.
def participants
- res = bbb.get_meeting_info(bbb_id, nil)
+ res = bbb(owner.provider).get_meeting_info(bbb_id, nil)
res[:attendees].map do |att|
User.find_by(uid: att[:userID], name: att[:fullName])
end
@@ -121,27 +123,18 @@ class Room < ApplicationRecord
[]
end
- # Fetches all recordings for a room.
- def recordings(search_params = {}, ret_search_params = false)
- res = bbb.get_recordings(meetingID: bbb_id)
-
- format_recordings(res, search_params, ret_search_params)
- end
-
- # Fetches a rooms public recordings.
- def public_recordings(search_params = {}, ret_search_params = false)
- search, order_col, order_dir, recs = recordings(search_params, ret_search_params)
- [search, order_col, order_dir, recs.select { |r| r[:metadata][:"gl-listed"] == "true" }]
+ def recording_count
+ bbb(owner.provider).get_recordings(meetingID: bbb_id)[:recordings].length
end
def update_recording(record_id, meta)
meta[:recordID] = record_id
- bbb.send_api_request("updateRecordings", meta)
+ bbb(owner.provider).send_api_request("updateRecordings", meta)
end
# Deletes a recording from a room.
def delete_recording(record_id)
- bbb.delete_recordings(record_id)
+ bbb(owner.provider).delete_recordings(record_id)
end
private
@@ -156,7 +149,7 @@ class Room < ApplicationRecord
# Deletes all recordings associated with the room.
def delete_all_recordings
- record_ids = recordings.map { |r| r[:recordID] }
+ record_ids = bbb(owner.provider).get_recordings(meetingID: bbb_id)[:recordings].pluck(:recordID)
delete_recording(record_ids) unless record_ids.empty?
end
diff --git a/app/models/user.rb b/app/models/user.rb
index a3428a7c..a92a87b8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -20,7 +20,6 @@ require 'bbb_api'
class User < ApplicationRecord
rolify
- include ::APIConcern
include ::BbbApi
attr_accessor :reset_token
@@ -119,7 +118,7 @@ class User < ApplicationRecord
end
end
- def self.admins_search(string)
+ def self.admins_search(string, role)
active_database = Rails.configuration.database_configuration[Rails.env]["adapter"]
# Postgres requires created_at to be cast to a string
created_at_query = if active_database == "postgresql"
@@ -128,38 +127,29 @@ class User < ApplicationRecord
"created_at"
end
- search_query = "users.name LIKE :search OR email LIKE :search OR username LIKE :search" \
- " OR users.#{created_at_query} LIKE :search OR provider LIKE :search"
+ search_query = ""
+ role_search_param = ""
+ if role.present?
+ search_query = "(users.name LIKE :search OR email LIKE :search OR username LIKE :search" \
+ " OR users.#{created_at_query} LIKE :search OR provider LIKE :search)" \
+ " AND roles.name = :roles_search"
+ role_search_param = role
+ else
+ search_query = "users.name LIKE :search OR email LIKE :search OR username LIKE :search" \
+ " OR users.#{created_at_query} LIKE :search OR provider LIKE :search" \
+ " OR roles.name LIKE :roles_search"
+ role_search_param = "%#{string}%".downcase
+ end
+
search_param = "%#{string}%"
- where(search_query, search: search_param)
+ joins("LEFT OUTER JOIN users_roles ON users_roles.user_id = users.id LEFT OUTER JOIN roles " \
+ "ON roles.id = users_roles.role_id").distinct
+ .where(search_query, search: search_param, roles_search: role_search_param)
end
def self.admins_order(column, direction)
- order("#{column} #{direction}")
- end
-
- def all_recordings(search_params = {}, ret_search_params = false)
- pag_num = Rails.configuration.pagination_number
-
- pag_loops = rooms.length / pag_num - 1
-
- res = { recordings: [] }
-
- (0..pag_loops).each do |i|
- pag_rooms = rooms[pag_num * i, pag_num]
-
- # bbb.get_recordings returns an object
- # take only the array portion of the object that is returned
- full_res = bbb.get_recordings(meetingID: pag_rooms.pluck(:bbb_id))
- res[:recordings].push(*full_res[:recordings])
- end
-
- last_pag_room = rooms[pag_num * (pag_loops + 1), rooms.length % pag_num]
-
- full_res = bbb.get_recordings(meetingID: last_pag_room.pluck(:bbb_id))
- res[:recordings].push(*full_res[:recordings])
-
- format_recordings(res, search_params, ret_search_params)
+ # Arel.sql to avoid sql injection
+ order(Arel.sql("#{column} #{direction}"))
end
# Activates an account and initialize a users main room
@@ -231,13 +221,17 @@ class User < ApplicationRecord
def admin_of?(user)
if Rails.configuration.loadbalanced_configuration
- if has_role? :super_admin
+ # Pulls in the user roles if they weren't request in the original request
+ # So the has_cached_role? doesn't always return false
+ user.roles
+ if has_cached_role? :super_admin
id != user.id
else
- (has_role? :admin) && (id != user.id) && (provider == user.provider) && (!user.has_role? :super_admin)
+ (has_cached_role? :admin) && (id != user.id) && (provider == user.provider) &&
+ (!user.has_cached_role? :super_admin)
end
else
- ((has_role? :admin) || (has_role? :super_admin)) && (id != user.id)
+ ((has_cached_role? :admin) || (has_cached_role? :super_admin)) && (id != user.id)
end
end
diff --git a/app/views/admins/components/_menu_buttons.html.erb b/app/views/admins/components/_menu_buttons.html.erb
new file mode 100644
index 00000000..7dfcc8ff
--- /dev/null
+++ b/app/views/admins/components/_menu_buttons.html.erb
@@ -0,0 +1,26 @@
+<%
+# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
+# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+# This program is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free Software
+# Foundation; either version 3.0 of the License, or (at your option) any later
+# version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see .
+%>
+
+
+ <%= link_to admins_path, class: "list-group-item list-group-item-action dropdown-item #{"active" if active_page == "index"}" do %>
+ <%= t("administrator.users.title") %>
+ <% end %>
+ <%= link_to admin_site_settings_path, class: "list-group-item list-group-item-action dropdown-item #{"active" if active_page == "site_settings"}" do %>
+ <%= t("administrator.site_settings.title") %>
+ <% end %>
+ <%= link_to admin_recordings_path, class: "list-group-item list-group-item-action dropdown-item #{"active" if active_page == "server_recordings"}" do %>
+ <%= t("administrator.recordings.title") %>
+ <% end %>
+
\ No newline at end of file
diff --git a/app/views/admins/components/_recordings.html.erb b/app/views/admins/components/_recordings.html.erb
new file mode 100644
index 00000000..2ffa9ee9
--- /dev/null
+++ b/app/views/admins/components/_recordings.html.erb
@@ -0,0 +1,91 @@
+<%
+# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
+# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+# This program is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free Software
+# Foundation; either version 3.0 of the License, or (at your option) any later
+# version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see .
+%>
+
+
+ <% else %>
+ <% @recordings.each do |recording| %>
+ <%= render "admins/components/server_recording_row", recording: recording %>
+ <% end %>
+ <% end %>
+
+
+ <% if !@recordings.empty?%>
+
+ <%== pagy_bootstrap_nav(@pagy) %>
+
+ <% end %>
+
+
+
\ No newline at end of file
diff --git a/app/views/admins/components/_server_recording_row.html.erb b/app/views/admins/components/_server_recording_row.html.erb
new file mode 100644
index 00000000..c6234755
--- /dev/null
+++ b/app/views/admins/components/_server_recording_row.html.erb
@@ -0,0 +1,81 @@
+<%
+# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
+# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+# This program is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free Software
+# Foundation; either version 3.0 of the License, or (at your option) any later
+# version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see .
+%>
+
+
+ <% p = recording[:playbacks].find do |p| p.key?(:length) end %>
+ <% if p %>
+ <%= t("recording.email") %>
+
+ <% end %>
+ <%= button_to delete_recording_path(meetingID: recording[:meetingID], record_id: recording[:recordID]), method: :delete, class: "dropdown-item" do %>
+ <%= t("delete") %>
+ <% end %>
+
+
+
+
diff --git a/app/views/admins/components/_setting_view.html.erb b/app/views/admins/components/_setting_view.html.erb
new file mode 100644
index 00000000..1b2eb6ec
--- /dev/null
+++ b/app/views/admins/components/_setting_view.html.erb
@@ -0,0 +1,26 @@
+<%
+# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
+# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+# This program is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free Software
+# Foundation; either version 3.0 of the License, or (at your option) any later
+# version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see .
+%>
+
+<%= content_tag(:div, id: setting_id, class: "setting-view card") do %>
+
+<% end %>
diff --git a/app/views/shared/admin_settings/_site_settings.html.erb b/app/views/admins/components/_settings.html.erb
similarity index 85%
rename from app/views/shared/admin_settings/_site_settings.html.erb
rename to app/views/admins/components/_settings.html.erb
index e9721d84..a32cfe0a 100644
--- a/app/views/shared/admin_settings/_site_settings.html.erb
+++ b/app/views/admins/components/_settings.html.erb
@@ -98,6 +98,27 @@
+
+
+
+
+
+
+
+
+
+ <%= button_to admin_recording_visibility_path(visibility: "public"), class: "dropdown-item" do %>
+ <%= t("administrator.site_settings.recording_visibility.public") %>
+ <% end %>
+ <%= button_to admin_recording_visibility_path(visibility: "private"), class: "dropdown-item" do %>
+ <%= t("administrator.site_settings.recording_visibility.private") %>
+ <% end %>
+
+
+
+
diff --git a/app/views/shared/admin_settings/_users.html.erb b/app/views/admins/components/_users.html.erb
similarity index 90%
rename from app/views/shared/admin_settings/_users.html.erb
rename to app/views/admins/components/_users.html.erb
index df8422fa..5d1ad1bd 100644
--- a/app/views/shared/admin_settings/_users.html.erb
+++ b/app/views/admins/components/_users.html.erb
@@ -13,6 +13,21 @@
# with BigBlueButton; if not, see .
%>
+<%
+# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
+# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+# This program is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free Software
+# Foundation; either version 3.0 of the License, or (at your option) any later
+# version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see .
+%>
+
<% if @role.present? %>
<%= render "shared/components/admins_tags" %>
<% end %>
@@ -146,3 +161,4 @@
<%= render "shared/modals/invite_user_modal" %>
+
diff --git a/app/views/admins/edit_user.html.erb b/app/views/admins/edit_user.html.erb
new file mode 100644
index 00000000..54beeb8e
--- /dev/null
+++ b/app/views/admins/edit_user.html.erb
@@ -0,0 +1,27 @@
+<%
+# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
+# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+# This program is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free Software
+# Foundation; either version 3.0 of the License, or (at your option) any later
+# version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see .
+%>
+
+
diff --git a/app/views/admins/server_recordings.html.erb b/app/views/admins/server_recordings.html.erb
new file mode 100644
index 00000000..a07b19cb
--- /dev/null
+++ b/app/views/admins/server_recordings.html.erb
@@ -0,0 +1,27 @@
+<%
+# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
+# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+# This program is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free Software
+# Foundation; either version 3.0 of the License, or (at your option) any later
+# version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see .
+%>
+
+
diff --git a/app/views/admins/site_settings.html.erb b/app/views/admins/site_settings.html.erb
new file mode 100644
index 00000000..c246ce71
--- /dev/null
+++ b/app/views/admins/site_settings.html.erb
@@ -0,0 +1,27 @@
+<%
+# BigBlueButton open source conferencing system - http://www.bigbluebutton.org/.
+# Copyright (c) 2018 BigBlueButton Inc. and by respective authors (see below).
+# This program is free software; you can redistribute it and/or modify it under the
+# terms of the GNU Lesser General Public License as published by the Free Software
+# Foundation; either version 3.0 of the License, or (at your option) any later
+# version.
+#
+# BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+# You should have received a copy of the GNU Lesser General Public License along
+# with BigBlueButton; if not, see .
+%>
+
+