forked from External/greenlight
		
	A warning message is shown when the BBB server configured is the one that comes by default
This commit is contained in:
		@@ -46,4 +46,14 @@ class ApplicationController < ActionController::Base
 | 
				
			|||||||
    USER_NAME_LIMIT
 | 
					    USER_NAME_LIMIT
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
  helper_method :user_name_limit
 | 
					  helper_method :user_name_limit
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  def user_name_limit
 | 
				
			||||||
 | 
					    USER_NAME_LIMIT
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					  helper_method :user_name_limit
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  def bigbluebutton_endpoint_default?
 | 
				
			||||||
 | 
					    Rails.configuration.bigbluebutton_endpoint_default === Rails.configuration.bigbluebutton_endpoint
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					  helper_method :bigbluebutton_endpoint_default?
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -28,7 +28,7 @@ module BbbApi
 | 
				
			|||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def bbb
 | 
					  def bbb
 | 
				
			||||||
    @bbb ||= BigBlueButton::BigBlueButtonApi.new(bbb_endpoint + "api", bbb_secret, "0.8", true)
 | 
					    @bbb ||= BigBlueButton::BigBlueButtonApi.new(bbb_endpoint + "api", bbb_secret, "0.8")
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def bbb_meeting_id(id)
 | 
					  def bbb_meeting_id(id)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,6 +18,9 @@
 | 
				
			|||||||
    <div class="center-block center-panel-size col-xs-12">
 | 
					    <div class="center-block center-panel-size col-xs-12">
 | 
				
			||||||
      <div class="panel panel-default">
 | 
					      <div class="panel panel-default">
 | 
				
			||||||
        <div class="panel-body">
 | 
					        <div class="panel-body">
 | 
				
			||||||
 | 
					          <% if bigbluebutton_endpoint_default? %>
 | 
				
			||||||
 | 
					          <div class="panel-alert alert alert-danger"><%= t('warning_bigbluebutton_endpoint_default') %></div>
 | 
				
			||||||
 | 
					          <% end %>
 | 
				
			||||||
          <h3 class="title-wrapper text-center">
 | 
					          <h3 class="title-wrapper text-center">
 | 
				
			||||||
            <%= yield :title %>
 | 
					            <%= yield :title %>
 | 
				
			||||||
          </h3>
 | 
					          </h3>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -37,9 +37,12 @@ module Greenlight
 | 
				
			|||||||
    config.i18n.fallbacks = {'en' => 'en-US'}
 | 
					    config.i18n.fallbacks = {'en' => 'en-US'}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # BigBlueButton
 | 
					    # BigBlueButton
 | 
				
			||||||
    config.bigbluebutton_endpoint = ENV['BIGBLUEBUTTON_ENDPOINT']  || 'http://test-install.blindsidenetworks.com/bigbluebutton/'
 | 
					    config.bigbluebutton_endpoint_default = 'http://test-install.blindsidenetworks.com/bigbluebutton/'
 | 
				
			||||||
    config.bigbluebutton_secret = ENV['BIGBLUEBUTTON_SECRET'] || '8cd8ef52e8e101574e400365b55e11a6'
 | 
					    config.bigbluebutton_secret_default = '8cd8ef52e8e101574e400365b55e11a6'
 | 
				
			||||||
 | 
					    config.bigbluebutton_endpoint = ENV['BIGBLUEBUTTON_ENDPOINT']  || config.bigbluebutton_endpoint_default
 | 
				
			||||||
 | 
					    config.bigbluebutton_secret = ENV['BIGBLUEBUTTON_SECRET'] || config.bigbluebutton_secret_default
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Greelight specific
 | 
				
			||||||
    config.use_webhooks = ENV['GREENLIGHT_USE_WEBHOOKS'] && ENV['GREENLIGHT_USE_WEBHOOKS'] == "true"
 | 
					    config.use_webhooks = ENV['GREENLIGHT_USE_WEBHOOKS'] && ENV['GREENLIGHT_USE_WEBHOOKS'] == "true"
 | 
				
			||||||
    config.mail_notifications = ENV['GREENLIGHT_MAIL_NOTIFICATIONS'] && ENV['GREENLIGHT_MAIL_NOTIFICATIONS'] == "true"
 | 
					    config.mail_notifications = ENV['GREENLIGHT_MAIL_NOTIFICATIONS'] && ENV['GREENLIGHT_MAIL_NOTIFICATIONS'] == "true"
 | 
				
			||||||
    config.disable_guest_access = ENV['DISABLE_GUEST_ACCESS'] && ENV['DISABLE_GUEST_ACCESS'] == "true"
 | 
					    config.disable_guest_access = ENV['DISABLE_GUEST_ACCESS'] && ENV['DISABLE_GUEST_ACCESS'] == "true"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -187,6 +187,7 @@ en-US:
 | 
				
			|||||||
  wait_for_mod_explanation: You will automatically join when the meeting starts
 | 
					  wait_for_mod_explanation: You will automatically join when the meeting starts
 | 
				
			||||||
  watch: Watch
 | 
					  watch: Watch
 | 
				
			||||||
  'yes': 'Yes'
 | 
					  'yes': 'Yes'
 | 
				
			||||||
 | 
					  warning_bigbluebutton_endpoint_default: This deployment of Greenlight is making use of the BigBlueButton testing server that comes pre-configured by default. It should be replaced.
 | 
				
			||||||
  welcome_to_greenlight: Welcome to GreenLight!
 | 
					  welcome_to_greenlight: Welcome to GreenLight!
 | 
				
			||||||
  youtube_description: This recording was recorded with BigBlueButton. For more information check out %{url}.
 | 
					  youtube_description: This recording was recorded with BigBlueButton. For more information check out %{url}.
 | 
				
			||||||
  youtube_footer: this will upload all webcam and audio data
 | 
					  youtube_footer: this will upload all webcam and audio data
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user