BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix so that we are checking logoutURL properly from properties file

Browse Source 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@4033 af16638f-c34d-0410-8cfa-b39d5352b314
This commit is contained in:
Richard Alam 2010-03-26 20:06:54 +00:00
parent 9871f9acfa
commit 873a8c125b
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
View File

@ -74,7 +74,7 @@ bigbluebutton.web.serverURL=http://192.168.0.120
#---------------------------------------------------- #----------------------------------------------------
# URL where the logged-out participant will be redirected after sign-out. # URL where the logged-out participant will be redirected after sign-out.
# If commented-out, it returns to bigbluebutton.web.serverURL # If commented-out, it returns to bigbluebutton.web.serverURL
# bigbluebutton.web.logoutURL=http://www.bigbluebutton.org #bigbluebutton.web.logoutURL=http://www.bigbluebutton.org
#------------------------------------------------------ #------------------------------------------------------
# Setting to enable the old scheduling mechanism. This is temporary # Setting to enable the old scheduling mechanism. This is temporary

16
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy
View File

@ -273,23 +273,31 @@ class PublicScheduledSessionController {
def config = ConfigurationHolder.config def config = ConfigurationHolder.config
def hostURL = config.bigbluebutton.web.logoutURL def hostURL = config.bigbluebutton.web.logoutURL
log.debug("LogoutURL=$hostURL")
// For backward compatibility. We renamed "loggedOutUrl" to // For backward compatibility. We renamed "loggedOutUrl" to
// "logoutURL" in 0.64 to be consistent with the API. Remove this // "logoutURL" in 0.64 to be consistent with the API. Remove this
// in later iterations (ralam mar 26, 2010) // in later iterations (ralam mar 26, 2010)
if ((hostURL == null) || (hostURL = "")) { //if ((hostURL == null) || (hostURL == "")) {
if (hostURL.isEmpty()) {
log.debug("No logoutURL property set. Checking for old loggedOutUrl.")
hostURL = config.bigbluebutton.web.loggedOutUrl hostURL = config.bigbluebutton.web.loggedOutUrl
if (!hostURL.isEmpty())
log.debug("Old loggedOutUrl property set to $hostURL")
} }
def meetingToken = session["conference"] def meetingToken = session["conference"]
DynamicConference conf = dynamicConferenceService.getConferenceByToken(meetingToken) DynamicConference conf = dynamicConferenceService.getConferenceByToken(meetingToken)
if (conf != null) { if (conf != null) {
if ((conf.logoutUrl != null) || (conf.logoutUrl != "")) { if ((conf.logoutUrl != null) && (conf.logoutUrl != "")) {
hostURL = conf.logoutUrl hostURL = conf.logoutUrl
log.debug("logoutURL has been set from API. Redirecting to server url $hostURL.")
} }
} }
if (!hostURL){ if (hostURL.isEmpty()) {
hostURL = config.bigbluebutton.web.serverURL hostURL = config.bigbluebutton.web.serverURL
log.debug("No logout url. Redirecting to server url $hostURL.")
} }
// Log the user out of the application. // Log the user out of the application.
session.invalidate() session.invalidate()