diff --git a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties index 384d53a4ae..e0cfa1d007 100755 --- a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties +++ b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties @@ -77,6 +77,7 @@ defaultDialAccessNumber=613-555-1234 # conference. This is only used for the old scheduling which will be # removed in the future. Use the API to create a conference. defaultWelcomeMessage=
Welcome to %%CONFNAME%%!

For help on using BigBlueButton see these (short) tutorial videos.

To join the audio bridge click the headset icon (upper-left hand corner). You can mute yourself in the Listeners window.
+defaultWelcomeMessageFooter=This BigBlueButton server runs the latest 0.81-dev version.

For more details about this release visit contact us. # Default maximum number of users a meeting can have. # Doesn't get enforced yet but is the default value when the create @@ -108,7 +109,7 @@ disableRecordingDefault=false #---------------------------------------------------- # This URL is where the BBB client is accessible. When a user sucessfully # enters a name and password, she is redirected here to load the client. -bigbluebutton.web.serverURL=http://192.168.0.249 +bigbluebutton.web.serverURL=http://192.168.0.158 #---------------------------------------------------- # Assign URL where the logged-out participant will be redirected after sign-out. @@ -127,7 +128,7 @@ defaultAvatarURL=${bigbluebutton.web.serverURL}/client/avatar.png apiVersion=0.8 # Salt which is used by 3rd-party apps to authenticate api calls -securitySalt=90ae86441b1211a4cbb3671f369fb031 +securitySalt=a106c6cff65f94ad5c846df9e230b480 # Directory where we drop the .done file recordStatusDir=/var/bigbluebutton/recording/status/recorded diff --git a/bigbluebutton-web/grails-app/conf/spring/resources.xml b/bigbluebutton-web/grails-app/conf/spring/resources.xml index a3d7c916ec..2f6f46aba3 100755 --- a/bigbluebutton-web/grails-app/conf/spring/resources.xml +++ b/bigbluebutton-web/grails-app/conf/spring/resources.xml @@ -93,6 +93,7 @@ with BigBlueButton; if not, see . + diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java b/bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java index 0fcb8f2d06..a06a56f147 100755 --- a/bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java +++ b/bigbluebutton-web/src/java/org/bigbluebutton/api/ParamsProcessorUtil.java @@ -43,6 +43,7 @@ public class ParamsProcessorUtil { private String securitySalt; private int defaultMaxUsers = 20; private String defaultWelcomeMessage; + private String defaultWelcomeMessageFooter; private String defaultDialAccessNumber; private String testVoiceBridge; private String testConferenceMock; @@ -342,6 +343,8 @@ public class ParamsProcessorUtil { if (StringUtils.isEmpty(message)) { welcomeMessage = defaultWelcomeMessage; } + if( !StringUtils.isEmpty(defaultWelcomeMessageFooter) ) + welcomeMessage += "

" + defaultWelcomeMessageFooter; return welcomeMessage; } @@ -483,6 +486,10 @@ public class ParamsProcessorUtil { public void setDefaultWelcomeMessage(String defaultWelcomeMessage) { this.defaultWelcomeMessage = defaultWelcomeMessage; } + + public void setDefaultWelcomeMessageFooter(String defaultWelcomeMessageFooter) { + this.defaultWelcomeMessageFooter = defaultWelcomeMessageFooter; + } public void setDefaultDialAccessNumber(String defaultDialAccessNumber) { this.defaultDialAccessNumber = defaultDialAccessNumber;