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 2013/08/11 18:57:32 UTC
svn commit: r1512970 [1/2] - in /openmeetings/trunk/singlewebapp: ./
WebContent/WEB-INF/ WebContent/openmeetings/public/ WebContent/src/base/
WebContent/src/modules/ WebContent/src/modules/admin/
WebContent/src/modules/dashboard/ WebContent/src/modules...
Author: solomax
Date: Sun Aug 11 16:57:31 2013
New Revision: 1512970
URL: http://svn.apache.org/r1512970
Log:
OPENMEETINGS-745 branch is merged back into trunk
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/invitiation/
- copied from r1512967, openmeetings/branches/OPENMEETINGS-745/src/org/apache/openmeetings/test/invitiation/
Removed:
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConfigurationService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/OrganisationService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/test/labels/TestLabels.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/util/ui/
Modified:
openmeetings/trunk/singlewebapp/ (props changed)
openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml
openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd
openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/library.lzx
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguageDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldManager.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/beans/MeetingMemberDTO.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/MeetingMemberDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/OrganisationManager.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/calendar/MeetingMember.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/invitation/Invitations.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/user/User.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LdapConfigService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/BackupImportController.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
Propchange: openmeetings/trunk/singlewebapp/
------------------------------------------------------------------------------
Merged /openmeetings/branches/OPENMEETINGS-745:r1512528-1512967
Modified: openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml Sun Aug 11 16:57:31 2013
@@ -80,7 +80,6 @@
<bean id="xmlcrm.service" class="org.apache.openmeetings.remote.MainService" />
<bean id="printservice.service" class="org.apache.openmeetings.remote.PrintService" />
<bean id="pollservice.service" class="org.apache.openmeetings.remote.PollService" />
- <bean id="organisationservice.service" class="org.apache.openmeetings.remote.OrganisationService" />
<bean id="meetingmemberservice.service" class="org.apache.openmeetings.remote.MeetingMemberService" />
<bean id="languageservice.service" class="org.apache.openmeetings.remote.LanguageService" />
<bean id="invitationservice.service" class="org.apache.openmeetings.remote.InvitationService" />
@@ -92,7 +91,6 @@
<bean id="openmeetings.FlvExplorerConverter" class="org.apache.openmeetings.data.flvrecord.converter.FlvExplorerConverter" />
<bean id="errorservice.service" class="org.apache.openmeetings.remote.ErrorService" />
<bean id="conferenceservice.service" class="org.apache.openmeetings.remote.ConferenceService" />
- <bean id="configservice.service" class="org.apache.openmeetings.remote.ConfigurationService" />
<bean id="chatservice.service" class="org.apache.openmeetings.remote.ChatService" />
<bean id="calendarservice.service" class="org.apache.openmeetings.remote.CalendarService" />
<bean id="flvrecorderservice.service" class="org.apache.openmeetings.remote.FLVRecorderService" />
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml (original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml Sun Aug 11 16:57:31 2013
@@ -283,27 +283,6 @@ To disable AEC please specify 0.
<!-- Module Configuration -->
<!-- #############################################
- Admin Modules
- -->
-
-<adminModuleUser>userAdmin</adminModuleUser>
-
-<adminModuleRoom>roomAdmin</adminModuleRoom>
-
-<adminModuleOrg>orgAdmin</adminModuleOrg>
-
-<adminModuleLanguages>languagesEditor</adminModuleLanguages>
-
-<adminModuleConnections>roomClient</adminModuleConnections>
-
-<adminModuleConfiguration>confAdmin</adminModuleConfiguration>
-
-<adminModuleBackup>backupContent</adminModuleBackup>
-
-<adminModuleLDAP>ldapAdmin</adminModuleLDAP>
-
-<adminModuleServers>serversAdmin</adminModuleServers>
-<!-- #############################################
Moderator Modules
-->
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd (original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd Sun Aug 11 16:57:31 2013
@@ -52,15 +52,6 @@
<xs:element ref="defaultWhiteboardWidth"/>
<xs:element ref="defaultWhiteboardHeight"/>
<xs:element ref="availableCameraResolutions"/>
- <xs:element ref="adminModuleUser"/>
- <xs:element ref="adminModuleRoom"/>
- <xs:element ref="adminModuleOrg"/>
- <xs:element ref="adminModuleLanguages"/>
- <xs:element ref="adminModuleConnections"/>
- <xs:element ref="adminModuleConfiguration"/>
- <xs:element ref="adminModuleBackup"/>
- <xs:element ref="adminModuleLDAP"/>
- <xs:element ref="adminModuleServers"/>
<xs:element ref="moderatorModuleUser"/>
<xs:element ref="moderatorModuleRoom"/>
<xs:element ref="dashboardModuleStartScreen"/>
@@ -173,15 +164,6 @@
<xs:attribute name="width" use="required" type="xs:integer"/>
</xs:complexType>
</xs:element>
- <xs:element name="adminModuleUser" type="xs:NCName"/>
- <xs:element name="adminModuleRoom" type="xs:NCName"/>
- <xs:element name="adminModuleOrg" type="xs:NCName"/>
- <xs:element name="adminModuleLanguages" type="xs:NCName"/>
- <xs:element name="adminModuleConnections" type="xs:NCName"/>
- <xs:element name="adminModuleConfiguration" type="xs:NCName"/>
- <xs:element name="adminModuleBackup" type="xs:NCName"/>
- <xs:element name="adminModuleLDAP" type="xs:NCName"/>
- <xs:element name="adminModuleServers" type="xs:NCName"/>
<xs:element name="moderatorModuleUser" type="xs:NCName"/>
<xs:element name="moderatorModuleRoom" type="xs:NCName"/>
<xs:element name="dashboardModuleStartScreen" type="xs:NCName"/>
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Sun Aug 11 16:57:31 2013
@@ -246,15 +246,6 @@
this.setAttribute('defaultWhiteboardHeight',Number(canvas.myConfigSet.getPointer().xpathQuery('config/defaultWhiteboardHeight/text()')));
- this.setAttribute('adminModuleUser',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleUser/text()'));
- this.setAttribute('adminModuleRoom',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleRoom/text()'));
- this.setAttribute('adminModuleOrg',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleOrg/text()'));
- this.setAttribute('adminModuleLanguages',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleLanguages/text()'));
- this.setAttribute('adminModuleConnections',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleConnections/text()'));
- this.setAttribute('adminModuleConfiguration',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleConfiguration/text()'));
- this.setAttribute('adminModuleBackup',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleBackup/text()'));
- this.setAttribute('adminModuleServers',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleServers/text()'));
-
this.setAttribute('moderatorModuleUser',canvas.myConfigSet.getPointer().xpathQuery('config/moderatorModuleUser/text()'));
this.setAttribute('moderatorModuleRoom',canvas.myConfigSet.getPointer().xpathQuery('config/moderatorModuleRoom/text()'));
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx Sun Aug 11 16:57:31 2013
@@ -26,29 +26,6 @@ these properties can be overwritten by p
<!-- #############################################
- Admin Modules
- -->
-
-<attribute name="adminModuleUser" value="userAdmin" type="string" />
-
-<attribute name="adminModuleRoom" value="roomAdmin" type="string" />
-
-<attribute name="adminModuleOrg" value="orgAdmin" type="string" />
-
-<attribute name="adminModuleLanguages" value="languagesEditor" type="string" />
-
-<attribute name="adminModuleConnections" value="roomClient" type="string" />
-
-<attribute name="adminModuleConfiguration" value="confAdmin" type="string" />
-
-<attribute name="adminModuleLDAP" value="ldapAdmin" type="string" />
-
-<attribute name="adminModuleBackup" value="backupContent" type="string" />
-
-<attribute name="adminModuleServers" value="serversAdmin" type="string" />
-
-
-<!-- #############################################
Moderator Modules
-->
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx Sun Aug 11 16:57:31 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/trunk/singlewebapp/WebContent/src/modules/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx Sun Aug 11 16:57:31 2013
@@ -22,12 +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/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx Sun Aug 11 16:57:31 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/trunk/singlewebapp/WebContent/src/modules/settings/library.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/library.lzx?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/library.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/library.lzx Sun Aug 11 16:57:31 2013
@@ -70,6 +70,5 @@
<include href="viewUserProfile.lzx" />
<include href="userSettings.lzx" />
- <include href="editUserProfile.lzx" />
</library>
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/CalendarWebService.java Sun Aug 11 16:57:31 2013
@@ -358,15 +358,11 @@ public class CalendarWebService {
Long user_level = userManager.getUserLevelByID(users_id);
if (authLevelUtil.checkUserLevel(user_level)) {
- log.debug("appointmentId " + appointmentId);
-
appointmentLogic.getAppointMentById(appointmentId);
- User user = userManager.getUserById(users_id);
-
return appointmentDao.updateAppointmentByTime(appointmentId,
appointmentstart, appointmentend, users_id, baseurl,
- languageId, user.getOmTimeZone().getIcal());
+ languageId);
}
} catch (Exception err) {
log.error("[updateAppointment]", err);
@@ -489,14 +485,12 @@ public class CalendarWebService {
roomDao.update(room, users_id);
}
- User user = userManager.getUserById(users_id);
-
return appointmentDao.updateAppointment(appointmentId,
appointmentName, appointmentDescription, appointmentstart
.getTime(), appointmentend.getTime(), isDaily,
isWeekly, isMonthly, isYearly, categoryId, remind, newList,
users_id, baseurl, languageId, isPasswordProtected,
- password, user.getOmTimeZone().getIcal(),
+ password,
appointmentLocation);
} catch (Exception err) {
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/JabberWebService.java Sun Aug 11 16:57:31 2013
@@ -33,6 +33,7 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.room.RoomOrganisation;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.remote.ConferenceService;
+import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -62,6 +63,8 @@ public class JabberWebService {
private OmTimeZoneDao omTimeZoneDaoImpl;
@Autowired
private ConfigurationDao configurationDao;
+ @Autowired
+ private TimezoneUtil timezoneUtil;
/**
* Get List<Rooms> of all rooms available to the user.
@@ -133,8 +136,8 @@ public class JabberWebService {
user_level, username, username, username, username, username,
room_id, "", Boolean.valueOf(false), null, Integer.valueOf(3),
null, null, users_id, "", Long.valueOf(1L),
- Boolean.valueOf(false), null, null, null, username
- , omTimeZoneDaoImpl.getOmTimeZone(configurationDao.getConfValue("default.timezone", String.class, "Europe/Berlin")));
+ Boolean.valueOf(false), null, null, null, username,
+ timezoneUtil.getDefaultTimeZone());
return ((invitation == null) ? null : invitation.getHash());
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java Sun Aug 11 16:57:31 2013
@@ -45,11 +45,11 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.room.Client;
import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.persistence.beans.room.RoomType;
-import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.remote.ConferenceService;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
import org.apache.openmeetings.session.ISessionManager;
import org.apache.openmeetings.utils.math.CalendarPatterns;
+import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -90,6 +90,8 @@ public class RoomWebService {
private MeetingMemberLogic meetingMemberLogic;
@Autowired
private RoomDao roomDao;
+ @Autowired
+ private TimezoneUtil timezoneUtil;
/**
* Returns an Object of Type RoomsList which contains a list of
@@ -1770,7 +1772,8 @@ public class RoomWebService {
username, username, username, room_id, "",
isPasswordProtected, invitationpass, valid,
dFrom, dTo, users_id, "", 1L, false, dFrom,
- dTo, null, username, userManager.getUserById(users_id).getOmTimeZone());
+ dTo, null, username,
+ timezoneUtil.getTimezoneByUser(userManager.getUserById(users_id)));
if (invitation != null) {
@@ -1909,7 +1912,8 @@ public class RoomWebService {
baseurl, email, subject, room_id, "",
isPasswordProtected, invitationpass, valid,
dFrom, dTo, users_id, baseurl, language_id,
- sendMail, dFrom, dTo, null, username, userManager.getUserById(users_id).getOmTimeZone());
+ sendMail, dFrom, dTo, null, username,
+ timezoneUtil.getTimezoneByUser(userManager.getUserById(users_id)));
if (invitation != null) {
@@ -2010,7 +2014,8 @@ public class RoomWebService {
baseurl, email, subject, room_id, "",
isPasswordProtected, invitationpass, valid,
dFrom, dTo, users_id, baseurl, language_id,
- sendMail, dFrom, dTo, null, username, userManager.getUserById(users_id).getOmTimeZone());
+ sendMail, dFrom, dTo, null, username,
+ timezoneUtil.getTimezoneByUser(userManager.getUserById(users_id)));
if (invitation != null) {
@@ -2283,8 +2288,6 @@ public class RoomWebService {
return rooms_id;
}
- User us = userManager.getUserById(users_id);
-
appointmentDao.addAppointment("appointmentName", users_id,
"appointmentLocation", "appointmentDescription", dFrom,
dTo, // appointmentstart, appointmentend,
@@ -2295,7 +2298,7 @@ public class RoomWebService {
roomDao.get(rooms_id), 1L, // language_id
isPasswordProtected, // isPasswordProtected
password, // password
- false, us.getOmTimeZone().getJname());
+ false);
return rooms_id;
@@ -2354,7 +2357,7 @@ public class RoomWebService {
Long memberId = meetingMemberLogic.addMeetingMember(firstname,
lastname, "0", "0", appointment.getAppointmentId(),
null, email, null, baseUrl, null, new Boolean(false),
- language_id, false, "", null, null, "");
+ language_id, false, "", null, "");
return memberId;
@@ -2418,7 +2421,7 @@ public class RoomWebService {
Long memberId = meetingMemberLogic.addMeetingMember(firstname,
lastname, "0", "0", appointment.getAppointmentId(),
null, email, "", baseUrl, null, new Boolean(false),
- language_id, false, "", null, null, invitorName);
+ language_id, false, "", null, invitorName);
return memberId;
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguageDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguageDao.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguageDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldLanguageDao.java Sun Aug 11 16:57:31 2013
@@ -87,24 +87,6 @@ public class FieldLanguageDao implements
}
}
- public Long updateFieldLanguage(Long language_id, String langName,
- String code, boolean deleted) {
- try {
- FieldLanguage fl = this.getFieldLanguageById(language_id);
- fl.setUpdatetime(new Date());
- if (langName.length() > 0)
- fl.setName(langName);
- if (code.length() > 0)
- fl.setCode(code);
- fl.setDeleted(deleted);
- this.updateLanguage(fl);
- return language_id;
- } catch (Exception ex2) {
- log.error("[updateLanguage]: ", ex2);
- }
- return new Long(-1);
- }
-
public void delete(FieldLanguage fl) {
fl.setUpdatetime(new Date());
fl.setDeleted(true);
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldManager.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/FieldManager.java Sun Aug 11 16:57:31 2013
@@ -33,7 +33,6 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
@@ -160,23 +159,6 @@ public class FieldManager {
return null;
}
- public Long deleteFieldlanguagesvaluesById(Long fieldlanguagesvalues_id) {
- try {
- Fieldlanguagesvalues flv = this
- .getFieldlanguagesvaluesById(fieldlanguagesvalues_id);
- if (flv == null) {
- return new Long(-27);
- }
-
- flv = em.find(Fieldlanguagesvalues.class, fieldlanguagesvalues_id);
-
- return new Long(-28);
- } catch (Exception ex2) {
- log.error("[getFieldByIdAndLanguage]: ", ex2);
- }
- return new Long(-1);
- }
-
public List<Fieldlanguagesvalues> getAllFieldsByLanguage(Long language_id) {
try {
@@ -398,168 +380,10 @@ public class FieldManager {
return q1.getResultList();
}
- public Fieldvalues getFieldvaluesById(Long fieldvalues_id, Long language_id) {
- try {
- // log.error("Long fieldvalues_id, Long language_id "+fieldvalues_id+" || "+language_id);
- Fieldvalues fv = this.getFieldvaluesById(fieldvalues_id);
- fv.setFieldlanguagesvalue(this.getFieldByIdAndLanguage(
- fieldvalues_id, language_id));
- return fv;
- } catch (Exception e) {
- log.error("[getFieldvaluesById] ", e);
- }
- return null;
- }
-
- /**
- * update given Field and its Label by IDs
- *
- * @param fieldvalues_id
- * @param name
- * @param fieldlanguagesvalues_id
- * @param value
- * @return
- */
- public Long updateLabel(Long fieldvalues_id, String name,
- Long fieldlanguagesvalues_id, String value) {
- try {
- Fieldvalues fv = this.getFieldvaluesById(fieldvalues_id);
- if (fv == null) {
- return new Long(-24);
- } else {
- fv.setName(name);
- fv.setUpdatetime(new Date());
- this.updateField(fv);
- }
- Fieldlanguagesvalues flv = this
- .getFieldlanguagesvaluesById(fieldlanguagesvalues_id);
- if (flv == null) {
- return new Long(-25);
- } else {
- flv.setUpdatetime(new Date());
- flv.setValue(value);
- this.updateFieldLanguagesLabel(flv);
- }
- return fieldvalues_id;
- } catch (Exception ex2) {
- log.error("[updateFieldLanguagesLabel]: ", ex2);
- }
- return new Long(-1);
- }
-
- public Long addAndUpdateLabel(Long fieldvalues_id, String name,
- String value, Long language_id) {
- try {
- Fieldvalues fv = this.getFieldvaluesById(fieldvalues_id);
- if (fv == null) {
- return new Long(-24);
- } else {
- fv.setName(name);
- fv.setUpdatetime(new Date());
- this.updateField(fv);
- }
- this.addFieldValueByFieldAndLanguage(fv, language_id,
- value);
- return fieldvalues_id;
- } catch (Exception ex2) {
- log.error("[updateFieldLanguagesLabel]: ", ex2);
- }
- return new Long(-1);
- }
-
public long getNextFieldvaluesId() {
return fieldLanguagesValuesDAO.count() + 1;
}
- public Long addFieldAndLabel(String name, String value, Long language_id) {
- try {
- Fieldvalues fv = addFieldById(name, getNextFieldvaluesId());
- if (fv.getFieldvalues_id() > 0) {
- this.addFieldValueByFieldAndLanguage(fv,
- language_id, value);
- return fv.getFieldvalues_id();
- } else {
- return -1L;
- }
- } catch (Exception ex2) {
- log.error("[updateFieldLanguagesLabel]: ", ex2);
- }
- return -1L;
- }
-
- public SearchResult<Fieldvalues> getFieldsByLanguage(int start, int max, String orderby,
- boolean asc, Long language_id, String search) {
- try {
- SearchResult<Fieldvalues> sresult = new SearchResult<Fieldvalues>();
- sresult.setObjectName(Fieldlanguagesvalues.class.getName());
- sresult.setRecords(this.selectMaxFromFieldsValues(search));
- sresult.setResult(this.getMixedFieldValuesList(start, max, orderby,
- asc, language_id, search));
- return sresult;
- } catch (Exception ex2) {
- log.error("[getFieldsByLanguage]: ", ex2);
- }
- return null;
- }
-
- private Long selectMaxFromFieldsValues(String search) throws Exception {
- String queryLanguage = "select count(c.fieldvalues_id) from Fieldvalues c where c.deleted = false";
- if (search.length()>0) {
- queryLanguage += " AND (c.name LIKE :searchStr " +
- "OR c.fieldvalues_id = :fieldvalues_id)";
- }
- TypedQuery<Long> query = em
- .createQuery(queryLanguage, Long.class);
- if (search.length()>0) {
- query.setParameter("searchStr", "%"+search+"%");
- long idNumber = 0;
- try {
- idNumber = Long.parseLong(search);
- } catch (NumberFormatException nfe) {
- }
- query.setParameter("fieldvalues_id", idNumber);
- }
- return query.getResultList().get(0);
- }
-
- private List<Fieldvalues> getMixedFieldValuesList(int start, int max,
- String orderby, boolean asc, Long language_id, String search) throws Exception {
- List<Fieldvalues> fvList = this.getFieldsValues(start, max, orderby, asc, search);
- for (Fieldvalues fv : fvList) {
- fv.setFieldlanguagesvalue(this.getFieldByIdAndLanguage(
- fv.getFieldvalues_id(), language_id));
- }
- return fvList;
- }
-
- private List<Fieldvalues> getFieldsValues(int start, int max,
- String orderby, boolean asc, String search) throws Exception {
- String queryLanguage = "select c from Fieldvalues c where c.deleted = false";
- if (search.length()>0) {
- queryLanguage += " AND (c.name LIKE :searchStr " +
- "OR c.fieldvalues_id = :fieldvalues_id)";
- }
- if (asc) {
- queryLanguage += " ORDER BY "+orderby+ " ASC";
- } else {
- queryLanguage += " ORDER BY "+orderby + "DESC";
- }
- TypedQuery<Fieldvalues> q = em
- .createQuery(queryLanguage, Fieldvalues.class);
- if (search.length()>0) {
- q.setParameter("searchStr", "%"+search+"%");
- long idNumber = 0;
- try {
- idNumber = Long.parseLong(search);
- } catch (NumberFormatException nfe) {
- }
- q.setParameter("fieldvalues_id", idNumber);
- }
- q.setFirstResult(start);
- q.setMaxResults(max);
- return q.getResultList();
- }
-
public Fieldvalues getFieldvaluesById(Long fieldvalues_id) {
String hql = "select f from Fieldvalues f WHERE f.fieldvalues_id = :fieldvalues_id ";
TypedQuery<Fieldvalues> query = em.createQuery(hql, Fieldvalues.class);
@@ -572,11 +396,6 @@ public class FieldManager {
return fv;
}
- private Fieldlanguagesvalues getFieldlanguagesvaluesById(
- Long fieldlanguagesvalues_id) throws Exception {
- return performReplace(fieldLanguagesValuesDAO.get(fieldlanguagesvalues_id));
- }
-
private Fieldlanguagesvalues performReplace(Fieldlanguagesvalues f) {
String appName = configurationDaoImpl.getAppName();
return performReplace(f, appName);
@@ -607,25 +426,4 @@ public class FieldManager {
return flv;
}
- private void updateField(Fieldvalues fv) throws Exception {
- if (fv.getFieldvalues_id() == null) {
- em.persist(fv);
- } else {
- if (!em.contains(fv)) {
- em.merge(fv);
- }
- }
- }
-
- private void updateFieldLanguagesLabel(Fieldlanguagesvalues flv)
- throws Exception {
- if (flv.getFieldlanguagesvalues_id() == null) {
- em.persist(flv);
- } else {
- if (!em.contains(flv)) {
- em.merge(flv);
- }
- }
- }
-
}
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/ConfigurationDao.java Sun Aug 11 16:57:31 2013
@@ -33,7 +33,6 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.IDataProviderDao;
-import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
@@ -138,20 +137,6 @@ public class ConfigurationDao implements
}
}
- public SearchResult<Configuration> getAllConf(int start, int max,
- String orderby, boolean asc) {
- try {
- SearchResult<Configuration> sresult = new SearchResult<Configuration>();
- sresult.setRecords(this.selectMaxFromConfigurations());
- sresult.setResult(this.getConfigurations(start, max, orderby, asc));
- sresult.setObjectName(Configuration.class.getName());
- return sresult;
- } catch (Exception ex2) {
- log.error("[getAllConf]: ", ex2);
- }
- return null;
- }
-
public List<Configuration> getConfigurations(int start, int max,
String orderby, boolean asc) {
try {
@@ -179,20 +164,6 @@ public class ConfigurationDao implements
}
/**
- *
- * @return
- * @deprecated please use {@link ConfigurationDao#count()}
- */
- public Long selectMaxFromConfigurations() {
- try {
- return count();
- } catch (Exception ex2) {
- log.error("[selectMaxFromConfigurations] ", ex2);
- }
- return null;
- }
-
- /**
*/
public Configuration add(String key, String value, Long userId, String comment) {
Configuration c = new Configuration();
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/LdapConfigDao.java Sun Aug 11 16:57:31 2013
@@ -26,10 +26,6 @@ import javax.persistence.NoResultExcepti
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceException;
import javax.persistence.TypedQuery;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.IDataProviderDao;
@@ -173,70 +169,7 @@ public class LdapConfigDao implements ID
return ldapConfig;
} catch (Exception ex2) {
- log.error("[getLdapConfigById]: ", ex2);
- }
- return null;
- }
-
- public List<LdapConfig> getLdapConfigs(int start, int max, String orderby,
- boolean asc) {
- try {
- CriteriaBuilder cb = em.getCriteriaBuilder();
- CriteriaQuery<LdapConfig> cq = cb.createQuery(LdapConfig.class);
- Root<LdapConfig> c = cq.from(LdapConfig.class);
- Predicate condition = cb.equal(c.get("deleted"), false);
- cq.where(condition);
- cq.distinct(asc);
- if (asc) {
- cq.orderBy(cb.asc(c.get(orderby)));
- } else {
- cq.orderBy(cb.desc(c.get(orderby)));
- }
- TypedQuery<LdapConfig> q = em.createQuery(cq);
- q.setFirstResult(start);
- q.setMaxResults(max);
- List<LdapConfig> ll = q.getResultList();
- return ll;
- } catch (Exception ex2) {
- log.error("[getLdapConfigs]", ex2);
- }
- return null;
- }
-
- public Long selectMaxFromLdapConfig() {
- try {
- log.debug("selectMaxFromConfigurations ");
- // get all users
- TypedQuery<Long> query = em
- .createQuery(
- "select count(c.ldapConfigId) from LdapConfig c where c.deleted = false",
- Long.class);
- List<Long> ll = query.getResultList();
- log.debug("selectMaxFromLdapConfig" + ll.get(0));
- return ll.get(0);
- } catch (Exception ex2) {
- log.error("[selectMaxFromLdapConfig] ", ex2);
- }
- return null;
- }
-
- public Long deleteLdapConfigById(Long ldapConfigId) {
- try {
-
- LdapConfig ldapConfig = this.get(ldapConfigId);
-
- if (ldapConfig == null) {
- return null;
- }
-
- ldapConfig = em
- .find(LdapConfig.class, ldapConfig.getLdapConfigId());
- em.remove(ldapConfig);
-
- return ldapConfigId;
-
- } catch (Exception ex2) {
- log.error("[deleteLdapConfigById]: ", ex2);
+ log.error("[get]: ", ex2);
}
return null;
}
@@ -291,7 +224,18 @@ public class LdapConfigDao implements ID
}
public long count() {
- return selectMaxFromLdapConfig();
+ try {
+ TypedQuery<Long> query = em
+ .createQuery(
+ "select count(c.ldapConfigId) from LdapConfig c where c.deleted = false",
+ Long.class);
+ List<Long> ll = query.getResultList();
+ log.debug("selectMaxFromLdapConfig" + ll.get(0));
+ return ll.get(0);
+ } catch (Exception ex2) {
+ log.error("[selectMaxFromLdapConfig] ", ex2);
+ }
+ return 0L;
}
public long count(String search) {
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDao.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/basic/dao/OmTimeZoneDao.java Sun Aug 11 16:57:31 2013
@@ -27,7 +27,6 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
-import org.apache.openmeetings.persistence.beans.user.User;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,31 +44,6 @@ public class OmTimeZoneDao {
@Autowired
private ConfigurationDao configurationDao;
- /**
- * Get a default {@link OmTimeZone}, if user is set, it will return the
- * {@link OmTimeZone} of the user, if not it will try to load it from the
- * server's config
- *
- * @param user
- * can be null
- * @return
- */
- public OmTimeZone getDefaultOmTimeZone(User user) {
-
- if (user != null && user.getOmTimeZone() != null) {
- return user.getOmTimeZone();
- }
-
- String jNameTimeZone = configurationDao.getConfValue(
- "default.timezone", String.class, "Europe/Berlin");
-
- OmTimeZone omTimeZone = this.getOmTimeZone(jNameTimeZone);
- if (omTimeZone == null) {
- throw new RuntimeException("Could not find default.timezone, misconfiguration of database");
- }
- return omTimeZone;
- }
-
public Long addOmTimeZone(String name, String label, String iCal,
Integer orderId) {
try {
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/beans/MeetingMemberDTO.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/beans/MeetingMemberDTO.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/beans/MeetingMemberDTO.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/beans/MeetingMemberDTO.java Sun Aug 11 16:57:31 2013
@@ -40,8 +40,7 @@ public class MeetingMemberDTO {
lastname = meetingMemberItem.getLastname();
userid = (meetingMemberItem.getUserid() != null) ? meetingMemberItem
.getUserid().getUser_id() : 0;
- jNameTimeZone = (meetingMemberItem.getOmTimeZone() != null) ? meetingMemberItem
- .getOmTimeZone().getJname() : "";
+ jNameTimeZone = meetingMemberItem.getTimeZoneId();
}
public long getMeetingMemberId() {
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/AppointmentDao.java Sun Aug 11 16:57:31 2013
@@ -45,7 +45,6 @@ import org.apache.openmeetings.data.conf
import org.apache.openmeetings.data.conference.dao.RoomDao;
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.data.user.dao.UsersDao;
-import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentCategory;
import org.apache.openmeetings.persistence.beans.calendar.AppointmentReminderTyps;
@@ -205,7 +204,7 @@ public class AppointmentDao {
Boolean isWeekly, Boolean isMonthly, Boolean isYearly,
Long categoryId, Long remind, Room room, Long language_id,
Boolean isPasswordProtected, String password,
- Boolean isConnectedEvent, String jNameTimeZone) {
+ Boolean isConnectedEvent) {
try {
Appointment ap = new Appointment();
@@ -283,6 +282,9 @@ public class AppointmentDao {
// update meeting members
List<MeetingMember> mmList = a.getMeetingMember();
if (mmList != null){
+
+
+
for (MeetingMember mm : mmList){
String urlPostfix = (mm.getUserid().getType() == Type.contact) ? "" : "#room/" + r.getRooms_id();
@@ -448,7 +450,7 @@ public class AppointmentDao {
Date appointmentend, Boolean isDaily, Boolean isWeekly,
Boolean isMonthly, Boolean isYearly, Long categoryId, Long remind,
@SuppressWarnings("rawtypes") List mmClient, Long users_id, String baseUrl, Long language_id,
- Boolean isPasswordProtected, String password, String iCalTimeZone, String appointmentLocation) {
+ Boolean isPasswordProtected, String password, String appointmentLocation) {
log.debug("AppointmentDAOImpl.updateAppointment");
try {
@@ -592,7 +594,6 @@ public class AppointmentDao {
// and Java around 600++
Long sendToUserId = 0L;
TimeZone timezoneMember = null;
- OmTimeZone omTimeZone = null;
if (clientMember.get("userId") != null) {
sendToUserId = Long.valueOf(
clientMember.get("userId").toString())
@@ -608,7 +609,6 @@ public class AppointmentDao {
.getUserById(sendToUserId);
timezoneMember = timezoneUtil
.getTimezoneByUser(interalUser);
- omTimeZone = interalUser.getOmTimeZone();
phone = interalUser.getPhoneForSMS();
} else {
// Get the internal-name of the timezone set in the
@@ -618,21 +618,19 @@ public class AppointmentDao {
log.error("jNameTimeZone not set in user object variable");
jName = "";
}
- omTimeZone = omTimeZoneDaoImpl.getOmTimeZone(jName
- .toString());
timezoneMember = timezoneUtil
.getTimezoneByInternalJName(jName
.toString());
}
- // Not In Remote List available - intern OR extern user
+ // Not In Remote List available - intern OR external user
meetingMemberLogic.addMeetingMember(
clientMember.get("firstname") == null ?
clientMember.get("firstname").toString() : "",
clientMember.get("lastname") == null ?
clientMember.get("lastname").toString() : "",
"0", // member - Status
- "0", // appointement - Status
+ "0", // appointment - Status
appointmentId,
null, // UserId
clientMember.get("email").toString(), // Email
@@ -647,7 +645,8 @@ public class AppointmentDao {
language_id,
isPasswordProtected,
password,
- timezoneMember, omTimeZone, invitorName);
+ timezoneMember,
+ invitorName);
}
@@ -664,7 +663,7 @@ public class AppointmentDao {
public Long updateAppointmentByTime(Long appointmentId,
Date appointmentstart, Date appointmentend, Long users_id,
- String baseUrl, Long language_id, String iCalTimeZone) {
+ String baseUrl, Long language_id) {
log.debug("AppointmentDAOImpl.updateAppointment");
try {
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/MeetingMemberDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/MeetingMemberDao.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/MeetingMemberDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/daos/MeetingMemberDao.java Sun Aug 11 16:57:31 2013
@@ -20,6 +20,7 @@ package org.apache.openmeetings.data.cal
import java.util.Date;
import java.util.List;
+import java.util.TimeZone;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
@@ -28,7 +29,6 @@ import javax.persistence.TypedQuery;
import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.user.dao.UsersDao;
-import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -177,7 +177,7 @@ public class MeetingMemberDao {
public Long addMeetingMember(String firstname, String lastname,
String memberStatus, String appointmentStatus, Long appointmentId,
- Long userid, String email, String phone, Boolean moderator, OmTimeZone omTimeZone,
+ Long userid, String email, String phone, Boolean moderator, TimeZone timeZone,
Boolean isConnectedEvent) {
try {
@@ -197,7 +197,7 @@ public class MeetingMemberDao {
gm.setInvitor(moderator);
gm.setIsConnectedEvent(isConnectedEvent);
- gm.setOmTimeZone(omTimeZone);
+ gm.setTimeZoneId(timeZone.getID());
gm = em.merge(gm);
Long group_member_id = gm.getMeetingMemberId();
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java Sun Aug 11 16:57:31 2013
@@ -35,7 +35,6 @@ import org.apache.openmeetings.data.conf
import org.apache.openmeetings.data.conference.dao.InvitationDao;
import org.apache.openmeetings.data.conference.dao.RoomDao;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
import org.apache.openmeetings.persistence.beans.invitation.Invitations;
@@ -213,7 +212,7 @@ public class AppointmentLogic {
userId, appointmentLocation, appointmentDescription,
appointmentstart, appointmentend, isDaily, isWeekly,
isMonthly, isYearly, categoryId, remind, room, language_id,
- isPasswordProtected, password, false, user.getOmTimeZone().getJname());
+ isPasswordProtected, password, false);
String invitorName = user.getFirstname() + " " + user.getLastname()
+ " [" + user.getAdresses().getEmail() + "]";
@@ -222,7 +221,7 @@ public class AppointmentLogic {
meetingMemberLogic.addMeetingMember(user.getFirstname(), user
.getLastname(), "", "", appointmentId, userId, user
.getAdresses().getEmail(), user.getPhoneForSMS(), baseUrl, userId, true,
- language_id, isPasswordProtected, password, timezone, user.getOmTimeZone(),
+ language_id, isPasswordProtected, password, timezone,
invitorName);
// iterate through all members of this meeting and add them to the
@@ -250,7 +249,6 @@ public class AppointmentLogic {
// and Java around 600++
Long sendToUserId = 0L;
TimeZone timezoneMember = null;
- OmTimeZone omTimeZone = null;
if (clientMember.get("userId") != null) {
sendToUserId = Long.valueOf(
clientMember.get("userId").toString())
@@ -267,7 +265,6 @@ public class AppointmentLogic {
phone = interalUser.getPhoneForSMS();
timezoneMember = timezoneUtil
.getTimezoneByUser(interalUser);
- omTimeZone = interalUser.getOmTimeZone();
} else {
// Get the internal-name of the timezone set in the
// client object and convert it to a real one
@@ -276,8 +273,6 @@ public class AppointmentLogic {
log.error("jNameTimeZone not set in user object variable");
jName = "";
}
- omTimeZone = omTimeZoneDaoImpl.getOmTimeZone(jName
- .toString());
timezoneMember = timezoneUtil
.getTimezoneByInternalJName(jName.toString());
}
@@ -299,7 +294,7 @@ public class AppointmentLogic {
language_id, //language_id
isPasswordProtected, // isPasswordProtected
password, // password
- timezoneMember, omTimeZone, invitorName);
+ timezoneMember, invitorName);
}
}
@@ -475,14 +470,7 @@ public class AppointmentLogic {
continue;
}
- TimeZone tZone = null;
-
- if (mm.getOmTimeZone() != null) {
- tZone = timezoneUtil.getTimezoneByOmTimeZoneId(mm
- .getOmTimeZone().getOmtimezoneId());
- } else {
- tZone = TimeZone.getDefault();
- }
+ TimeZone tZone = timezoneUtil.getTimeZone(mm.getTimeZoneId());
String subject = generateSubject(labelid1158, ment, tZone);
String smsSubject = generateSMSSubject(labelid1158, ment);
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/MeetingMemberLogic.java Sun Aug 11 16:57:31 2013
@@ -26,7 +26,6 @@ import org.apache.openmeetings.data.cale
import org.apache.openmeetings.data.conference.InvitationManager;
import org.apache.openmeetings.data.conference.dao.InvitationDao;
import org.apache.openmeetings.data.user.UserManager;
-import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
import org.apache.openmeetings.persistence.beans.invitation.Invitations;
@@ -61,10 +60,8 @@ public class MeetingMemberLogic {
* This can be either an internal or an external user, internal users have a
* user id != null && > 0
*
- * jNameInternalTimeZone is needed for the mapping of the timezones
- * available
- *
* @author obecherer,seba.wagner
+ *
* @param firstname
* @param lastname
* @param memberStatus
@@ -79,7 +76,6 @@ public class MeetingMemberLogic {
* @param isPasswordProtected
* @param password
* @param timezone
- * @param jNameInternalTimeZone
* @param invitorName
* can be different from the current firstname/lastname of course
* @return
@@ -88,13 +84,14 @@ public class MeetingMemberLogic {
String memberStatus, String appointmentStatus, Long appointmentId,
Long userid, String email, String phone, String baseUrl, Long meeting_organizer,
Boolean invitor, Long language_id, Boolean isPasswordProtected,
- String password, TimeZone timezone, OmTimeZone omTimeZone,
+ String password, TimeZone timezone,
String invitorName) {
try {
+
Long memberId = meetingMemberDao.addMeetingMember(firstname,
lastname, memberStatus, appointmentStatus, appointmentId,
- userid, email, phone, invitor, omTimeZone, false);
+ userid, email, phone, invitor, timezone, false);
// DefaultInvitation
Appointment point = appointmentLogic
@@ -146,7 +143,8 @@ public class MeetingMemberLogic {
point.getAppointmentEndtime(),
point.getAppointmentId(),
invitorName,
- omTimeZone);
+ timezone
+ );
invitationId = invitation.getInvitations_id();
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/InvitationManager.java Sun Aug 11 16:57:31 2013
@@ -38,7 +38,6 @@ import org.apache.openmeetings.data.conf
import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.basic.MailMessage;
-import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.calendar.Appointment;
import org.apache.openmeetings.persistence.beans.calendar.MeetingMember;
import org.apache.openmeetings.persistence.beans.invitation.Invitations;
@@ -126,7 +125,7 @@ public class InvitationManager {
Boolean isPasswordProtected, String invitationpass, Integer valid,
Date validFrom, Date validTo, Long createdBy, String baseUrl,
Long language_id, Boolean sendMail, Date gmtTimeStart,
- Date gmtTimeEnd, Long appointmentId, String fromUserField, OmTimeZone omTimeZone) {
+ Date gmtTimeEnd, Long appointmentId, String fromUserField, TimeZone timeZone) {
try {
if (authLevelUtil.checkUserLevel(user_level)) {
@@ -141,7 +140,7 @@ public class InvitationManager {
invitation.setInvitationWasUsed(false);
log.debug(baseUrl);
invitation.setBaseUrl(baseUrl);
- invitation.setOmTimeZone(omTimeZone);
+ invitation.setTimeZoneId(timeZone.getID());
// valid period of Invitation
if (valid == 1) {
@@ -239,7 +238,7 @@ public class InvitationManager {
invitation.setInvitationWasUsed(false);
log.debug(baseUrl);
invitation.setBaseUrl(baseUrl);
- invitation.setOmTimeZone(createdBy.getOmTimeZone());
+ invitation.setTimeZoneId(timezoneUtil.getTimezoneByUser(createdBy).getID());
// valid period of Invitation
if (valid == 1) {
@@ -336,8 +335,7 @@ public class InvitationManager {
if (us != null) {
timezone = timezoneUtil.getTimezoneByUser(us);
} else {
- timezone = timezoneUtil.getTimezoneByInternalJName(member
- .getOmTimeZone().getJname());
+ timezone = timezoneUtil.getTimeZone(member.getTimeZoneId());
}
String subject = formatCancelSubject(language_id, appointment, user,
@@ -480,8 +478,7 @@ public class InvitationManager {
if (us != null) {
timezone = timezoneUtil.getTimezoneByUser(us);
} else {
- timezone = timezoneUtil.getTimezoneByInternalJName(member
- .getOmTimeZone().getJname());
+ timezone = timezoneUtil.getTimeZone(member.getTimeZoneId());
}
// Get text messages
@@ -1223,14 +1220,12 @@ public class InvitationManager {
}
} else if (invitation.getIsValidByTime()) {
- OmTimeZone tz = invitation.getOmTimeZone() == null
- ? omTimeZoneDaoImpl.getOmTimeZone(configurationDao.getConfValue("default.timezone", String.class, "Europe/Berlin"))
- : invitation.getOmTimeZone();
- Calendar now = Calendar.getInstance(TimeZone.getTimeZone(tz.getIcal()));
- Calendar start = Calendar.getInstance(TimeZone.getTimeZone(tz.getIcal()));
+
+ Calendar now = Calendar.getInstance(timezoneUtil.getTimeZone(invitation.getTimeZoneId()));
+ Calendar start = Calendar.getInstance(timezoneUtil.getTimeZone(invitation.getTimeZoneId()));
start.setTime(invitation.getValidFrom());
- Calendar end = Calendar.getInstance(TimeZone.getTimeZone(tz.getIcal()));
+ Calendar end = Calendar.getInstance(timezoneUtil.getTimeZone(invitation.getTimeZoneId()));
end.setTime(invitation.getValidTo());
if (now.after(start) && now.before(end)) {
invitationDao.updateInvitation(invitation);
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/RoomManager.java Sun Aug 11 16:57:31 2013
@@ -1132,56 +1132,6 @@ public class RoomManager {
return null;
}
- /**
- * Update a Record in the rooms table
- * @param rooms_id
- * @param roomtypes_id
- * @param name
- * @param ispublic
- * @param comment
- * @param hideActivitiesAndActions TODO
- * @param hideFilesExplorer TODO
- * @param hideActionsMenu TODO
- * @param hideScreenSharing TODO
- * @param hideWhiteboard TODO
- * @return
- */
- public Long updateRoom(long user_level, long rooms_id, long roomtypes_id,
- String name, boolean ispublic, String comment,
- Long numberOfPartizipants, List<Integer> organisations,
- Boolean appointment, Boolean isDemoRoom, Integer demoTime,
- Boolean isModeratedRoom, List<Map<String, Object>> roomModerators,
- Boolean allowUserQuestions, Boolean isAudioOnly, Boolean allowFontStyles, Boolean isClosed,
- String redirectURL, String conferencePin,
- Long ownerId, Boolean waitForRecording, Boolean allowRecording,
- Boolean hideTopBar, Boolean hideChat, Boolean hideActivitiesAndActions,
- Boolean hideFilesExplorer, Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard,
- Boolean showMicrophoneStatus, Boolean chatModerated, boolean chatOpened, boolean filesOpened
- , boolean autoVideoSelect, boolean sipEnabled) {
- try {
-
- log.debug("*** updateRoom numberOfPartizipants: "
- + numberOfPartizipants);
- if (authLevelUtil.checkAdminLevel(user_level)) {
-
- return this.updateRoomInternal(rooms_id, roomtypes_id, name,
- ispublic, comment, numberOfPartizipants, organisations,
- appointment, isDemoRoom, demoTime, isModeratedRoom,
- roomModerators, allowUserQuestions, isAudioOnly, allowFontStyles,
- isClosed, redirectURL, conferencePin,
- ownerId, waitForRecording, allowRecording, hideTopBar, hideChat,
- hideActivitiesAndActions, hideFilesExplorer, hideActionsMenu,
- hideScreenSharing, hideWhiteboard, showMicrophoneStatus, chatModerated
- , chatOpened, filesOpened, autoVideoSelect, sipEnabled);
-
- }
-
- } catch (Exception ex2) {
- log.error("[updateRoom] ", ex2);
- }
- return null;
- }
-
public Long updateRoomInternal(long rooms_id, long roomtypes_id,
String name, boolean ispublic, String comment,
Long numberOfPartizipants, List<Integer> organisations,
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/OrganisationManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/OrganisationManager.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/OrganisationManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/OrganisationManager.java Sun Aug 11 16:57:31 2013
@@ -73,26 +73,6 @@ public class OrganisationManager {
private AuthLevelUtil authLevelUtil;
/**
- * adds a new organisation if userlevel is admin
- *
- * @param user_level
- * @param orgname
- * @param user_id
- * @return
- */
- public Long addOrganisation(Long user_level, String orgname, long user_id) {
- try {
- if (authLevelUtil.checkAdminLevel(user_level)) {
- Long orgId = this.addOrganisation(orgname, user_id);
- return orgId;
- }
- } catch (Exception err) {
- log.error("addOrganisation", err);
- }
- return null;
- }
-
- /**
* adds a new organisation to the table organisation
*
* @param titelname
@@ -127,63 +107,6 @@ public class OrganisationManager {
return null;
}
- /**
- *
- * @param user_level
- * @param start
- * @param max
- * @param orderby
- * @return
- */
- public SearchResult<Organisation> getOrganisations(long user_level, int start, int max,
- String orderby, boolean asc) {
- try {
- if (authLevelUtil.checkAdminLevel(user_level)) {
- SearchResult<Organisation> sresult = new SearchResult<Organisation>();
- sresult.setObjectName(Organisation.class.getName());
- sresult.setRecords(orgDao.count());
- sresult.setResult(this.getOrganisations(start, max, orderby,
- asc));
- return sresult;
- } else {
- log.error("[getOrganisations] noPremission");
- }
- } catch (Exception ex2) {
- log.error("[getOrganisations]", ex2);
- }
- return null;
- }
-
- /**
- *
- * @param user_level
- * @return
- */
- public List<Organisation> getOrganisations(int start, int max,
- String orderby, boolean asc) {
- try {
- CriteriaBuilder cb = em.getCriteriaBuilder();
- CriteriaQuery<Organisation> cq = cb.createQuery(Organisation.class);
- Root<Organisation> c = cq.from(Organisation.class);
- Predicate condition = cb.equal(c.get("deleted"), false);
- cq.where(condition);
- cq.distinct(asc);
- if (asc) {
- cq.orderBy(cb.asc(c.get(orderby)));
- } else {
- cq.orderBy(cb.desc(c.get(orderby)));
- }
- TypedQuery<Organisation> q = em.createQuery(cq);
- q.setFirstResult(start);
- q.setMaxResults(max);
- List<Organisation> ll = q.getResultList();
- return ll;
- } catch (Exception ex2) {
- log.error("[getOrganisations]", ex2);
- }
- return null;
- }
-
public List<Organisation> getOrganisations(Long user_level) {
try {
if (authLevelUtil.checkAdminLevel(user_level)) {
@@ -206,33 +129,6 @@ public class OrganisationManager {
}
/**
- * updates an organisation if user_level is admin
- *
- * @param user_level
- * @param organisation_id
- * @param orgname
- * @param users_id
- * @return
- */
- public Long updateOrganisation(Long user_level, long organisation_id,
- String orgname, long users_id) {
- try {
-
- Organisation org = orgDao.get(organisation_id);
- org.setName(orgname);
- org.setUpdatedby(users_id);
- org.setUpdatetime(new Date());
-
- em.merge(org);
-
- return org.getOrganisation_id();
- } catch (Exception err) {
- log.error("updateOrganisation", err);
- }
- return null;
- }
-
- /**
* checks if a user is already stored
*
* @param userIdToAdd
@@ -330,27 +226,6 @@ public class OrganisationManager {
}
/**
- * get an organisation by id and only as admin
- *
- * @param user_level
- * @param organisation_id
- * @return
- */
- public Organisation getOrganisationById(long user_level,
- long organisation_id) {
- try {
- if (authLevelUtil.checkAdminLevel(user_level)) {
- return orgDao.get(organisation_id);
- } else {
- log.error("[getOrganisationById] authorization required");
- }
- } catch (Exception ex2) {
- log.error("[getOrganisationById]", ex2);
- }
- return null;
- }
-
- /**
* Gets an organisation by its id
*
* @param organisation_id
@@ -381,33 +256,6 @@ public class OrganisationManager {
return getOrganisationByIdBackup(organisation_id);
}
- public Long deleteOrganisation(long user_level, long organisation_id,
- long updatedby) {
- try {
- if (authLevelUtil.checkAdminLevel(user_level)) {
- return this.deleteOrganisation(organisation_id, updatedby);
- }
- } catch (Exception ex2) {
- log.error("[deleteOrganisation]", ex2);
- }
- return null;
- }
-
- /**
- *
- * @param organisation_id
- * @param updatedby
- * @return
- */
- public Long deleteOrganisation(long organisation_id, long updatedby) {
- try {
- orgDao.delete(orgDao.get(organisation_id), updatedby);
- } catch (Exception ex2) {
- log.error("[deleteOrganisation]", ex2);
- }
- return organisation_id;
- }
-
/**
* Adds a user to a given organisation-unit
*
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/UserManager.java Sun Aug 11 16:57:31 2013
@@ -28,6 +28,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.TimeZone;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
@@ -36,8 +37,6 @@ import javax.persistence.PersistenceCont
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
@@ -50,7 +49,6 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.beans.basic.SearchResult;
import org.apache.openmeetings.data.user.dao.StateDao;
import org.apache.openmeetings.data.user.dao.UsersDao;
-import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.basic.Sessiondata;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.apache.openmeetings.persistence.beans.room.Client;
@@ -66,7 +64,7 @@ import org.apache.openmeetings.utils.Dao
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
import org.apache.openmeetings.utils.mail.MailHandler;
import org.apache.openmeetings.utils.math.CalendarPatterns;
-import org.red5.io.utils.ObjectMap;
+import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IClient;
import org.red5.server.api.scope.IScope;
@@ -114,6 +112,8 @@ public class UserManager {
private AuthLevelUtil authLevelUtil;
@Autowired
private ISessionManager sessionManager;
+ @Autowired
+ private TimezoneUtil timezoneUtil;
/**
* query for a list of users
@@ -351,45 +351,6 @@ public class UserManager {
}
}
- /**
- * suche eines Bentzers
- *
- * @param user_level
- * @param searchstring
- * @param max
- * @param start
- * @return
- */
- public List<User> searchUser(long user_level, String searchcriteria,
- String searchstring, int max, int start, String orderby, boolean asc) {
- if (authLevelUtil.checkAdminLevel(user_level)) {
- try {
- CriteriaBuilder cb = em.getCriteriaBuilder();
- CriteriaQuery<User> cq = cb.createQuery(User.class);
- Root<User> c = cq.from(User.class);
- Expression<String> literal = cb.literal("%" + searchstring + "%");
- Path<String> path = c.get(searchcriteria);
- Predicate predicate = cb.like(path, literal);
- Predicate condition = cb.notEqual(c.get("deleted"), true);
- cq.where(condition, predicate);
- cq.distinct(asc);
- if (asc) {
- cq.orderBy(cb.asc(c.get(orderby)));
- } else {
- cq.orderBy(cb.desc(c.get(orderby)));
- }
- TypedQuery<User> q = em.createQuery(cq);
- q.setFirstResult(start);
- q.setMaxResults(max);
- List<User> contactsZ = q.getResultList();
- return contactsZ;
- } catch (Exception ex2) {
- log.error("searchUser", ex2);
- }
- }
- return null;
- }
-
public List<Userdata> getUserdataDashBoard(Long user_id) {
if (user_id.longValue() > 0) {
try {
@@ -428,99 +389,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.setOmTimeZone(omTimeZoneDaoImpl
- .getOmTimeZone(jNameTimeZone));
- 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";
@@ -813,7 +681,8 @@ public class UserManager {
town, language_id, sendWelcomeMessage,
organisations, phone, sendSMS, baseURL,
sendConfirmation,
- omTimeZoneDaoImpl.getOmTimeZone(jname_timezone), forceTimeZoneCheck,
+ timezoneUtil.getTimezoneByInternalJName(jname_timezone),
+ forceTimeZoneCheck,
userOffers, userSearchs, showContactData,
showContactDataToContacts, null);
}
@@ -860,7 +729,7 @@ public class UserManager {
String town, long language_id, boolean sendWelcomeMessage,
List<Long> organisations, String phone, boolean sendSMS, String baseURL,
Boolean sendConfirmation,
- OmTimeZone timezone, Boolean forceTimeZoneCheck,
+ TimeZone timezone, Boolean forceTimeZoneCheck,
String userOffers, String userSearchs, Boolean showContactData,
Boolean showContactDataToContacts, String activatedHash) throws Exception {
// TODO: make phone number persistent
@@ -977,7 +846,7 @@ public class UserManager {
public Long addUser(long level_id, int availible, int status,
String firstname, String login, String lastname, long language_id,
String userpass, Address adress, boolean sendSMS, Date age, String hash,
- OmTimeZone timezone,
+ TimeZone timezone,
Boolean forceTimeZoneCheck, String userOffers, String userSearchs,
Boolean showContactData, Boolean showContactDataToContacts, List<Long> orgIds) {
try {
@@ -997,7 +866,7 @@ public class UserManager {
users.setSalutations_id(1L);
users.setStarttime(new Date());
users.setActivatehash(hash);
- users.setOmTimeZone(timezone);
+ users.setTimeZoneId(timezone.getID());
users.setForceTimeZoneCheck(forceTimeZoneCheck);
users.setUserOffers(userOffers);
@@ -1087,7 +956,7 @@ public class UserManager {
users.setStarttime(new Date());
users.setActivatehash(hash);
users.setPictureuri(pictureuri);
- users.setOmTimeZone(omTimeZoneDaoImpl.getOmTimeZone(jNameTimeZone));
+ users.setTimeZoneId(timezoneUtil.getTimezoneByInternalJName(jNameTimeZone).getID());
users.setExternalUserId(externalUserId);
users.setExternalUserType(externalUserType);
@@ -1146,108 +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.setOmTimeZone(omTimeZoneDaoImpl
- .getOmTimeZone((values.get("jnameTimeZone")
- .toString())));
-
- 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
*
@@ -1554,66 +1321,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/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/UsersDao.java Sun Aug 11 16:57:31 2013
@@ -40,6 +40,7 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.utils.DaoHelper;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
+import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -68,6 +69,8 @@ public class UsersDao implements IDataPr
private OmTimeZoneDao omTimeZoneDaoImpl;
@Autowired
private StateDao stateDaoImpl;
+ @Autowired
+ private TimezoneUtil timezoneUtil;
/**
* Get a new instance of the {@link User} entity, with all default values
@@ -84,7 +87,7 @@ public class UsersDao implements IDataPr
// configurable
user.setLevel_id(1L);
user.setLanguage_id(configurationDao.getConfValue(DEFAUT_LANG_KEY, Long.class, "1"));
- user.setOmTimeZone(omTimeZoneDaoImpl.getDefaultOmTimeZone(currentUser));
+ user.setTimeZoneId(timezoneUtil.getTimezoneByUser(currentUser).getID());
user.setForceTimeZoneCheck(false);
user.setSendSMS(false);
user.setAge(new Date());
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java Sun Aug 11 16:57:31 2013
@@ -66,6 +66,7 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.user.oauth.OAuthServer.RequestMethod;
import org.apache.openmeetings.utils.ImportHelper;
import org.apache.openmeetings.utils.OmFileHelper;
+import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
@@ -110,6 +111,10 @@ public class ImportInitvalues {
private SipDao sipDao;
@Autowired
private OAuth2Dao oauthDao;
+ @Autowired
+ private TimezoneUtil timezoneUtil;
+
+
private int progress = 0;
public int getProgress() {
@@ -714,7 +719,7 @@ public class ImportInitvalues {
new java.util.Date(), "street", "no", "fax", "zip", 1,
"town", default_lang_id, false,
Arrays.asList(organisation_id), "phone", false, "", false,
- omTimeZoneDaoImpl.getOmTimeZoneByIcal(cfg.ical_timeZone),
+ timezoneUtil.getTimezoneByInternalJName(cfg.ical_timeZone),
false, "", "", false, true, null);
log.debug("Installation - User Added user-Id " + user_id);
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java?rev=1512970&r1=1512969&r2=1512970&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/ldap/LdapLoginManagement.java Sun Aug 11 16:57:31 2013
@@ -38,13 +38,13 @@ import org.apache.openmeetings.data.user
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.ldap.config.ConfigReader;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
-import org.apache.openmeetings.persistence.beans.basic.OmTimeZone;
import org.apache.openmeetings.persistence.beans.room.Client;
import org.apache.openmeetings.persistence.beans.user.State;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.remote.util.SessionVariablesUtil;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
+import org.apache.openmeetings.utils.math.TimezoneUtil;
import org.red5.logging.Red5LoggerFactory;
import org.red5.server.api.IClient;
import org.slf4j.Logger;
@@ -76,6 +76,8 @@ public class LdapLoginManagement {
private ManageCryptStyle cryptManager;
@Autowired
private UsersDao usersDao;
+ @Autowired
+ private TimezoneUtil timezoneUtil;
// External User Types
public static final String EXTERNAL_USER_TYPE_LDAP = "LDAP";
@@ -823,13 +825,9 @@ public class LdapLoginManagement {
String jName_timeZone = "";
if (userdata.containsKey(ldapAttrs.get("timezoneAttr"))
- && userdata.get(ldapAttrs.get("timezoneAttr")) != null)
+ && userdata.get(ldapAttrs.get("timezoneAttr")) != null) {
jName_timeZone = userdata.get(ldapAttrs.get("timezoneAttr"));
-
- //only change the timezone if there can be found some in the OpenMeetings database
- OmTimeZone omTimeZone = omTimeZoneDaoImpl.getOmTimeZone(jName_timeZone);
- if (omTimeZone != null) {
- user.setOmTimeZone(omTimeZone);
+ user.setTimeZoneId(timezoneUtil.getTimezoneByInternalJName(jName_timeZone).getID());
}
}