Author: sebawagner
Date: Sun Aug 11 03:20:04 2013
New Revision: 1512865
URL: http://svn.apache.org/r1512865
Log:
OPENMEETINGS-758 Remove user admin Flash UI and Server Side related API
Removed:
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/admin/
Modified:
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/user/UserManager.java
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/UserService.java
Modified:
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/user/UserManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/user/UserManager.java?rev=1512865&r1=1512864&r2=1512865&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/user/UserManager.java
(original)
+++
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/data/user/UserManager.java
Sun Aug 11 03:20:04 2013
@@ -390,98 +390,6 @@ public class UserManager {
return userdata;
}
- public Long updateUser(long user_level, Long user_id, Long level_id,
- String login, String password, String lastname, String
firstname,
- Date age, String street, String additionalname, String
zip,
- long states_id, String town, Long language_id, int
availible,
- String telefon, String fax, String mobil, String email,
- String comment, int status, List<Long> organisations,
int salutations_id,
- String phone, boolean sendSMS, String jNameTimeZone,
- Boolean forceTimeZoneCheck, String userOffers, String
userSearchs,
- Boolean showContactData, Boolean
showContactDataToContacts) {
-
- if (authLevelUtil.checkUserLevel(user_level) && user_id != 0) {
- try {
- User us = usersDao.get(user_id);
-
- // Check for duplicates
- boolean checkName = true;
-
- if (!login.equals(us.getLogin())) {
- checkName =
usersDao.checkUserLogin(login, user_id);
- }
- boolean checkEmail = true;
-
- // Compare old address with new address
- if (!email.equals(us.getAdresses().getEmail()))
{
-
- // Its a new one - check, whether
another user already uses
- // that one...
- checkEmail =
usersDao.checkUserEMail(email, user_id);
- }
-
- if (checkName && checkEmail) {
- // log.info("user_id " + user_id);
-
- // add or delete organisations from
this user
- if (organisations != null) {
-
organisationManager.updateUserOrganisationsByUser(
- us,
organisations);
- }
- us = usersDao.get(user_id);
-
- us.setLastname(lastname);
- us.setFirstname(firstname);
- us.setAge(age);
- us.setLogin(login);
- us.setUpdatetime(new Date());
- us.setAvailible(availible);
- us.setStatus(status);
-
us.setSalutations_id((long)salutations_id);
-
us.setTimeZoneId(timezoneUtil.getTimezoneByInternalJName(jNameTimeZone).getID());
- us.setLanguage_id(language_id);
-
us.setForceTimeZoneCheck(forceTimeZoneCheck);
-
- us.setSendSMS(sendSMS);
- us.setUserOffers(userOffers);
- us.setUserSearchs(userSearchs);
- us.setShowContactData(showContactData);
-
us.setShowContactDataToContacts(showContactDataToContacts);
-
- if (level_id != 0) {
- us.setLevel_id(level_id);
- }
- if (password.length() != 0) {
- try {
-
us.updatePassword(cryptManager, configurationDao, password);
- } catch (Exception e) {
- return new Long(-7);
- }
- }
- us.setAdresses(street, zip, town,
statemanagement.getStateById(states_id),
- additionalname,
comment, fax, phone, email);
-
- em.merge(us);
-
- return us.getUser_id();
-
- } else {
- if (!checkName) {
- return new Long(-15);
- } else if (!checkEmail) {
- return new Long(-17);
- }
- }
- } catch (Exception ex2) {
- log.error("[updateUser]", ex2);
- }
- } else {
- log.error("Error: Permission denied");
- return new Long(-1);
- }
- return new Long(-1);
- }
-
public String updateUserdata(int DATA_ID, long USER_ID, String DATA_KEY,
String DATA, String Comment) {
String res = "Fehler beim Update";
@@ -1514,66 +1422,6 @@ public class UserManager {
usersDao.update(user, null);
}
- /**
- * @param user_level
- * @param start
- * @param max
- * @param orderby
- * @param asc
- * @param search
- * @return
- */
- public SearchResult<User> getUsersListWithSearch(Long user_level, int
start,
- int max, String orderby, boolean asc, String search) {
- try {
- if (authLevelUtil.checkAdminLevel(user_level)) {
-
- String hql = "select c from User c "
- + "where c.deleted = false " +
"AND ("
- + "lower(c.login) LIKE :search "
- + "OR lower(c.firstname) LIKE
:search "
- + "OR lower(c.lastname) LIKE
:search " + ")";
-
- if (orderby.startsWith("c.")) {
- hql += "ORDER BY " + orderby;
- } else {
- hql += "ORDER BY " + "c." + orderby;
- }
-
- if (asc) {
- hql += " ASC";
- } else {
- hql += " DESC";
- }
-
- if (search.length() == 0) {
- search = "%";
- } else {
- search = "%" + search + "%";
- }
- log.debug("getUsersList search: " + search);
-
- SearchResult<User> sresult = new
SearchResult<User>();
- sresult.setObjectName(User.class.getName());
- sresult.setRecords(usersDao
-
.selectMaxFromUsersWithSearch(search));
-
- // get all users
- TypedQuery<User> query = em.createQuery(hql,
User.class);
- query.setParameter("search",
StringUtils.lowerCase(search));
- query.setMaxResults(max);
- query.setFirstResult(start);
-
- sresult.setResult(query.getResultList());
-
- return sresult;
- }
- } catch (Exception ex2) {
- log.error("[getUsersList] " + ex2);
- }
- return null;
- }
-
private StringBuilder getUserProfileQuery(boolean count, String text,
String offers, String search) {
StringBuilder sb = new StringBuilder("SELECT ");
sb.append(count ? "COUNT(" : "").append("u").append(count ? ")
" : " ")
Modified:
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/UserService.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/UserService.java?rev=1512865&r1=1512864&r2=1512865&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/UserService.java
(original)
+++
openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/remote/UserService.java
Sun Aug 11 03:20:04 2013
@@ -20,11 +20,9 @@ package org.apache.openmeetings.remote;
import static
org.apache.openmeetings.persistence.beans.basic.Configuration.DEFAUT_LANG_KEY;
-import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.TimeZone;
@@ -293,14 +291,6 @@ public class UserService {
.getUsersList(user_level, start, max, orderby,
asc);
}
- public SearchResult<User> getUserListWithSearch(String SID, int start,
- int max, String orderby, boolean asc, String search) {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- return userManager.getUsersListWithSearch(user_level, start,
max,
- orderby, asc, search);
- }
-
/**
* gets a user-list by search criteria
*
@@ -342,173 +332,6 @@ public class UserService {
}
/**
- *
- * @param SID
- * @param regObjectObj
- * @return - id of the user updated in case of success, null otherwise
- */
- @SuppressWarnings({ "rawtypes" })
- public Long saveOrUpdateUser(String SID, Object regObjectObj) {
- try {
- LinkedHashMap argObjectMap = (LinkedHashMap)
regObjectObj;
- Long user_idClient = null;
- if (argObjectMap.get("user_idClient") != null) {
- user_idClient = Long.valueOf(
-
argObjectMap.get("user_idClient").toString())
- .longValue();
- }
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
-
- List<?> orgO = (List<?>)
argObjectMap.get("organisations");
- List<Long> orgIds = new ArrayList<Long>(orgO.size());
- for (Object o : orgO) {
- orgIds.add(Long.valueOf((Integer) o));
- }
- Date age = null;
- if (argObjectMap.get("userage") instanceof Date) {
- age = (Date) argObjectMap.get("userage");
- }
-
- log.debug("Mail : " +
argObjectMap.get("email").toString());
- log.debug("Phone : " +
argObjectMap.get("phone").toString());
-
- long userId;
- if (user_idClient == null || user_idClient == 0) {
- userId = userManager.registerUserInit(
- user_level,
-
Long.valueOf(argObjectMap.get("level_id").toString())
- .longValue(),
- Integer.valueOf(
-
argObjectMap.get("availible").toString())
- .intValue(),
-
Integer.valueOf(argObjectMap.get("status").toString())
- .intValue(),
-
argObjectMap.get("login").toString(),
-
argObjectMap.get("password").toString(),
-
argObjectMap.get("lastname").toString(),
-
argObjectMap.get("firstname").toString(),
-
argObjectMap.get("email").toString(),
- age,
-
argObjectMap.get("street").toString(),
-
argObjectMap.get("additionalname").toString(),
-
argObjectMap.get("fax").toString(),
-
argObjectMap.get("zip").toString(),
-
Long.valueOf(argObjectMap.get("states_id").toString())
- .longValue(),
-
argObjectMap.get("town").toString(),
- new
Long(argObjectMap.get("language_id").toString()),
- true,
- orgIds,
-
argObjectMap.get("phone").toString(),
-
Boolean.valueOf(argObjectMap.get("sendSMS").toString())
- .booleanValue(),
- "",
- false,
-
argObjectMap.get("jNameTimeZone").toString(),
- Boolean.valueOf(
-
argObjectMap.get("forceTimeZoneCheck")
-
.toString()).booleanValue(),
-
argObjectMap.get("userOffers").toString(),
-
argObjectMap.get("userSearchs").toString(),
- Boolean.valueOf(
-
argObjectMap.get("showContactData").toString())
- .booleanValue(),
- Boolean.valueOf(
-
argObjectMap.get("showContactDataToContacts")
-
.toString()).booleanValue());
- } else {
- userId = userManager.updateUser(
- user_level,
- user_idClient,
-
Long.valueOf(argObjectMap.get("level_id").toString())
- .longValue(),
-
argObjectMap.get("login").toString(),
-
argObjectMap.get("password").toString(),
-
argObjectMap.get("lastname").toString(),
-
argObjectMap.get("firstname").toString(),
- age,
-
argObjectMap.get("street").toString(),
-
argObjectMap.get("additionalname").toString(),
-
argObjectMap.get("zip").toString(),
-
Long.valueOf(argObjectMap.get("states_id").toString())
- .longValue(),
-
argObjectMap.get("town").toString(),
- new
Long(argObjectMap.get("language_id").toString()),
- Integer.valueOf(
-
argObjectMap.get("availible").toString())
- .intValue(),
-
argObjectMap.get("telefon").toString(),
-
argObjectMap.get("fax").toString(),
-
argObjectMap.get("mobil").toString(),
-
argObjectMap.get("email").toString(),
-
argObjectMap.get("comment").toString(),
-
Integer.valueOf(argObjectMap.get("status").toString())
- .intValue(),
- orgIds,
- Integer.valueOf(
-
argObjectMap.get("salutations_id").toString())
- .intValue(),
-
argObjectMap.get("phone").toString(),
-
Boolean.valueOf(argObjectMap.get("sendSMS").toString())
- .booleanValue(),
-
argObjectMap.get("jNameTimeZone").toString(),
- Boolean.valueOf(
-
argObjectMap.get("forceTimeZoneCheck")
-
.toString()).booleanValue(),
-
argObjectMap.get("userOffers").toString(),
-
argObjectMap.get("userSearchs").toString(),
- Boolean.valueOf(
-
argObjectMap.get("showContactData").toString())
- .booleanValue(),
- Boolean.valueOf(
-
argObjectMap.get("showContactDataToContacts")
-
.toString()).booleanValue());
- }
-
- return userId;
-
- } catch (Exception ex) {
- log.error("[saveOrUpdateUser]: ", ex);
- }
- return null;
- }
-
- /**
- * deletes a user
- *
- * @param SID
- * @param user_idClient
- * @return - id of the user deleted in case of success, error code
otherwise
- */
- public Long deleteUserAdmin(String SID, Long user_idClient) {
- log.debug("deleteUserAdmin");
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
-
- // admins only
- if (authLevelUtil.checkAdminLevel(user_level)) {
- // no self destruction ;-)
- if (!users_id.equals(user_idClient)) {
-
- // Setting user deleted
- Long userId =
usersDao.deleteUserID(user_idClient);
-
- return userId;
- } else {
- return new Long(-38);
- }
- } else {
- return new Long(-11);
- }
- } catch (Exception err) {
- log.error("[deleteUserAdmin]", err);
- }
- return null;
- }
-
- /**
* kicks a user from the server, also from slaves if needed, this
method is
* only invoked by the connection administration UI
*
