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 2016/01/21 03:09:07 UTC
svn commit: r1725854 - in /openmeetings/application/branches/3.1.x:
openmeetings-flash/src/main/swf/base/
openmeetings-flash/src/main/swf/modules/invitation/
openmeetings-web/src/main/java/org/apache/openmeetings/web/room/
Author: solomax
Date: Thu Jan 21 02:09:07 2016
New Revision: 1725854
URL: http://svn.apache.org/viewvc?rev=1725854&view=rev
Log:
[OPENMEETINGS-794] invitation links are partially fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx?rev=1725854&r1=1725853&r2=1725854&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/mainMethods.lzx Thu Jan 21 02:09:07 2016
@@ -291,69 +291,20 @@
if ($debug) Debug.info("###################### -2 ");
- //sid=fe9ea55284e0b23991b1c1089b2c8f64&roomid=1
- var sid = lz.Browser.getInitArg('sid');
- var initroomid = lz.Browser.getInitArg('roomid');
- if (sid != undefined && initroomid != undefined){
- canvas.remoteUserLogin = true;
- canvas.initroomid = initroomid;
- canvas.remoteUserSid = sid;
- }
-
- var directRoomId = lz.Browser.getInitArg('directRoomId');
- if (directRoomId != undefined) {
- canvas.directUserLogin = true;
- canvas.directRoomId = directRoomId;
- }
-
var language = lz.Browser.getInitArg('language');
if (language != undefined) {
canvas.language_id = Number(language);
}
- //check for reset password
- var hash = lz.Browser.getInitArg('hash');
- if (hash!=undefined){
- canvas.isResetUsername = true;
- canvas.resetHash = hash;
- }
-
- var cuserItem = lz.Browser.getInitArg('cuser');
- if (cuserItem!=undefined){
- canvas.cuser = cuserItem;
-
- //Lookup additional actions
- var tAccept = lz.Browser.getInitArg('tAccept');
- if (tAccept != undefined) {
- canvas.cuserStatus = tAccept;
- } else {
- canvas.cuserStatus = "none";
- }
-
- }
-
- var becomemoderator = lz.Browser.getInitArg('becomemoderator');
-
- if (becomemoderator != undefined) {
- if (becomemoderator == "2"){
- canvas.becomemoderator = true;
- } else {
- canvas.becomemoderator = false;
- }
- }
-
- var scopeRoomId = lz.Browser.getInitArg('scopeRoomId');
- if (scopeRoomId != undefined){
- hib.userScope = scopeRoomId;
+ var wicketroomid = lz.Browser.getInitArg('wicketroomid');
+ if (wicketroomid != undefined && !isNaN(wicketroomid)) {
+ canvas.setAttribute('wicketroomid', Number(wicketroomid));
+ hib.userScope = canvas.wicketroomid;
}
-
canvas.setAttribute('wicketsid', null);
var wicketsid = lz.Browser.getInitArg('wicketsid');
- var wicketroomid = lz.Browser.getInitArg('wicketroomid');
- if (wicketsid != undefined && wicketroomid != undefined && !isNaN(wicketroomid)) {
+ if (wicketsid != undefined) {
canvas.setAttribute('wicketsid', wicketsid);
- canvas.setAttribute('wicketroomid', Number(wicketroomid));
- hib.userScope = wicketroomid;
}
this.setBaseColors();
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx?rev=1725854&r1=1725853&r2=1725854&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/invitation/invitationQuickLoader.lzx Thu Jan 21 02:09:07 2016
@@ -96,10 +96,7 @@
</netRemoteCallHib>
<method name="setRoomValues">
- canvas.isConference = canvas.thishib.currentInvitation.room.type == 'conference';
- var roomObj = canvas.thishib.currentInvitation.room;
- hib.currentroomid = roomObj.id;
-
+ canvas.setRoomValues(canvas.thishib.currentInvitation.room);
</method>
<method name="login">
@@ -168,7 +165,7 @@
<![CDATA[
var selVal = canvas.language_id;
var found = false;
- for (var i=0;i<value.length;i++){
+ for (var i = 0; i < value.length; ++i){
this.parent.addItem(value[i].name,value[i].language_id);
if (value[i].language_id == selVal) {
found = true;
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1725854&r1=1725853&r2=1725854&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Thu Jan 21 02:09:07 2016
@@ -130,19 +130,6 @@ public class RoomPanel extends BasePanel
public RoomPanel(String id, PageParameters pp) {
super(id);
-
- StringValue swfVal = pp.get("swf");
- String swf = (swfVal.isEmpty() ? getFlashFile() : swfVal.toString())
- + new PageParametersEncoder().encodePageParameters(pp);
- add(new Label("init", String.format("initSwf('%s');", swf)).setEscapeModelStrings(false));
- add(new AbstractAjaxTimerBehavior(Duration.minutes(5)) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onTimer(AjaxRequestTarget target) {
- getBean(SessiondataDao.class).checkSession(WebSession.getSid()); //keep SID alive
- }
- });
//OK let's find the room
try {
StringValue room = pp.get(WICKET_ROOM_ID);
@@ -158,6 +145,19 @@ public class RoomPanel extends BasePanel
} catch (Exception e) {
//no-op
}
+ StringValue swfVal = pp.get("swf");
+ PageParameters spp = new PageParameters(pp).mergeWith(new PageParameters().add(WICKET_ROOM_ID, roomId));
+ String swf = (swfVal.isEmpty() ? getFlashFile() : swfVal.toString())
+ + new PageParametersEncoder().encodePageParameters(spp);
+ add(new Label("init", String.format("initSwf('%s');", swf)).setEscapeModelStrings(false));
+ add(new AbstractAjaxTimerBehavior(Duration.minutes(5)) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onTimer(AjaxRequestTarget target) {
+ getBean(SessiondataDao.class).checkSession(WebSession.getSid()); //keep SID alive
+ }
+ });
add(invite = new InvitationDialog("invite", roomId));
add(createPoll = new CreatePollDialog("createPoll", roomId));
add(vote = new VoteDialog("vote", roomId));