Author: sebawagner
Date: Sun Aug 11 03:33:42 2013
New Revision: 1512868
URL: http://svn.apache.org/r1512868
Log:
OPENMEETINGS-759 Unlink user profile OpenLaszlo/Flash UI from main container,
remove edit user profile and related API calls
Removed:
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/settings/editUserProfile.lzx
Modified:
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/dashboard/profilesPanel.lzx
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/library.lzx
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/lzcalendar/lzCalendar.lzx
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/settings/library.lzx
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/WebContent/src/modules/dashboard/profilesPanel.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/dashboard/profilesPanel.lzx?rev=1512868&r1=1512867&r2=1512868&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/dashboard/profilesPanel.lzx
(original)
+++
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/dashboard/profilesPanel.lzx
Sun Aug 11 03:33:42 2013
@@ -139,27 +139,15 @@
<view name="_langAndCountry" layout="axis:x;spacing:2" y="20" x="140">
<labelText name="_town" fgcolor="0x0000CC">
- <handler name="onclick">
- canvas.userSettingsModuleOpt = "userProfile";
- quicklinkAct("userSettingsModule");
- </handler>
</labelText>
<labelText labelid="1143" />
<labelText name="_timeZone" fgcolor="0x0000CC">
- <handler name="onclick">
- canvas.userSettingsModuleOpt = "userProfile";
- quicklinkAct("userSettingsModule");
- </handler>
</labelText>
</view>
<view name="_newmessages" layout="axis:x;spacing:2" y="40" x="140">
<labelText name="_label" labelid="378" />
<labelText name="_text" fgcolor="0x0000CC">
- <handler name="onclick">
- canvas.userSettingsModuleOpt = "contactMessages";
- quicklinkAct("userSettingsModule");
- </handler>
</labelText>
</view>
@@ -169,10 +157,6 @@
this.setAttribute("text","<u>..."+canvas.getLabelName(377)+"</u>");
]]>
</handler>
- <handler name="onclick">
- canvas.userSettingsModuleOpt = "userProfile";
- quicklinkAct("userSettingsModule");
- </handler>
</labelText>
<labelText name="help" fontstyle="bold" x="2"
Modified:
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/library.lzx?rev=1512868&r1=1512867&r2=1512868&view=diff
==============================================================================
--- openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/library.lzx
(original)
+++ openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/library.lzx
Sun Aug 11 03:33:42 2013
@@ -22,14 +22,13 @@
<include href="conference/" />
<include href="chat/" />
+ <!--
<include href="settings/" />
+ -->
<include href="invitation/" />
<include href="lzrecordcontent/" />
<include href="dashboard/" />
<include href="meetings/" />
- <!--
- <include href="admin/" />
- -->
<include href="sipintegration/" />
<include href="lzcalendar/" />
Modified:
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/lzcalendar/lzCalendar.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/lzcalendar/lzCalendar.lzx?rev=1512868&r1=1512867&r2=1512868&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/lzcalendar/lzCalendar.lzx
(original)
+++
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/lzcalendar/lzCalendar.lzx
Sun Aug 11 03:33:42 2013
@@ -329,10 +329,6 @@
this.setAttribute("text","<u>"+canvas.jNameTimeZone+"</u>");
]]>
</handler>
- <handler name="onclick">
- canvas.userSettingsModuleOpt =
"editUserProfile";
- quicklinkAct("userSettingsModule");
- </handler>
</labelText>
Modified:
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/settings/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/settings/library.lzx?rev=1512868&r1=1512867&r2=1512868&view=diff
==============================================================================
---
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/settings/library.lzx
(original)
+++
openmeetings/branches/OPENMEETINGS-745/WebContent/src/modules/settings/library.lzx
Sun Aug 11 03:33:42 2013
@@ -70,6 +70,5 @@
<include href="viewUserProfile.lzx" />
<include href="userSettings.lzx" />
- <include href="editUserProfile.lzx" />
</library>
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=1512868&r1=1512867&r2=1512868&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:33:42 2013
@@ -65,7 +65,6 @@ import org.apache.openmeetings.utils.cry
import org.apache.openmeetings.utils.mail.MailHandler;
import org.apache.openmeetings.utils.math.CalendarPatterns;
import org.apache.openmeetings.utils.math.TimezoneUtil;
-import org.red5.io.utils.ObjectMap;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IClient;
import org.red5.server.api.scope.IScope;
@@ -1016,106 +1015,6 @@ public class UserManager {
}
/**
- * Update User by Object
- *
- * @param user_level
- * @param values
- * @param users_id
- * @return
- */
-
- public Long saveOrUpdateUser(Long user_level, ObjectMap<?, ?> values,
- Long users_id) {
- try {
- if (authLevelUtil.checkAdminLevel(user_level)) {
- Long returnLong = null;
-
- Long user_id =
Long.parseLong(values.get("user_id").toString());
-
- if (user_id != null && user_id > 0) {
-
- returnLong = user_id;
- User savedUser = usersDao.get(user_id);
- savedUser.setAge((Date)
values.get("age"));
-
savedUser.setFirstname(values.get("firstname").toString());
-
savedUser.setLastname(values.get("lastname").toString());
-
savedUser.setSalutations_id(Long.parseLong(values.get(
-
"salutations_id").toString()));
-
-
savedUser.setLanguage_id(Long.parseLong(values.get(
-
"languages_id").toString()));
-
savedUser.setTimeZoneId(timezoneUtil.getTimezoneByInternalJName(values.get("jnameTimeZone").toString()).getID());
-
- String password =
values.get("password").toString();
- if (password != null &&
!password.isEmpty()) {
-
savedUser.updatePassword(cryptManager, configurationDao, password);
- }
-
- String email =
values.get("email").toString();
-
- if
(!email.equals(savedUser.getAdresses().getEmail())) {
- boolean checkEmail =
usersDao.checkUserEMail(email, user_id);
- if (!checkEmail) {
- // mail already used by
another user!
- returnLong = new
Long(-11);
- } else {
-
savedUser.getAdresses().setEmail(email);
- }
- }
-
- String phone =
values.get("phone").toString();
- savedUser.getAdresses().setPhone(phone);
- savedUser.getAdresses().setComment(
-
values.get("comment").toString());
- savedUser.getAdresses().setStreet(
-
values.get("street").toString());
- savedUser.getAdresses().setTown(
-
values.get("town").toString());
-
savedUser.getAdresses().setAdditionalname(
-
values.get("additionalname").toString());
- savedUser.getAdresses()
-
.setZip(values.get("zip").toString());
- savedUser.setSendSMS(false);
- savedUser.setForceTimeZoneCheck(false);
- savedUser.getAdresses().setStates(
-
statemanagement.getStateById(Long.parseLong(values
-
.get("state_id").toString())));
-
-
savedUser.setShowContactData(Boolean.valueOf(values.get(
-
"showContactData").toString()));
-
savedUser.setShowContactDataToContacts(Boolean
-
.valueOf(values.get("showContactDataToContacts")
-
.toString()));
- savedUser
-
.setUserOffers(values.get("userOffers").toString());
-
savedUser.setUserSearchs(values.get("userSearchs")
- .toString());
-
- //
savedUser.setAdresses(addressmanagement.getAdressbyId(user.getAdresses().getAdresses_id()));
-
- if (savedUser.getUser_id() == null) {
- em.persist(savedUser);
- } else {
- if (!em.contains(savedUser)) {
- em.merge(savedUser);
- }
- }
-
- return returnLong;
- }
-
- } else {
- log.error("[saveOrUpdateUser] invalid auth " +
users_id + " "
- + new Date());
- }
- } catch (Exception ex) {
- log.error("[saveOrUpdateUser]", ex);
- }
-
- return null;
- }
-
- /**
* reset a username by a given mail oder login by sending a mail to the
* registered EMail-Address
*
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=1512868&r1=1512867&r2=1512868&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:33:42 2013
@@ -67,7 +67,6 @@ import org.apache.openmeetings.utils.cry
import org.apache.openmeetings.utils.mail.MailHandler;
import org.apache.openmeetings.utils.math.CalendarPatterns;
import org.apache.openmeetings.utils.math.TimezoneUtil;
-import org.red5.io.utils.ObjectMap;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.scope.IScope;
import org.slf4j.Logger;
@@ -175,19 +174,6 @@ public class UserService {
}
/**
- * get user by id, admin only
- *
- * @param SID
- * @param user_id
- * @return User with the id given
- */
- public User getUserById(String SID, long user_id) {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level = userManager.getUserLevelByID(users_id);
- return userManager.checkAdmingetUserById(user_level, user_id);
- }
-
- /**
* refreshes the current SID
*
* @param SID
@@ -308,30 +294,6 @@ public class UserService {
}
/**
- * updates the user profile, every user can update his own profile
- *
- * @param SID
- * @param values
- * @return user_id or NULL or negativ value (error_id)
- */
- public Long updateUserSelfSmall(String SID,
- @SuppressWarnings("rawtypes") ObjectMap values) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- if (user_level != null && user_level >= 1) {
- return userManager.saveOrUpdateUser(new
Long(3), values,
- users_id);
- } else {
- return new Long(-2);
- }
- } catch (Exception err) {
- log.error("[updateUserSelfSmall] " + err);
- return new Long(-1);
- }
- }
-
- /**
* kicks a user from the server, also from slaves if needed, this
method is
* only invoked by the connection administration UI
*
