Revision: 3748
Author: seba.wagner
Date: Tue Apr 26 02:04:56 2011
Log: [No log message]
http://code.google.com/p/openmeetings/source/detail?r=3748
Modified:
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/moderation/moderationPanel.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/sharing/sharingSession.lzx
/trunk/singlewebapp/WebContent/openmeetings/plugins/conference/whiteboard/Copy
of fixedFileExplorerWhiteBoard.lzx
/trunk/singlewebapp/WebContent/openmeetings/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/moderation/moderationPanel.lzx
Mon Jun 21 05:18:19 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/moderation/moderationPanel.lzx
Tue Apr 26 02:04:56 2011
@@ -95,6 +95,7 @@
+'&sid='+canvas.sessionId
+'&red5httpport='+canvas.red5httpport
+'&connectionType='+canvas.thishib.protocollName
+ +'&allowRecording='+canvas.allowRecording
+'&port='+canvas.thishib.protocollPort
+'&publicSID='+canvas.publicSID
+'&httpRootKey='+canvas.httpRootKey
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/sharing/sharingSession.lzx
Fri Apr 23 08:19:14 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/sharing/sharingSession.lzx
Tue Apr 26 02:04:56 2011
@@ -183,6 +183,7 @@
+canvas.httpRootKey+'ScreenRequestHandler?'
+'rtmphostlocal='+canvas.rtmphostlocal
+'&httpRootKey='+canvas.httpRootKey
+ +'&allowRecording='+canvas.allowRecording
+'&room='+hib.currentroomid
+'&domain='+hib.conferencedomain
+'&sid='+canvas.sessionId
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/plugins/conference/whiteboard/Copy
of fixedFileExplorerWhiteBoard.lzx Tue Apr 19 02:36:23 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/plugins/conference/whiteboard/Copy
of fixedFileExplorerWhiteBoard.lzx Tue Apr 26 02:04:56 2011
@@ -129,6 +129,7 @@
+canvas.httpRootKey+'ScreenRequestHandler?'
+'rtmphostlocal='+canvas.rtmphostlocal
+'&room='+hib.currentroomid
+ +'&allowRecording='+canvas.allowRecording
+'&domain='+hib.conferencedomain
+'&sid='+canvas.sessionId
+'&red5httpport='+canvas.red5httpport;
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
Wed Apr 20 05:32:18 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/plugins/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
Tue Apr 26 02:04:56 2011
@@ -130,18 +130,36 @@
<method name="checkForApplyScreen">
- <![CDATA[
- var downloadurl
= 'http://'+canvas.rtmphostlocal+':'+canvas.red5httpport
- +canvas.httpRootKey+'ScreenRequestHandler?'
- +'rtmphostlocal='+canvas.rtmphostlocal
- +'&room='+hib.currentroomid
- +'&domain='+hib.conferencedomain
- +'&sid='+canvas.sessionId
- +'&red5httpport='+canvas.red5httpport;
-
- //Debug.write(downloadurl);
- lz.Browser.loadURL(downloadurl,'_blank');
- ]]>
+ <![CDATA[
+ var organisation_id = 1;
+
+ if ($debug) Debug.write(hib.userobject);
+ if ($debug) Debug.write(hib.currentdomainObj);
+
+ if (hib.currentdomainObj != null) {
+ organisation_id = hib.currentdomainObj.organisation_id
+ }
+
+ var downloadurl
= 'http://'+canvas.rtmphostlocal+':'+canvas.red5httpport
+ +canvas.httpRootKey+'ScreenRequestHandler?'
+ +'rtmphostlocal='+canvas.rtmphostlocal
+ +'&room='+hib.currentroomid
+ +'&domain='+hib.conferencedomain
+ +'&organization_id='+organisation_id
+ +'&sid='+canvas.sessionId
+ +'&red5httpport='+canvas.red5httpport
+ +'&connectionType='+canvas.thishib.protocollName
+ +'&allowRecording='+canvas.allowRecording
+ +'&port='+canvas.thishib.protocollPort
+ +'&publicSID='+canvas.publicSID
+ +'&httpRootKey='+canvas.httpRootKey
+ +'&languageAsString='+hib.userlang
+ +'&record='+record;
+
+ if ($debug) Debug.write(downloadurl);
+ lz.Browser.loadURL(downloadurl,'_blank');
+
+ ]]>
</method>
<handler name="onmousedown" >
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
