lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #165 from zach-chai/encoding 

encode room id separately from meeting id
This commit is contained in:
Zachary Chai 2017-04-21 13:56:15 -04:00 committed by GitHub
parent 7c0b5613df 30838f4b36
commit 62ef95128c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/bbb_controller.rb
View File

@ -56,11 +56,11 @@ class BbbController < ApplicationController
meeting_id = "#{params[:room_id]}-#{params[:id]}"
meeting_name = params[:id]
meeting_path = "#{params[:room_id]}/#{params[:id]}"
meeting_path = "#{URI.encode(params[:room_id])}/#{URI.encode(params[:id]).gsub('/','%2F')}"
else
user = User.find_by encrypted_id: params[:id]
meeting_id = params[:id]
meeting_path = meeting_id
meeting_path = URI.encode(meeting_id).gsub('/','%2F')
end
options = if user
@ -77,7 +77,7 @@ class BbbController < ApplicationController
}
end
base_url = "#{request.base_url}#{relative_root}/#{params[:resource]}/#{URI.encode(meeting_path).gsub('/','%2F')}"
base_url = "#{request.base_url}#{relative_root}/#{params[:resource]}/#{meeting_path}"
options[:meeting_logout_url] = base_url
options[:hook_url] = "#{base_url}/callback"
options[:moderator_message] = t('moderator_default_message', url: "<a href=\"#{base_url}\" target=\"_blank\"><u>#{base_url}</u></a>")