diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java index fef155af2c4fac1491016a32a7458e0f1052a9ea..732ea5fefce0d9fb0777729bbded0f0fe613879a 100755 --- a/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java +++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java @@ -72,7 +72,7 @@ public class ParamsProcessorUtil { private String defaultLogoutUrl; private String defaultServerUrl; private int defaultNumDigitsForTelVoice; - private String defaultClientUrl; + private String defaultHTML5ClientUrl; private String defaultGuestWaitURL; private Boolean allowRequestsWithoutSession; private Boolean useDefaultAvatar = false; @@ -551,8 +551,8 @@ public class ParamsProcessorUtil { return serviceEnabled; } - public String getDefaultClientUrl() { - return defaultClientUrl; + public String getDefaultHTML5ClientUrl() { + return defaultHTML5ClientUrl; } public String getDefaultGuestWaitURL() { @@ -912,8 +912,8 @@ public class ParamsProcessorUtil { this.defaultNumDigitsForTelVoice = defaultNumDigitsForTelVoice; } - public void setDefaultClientUrl(String defaultClientUrl) { - this.defaultClientUrl = defaultClientUrl; + public void setDefaultHTML5ClientUrl(String defaultHTML5ClientUrl) { + this.defaultHTML5ClientUrl = defaultHTML5ClientUrl; } public void setDefaultGuestWaitURL(String url) { diff --git a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties index cc3498f903705be9c95f9088c88cfde65e040f1d..2882561697d7372bffe0574144b4b274bc9560d2 100755 --- a/bigbluebutton-web/grails-app/conf/bigbluebutton.properties +++ b/bigbluebutton-web/grails-app/conf/bigbluebutton.properties @@ -243,9 +243,9 @@ bigbluebutton.web.serverURL=http://bigbluebutton.example.com # If "default", it returns to bigbluebutton.web.serverURL bigbluebutton.web.logoutURL=default -# The url of the BigBlueButton client. Users will be redirected here when +# The url of the BigBlueButton HTML5 client. Users will be redirected here when # successfully joining the meeting. -defaultClientUrl=${bigbluebutton.web.serverURL}/html5client/%%INSTANCEID%%/join +defaultHTML5ClientUrl=${bigbluebutton.web.serverURL}/html5client/%%INSTANCEID%%/join # Allow requests without JSESSIONID to be handled (default = false) allowRequestsWithoutSession=false diff --git a/bigbluebutton-web/grails-app/conf/spring/resources.xml b/bigbluebutton-web/grails-app/conf/spring/resources.xml index 05a2060174293445659e69823ae6c689a98bdc89..34d77afe8b5433aa4cba62ed45c92554d3dd8977 100755 --- a/bigbluebutton-web/grails-app/conf/spring/resources.xml +++ b/bigbluebutton-web/grails-app/conf/spring/resources.xml @@ -128,7 +128,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. <property name="defaultLogoutUrl" value="${bigbluebutton.web.logoutURL}"/> <property name="defaultServerUrl" value="${bigbluebutton.web.serverURL}"/> <property name="defaultNumDigitsForTelVoice" value="${defaultNumDigitsForTelVoice}"/> - <property name="defaultClientUrl" value="${defaultClientUrl}"/> + <property name="defaultHTML5ClientUrl" value="${defaultHTML5ClientUrl}"/> <property name="defaultGuestWaitURL" value="${defaultGuestWaitURL}"/> <property name="defaultMeetingDuration" value="${defaultMeetingDuration}"/> <property name="disableRecordingDefault" value="${disableRecordingDefault}"/> diff --git a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy index 142198eaa0e105a2f6e9e726319f8ba7601b2694..98a89a413a55a2ae7d9a066bc4c0b3d4c4b673a4 100755 --- a/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy +++ b/bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy @@ -494,7 +494,7 @@ class ApiController { //check if exists the param redirect boolean redirectClient = true; - String clientURL = paramsProcessorUtil.getDefaultClientUrl(); + String clientURL = paramsProcessorUtil.getDefaultHTML5ClientUrl(); String meetingInstance = meeting.getHtml5InstanceId(); meetingInstance = (meetingInstance == null) ? "1" : meetingInstance;