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

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

Browse Source
This commit is contained in:
Richard Alam 2012-09-21 21:06:51 +00:00
commit fc294df41f
1 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
View File

@ -327,8 +327,41 @@ class ApiController {
session.setMaxInactiveInterval(SESSION_TIMEOUT);
log.info("Successfully joined. Redirecting to ${paramsProcessorUtil.getDefaultClientUrl()}");
redirect(url: paramsProcessorUtil.getDefaultClientUrl())
//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){
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.")
}
}
}
}
}
}
/*******************************************