Author: sebawagner
Date: Tue Dec 11 22:49:09 2012
New Revision: 1420478
URL: http://svn.apache.org/viewvc?rev=1420478&view=rev
Log:
OPENMEETINGS-460 Prepare separation of HTTP and RTMP traffic: Centralize
download URL string builder
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/dragItemFileExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/dynamicFileName.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/presentations/items/baseListPresentationItemExplorer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/documentFileExplorerItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/videoFileExplorerItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfileListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/contactsListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/pendingContactsListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/upload/uploadWindowExplorer.lzx
Tue Dec 11 22:49:09 2012
@@ -66,7 +66,7 @@
<method name="formatURL" args="fileHash">
<![CDATA[
var uploadmoduleimgfolderVar = '/' + fileHash;
- var downloadurl = canvas.protocol + '://' +
canvas.rtmphostlocal + ':' + canvas.red5httpport +
canvas.httpRootKey+'DownloadHandler?' +
+ var downloadurl = canvas.getUrl()+'DownloadHandler?' +
'fileName=' + encodeURIComponent(fileHash + ".swf") +
'&moduleName=' + 'videoconf1' +
'&parentPath=' +
encodeURIComponent(uploadmoduleimgfolderVar + '/' )+
@@ -79,7 +79,7 @@
<method name="generateFileLink" args="fileHash">
<![CDATA[
- return canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey+'DownloadHandler?'
+
+ return canvas.getUrl()+'DownloadHandler?' +
'fileName='+ fileHash +
'&moduleName='+ "videoconf1" +
'&parentPath='+ '/' +
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/dragItemFileExplorer.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/dragItemFileExplorer.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/dragItemFileExplorer.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/dragItemFileExplorer.lzx
Tue Dec 11 22:49:09 2012
@@ -152,8 +152,7 @@
<![CDATA[
if ($debug) Debug.write("deleteFileOrFolder HTTP 2: ");
//this.getFileExplorerByRoom.doCall();
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'services/FileService/deleteFileOrFolderSelf?'
+ var downloadurl =
canvas.getUrl()+'services/FileService/deleteFileOrFolderSelf?'
+'SID='+canvas.sessionId
+'&fileExplorerItemId='+this.fileExplorerItemId;
@@ -197,8 +196,7 @@
<![CDATA[
if ($debug) Debug.write("moveFile HTTP 1: ");
//this.getFileExplorerByRoom.doCall();
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'services/FileService/moveFileSelfInternal?'
+ var downloadurl =
canvas.getUrl()+'services/FileService/moveFileSelfInternal?'
+'SID='+canvas.sessionId
+'&fileExplorerItemId='+this.fileExplorerItemId
+'&newParentFileExplorerItemId='+this.newParentFileExplorerItemId
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/dynamicFileName.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/dynamicFileName.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/dynamicFileName.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/dynamicFileName.lzx
Tue Dec 11 22:49:09 2012
@@ -60,8 +60,7 @@
<![CDATA[
if ($debug) Debug.write("moveFile HTTP 1: ");
//this.getFileExplorerByRoom.doCall();
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'services/FileService/addFolderSelfInternal?'
+ var downloadurl =
canvas.getUrl()+'services/FileService/addFolderSelfInternal?'
+'SID='+canvas.sessionId
+'&parentFileExplorerItemId='+this.parentFileExplorerItemId
+'&fileName='+this.text
@@ -107,8 +106,7 @@
<![CDATA[
if ($debug) Debug.write("moveFile HTTP 1: ");
//this.getFileExplorerByRoom.doCall();
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'services/FileService/updateFileOrFolderNameSelf?'
+ var downloadurl =
canvas.getUrl()+'services/FileService/updateFileOrFolderNameSelf?'
+'SID='+canvas.sessionId
+'&fileExplorerItemId='+this.fileExplorerItemId
+'&fileName='+this.text;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
Tue Dec 11 22:49:09 2012
@@ -162,8 +162,7 @@
<![CDATA[
if (this["getFileExplorerByRoomSelf"]) {
//this.getFileExplorerByRoom.doCall();
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'services/FileService/getFileExplorerByRoomSelfInternal?'
+ var downloadurl =
canvas.getUrl()+'services/FileService/getFileExplorerByRoomSelfInternal?'
+'SID='+canvas.sessionId
+'&roomId='+hib.currentroomid;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/presentations/items/baseListPresentationItemExplorer.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/presentations/items/baseListPresentationItemExplorer.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/presentations/items/baseListPresentationItemExplorer.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/presentations/items/baseListPresentationItemExplorer.lzx
Tue Dec 11 22:49:09 2012
@@ -32,7 +32,7 @@
<method name="formatURL" args="filename">
<![CDATA[
- var downloadurl = canvas.protocol + '://' + canvas.rtmphostlocal +
':' + canvas.red5httpport +canvas.httpRootKey+'DownloadHandler?' +
+ var downloadurl = canvas.getUrl()+'DownloadHandler?' +
'fileName=' + encodeURIComponent(filename) +
'&moduleName=' + this.uploadmodul +
'&parentPath=' + encodeURIComponent(this.uploadmoduleimgfolder
+ '/' )+
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
Tue Dec 11 22:49:09 2012
@@ -157,8 +157,7 @@
if ($debug) Debug.write("deleteFileOrFolder HTTP 1: ");
//this.getFileExplorerByRoom.doCall();
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'services/FileService/deleteFileOrFolderSelf?'
+ var downloadurl =
canvas.getUrl()+'services/FileService/deleteFileOrFolderSelf?'
+'SID='+canvas.sessionId
+'&fileExplorerItemId='+this.fileExplorerItemId;
@@ -389,8 +388,7 @@
<method name="loadFiles">
<![CDATA[
//this.getFileExplorerByRoom.doCall();
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'services/FileService/getFileExplorerByParentSelfInternal?'
+ var downloadurl =
canvas.getUrl()+'services/FileService/getFileExplorerByParentSelfInternal?'
+'SID='+canvas.sessionId
+'&parentFileExplorerItemId='+this.fileExplorerItemId
+'&roomId='+hib.currentroomid
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/documentFileExplorerItem.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/documentFileExplorerItem.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/documentFileExplorerItem.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/documentFileExplorerItem.lzx
Tue Dec 11 22:49:09 2012
@@ -26,7 +26,7 @@
<method name="formatURL" args="filename">
<![CDATA[
var uploadmoduleimgfolderVar = '/' + this.fileHash;
- var downloadurl = canvas.protocol + '://' + canvas.rtmphostlocal +
':' + canvas.red5httpport + canvas.httpRootKey+'DownloadHandler?' +
+ var downloadurl = canvas.getUrl()+'DownloadHandler?' +
'fileName=' + encodeURIComponent(this.fileHash + ".swf") +
'&moduleName=' + 'videoconf1' +
'&parentPath=' + encodeURIComponent(uploadmoduleimgfolderVar +
'/' )+
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx
Tue Dec 11 22:49:09 2012
@@ -24,7 +24,7 @@
<method name="generateFileLink">
<![CDATA[
- return canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey+'DownloadHandler?'
+
+ return canvas.getUrl()+'DownloadHandler?' +
'fileName='+ this.fileHash +
'&moduleName='+ "videoconf1" +
'&parentPath='+ '/' +
@@ -38,7 +38,7 @@
var mouse_x = canvas._drawarea.getMouse("x");
var mouse_y = canvas._drawarea.getMouse("y");
canvas._drawarea.parent.parent.clearAreaAndAddImage(this.generateFileLink(),mouse_x,mouse_y,
- canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey+'DownloadHandler',
+ canvas.getUrl()+'DownloadHandler',
this.fileHash,"videoconf1","/","files",hib.conferencedomain);
} else {
new
lz.errorModeratorPopup(canvas,{error:canvas.getLabelName(721)});
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/videoFileExplorerItem.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/videoFileExplorerItem.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/videoFileExplorerItem.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/videoFileExplorerItem.lzx
Tue Dec 11 22:49:09 2012
@@ -24,7 +24,7 @@
<method name="generateFileLink">
<![CDATA[
- return canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey+'DownloadHandler?'
+
+ return canvas.getUrl()+'DownloadHandler?' +
'fileName='+ this.fileHash +
'&moduleName='+ "videoconf1" +
'&parentPath='+ '/' +
@@ -38,7 +38,7 @@
var mouse_x = canvas._drawarea.getMouse("x");
var mouse_y = canvas._drawarea.getMouse("y");
canvas._drawarea.parent.parent.clearAreaAndAddImage(this.generateFileLink(),mouse_x,mouse_y,
- canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey+'DownloadHandler',
+ canvas.getUrl()+'DownloadHandler',
this.fileHash,"videoconf1","/","files",hib.conferencedomain);
} else {
new
lz.errorModeratorPopup(canvas,{error:canvas.getLabelName(721)});
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
Tue Dec 11 22:49:09 2012
@@ -64,8 +64,14 @@ RTMP-host, RTMP/RTMPT-port for the sessi
if (value != null){
//FIXME load config from slave server first,
cause the slave could potentially
//have other RTMP and RTMPT ports configured.
+
+ //the HTTP port stays with the master, if you
want to cluster HTTP traffic use
+ //the regular Apache Tomcat mechanisms!
+
+
+ } else {
+ this.parent.startConference();
}
- this.parent.startConference();
</handler>
</netRemoteCallHib>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
Tue Dec 11 22:49:09 2012
@@ -134,7 +134,7 @@
//only do if last image has been loading successfully
if (!this.isScreenImageLoading){
this.isScreenImageLoading = true;
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey+'ScreenViewHandler?'
+ var downloadurl = canvas.getUrl() + 'ScreenViewHandler?'
+'fileName='+encodeURIComponent(value.fileName)
+'&room='+hib.currentroomid
+'&domain='+hib.conferencedomain
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawObject.lzx
Tue Dec 11 22:49:09 2012
@@ -178,7 +178,7 @@
//}
//if ($debug) Debug.write("addPresentationToLayer
uniqueObjectSyncName:",uniqueObjectSyncName,innerwidth,innerheight);
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey+'DownloadHandler?'
+
+ var downloadurl = canvas.getUrl() + 'DownloadHandler?' +
'fileName=' + encodeURIComponent(fileName) +
'&moduleName=' + moduleName +
'&parentPath=' + encodeURIComponent(parentPath + '/') +
@@ -219,7 +219,7 @@
this.loadimageDataWinRef = new
lz.loadWhiteboardWindow(canvas.main_content._content.inner,{refObj:this});
this.loadimageDataWinRef.setMessage(canvas.getLabelName(this.imageLoadMessageId));
}
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey+'DownloadHandler?'
+
+ var downloadurl = canvas.getUrl()+'DownloadHandler?' +
'fileName=' + encodeURIComponent(fileName) +
'&moduleName=' + moduleName +
'&parentPath=' + encodeURIComponent(parentPath) +
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/baseDrawSave.lzx
Tue Dec 11 22:49:09 2012
@@ -217,7 +217,7 @@
<handler name="ondata" args="value">
<![CDATA[
if ($debug) Debug.write("addPrintList: ",value);
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey+'ExportToImage?'
+
+ var downloadurl = canvas.getUrl()+'ExportToImage?' +
'fileName=' +
parent.savefileName +
'&hash='+value +
'&exportType=' + parent.exportType +
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/tools/baseDrawClipArt.lzx
Tue Dec 11 22:49:09 2012
@@ -72,8 +72,7 @@
this.startx = this.currentlayer.getMouse('x');
this.starty = this.currentlayer.getMouse('y');
- var imageurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey
-
+'public/cliparts/'+this.currentClipArtRessourceName;
+ var imageurl = canvas.getUrl() +
'public/cliparts/'+this.currentClipArtRessourceName;
if ($debug) Debug.write("imageurl :: ",imageurl);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
Tue Dec 11 22:49:09 2012
@@ -101,8 +101,7 @@
if ($debug) Debug.write("deleteFileOrFolder: ",value);
parent.isLoaded = true;
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'DownloadHandler?fileName=UPLOADFLV_'+parent.fileExplorerItemId+'.jpg'
+ var downloadurl =
canvas.getUrl()+'DownloadHandler?fileName=UPLOADFLV_'+parent.fileExplorerItemId+'.jpg'
+'&moduleName=lzRecorderApp&parentPath=&room_id='
+'&sid='+canvas.sessionId;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
Tue Dec 11 22:49:09 2012
@@ -147,8 +147,7 @@
organisation_id = hib.currentdomainObj.organisation_id
}
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
- +canvas.httpRootKey+'screen.upload?'
+ var downloadurl = canvas.getUrl() + 'screen.upload?'
+'rtmphostlocal='+canvas.rtmphostlocal
+'&domain='+hib.conferencedomain
+'&organization_id='+organisation_id
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/mainToolsPanel.lzx
Tue Dec 11 22:49:09 2012
@@ -55,9 +55,8 @@
<handler name="oninit">
this._bgIcon.setAttribute("visibility","hidden");
- var imageurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey
- +'public/cliparts/thumb/'
-
+canvas._drawarea.currentClipArtRessourceName;
+ var imageurl = canvas.getUrl() + 'public/cliparts/thumb/'
+ +
canvas._drawarea.currentClipArtRessourceName;
this._rscIcon.setSource(imageurl);
</handler>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/panels/maintoolspanel/subMenuIconToolsToUpload.lzx
Tue Dec 11 22:49:09 2012
@@ -258,8 +258,7 @@
folderName += "/";
}
- var imageurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey
- +'public/cliparts/thumb/'+refObj.modi;
+ var imageurl = canvas.getUrl() + 'public/cliparts/thumb/'+refObj.modi;
if ($debug) Debug.write("this.refToolbar :: ",this.refToolbar);
@@ -319,8 +318,7 @@
<method name="loadIconThumbs" args="list,folderName">
<![CDATA[
- var imageurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport+canvas.httpRootKey
- +'public/cliparts/thumb/';
+ var imageurl = canvas.getUrl() + 'public/cliparts/thumb/';
//if ($debug) Debug.write("imageurl :: ",imageurl);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
Tue Dec 11 22:49:09 2012
@@ -83,8 +83,7 @@
} else {
value.pictureuri =
"_profile_"+value.pictureuri;
}
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'DownloadHandler?fileName='+value.pictureuri
+ var downloadurl = canvas.getUrl() +
'DownloadHandler?fileName='+value.pictureuri
+'&moduleName=userprofile&parentPath=&room_id='
+'&sid='+canvas.sessionId;
if($debug) Debug.write("dashboard/downloadurl
",downloadurl);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
Tue Dec 11 22:49:09 2012
@@ -41,8 +41,7 @@
<![CDATA[
_mainScrollBar.setAttribute("visibility","hidden");
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'services/CalendarService/getAppointmentReminderTypList?'
+ var downloadurl = canvas.getUrl() +
'services/CalendarService/getAppointmentReminderTypList?'
+'SID='+canvas.sessionId;
this.getAppointmentReminderTypList.setAttribute("src",downloadurl);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/contentviews/lzRecordingsViewMain.lzx
Tue Dec 11 22:49:09 2012
@@ -192,8 +192,7 @@
this._content.initW = recording.flvWidth;
this._content.initH = recording.flvHeight;
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'DownloadHandler?fileName='+recording.previewImage
+ var downloadurl = canvas.getUrl() +
'DownloadHandler?fileName='+recording.previewImage
+'&moduleName=lzRecorderApp&parentPath=&room_id='
+'&sid='+canvas.sessionId;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx
Tue Dec 11 22:49:09 2012
@@ -468,8 +468,7 @@
return;
}
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'DownloadHandler?fileName='+parent.recordingName
+ var downloadurl = canvas.getUrl() +
'DownloadHandler?fileName='+parent.recordingName
+'&moduleName=lzRecorderApp&parentPath=&room_id='
+'&sid='+canvas.sessionId;
@@ -493,8 +492,7 @@
return;
}
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'DownloadHandler?fileName='+parent.alternateName
+ var downloadurl = canvas.getUrl() +
'DownloadHandler?fileName='+parent.alternateName
+'&moduleName=lzRecorderApp&parentPath=&room_id='
+'&sid='+canvas.sessionId;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
Tue Dec 11 22:49:09 2012
@@ -126,8 +126,7 @@
if (value.pictureuri.startsWith("http") ||
value.pictureuri.startsWith("https")) {
var downloadurl = value.pictureuri;
} else {
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'DownloadHandler?fileName='+value.pictureuri
+ var downloadurl = canvas.getUrl() +
'DownloadHandler?fileName='+value.pictureuri
+'&moduleName=userprofile&parentPath=&room_id='
+'&sid='+canvas.sessionId+'&r='+t.getTime();
}
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfileListItem.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfileListItem.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfileListItem.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfileListItem.lzx
Tue Dec 11 22:49:09 2012
@@ -60,14 +60,12 @@
var t=new Date();
- var profileUrl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
- +canvas.httpRootKey+'DownloadHandler?fileName='+pictureuri
+ var profileUrl = canvas.getUrl() +
'DownloadHandler?fileName='+pictureuri
+'&moduleName=remoteuserprofile&parentPath=&room_id='
+'&remoteUserid='+this.refObj.user_id+'&r='+t.getTime()
+'&sid='+canvas.sessionId;
- //var profileUrl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
- //
+canvas.httpRootKey+'DownloadHandler?fileName='+pictureuri
+ //var profileUrl = canvas.getUrl() +
'DownloadHandler?fileName='+pictureuri
//
+'&moduleName=userprofile&parentPath=&room_id='
//
+'&sid='+canvas.sessionId+'&r='+t.getTime();
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/contactsListItem.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/contactsListItem.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/contactsListItem.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/contactsListItem.lzx
Tue Dec 11 22:49:09 2012
@@ -45,15 +45,13 @@
//var t=new Date();
- // var profileUrl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
- //
+canvas.httpRootKey+'DownloadHandler?fileName='+pictureuri
+ // var profileUrl = canvas.getUrl() +
'DownloadHandler?fileName='+pictureuri
//
+'&moduleName=userprofile&parentPath=&room_id='
//
+'&sid='+canvas.sessionId+'&r='+t.getTime();
var t=new Date();
- var profileUrl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
- +canvas.httpRootKey+'DownloadHandler?fileName='+pictureuri
+ var profileUrl = canvas.getUrl() +
'DownloadHandler?fileName='+pictureuri
+'&moduleName=remoteuserprofile&parentPath=&room_id='
+'&remoteUserid='+this.refObj.user_id+'&r='+t.getTime()
+'&sid='+canvas.sessionId;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/pendingContactsListItem.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/pendingContactsListItem.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/pendingContactsListItem.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/pendingContactsListItem.lzx
Tue Dec 11 22:49:09 2012
@@ -45,15 +45,13 @@
//var t=new Date();
- //var profileUrl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
- //
+canvas.httpRootKey+'DownloadHandler?fileName='+pictureuri
+ //var profileUrl = canvas.getUrl() +
'DownloadHandler?fileName='+pictureuri
//
+'&moduleName=userprofile&parentPath=&room_id='
//
+'&sid='+canvas.sessionId+'&r='+t.getTime();
var t=new Date();
- var profileUrl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
- +canvas.httpRootKey+'DownloadHandler?fileName='+pictureuri
+ var profileUrl = canvas.getUrl() +
'DownloadHandler?fileName='+pictureuri
+'&moduleName=remoteuserprofile&parentPath=&room_id='
+'&remoteUserid='+this.refObj.user_id+'&r='+t.getTime()
+'&sid='+canvas.sessionId;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx
Tue Dec 11 22:49:09 2012
@@ -131,8 +131,7 @@
this.userObject = obj;
- //var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
- //
+canvas.httpRootKey+'DownloadHandler?fileName='+obj.pictureuri
+ //var downloadurl = canvas.getUrl() +
'DownloadHandler?fileName='+obj.pictureuri
// +'&moduleName=userprofile&parentPath=&room_id='
// +'&sid='+canvas.sessionId;
var t = new Date();
@@ -140,8 +139,7 @@
if (obj.pictureuri.startsWith("http") ||
obj.pictureuri.startsWith("https")) {
var downloadurl = obj.pictureuri;
} else {
- var downloadurl = canvas.protocol +
'://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'DownloadHandler?fileName='+obj.pictureuri
+ var downloadurl = canvas.getUrl() +
'DownloadHandler?fileName='+obj.pictureuri
+'&moduleName=remoteuserprofile&parentPath=&room_id='
+'&remoteUserid='+obj.user_id+'&r='+t.getTime()
+'&sid='+canvas.sessionId;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainAttributes.lzx
Tue Dec 11 22:49:09 2012
@@ -53,6 +53,8 @@
<attribute name="httpRootKey" value="/" type="string" />
+ <attribute name="protocol" value="/" type="string" />
+
<attribute name="proxyType" value="none" type="string" />
<!---
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/mainMethods.lzx
Tue Dec 11 22:49:09 2012
@@ -41,7 +41,7 @@
this.setAttribute('microphoneRateBest',Number(canvas.myConfigSet.getPointer().xpathQuery('config/microphoneRateBest/text()')));
this.setAttribute('httpRootKey',canvas.myConfigSet.getPointer().xpathQuery('config/httpRootKey/text()'));
-
+
this.setAttribute('protocol',canvas.myConfigSet.getPointer().xpathQuery('config/protocol/text()'));
this.setAttribute('proxyType',canvas.myConfigSet.getPointer().xpathQuery('config/proxyType/text()'));
var _url = this.getDisplayObject().loaderInfo.url;
@@ -69,5 +69,12 @@
if ($debug) Debug.write("tColor SWF10 "+tColor);
return tColor;
</method>
+
+ <method name="getUrl">
+ <![CDATA[
+ return canvas.protocol + '://' + canvas.rtmphostlocal
+ + ':' + canvas.red5httpport +
canvas.httpRootKey;
+ ]]>
+ </method>
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx?rev=1420478&r1=1420477&r2=1420478&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/videoUserProfilePicSWF10.lzx
Tue Dec 11 22:49:09 2012
@@ -30,8 +30,7 @@
} else {
this.value.picture_uri =
"_profile_"+value.picture_uri;
}
- var downloadurl =
'http://'+canvas.rtmphostlocal+':'+canvas.red5httpport
-
+canvas.httpRootKey+'DownloadHandler?fileName='+value.picture_uri
+ var downloadurl = canvas.getUrl() +
'DownloadHandler?fileName='+value.picture_uri
+'&moduleName=remoteuserprofile&parentPath=&room_id='
+'&remoteUserid='+this.value.user_id
+'&sid='+canvas.sessionId;
