From c21802e24ec48ce1e371d366b8755b15a11ebc41 Mon Sep 17 00:00:00 2001
From: Jesus Federico <jesus@123it.ca>
Date: Fri, 7 Jun 2013 17:45:47 -0400
Subject: [PATCH] bbb-lti: Renamed custom parameters
---
bbb-lti/grails-app/controllers/ToolController.groovy | 6 +++---
bbb-lti/grails-app/services/BigbluebuttonService.groovy | 6 +++---
bbb-lti/src/java/org/bigbluebutton/lti/Parameter.java | 9 +++++----
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/bbb-lti/grails-app/controllers/ToolController.groovy b/bbb-lti/grails-app/controllers/ToolController.groovy
index 0584815a20..5ff8ce97f4 100644
--- a/bbb-lti/grails-app/controllers/ToolController.groovy
+++ b/bbb-lti/grails-app/controllers/ToolController.groovy
@@ -66,7 +66,7 @@ class ToolController {
result = doJoinMeeting(params)
} else {
log.debug "LTI service running in extended mode."
- if ( !Boolean.parseBoolean(params.get(Parameter.CUSTOM_BBB_RECORD)) ) {
+ if ( !Boolean.parseBoolean(params.get(Parameter.CUSTOM_RECORD)) ) {
log.debug "No bbb_record parameter was sent; immediately redirecting to BBB session!"
result = doJoinMeeting(params)
}
@@ -230,8 +230,8 @@ class ToolController {
log.debug "Localized default welcome message: [" + welcome + "]"
// Check for [custom_]welcome parameter being passed from the LTI
- if (params.get(Parameter.CUSTOM_BBB_WELCOME) != null) {
- welcome = params.get(Parameter.CUSTOM_BBB_WELCOME)
+ if (params.get(Parameter.CUSTOM_WELCOME) != null) {
+ welcome = params.get(Parameter.CUSTOM_WELCOME)
log.debug "Overriding default welcome message with: [" + welcome + "]"
}
diff --git a/bbb-lti/grails-app/services/BigbluebuttonService.groovy b/bbb-lti/grails-app/services/BigbluebuttonService.groovy
index acbfea0b3f..8bab7e2400 100644
--- a/bbb-lti/grails-app/services/BigbluebuttonService.groovy
+++ b/bbb-lti/grails-app/services/BigbluebuttonService.groovy
@@ -91,9 +91,9 @@ class BigbluebuttonService {
String record = false
Integer duration = 0
if( "extended".equals(mode) ){
- voiceBridge = getValidatedBBBVoiceBridge(params.get(Parameter.CUSTOM_BBB_VOICEBRIDGE))
- record = getValidatedBBBRecord(params.get(Parameter.CUSTOM_BBB_RECORD))
- duration = getValidatedBBBDuration(params.get(Parameter.CUSTOM_BBB_DURATION))
+ voiceBridge = getValidatedBBBVoiceBridge(params.get(Parameter.CUSTOM_VOICEBRIDGE))
+ record = getValidatedBBBRecord(params.get(Parameter.CUSTOM_RECORD))
+ duration = getValidatedBBBDuration(params.get(Parameter.CUSTOM_DURATION))
}
String[] values = [meetingName, courseTitle]
diff --git a/bbb-lti/src/java/org/bigbluebutton/lti/Parameter.java b/bbb-lti/src/java/org/bigbluebutton/lti/Parameter.java
index 8bdaaf8d25..9f2429ceb9 100644
--- a/bbb-lti/src/java/org/bigbluebutton/lti/Parameter.java
+++ b/bbb-lti/src/java/org/bigbluebutton/lti/Parameter.java
@@ -49,10 +49,11 @@ public class Parameter {
public static final String CUSTOM_USER_ID = "custom_lis_person_sourcedid";
//BigBlueButton custom parameters
- public static final String CUSTOM_BBB_RECORD = "custom_bbb_recording";
- public static final String CUSTOM_BBB_VOICEBRIDGE = "custom_bbb_voicebridge";
- public static final String CUSTOM_BBB_DURATION = "custom_bbb_duration";
- public static final String CUSTOM_BBB_WELCOME = "custom_bbb_welcome";
+ public static final String CUSTOM_RECORD = "custom_record";
+ public static final String CUSTOM_VOICEBRIDGE = "custom_voicebridge";
+ public static final String CUSTOM_DURATION = "custom_duration";
+ public static final String CUSTOM_WELCOME = "custom_welcome";
+ public static final String CUSTOM_MODE = "custom_mode";
///BigBlueButton internal parameters
public static final String BBB_RECORDING_ID = "bbb_recording_id";
--
GitLab