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

Merge remote-tracking branch 'upstream/master' into sound

Browse Source
This commit is contained in:
JaeeunCho 2017-01-17 14:05:55 -08:00
commit f66799604b
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bbb-api-demo/src/main/webapp/bbb_api.jsp
View File

@ -243,7 +243,8 @@ public String getJoinURL(String username, String meetingID, String record, Strin
// - record ["true", "false"]
// - welcome message (null causes BigBlueButton to use the default welcome message
// - metadata (passed through when record="true"
// - xml (used for pre-upload of slides)_
// - xml (used for pre-upload of slides)
// - isModerator [true, false]
//
// Returned
// - valid join URL using the username
@ -251,9 +252,7 @@ public String getJoinURL(String username, String meetingID, String record, Strin
// VERSION ADJUSTED TO THE NEEDS OF THE HTML5 CLIENT
// -redirect=false //so that we get xml returned instead of being redirected to the meeting
// -password=ap //at this stage the html5 client is viewer only (Feb 2015)
public String getJoinURLHTML5(String username, String meetingID, String record, String welcome, Map<String, String> metadata, String xml) {
public String getJoinURLHTML5(String username, String meetingID, String record, String welcome, Map<String, String> metadata, String xml, boolean isModerator) {
String base_url_create = BigBlueButtonURL + "api/create?";
String base_url_join = BigBlueButtonURL + "api/join?";
@ -268,6 +267,13 @@ public String getJoinURLHTML5(String username, String meetingID, String record,
xml_param = xml;
}
String defaultModeratorPW = "mp";
String defaultAttendeePW = "ap";
String html5UserPassword = defaultAttendeePW; // default html5 user to attendee
if (isModerator) {
html5UserPassword = defaultModeratorPW;
}
Random random = new Random();
String voiceBridge_param = "&voiceBridge=" + (70000 + random.nextInt(9999));
@ -286,8 +292,11 @@ public String getJoinURLHTML5(String username, String meetingID, String record,
//
String create_parameters = "name=" + urlEncode(meetingID)
+ "&meetingID=" + urlEncode(meetingID) + welcome_param + voiceBridge_param
+ "&attendeePW=ap&moderatorPW=mp"
+ "&meetingID=" + urlEncode(meetingID)
+ welcome_param
+ voiceBridge_param
+ "&attendeePW=" + defaultAttendeePW
+ "&moderatorPW=" + defaultModeratorPW
+ "&record=" + record + getMetaData( metadata );
@ -314,7 +323,7 @@ public String getJoinURLHTML5(String username, String meetingID, String record,
// and will pass them to the joining url for the html5 client (different format)
// Also we set PASSWORD=AP FOR ATTENDEE
String join_parameters = "meetingID=" + urlEncode(meetingID)
+ "&fullName=" + urlEncode(username) + "&redirect=false&password=ap";
+ "&fullName=" + urlEncode(username) + "&redirect=false&password=" + html5UserPassword;
return base_url_join + join_parameters + "&checksum="
+ checksum("join" + join_parameters + salt);

12
bbb-api-demo/src/main/webapp/demoHTML5.jsp
View File

@ -63,9 +63,16 @@ if (request.getParameterMap().isEmpty()) {
<td>&nbsp;</td>
<td style="text-align: right; ">Meeting Name:</td>
<td style="width: 5px; ">&nbsp;</td>
<td style="text-align: left "><input type="text" name="meetingname" value="Demo Meeting" /></td>
<td style="text-align: left "><input type="text" required name="meetingname" value="Demo Meeting" /></td>
<tr>
<tr>
<td>&nbsp;</td>
<td style="text-align: right; ">Moderator Role:</td>
<td style="width: 5px; ">&nbsp;</td>
<td style="text-align: left "><input type=checkbox name=isModerator value="true"></td>
<tr>
<tr>
<td>&nbsp;</td>
<td>&nbsp;</td>
@ -87,8 +94,9 @@ if (request.getParameterMap().isEmpty()) {
String username = request.getParameter("username");
String meetingname = request.getParameter("meetingname");
boolean isModerator = Boolean.parseBoolean(request.getParameter("isModerator"));
String joinURL = getJoinURLHTML5(username, meetingname, "false", null, null, null);
String joinURL = getJoinURLHTML5(username, meetingname, "false", null, null, null, isModerator);
Document doc = null;
doc = parseXml(getURL(joinURL));