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

- reformat welcome message

Browse Source 
git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@3243 af16638f-c34d-0410-8cfa-b39d5352b314
This commit is contained in:
Richard Alam 2010-01-08 15:51:43 +00:00
parent e86fab350c
commit 80e25349a1
4 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,11 +48,15 @@ maxConversionTime=5
# Maximum number of pages allowed for an uploaded presentation (default 100).
maxNumPages=100
#----------------------------------------------------
# Default dial access number
defaultDialAccessNumber = 613-555-1234
#----------------------------------------------------
# Default welcome message to display when the participant joins the web
# conference. This is only used for the old scheduling which will be
# removed in the future. Use the API to create a conference.
defaultWelcomeMessage=Dial: 613-555-1234 Conference:
defaultWelcomeMessage=<b>Welcome! To join the voice conference using you phone, dial: {0} conference: {1}</b>
#----------------------------------------------------
# Inject values into grails service beans
@ -60,6 +64,7 @@ beans.presentationService.presentationDir=${presentationDir}
beans.dynamicConferenceService.serviceEnabled=true
beans.dynamicConferenceService.securitySalt=639259d4-9dd8-4b25-bf01-95f9567eaf4b
beans.dynamicConferenceService.defaultWelcomeMessage=${defaultWelcomeMessage}
beans.dynamicConferenceService.defaultDialAccessNumber=${defaultDialAccessNumber}
#----------------------------------------------------
# This URL is where the BBB client is accessible. When a user sucessfully

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

@ -21,7 +21,7 @@
package org.bigbluebutton.web.controllers
import java.text.MessageFormat;
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.codec.digest.DigestUtils;
@ -100,8 +100,14 @@ class ApiController {
conf.setVoiceBridge(voiceBr == null || voiceBr == "" ? mtgID : voiceBr)
if (welcomeMessage == null || welcomeMessage == "") {
def defaultWelcomeMessage = dynamicConferenceService.defaultWelcomeMessage
welcomeMessage = "$defaultWelcomeMessage ${conf.voiceBridge}"
String defaultWelcomeMessage = dynamicConferenceService.defaultWelcomeMessage
String defaultDialAccessNumber = dynamicConferenceService.defaultDialAccessNumber
MessageFormat msgFormat = new MessageFormat(defaultWelcomeMessage);
String[] args = new String[2]
args[0] = defaultDialAccessNumber
args[1] = conf.voiceBridge
welcomeMessage = msgFormat.format(args)
}
conf.welcome = welcomeMessage

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

@ -18,7 +18,8 @@
* $Id: $
*/
package org.bigbluebutton.web.controllers
import java.text.MessageFormat;
import org.bigbluebutton.web.domain.ScheduledSession
import org.bigbluebutton.web.domain.Conference
import grails.converters.*
@ -139,8 +140,16 @@ class PublicScheduledSessionController {
}
if (signedIn) {
log.debug "Login successful...setting in session information"
def defaultWelcomeMessage = dynamicConferenceService.defaultWelcomeMessage
def welcomeMessage = "$defaultWelcomeMessage ${confSession.voiceConferenceBridge}"
String defaultWelcomeMessage = dynamicConferenceService.defaultWelcomeMessage
String defaultDialAccessNumber = dynamicConferenceService.defaultDialAccessNumber
MessageFormat msgFormat = new MessageFormat(defaultWelcomeMessage)
String[] args = new String[2]
args[0] = defaultDialAccessNumber
args[1] = confSession.voiceConferenceBridge
def welcomeMessage = msgFormat.format(args)
session["fullname"] = params.fullname
session["role"] = role
session["conference"] = confSession.tokenId

1
bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/DynamicConferenceService.groovy
View File

@ -29,6 +29,7 @@ public class DynamicConferenceService {
def serviceEnabled = false
def securitySalt
def defaultWelcomeMessage
def defaultDialAccessNumber
private final Map<String, DynamicConference> confsByMtgID
private final Map<String, String> tokenMap