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

- rename set and get configxml api

Browse Source
This commit is contained in:
Richard Alam 2012-12-09 20:44:52 +00:00
parent a70d56ff56
commit 02c6121a6c
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-client/src/org/bigbluebutton/core/managers/ConfigManager2.as
View File

@ -15,7 +15,7 @@ package org.bigbluebutton.core.managers
import org.bigbluebutton.core.model.Config; import org.bigbluebutton.core.model.Config;
public class ConfigManager2 extends EventDispatcher { public class ConfigManager2 extends EventDispatcher {
public static const CONFIG_XML:String = "bigbluebutton/api/configXML"; public static const CONFIG_XML:String = "bigbluebutton/api/getConfigXML";
private var _config:Config = null; private var _config:Config = null;

2
bigbluebutton-client/src/org/bigbluebutton/main/model/ConfigParameters.as
View File

@ -35,7 +35,7 @@ package org.bigbluebutton.main.model
import org.bigbluebutton.main.model.modules.ModuleDescriptor; import org.bigbluebutton.main.model.modules.ModuleDescriptor;
public class ConfigParameters { public class ConfigParameters {
public static const CONFIG_XML:String = "bigbluebutton/api/configXML"; public static const CONFIG_XML:String = "bigbluebutton/api/getConfigXML";
private var _urlLoader:URLLoader; private var _urlLoader:URLLoader;

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

@ -149,17 +149,7 @@ class ApiController {
} }
Meeting newMeeting = paramsProcessorUtil.processCreateParams(params); Meeting newMeeting = paramsProcessorUtil.processCreateParams(params);
if (! StringUtils.isEmpty(params.configToken)) {
Config conf = meetingService.getConfig(params.configToken);
if (conf == null) {
errors.noConfigFoundForToken(params.configToken);
respondWithErrors(errors);
} else {
newMeeting.setDefaultConfig(conf.config);
}
}
meetingService.createMeeting(newMeeting); meetingService.createMeeting(newMeeting);
// See if the request came with pre-uploading of presentation. // See if the request came with pre-uploading of presentation.
@ -760,7 +750,7 @@ class ApiController {
/*********************************************** /***********************************************
* CONFIG API * CONFIG API
***********************************************/ ***********************************************/
def configXml = { def setConfigXML = {
if (StringUtils.isEmpty(params.checksum)) { if (StringUtils.isEmpty(params.checksum)) {
invalid("checksumError", "You did not pass the checksum security check") invalid("checksumError", "You did not pass the checksum security check")
@ -831,7 +821,7 @@ class ApiController {
/*********************************************** /***********************************************
* CONFIG API * CONFIG API
***********************************************/ ***********************************************/
def configXML = { def getConfigXML = {
if (! session["user-token"] || (meetingService.getUserSession(session['user-token']) == null)) { if (! session["user-token"] || (meetingService.getUserSession(session['user-token']) == null)) {
log.info("No session for user in conference.") log.info("No session for user in conference.")