You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/03/14 07:05:52 UTC
svn commit: r1456337 - in /openmeetings/trunk/singlewebapp:
WebContent/src/base/mainMethods.lzx
src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
Author: solomax
Date: Thu Mar 14 06:05:51 2013
New Revision: 1456337
URL: http://svn.apache.org/r1456337
Log:
[OPENMEETINGS-431] baseurl is passed from the client
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1456337&r1=1456336&r2=1456337&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Thu Mar 14 06:05:51 2013
@@ -158,16 +158,16 @@
? hib.currentdomainObj.organisation_id : 1;
if ($debug) Debug.write("mainMethods::getScreenSharingUrl ", hib.userobject, hib.currentdomainObj);
- var downloadurl = canvas.getAppBaseUrl() + 'screen.upload?'
+ var appBase = canvas.getAppBaseUrl();
+ var downloadurl = appBase + 'screen.upload?'
+'rtmphostlocal=' + canvas.getHttpHost()
+ +'&baseurl=' + escape(appBase)
+'&domain=' + hib.conferencedomain
+'&organization_id=' + organisation_id
+'&sid=' + canvas.sessionId
- +'&red5httpport=' + canvas.red5httpport
+'&connectionType=' + canvas.thishib.getProtocol()
+'&port=' + canvas.thishib.getPort()
+'&publicSID=' + canvas.publicSID
- +'&httpRootKey=' + canvas.httpRootKey
+'&languageAsString=' + hib.userlang;
if ($debug) Debug.write("mainMethods::getScreenSharingUrl ", downloadurl);
return downloadurl;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java?rev=1456337&r1=1456336&r2=1456337&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java Thu Mar 14 06:05:51 2013
@@ -110,21 +110,11 @@ public class ScreenController {
if (rtmphostlocal == null) {
throw new Exception("rtmphostlocal is empty: " + rtmphostlocal);
}
-
- String red5httpport = request.getParameter("red5httpport");
- if (red5httpport == null) {
- throw new Exception("red5httpport is empty: " + red5httpport);
- }
-
- String httpRootKey = request.getParameter("httpRootKey");
- if (httpRootKey == null) {
- throw new Exception("httpRootKey is empty could not start sharer");
+
+ String baseURL = request.getParameter("baseurl");
+ if (baseURL == null) {
+ throw new Exception("baseurl is empty: " + baseURL);
}
-
- String baseURL = request.getScheme() + "://" + rtmphostlocal + ":" + red5httpport
- + httpRootKey;
-
- log.debug("httpRootKey " + httpRootKey);
log.debug("language_id :: " + language_id);
String label_sharer = "Sharer";