Author: solomax
Date: Thu Oct 22 18:54:35 2015
New Revision: 1710075
URL: http://svn.apache.org/viewvc?rev=1710075&view=rev
Log:
[OPENMEETINGS-794] nickname dialog is displayed for external users
Modified:
openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewUserListItem.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participantListItem.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/conference/popups/chooseNickName.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/invitationQuickLoader.lzx
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/InvitationDialog.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/FormatHelper.java
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
Modified:
openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1710075&r1=1710074&r2=1710075&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Thu Oct 22 18:54:35 2015
@@ -519,63 +519,67 @@
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="getCurrentRoomClient"
funcname="xmlcrm.getCurrentRoomClient" >
- <netparam name="sessionId"><method name="getValue">return
canvas.sessionId;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("getCurrentRoomClient: ",value);
- if (value!=null){
- canvas.currentClient = value;
- canvas.setAttribute('currentuser',value.firstname+"
"+value.lastname);
-
- //Somehow this leads to a bug in the implementation of the
secure User Login
- canvas.setAttribute('user_id',value.user_id);
-
- canvas.setAttribute('allowRecording',value.allowRecording);
-
- var fName = value.firstname == null ? "" : value.firstname;
- var lName = value.lastname == null ? "" : value.lastname;
- canvas.setAttribute('firstName', fName);
- canvas.setAttribute('lastName', lName);
-
- hib.userobject.firstname = fName;
- hib.userobject.lastname = lName;
-
- canvas.setAttribute('mail','');
- canvas.setAttribute('lastLogin','');
- canvas.setAttribute('official_code','');
- canvas.setAttribute('picture_uri',value.picture_uri);
- canvas.setAttribute('language','');
-
- if ($debug) Debug.write("canvas.landingZone ::
",canvas.landingZone);
-
- if (canvas.landingZone == "dashboard") {
- canvas.destroyExitButton = false;
- parent.setUsernameAndSession.doCall();
- parent.getRoomTypes.doCall();
- } else if (canvas.roomRecordingId > 0) {
- if (canvas.thishib.loaderVar != null) {
- canvas.thishib.loaderVar.close();
- }
- //parent.getRoomById.doCall();
- var obj = new Array();
- obj["action"] = "recordModule";
- loadContent(obj,null,null);
- } else if (canvas.wicketroomid > 0) {
- canvas.initroomid = canvas.wicketroomid;
- parent.getRoomTypes.doCall();
- parent.getRoomById.doCall();
- } else {
- if (canvas.thishib.loaderVar != null) {
- canvas.thishib.loaderVar.close();
- }
- parent.getRoomById.doCall();
- }
- }
- ]]>
- </handler>
- </netRemoteCallHib>
+ <netRemoteCallHib name="getCurrentRoomClient"
funcname="xmlcrm.getCurrentRoomClient" >
+ <netparam name="sessionId"><method name="getValue">return
canvas.sessionId;</method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the
rtmpconnection
+ if ($debug) Debug.write("getCurrentRoomClient: ",value);
+ if (value != null) {
+ canvas.currentClient = value;
+
canvas.setAttribute('currentuser',value.firstname+" "+value.lastname);
+
+ //Somehow this leads to a bug in the
implementation of the secure User Login
+ canvas.setAttribute('user_id',value.user_id);
+
+
canvas.setAttribute('allowRecording',value.allowRecording);
+
+ var fName = value.firstname == null ? "" :
value.firstname;
+ var lName = value.lastname == null ? "" :
value.lastname;
+ canvas.setAttribute('firstName', fName);
+ canvas.setAttribute('lastName', lName);
+ canvas.setAttribute('mail',
value.adresses.email);
+
+ if (canvas.isRemoteUser() && fName == '' &&
lName == '') {
+ if ($debug) Debug.write("!!!!!!!!!!!
Nickname HIB ", value.adresses.email);
+ new lz.chooseNickName(canvas);
+ }
+ hib.userobject.firstname = fName;
+ hib.userobject.lastname = lName;
+
+ canvas.setAttribute('lastLogin','');
+ canvas.setAttribute('official_code','');
+
canvas.setAttribute('picture_uri',value.picture_uri);
+ canvas.setAttribute('language','');
+
+ if ($debug) Debug.write("canvas.landingZone ::
",canvas.landingZone);
+
+ if (canvas.landingZone == "dashboard") {
+ canvas.destroyExitButton = false;
+ parent.setUsernameAndSession.doCall();
+ parent.getRoomTypes.doCall();
+ } else if (canvas.roomRecordingId > 0) {
+ if (canvas.thishib.loaderVar != null) {
+
canvas.thishib.loaderVar.close();
+ }
+ //parent.getRoomById.doCall();
+ var obj = new Array();
+ obj["action"] = "recordModule";
+ loadContent(obj,null,null);
+ } else if (canvas.wicketroomid > 0) {
+ canvas.initroomid = canvas.wicketroomid;
+ parent.getRoomTypes.doCall();
+ parent.getRoomById.doCall();
+ } else {
+ if (canvas.thishib.loaderVar != null) {
+
canvas.thishib.loaderVar.close();
+ }
+ parent.getRoomById.doCall();
+ }
+ }
+ ]]>
+ </handler>
+ </netRemoteCallHib>
<netRemoteCallHib name="getRoomById"
funcname="conferenceservice.getRoomById" >
<netparam name="sessionId"><method name="getValue">return
canvas.sessionId;</method></netparam>
@@ -663,7 +667,7 @@
if (value.organisation_users.length > 0){
hib.currentdomain =
value.organisation_users[0].organisation.name;
hib.currentdomainObj =
value.organisation_users[0].organisation;
- } else {
+ } else if (!canvas.isRemoteUser()) {
new lz.errorPopup(canvas,{error:"Missing Organization in User
Object, set the Configuration value of the key 'default.rpc.userid' to a valid
user Id that has at least one Organization assigned in the OpenMeetings
Administrion Configuration Panel "});
}
@@ -1747,6 +1751,19 @@
</handler>
</netRemoteCallHib>
+ <netRemoteCallHib name="nickNameSet" funcname="nickNameSet" >
+ <handler name="ondata" args="value">
+ if ($debug) Debug.write("nickNameSet: ", value);
+ canvas.setAttribute('mail', value.email);
+ canvas.setAttribute('firstName', value.firstname);
+ canvas.setAttribute('lastName', value.lastname);
+
+ var vo =
canvas._videocontainer._participants.getUserListItemByPublicSID(value.publicSID);
+ if (vo != null) {
+ vo.update(value);
+ }
+ </handler>
+ </netRemoteCallHib>
<!-- Whiteboard sync Events -->
<netRemoteCallHib name="sendSyncFlag" funcname="sendSyncFlag">
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewUserListItem.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewUserListItem.lzx?rev=1710075&r1=1710074&r2=1710075&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewUserListItem.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/modules/conference/interviewuserlist/interviewUserListItem.lzx
Thu Oct 22 18:54:35 2015
@@ -56,6 +56,12 @@
]]>
</handler>
+ <method name="update" args="obj">
+ setAttribute('firstname', obj.firstname);
+ setAttribute('lastname', obj.lastname);
+ refObj = obj;
+ </method>
+
<method name="updateIconByMod">
this.isMod = canvas.getIsModeratorByPublicSID(this.refObj.publicSID);
if (this.isMod) {
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participantListItem.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participantListItem.lzx?rev=1710075&r1=1710074&r2=1710075&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participantListItem.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participantListItem.lzx
Thu Oct 22 18:54:35 2015
@@ -53,6 +53,12 @@
]]>
</handler>
+ <method name="update" args="obj">
+ setAttribute('firstname', obj.firstname);
+ setAttribute('lastname', obj.lastname);
+ refObj = obj;
+ </method>
+
<method name="fadeText" args="ignore=null">
<![CDATA[
if ($debug) Debug.write("fadeText :1: ",this.refObj);
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/conference/popups/chooseNickName.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/popups/chooseNickName.lzx?rev=1710075&r1=1710074&r2=1710075&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/modules/conference/popups/chooseNickName.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/modules/conference/popups/chooseNickName.lzx
Thu Oct 22 18:54:35 2015
@@ -24,17 +24,16 @@
docking="true" resizeable="false" closable="false"
width="324" x="$once{ parent.width/2 - this.width/2 }" y="100"
height="200">
- <handler name="oninit">
- <![CDATA[
-
- var tFirstname = "Guest"
- var tLastname = "User "+getStringTimeWithSeconds();
-
- this.firstName.setAttribute("text",tFirstname);
- this.lastName.setAttribute("text",tLastname);
-
- ]]>
- </handler>
+ <handler name="oninit">
+ <![CDATA[
+ var tFirstname = "Guest"
+ var tLastname = "User " + getStringTimeWithSeconds();
+
+ this.firstName.setAttribute("text", tFirstname);
+ this.lastName.setAttribute("text", tLastname);
+ this.mail.setAttribute("text", canvas.mail);
+ ]]>
+ </handler>
<!--
public Long setUserNickName(String firstname, String lastname, String
email)
@@ -52,7 +51,7 @@
if (value<0){
} else {
- canvas.thishib.getCurrentRoomClient.doCall();
+ //canvas.thishib.getCurrentRoomClient.doCall();
parent.close();
}
]]>
@@ -66,8 +65,7 @@
<customEdittext name="lastName" y="54" x="120" width="200"
text="" />
<labelText y="86" x="4" labelid="1290" />
- <customEdittext name="mail" y="84" x="120" width="200"
- regexpType="email" text="" />
+ <customEdittext name="mail" y="84" x="120" width="200"
regexpType="email" text="" />
<simpleLabelButton name="connect" x="$once{ parent.width-this.width-10
}"
y="$once{ parent.height-30 }"
labelid="1291" width="120" >
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx?rev=1710075&r1=1710074&r2=1710075&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/modules/conference/restricted/restrictedUserListItem.lzx
Thu Oct 22 18:54:35 2015
@@ -42,6 +42,12 @@
<attribute name="selfItem" value="false" type="boolean"/>
+ <method name="update" args="obj">
+ setAttribute('firstname', obj.firstname);
+ setAttribute('lastname', obj.lastname);
+ refObj = obj;
+ </method>
+
<handler name="onisMod">
<![CDATA[
if (this.isMod) {
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/invitationQuickLoader.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/invitation/invitationQuickLoader.lzx?rev=1710075&r1=1710074&r2=1710075&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/invitationQuickLoader.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/invitationQuickLoader.lzx
Thu Oct 22 18:54:35 2015
@@ -124,9 +124,13 @@
canvas.setAttribute('currentuser', email);
canvas.setAttribute('user_id', -invitee.user_id);
+ canvas.setAttribute('mail', email);
+ if (!invitee.firstname && !invitee.lastname) {
+ if ($debug) Debug.write("!!!!!!!!!!! Nickname
invitation ", email);
+ new lz.chooseNickName(canvas);
+ }
canvas.setAttribute('firstName', fName);
canvas.setAttribute('lastName', lName);
- canvas.setAttribute('mail', email);
canvas.setAttribute('lastLogin', invitee.lastlogin);
canvas.setAttribute('official_code','');
canvas.setAttribute('picture_uri', invitee.pictureuri);
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java?rev=1710075&r1=1710074&r2=1710075&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java
Thu Oct 22 18:54:35 2015
@@ -325,11 +325,9 @@ public class MainService implements IPen
*/
public Long setUserNickName(String firstname, String lastname, String
email) {
try {
-
IConnection current = Red5.getConnectionLocal();
String streamId = current.getClient().getId();
- Client currentClient = this.sessionManager
- .getClientByStreamId(streamId, null);
+ Client currentClient =
sessionManager.getClientByStreamId(streamId, null);
currentClient.setFirstname(firstname);
currentClient.setLastname(lastname);
@@ -344,11 +342,10 @@ public class MainService implements IPen
currentClient.getEmail(),
currentClient.getFirstname(),
currentClient.getLastname());
- this.sessionManager.updateClientByStreamId(streamId,
- currentClient, false, null);
+ sessionManager.updateClientByStreamId(streamId,
currentClient, false, null);
+
scopeApplicationAdapter.sendMessageToCurrentScope("nickNameSet", currentClient,
true);
return 1L;
-
} catch (Exception err) {
log.error("[setUserNickName] ", err);
}
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/InvitationDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/InvitationDialog.java?rev=1710075&r1=1710074&r2=1710075&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/InvitationDialog.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/room/InvitationDialog.java
Thu Oct 22 18:54:35 2015
@@ -29,7 +29,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import org.apache.openmeetings.data.conference.InvitationManager;
@@ -112,8 +111,7 @@ public class InvitationDialog extends Ab
public void query(String term, int page,
Response<Organisation> response) {
if
(WebSession.getRights().contains(User.Right.Admin)) {
List<Organisation> groups =
getBean(OrganisationDao.class).get(0, Integer.MAX_VALUE);
- for (Iterator<Organisation> i =
groups.iterator(); i.hasNext();) {
- Organisation g =
i.next();
+ for (Organisation g : groups) {
if
(g.getName().toLowerCase().contains(term.toLowerCase())) {
response.add(g);
}
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/FormatHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/FormatHelper.java?rev=1710075&r1=1710074&r2=1710075&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/FormatHelper.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/FormatHelper.java
Thu Oct 22 18:54:35 2015
@@ -69,7 +69,11 @@ public class FormatHelper {
String user = "";
if (u != null) {
String email = u.getAdresses() == null ? "" :
u.getAdresses().getEmail();
- user = String.format("\"%s %s\" <%s>",
u.getFirstname(), u.getLastname(), email);
+ if (u.getFirstname() == null && u.getLastname() ==
null) {
+ user = email;
+ } else {
+ user = String.format("\"%s %s\" <%s>",
u.getFirstname(), u.getLastname(), email);
+ }
user = isHTMLEscape ? escapeHtml4(user) : user;
}
return user;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java?rev=1710075&r1=1710074&r2=1710075&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/MainService.java
Thu Oct 22 18:54:35 2015
@@ -226,11 +226,9 @@ public class MainService implements IPen
*/
public Long setUserNickName(String firstname, String lastname, String
email) {
try {
-
IConnection current = Red5.getConnectionLocal();
String streamId = current.getClient().getId();
- Client currentClient = this.sessionManager
- .getClientByStreamId(streamId, null);
+ Client currentClient =
sessionManager.getClientByStreamId(streamId, null);
currentClient.setFirstname(firstname);
currentClient.setLastname(lastname);
@@ -241,11 +239,10 @@ public class MainService implements IPen
Type.nicknameEnter,
currentClient.getUserId(), streamId,
null, currentClient.getUserip(),
currentClient.getScope());
- this.sessionManager.updateClientByStreamId(streamId,
- currentClient, false, null);
+ sessionManager.updateClientByStreamId(streamId,
currentClient, false, null);
+
scopeApplicationAdapter.sendMessageToCurrentScope("nickNameSet", currentClient,
true);
return 1L;
-
} catch (Exception err) {
log.error("[setUserNickName] ", err);
}
@@ -385,11 +382,6 @@ public class MainService implements IPen
return -1L;
}
- public String[] getTimeZones(int start, int count) {
- String all[] = TimeZone.getAvailableIDs();
- return Arrays.copyOfRange(all, start, Math.min(start + count,
all.length));
- }
-
public List<Configuration> getGeneralOptions(String SID) {
try {
return configurationDao.get("exclusive.audio.keycode",
"red5sip.enable", CONFIG_MAX_UPLOAD_SIZE_KEY, "mute.keycode",
CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY);
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java?rev=1710075&r1=1710074&r2=1710075&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/FormatHelper.java
Thu Oct 22 18:54:35 2015
@@ -69,7 +69,11 @@ public class FormatHelper {
String user = "";
if (u != null) {
String email = u.getAddress() == null ? "" :
u.getAddress().getEmail();
- user = String.format("\"%s %s\" <%s>",
u.getFirstname(), u.getLastname(), email);
+ if (u.getFirstname() == null && u.getLastname() ==
null) {
+ user = email;
+ } else {
+ user = String.format("\"%s %s\" <%s>",
u.getFirstname(), u.getLastname(), email);
+ }
user = isHTMLEscape ? escapeHtml4(user) : user;
}
return user;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java?rev=1710075&r1=1710074&r2=1710075&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
Thu Oct 22 18:54:35 2015
@@ -29,7 +29,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
@@ -111,8 +110,7 @@ public class InvitationDialog extends Ab
public void query(String term, int page,
Response<Group> response) {
if
(WebSession.getRights().contains(User.Right.Admin)) {
List<Group> groups =
getBean(GroupDao.class).get(0, Integer.MAX_VALUE);
- for (Iterator<Group> i =
groups.iterator(); i.hasNext();) {
- Group g = i.next();
+ for (Group g : groups) {
if
(g.getName().toLowerCase().contains(term.toLowerCase())) {
response.add(g);
}
