Revision: 4185
Author: seba.wagner
Date: Sun Sep 4 08:07:56 2011
Log: Should fix Kick User by StreamId and kick User by publicSID
http://code.google.com/p/openmeetings/source/detail?r=4185
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
Sun Sep 4 01:44:00 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
Sun Sep 4 08:07:56 2011
@@ -496,7 +496,8 @@
// add or delete organisations from
this user
if (organisations != null) {
- organisationmanagement.updateUserOrganisationsByUser(us,
organisations);
+
organisationmanagement.updateUserOrganisationsByUser(
+ us,
organisations);
}
us = usersDao.getUser(user_id);
@@ -1725,13 +1726,14 @@
}
IScope currentScope = scopeApplicationAdapter
.getRoomScope(scopeName);
- scopeApplicationAdapter.roomLeaveByScope(rcl,
currentScope);
HashMap<Integer, String> messageObj = new
HashMap<Integer, String>();
messageObj.put(0, "kick");
scopeApplicationAdapter.sendMessageById(messageObj,
rcl.getStreamid(),
currentScope);
+ scopeApplicationAdapter.roomLeaveByScope(rcl,
currentScope);
+
return true;
}
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
Sun Sep 4 03:51:40 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
Sun Sep 4 08:07:56 2011
@@ -201,8 +201,8 @@
* @param asc
* @return
*/
- public List<Users> getOrgUserList(String SID, long organisation_id, int
start,
- int max, String orderby, boolean asc) {
+ public List<Users> getOrgUserList(String SID, long organisation_id,
+ int start, int max, String orderby, boolean asc) {
return
organisationmanagement.getUsersByOrganisationId(organisation_id,
start, max, orderby, asc);
}
@@ -224,8 +224,8 @@
* @param asc
* @return
*/
- public List<Organisation> getOrganisationListByUser(String SID, long
client_user,
- int start, int max, String orderby, boolean asc) {
+ public List<Organisation> getOrganisationListByUser(String SID,
+ long client_user, int start, int max, String orderby,
boolean asc) {
Long users_id = sessionManagement.checkSession(SID);
long user_level = userManagement.getUserLevelByID(users_id);
return
organisationmanagement.getOrganisationsByUserId(user_level,
@@ -243,8 +243,8 @@
* @param asc
* @return
*/
- public List<Organisation> getRestOrganisationListByUser(String SID, long
client_user,
- int start, int max, String orderby, boolean asc) {
+ public List<Organisation> getRestOrganisationListByUser(String SID,
+ long client_user, int start, int max, String orderby,
boolean asc) {
Long users_id = sessionManagement.checkSession(SID);
Long user_level = userManagement.getUserLevelByID(users_id);
return
organisationmanagement.getRestOrganisationsByUserId(user_level,
@@ -299,7 +299,8 @@
* @param argObject
* @return user_id or NULL or negativ value (error_id)
*/
- public Long updateUserSelfSmall(String SID, @SuppressWarnings("rawtypes")
ObjectMap values) {
+ public Long updateUserSelfSmall(String SID,
+ @SuppressWarnings("rawtypes") ObjectMap values) {
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
@@ -349,7 +350,8 @@
Date age = null;
if (argObjectMap.get("userage") instanceof Date) {
age = (Date) argObjectMap.get("userage");
- //log.debug("saveOrUpdateUser7 TimezoneOffset: " +
age.getTimezoneOffset());
+ // log.debug("saveOrUpdateUser7 TimezoneOffset:
" +
+ // age.getTimezoneOffset());
}
log.debug("Mail : " +
argObjectMap.get("email").toString());
@@ -532,14 +534,15 @@
}
IScope currentScope =
this.scopeApplicationAdapter
.getRoomScope(scopeName);
- this.scopeApplicationAdapter
- .roomLeaveByScope(rcl,
currentScope);
HashMap<Integer, String> messageObj = new
HashMap<Integer, String>();
messageObj.put(0, "kick");
this.scopeApplicationAdapter.sendMessageById(messageObj,
streamid, currentScope);
+ this.scopeApplicationAdapter
+ .roomLeaveByScope(rcl,
currentScope);
+
return true;
}
@@ -1257,7 +1260,8 @@
return null;
}
- public Integer moveMailsToFolder(String SID,
@SuppressWarnings("rawtypes") List privateMessageIntsIds,
+ public Integer moveMailsToFolder(String SID,
+ @SuppressWarnings("rawtypes") List
privateMessageIntsIds,
Long newFolderId) {
try {
Long users_id = sessionManagement.checkSession(SID);
@@ -1282,7 +1286,8 @@
return null;
}
- public Integer moveMailsToTrash(String SID, @SuppressWarnings("rawtypes")
List privateMessageIntsIds,
+ public Integer moveMailsToTrash(String SID,
+ @SuppressWarnings("rawtypes") List
privateMessageIntsIds,
Boolean isTrash) {
try {
Long users_id = sessionManagement.checkSession(SID);
@@ -1309,7 +1314,8 @@
return -1;
}
- public Integer deletePrivateMessages(String SID,
@SuppressWarnings("rawtypes") List privateMessageIntsIds) {
+ public Integer deletePrivateMessages(String SID,
+ @SuppressWarnings("rawtypes") List
privateMessageIntsIds) {
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
@@ -1333,7 +1339,8 @@
return -1;
}
- public Integer markReadStatusMails(String SID,
@SuppressWarnings("rawtypes") List privateMessageIntsIds,
+ public Integer markReadStatusMails(String SID,
+ @SuppressWarnings("rawtypes") List
privateMessageIntsIds,
Boolean isRead) {
try {
Long users_id = sessionManagement.checkSession(SID);
--
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.
