From 1911c4a62c3558117099519aa72b7de865e8148a Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Fri, 13 Jan 2017 16:56:33 -0500
Subject: [PATCH] add a pre-filled meetingname field in html5 demo page
---
bbb-api-demo/src/main/webapp/bbb_api.jsp | 11 +++---
bbb-api-demo/src/main/webapp/demoHTML5.jsp | 42 +++++++++++-----------
2 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/bbb-api-demo/src/main/webapp/bbb_api.jsp b/bbb-api-demo/src/main/webapp/bbb_api.jsp
index 6609cc955f..96b7b75293 100755
--- a/bbb-api-demo/src/main/webapp/bbb_api.jsp
+++ b/bbb-api-demo/src/main/webapp/bbb_api.jsp
@@ -234,10 +234,8 @@ public String getJoinURL(String username, String meetingID, String record, Strin
}
-
-
//
-// Create a meeting and return a URL to join it as moderator. This is used for the API demos.
+// Create a meeting and return a URL to join it as attendee. This is used for the API demos.
//
// Passed
// - username
@@ -250,8 +248,6 @@ public String getJoinURL(String username, String meetingID, String record, Strin
// Returned
// - valid join URL using the username
//
-// Note this meeting will use username for meetingID
-//
// VERSION ADJUSTED TO THE NEEDS OF THE HTML5 CLIENT
// -redirect=false //so that we get xml returned instead of being redirected to the meeting
@@ -314,8 +310,11 @@ public String getJoinURLHTML5(String username, String meetingID, String record,
// Looks good, now return a URL to join that meeting
//
+ // Note that REDIRECT=FALSE -- we will use the url to extract meetingID, userID, authToken
+ // 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"; //REDIRECT=FALSE (HTML5 CLIENT) PASSWORD=AP FOR ATTENDEE
+ + "&fullName=" + urlEncode(username) + "&redirect=false&password=ap";
return base_url_join + join_parameters + "&checksum="
+ checksum("join" + join_parameters + salt);
diff --git a/bbb-api-demo/src/main/webapp/demoHTML5.jsp b/bbb-api-demo/src/main/webapp/demoHTML5.jsp
index e1d76c202e..5ae2a55100 100644
--- a/bbb-api-demo/src/main/webapp/demoHTML5.jsp
+++ b/bbb-api-demo/src/main/webapp/demoHTML5.jsp
@@ -35,11 +35,11 @@ Author: Fred Dixon <ffdixon@bigbluebutton.org>
<body>
-<%@ include file="bbb_api.jsp"%>
+<p>You must have the BigBlueButton HTML5 client installed to use this API demo.</p>
-You must have the BigBlueButton HTML5 client installed to use this API demo.
+<%@ include file="bbb_api.jsp"%>
-<%
+<%
if (request.getParameterMap().isEmpty()) {
//
// Assume we want to create a meeting
@@ -49,29 +49,29 @@ if (request.getParameterMap().isEmpty()) {
<h2>Join Meeting via HTML5 Client</h2>
-<FORM NAME="form1" METHOD="GET">
+<FORM NAME="form1" METHOD="GET">
<table cellpadding="5" cellspacing="5" style="width: 400px; ">
<tbody>
<tr>
- <td>
- </td>
- <td style="text-align: right; ">
- Full Name:</td>
- <td style="width: 5px; ">
- </td>
- <td style="text-align: left ">
- <input type="text" autofocus required name="username" /></td>
+ <td> </td>
+ <td style="text-align: right; ">Full Name:</td>
+ <td style="width: 5px; "> </td>
+ <td style="text-align: left "><input type="text" autofocus required name="username" /></td>
</tr>
+
+ <tr>
+ <td> </td>
+ <td style="text-align: right; ">Meeting Name:</td>
+ <td style="width: 5px; "> </td>
+ <td style="text-align: left "><input type="text" name="meetingname" value="Demo Meeting" /></td>
+ <tr>
+
+ <tr>
+ <td> </td>
+ <td> </td>
+ <td> </td>
+ <td><input type="submit" value="Join" /></td>
<tr>
- <td>
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- <input type="submit" value="Join" /></td>
- </tr>
</tbody>
</table>
<INPUT TYPE=hidden NAME=action VALUE="create">
--
GitLab