Author: solomax
Date: Mon Aug 12 18:03:52 2013
New Revision: 1513211
URL: http://svn.apache.org/r1513211
Log:
[OPENMEETINGS-760] user settings are removed from Flash UI
Removed:
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/newPrivateMessageFolder.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/pendingUserStatus.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/privateMessagItem.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/privateMessageFolder.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/privateMessages.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/roomAccessMessage.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/userSettings.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/contactsListItem.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/editUserContacts.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/pendingContactsListItem.lzx
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml
openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd
openmeetings/trunk/singlewebapp/WebContent/project.xsd
openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/library.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/library.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/library.lzx
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml?rev=1513211&r1=1513210&r2=1513211&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xml
Mon Aug 12 18:03:52 2013
@@ -317,15 +317,5 @@ To disable AEC please specify 0.
Room Layouts: interviewConferenceRoom
-->
<interviewRoomModule>interviewConferenceRoom</interviewRoomModule>
-
-<!-- #############################################
- Event Room Modules
- -->
-
-<!-- #############################################
- Profiles Panel Modules
- -->
-
-<userSettingsModule>userSettings</userSettingsModule>
</config>
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd?rev=1513211&r1=1513210&r2=1513211&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/public/config.xsd
Mon Aug 12 18:03:52 2013
@@ -58,7 +58,6 @@
<xs:element ref="conferenceRoomModule"/>
<xs:element ref="restrictedRoomModule"/>
<xs:element ref="interviewRoomModule"/>
- <xs:element ref="userSettingsModule"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -167,5 +166,4 @@
<xs:element name="conferenceRoomModule" type="xs:NCName"/>
<xs:element name="restrictedRoomModule" type="xs:NCName"/>
<xs:element name="interviewRoomModule" type="xs:NCName"/>
- <xs:element name="userSettingsModule" type="xs:NCName"/>
</xs:schema>
Modified: openmeetings/trunk/singlewebapp/WebContent/project.xsd
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/project.xsd?rev=1513211&r1=1513210&r2=1513211&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/project.xsd (original)
+++ openmeetings/trunk/singlewebapp/WebContent/project.xsd Mon Aug 12 18:03:52
2013
@@ -1113,20 +1113,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="searchUserProfile" type="project:searchUserProfile" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- modules:dashboard </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="searchUserProfile" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="newMessageActive" type="lzx:boolean" default="false"
>
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="miniIconSmybolExtraIcons"
type="project:miniIconSmybolExtraIcons" >
</xs:element>
<xs:complexType name="miniIconSmybolExtraIcons" mixed="true">
@@ -1488,16 +1474,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="editUserContacts" type="project:editUserContacts" >
-</xs:element>
- <xs:complexType name="editUserContacts" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="contactContent" type="xs:string" default="null" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="parentResultPollBalk" type="project:parentResultPollBalk" >
</xs:element>
<xs:complexType name="parentResultPollBalk" mixed="true">
@@ -1814,32 +1790,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="userSettings" type="project:userSettings" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
- User Profile Setting Panel </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="userSettings" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentView">
- <xs:attribute name="currentSelected" type="xs:string" default="null" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-<xs:element name="pendingContactsListItem"
type="project:pendingContactsListItem" >
-</xs:element>
- <xs:complexType name="pendingContactsListItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:basePagingListItem">
- <xs:attribute name="username" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="searchUserProfileImage" type="xs:string"
default="null" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="documentsTabBar" type="project:documentsTabBar" >
</xs:element>
<xs:complexType name="documentsTabBar" mixed="true">
@@ -2242,32 +2192,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="menuListItemUserProfile"
type="project:menuListItemUserProfile" >
-</xs:element>
- <xs:complexType name="menuListItemUserProfile" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="textvalue" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="textLabel" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="selected" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="list" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="labelid" type="lzx:number" >
-</xs:attribute>
- <xs:attribute name="labelLabelid" type="lzx:number" default="-1" >
-</xs:attribute>
- <xs:attribute name="isopen" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="isleaf" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="action" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="chatParticipantsInviteConference"
type="project:chatParticipantsInviteConference" >
</xs:element>
<xs:complexType name="chatParticipantsInviteConference" mixed="true">
@@ -2320,18 +2244,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="newPrivateMessageFolder"
type="project:newPrivateMessageFolder" >
-</xs:element>
- <xs:complexType name="newPrivateMessageFolder" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:guiPresenter">
- <xs:attribute name="refObj" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="folderName" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="drawAreaObjectCombobox"
type="project:drawAreaObjectCombobox" >
</xs:element>
<xs:complexType name="drawAreaObjectCombobox" mixed="true">
@@ -2492,20 +2404,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="pendingUserStatus" type="project:pendingUserStatus" >
-</xs:element>
- <xs:complexType name="pendingUserStatus" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="userContactId" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="pending" type="lzx:boolean" default="true" >
-</xs:attribute>
- <xs:attribute name="message" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="drawDrawarrowTools" type="project:drawDrawarrowTools" >
</xs:element>
<xs:complexType name="drawDrawarrowTools" mixed="true">
@@ -2764,24 +2662,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="privateMessagItem" type="project:privateMessagItem" >
-</xs:element>
- <xs:complexType name="privateMessagItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:basePagingListItem">
- <xs:attribute name="subject" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="strTime" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="itemSelected" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="isRead" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="from" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="activityListRestrictedRoomV"
type="project:activityListRestrictedRoomV" >
</xs:element>
<xs:complexType name="activityListRestrictedRoomV" mixed="true">
@@ -3853,16 +3733,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="searchUserProfileImage"
type="project:searchUserProfileImage" >
-</xs:element>
- <xs:complexType name="searchUserProfileImage" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="profileUrl" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="chooseNickName" type="project:chooseNickName" >
</xs:element>
<xs:complexType name="chooseNickName" mixed="true">
@@ -5284,16 +5154,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="roomAccessMessage" type="project:roomAccessMessage" >
-</xs:element>
- <xs:complexType name="roomAccessMessage" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="rooms_id" type="lzx:number" default="0" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="simpleLabelRoundButton"
type="project:simpleLabelRoundButton" >
</xs:element>
<xs:complexType name="simpleLabelRoundButton" mixed="true">
@@ -5832,20 +5692,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="userContacts" type="project:userContacts" >
-</xs:element>
- <xs:complexType name="userContacts" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="userContactId" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="pending" type="lzx:boolean" default="true" >
-</xs:attribute>
- <xs:attribute name="doShare" type="lzx:boolean" default="true" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="copiedTextPopup" type="project:copiedTextPopup" >
</xs:element>
<xs:complexType name="copiedTextPopup" mixed="true">
@@ -6030,20 +5876,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="privateMessageFolder" type="project:privateMessageFolder" >
-</xs:element>
- <xs:complexType name="privateMessageFolder" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="selected" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="privateMessageFolderId" type="lzx:number"
default="0" >
-</xs:attribute>
- <xs:attribute name="folderName" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="baseDrawPaint" type="project:baseDrawPaint" >
</xs:element>
<xs:complexType name="baseDrawPaint" mixed="true">
@@ -6363,20 +6195,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="editPrivateMessageFolder"
type="project:editPrivateMessageFolder" >
-</xs:element>
- <xs:complexType name="editPrivateMessageFolder" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:customInputtext">
- <xs:attribute name="refObj" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="privateMessageFolderId" type="lzx:number"
default="0" >
-</xs:attribute>
- <xs:attribute name="folderName" type="xs:string" default="" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="createPollWin" type="project:createPollWin" >
</xs:element>
<xs:complexType name="createPollWin" mixed="true">
@@ -7440,26 +7258,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="searchUserProfileListItem"
type="project:searchUserProfileListItem" >
-</xs:element>
- <xs:complexType name="searchUserProfileListItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:basePagingListItem">
- <xs:attribute name="username" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="timezone" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="searchUserProfileImage" type="xs:string"
default="null" >
-</xs:attribute>
- <xs:attribute name="searchSearchs" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="searchOffers" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="pending" type="lzx:boolean" default="false" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="resultPieCharPoll" type="project:resultPieCharPoll" >
</xs:element>
<xs:complexType name="resultPieCharPoll" mixed="true">
@@ -8088,20 +7886,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="contactsListItem" type="project:contactsListItem" >
-</xs:element>
- <xs:complexType name="contactsListItem" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:basePagingListItem">
- <xs:attribute name="username" type="xs:string" default="" >
-</xs:attribute>
- <xs:attribute name="shareCalendar" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="searchUserProfileImage" type="xs:string"
default="null" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="comoboxListItemNoHeaders"
type="project:comoboxListItemNoHeaders" >
</xs:element>
<xs:complexType name="comoboxListItemNoHeaders" mixed="true">
@@ -8476,52 +8260,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="privateMessages" type="project:privateMessages" >
-</xs:element>
- <xs:complexType name="privateMessages" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="userContactId" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="senderuserId" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="sendEventToReload" type="lzx:boolean"
default="false" >
-</xs:attribute>
- <xs:attribute name="selectedRefObjIds" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="selected" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="selectMenuItemObj" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="roomObjectRef" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="privateMessageId" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="privateMessageFolderId" type="lzx:number"
default="0" >
-</xs:attribute>
- <xs:attribute name="pendingUserStatusRef" type="xs:string"
default="null" >
-</xs:attribute>
- <xs:attribute name="onlyUpdateDropDown" type="lzx:boolean"
default="false" >
-</xs:attribute>
- <xs:attribute name="newMessageActive" type="lzx:boolean" default="false"
>
-</xs:attribute>
- <xs:attribute name="newFolderId" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="isTrash" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="isSend" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="isRead" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="isInbox" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="isFolder" type="lzx:boolean" default="false" >
-</xs:attribute>
- <xs:attribute name="countUnRead" type="lzx:number" default="0" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="screenSharingContainer"
type="project:screenSharingContainer" >
</xs:element>
<xs:complexType name="screenSharingContainer" mixed="true">
@@ -8552,33 +8290,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="recordContent" type="project:recordContent" >
-<xs:annotation>
-<xs:documentation xml:lang="en">
-
- View for recorded contents list.
- When you select 'Recordings' on the top menu, this class shows
the list.
- </xs:documentation>
-</xs:annotation>
-</xs:element>
- <xs:complexType name="recordContent" mixed="true">
- <xs:complexContent>
- <xs:extension base="project:baseContentView">
- <xs:attribute name="recordedFileToDelete" type="lzx:number" default="0" >
-</xs:attribute>
- <xs:attribute name="preButton" type="xs:string" default="null" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-<xs:element name="editUserContactsContent"
type="project:editUserContactsContent" >
-</xs:element>
- <xs:complexType name="editUserContactsContent" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="dynamicFileName" type="project:dynamicFileName" >
</xs:element>
<xs:complexType name="dynamicFileName" mixed="true">
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1513211&r1=1513210&r2=1513211&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx Mon
Aug 12 18:03:52 2013
@@ -404,8 +404,6 @@ and some more references to temp-objects
<attribute name="roomJumpId" value="0" type="number" />
-<attribute name="userContacts" value="null" />
-
<!--
Loads a User profile page directly instead of loading the Dashboard
cuser is a hash that can be found in the UserContacts Table
@@ -418,15 +416,6 @@ and some more references to temp-objects
<attribute name="cuserStatus" value="none" type="string"/>
<!--
- Attributes to handle the click search on linked user-keywords
- -->
-<attribute name="userSettingsModuleOpt" value="userProfile" type="string"/>
-
-<attribute name="userSettingsSearchType" value="" type="string"/>
-<attribute name="userSettingsSearchPhrase" value="" type="string"/>
-<attribute name="userSettingsSearchRef" value="null"/>
-
-<!--
Attribute to load a custom user calendar instead of the own one
-->
<attribute name="contactUser" value="0" type="number" />
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1513211&r1=1513210&r2=1513211&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Mon Aug
12 18:03:52 2013
@@ -255,7 +255,6 @@
this.setAttribute('conferenceRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/conferenceRoomModule/text()'));
this.setAttribute('restrictedRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/restrictedRoomModule/text()'));
this.setAttribute('interviewRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/interviewRoomModule/text()'));
-
this.setAttribute('userSettingsModule',canvas.myConfigSet.getPointer().xpathQuery('config/userSettingsModule/text()'));
this.setAttribute('recordModule',canvas.myConfigSet.getPointer().xpathQuery('config/recordModule/text()'));
this.setAttribute('httpRootKey',canvas.myConfigSet.getPointer().xpathQuery('config/httpRootKey/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=1513211&r1=1513210&r2=1513211&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/moduleConfiguration.lzx
Mon Aug 12 18:03:52 2013
@@ -34,13 +34,6 @@ these properties can be overwritten by p
<attribute name="moderatorModuleRoom" value="roomModerate" type="string" />
-<!-- #############################################
- Dashboard Modules
- -->
-
-<attribute name="dashboardModuleCalendar" value="myScheduledMeetings"
type="string" />
-
-
<!-- Conference Room Modules -->
<attribute name="conferenceModuleRoomList" value="allmeetings" type="string" />
@@ -73,16 +66,4 @@ these properties can be overwritten by p
-->
<attribute name="interviewRoomModule" value="interviewConferenceRoom"
type="string" />
-<!-- #############################################
- Event Room Modules
- -->
-
-<attribute name="recordModule" value="recordContent" type="string" />
-
-<!-- #############################################
- Profiles Panel Modules
- -->
-
-<attribute name="userSettingsModule" value="userSettings" type="string" />
-
</library>
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx?rev=1513211&r1=1513210&r2=1513211&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx Mon Aug
12 18:03:52 2013
@@ -22,9 +22,7 @@
<include href="conference/" />
<include href="chat/" />
- <!--
<include href="settings/" />
- -->
<include href="invitation/" />
<include href="dashboard/" />
<include href="meetings/" />
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=1513211&r1=1513210&r2=1513211&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/library.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/library.lzx
Mon Aug 12 18:03:52 2013
@@ -66,9 +66,7 @@
<include href="privatemessages/" />
<include href="usercontacts/" />
- <include href="searchuserprofile/" />
<include href="viewUserProfile.lzx" />
- <include href="userSettings.lzx" />
</library>
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/library.lzx?rev=1513211&r1=1513210&r2=1513211&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/library.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/library.lzx
Mon Aug 12 18:03:52 2013
@@ -20,14 +20,6 @@
-->
<library>
-
<include href="newPrivateMessage.lzx" />
- <include href="newPrivateMessageFolder.lzx" />
- <include href="privateMessageFolder.lzx" />
- <include href="privateMessagItem.lzx" />
- <include href="privateMessages.lzx" />
- <include href="roomAccessMessage.lzx" />
- <include href="pendingUserStatus.lzx" />
-
</library>
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/library.lzx?rev=1513211&r1=1513210&r2=1513211&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/library.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/library.lzx
Mon Aug 12 18:03:52 2013
@@ -20,11 +20,6 @@
-->
<library>
-
- <include href="contactsListItem.lzx" />
- <include href="pendingContactsListItem.lzx" />
<include href="userContacts.lzx" />
- <include href="editUserContacts.lzx" />
-
</library>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java?rev=1513211&r1=1513210&r2=1513211&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/CalendarService.java
Mon Aug 12 18:03:52 2013
@@ -120,32 +120,6 @@ public class CalendarService {
}
- public Appointment getAppointmentByRoomId(String SID, Long room_id) {
- try {
-
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- Appointment appointment = new Appointment();
-
- Appointment appStored =
appointmentDao.getAppointmentByRoomId(
- users_id, room_id);
-
- appointment.setAppointmentStarttime(appStored
- .getAppointmentStarttime());
- appointment.setAppointmentEndtime(appStored
- .getAppointmentEndtime());
-
- return appointment;
- }
-
- } catch (Exception err) {
- log.error("[getAppointmentByRoomId]", err);
- }
- return null;
- }
-
public List<AppointmentCategory> getAppointmentCategoryList(String SID)
{
log.debug("AppointmenetCategoryService.getAppointmentCategoryList SID : "
+ SID);
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java?rev=1513211&r1=1513210&r2=1513211&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
Mon Aug 12 18:03:52 2013
@@ -23,7 +23,6 @@ import static org.apache.openmeetings.pe
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
-import java.util.LinkedList;
import java.util.List;
import java.util.TimeZone;
@@ -54,8 +53,6 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.persistence.beans.room.Client;
import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.persistence.beans.user.PrivateMessage;
-import org.apache.openmeetings.persistence.beans.user.PrivateMessageFolder;
import org.apache.openmeetings.persistence.beans.user.Salutation;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.persistence.beans.user.UserContact;
@@ -137,6 +134,19 @@ public class UserService {
private SlaveHTTPConnectionManager slaveHTTPConnectionManager;
/**
+ * 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
@@ -326,33 +336,6 @@ public class UserService {
return null;
}
- public SearchResult<User> searchUserProfile(String SID, String
searchTxt,
- String userOffers, String userSearchs, String orderBy,
int start,
- int max, boolean asc) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- SearchResult<User> searchResult = new
SearchResult<User>();
-
searchResult.setObjectName(User.class.getName());
- List<User> userList =
userManager.searchUserProfile(
- searchTxt, userOffers,
userSearchs, orderBy, start,
- max, asc);
- searchResult.setResult(userList);
- Long resultInt =
userManager.searchCountUserProfile(
- searchTxt, userOffers,
userSearchs);
- searchResult.setRecords(resultInt);
-
- return searchResult;
- }
- } catch (Exception err) {
- log.error("[searchUserProfile]", err);
- }
- return null;
- }
-
@Deprecated
public Long requestUserToContactList(String SID, Long userToAdd_id,
String domain, String port, String webapp) {
@@ -483,31 +466,6 @@ public class UserService {
return null;
}
- public Long checkPendingStatus(String SID, Long userContactId) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- UserContact userContacts =
userContactsDao.get(userContactId);
-
- if (userContacts == null) {
- return -46L;
- }
-
- if (!userContacts.getPending()) {
- return -47L;
- }
-
- return userContactId;
- }
- } catch (Exception err) {
- log.error("[checkPendingStatus]", err);
- }
- return null;
- }
-
public Integer removeContactUser(String SID, Long userContactId) {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -818,324 +776,6 @@ public class UserService {
}
- public SearchResult<PrivateMessage> getInbox(String SID, String search,
- String orderBy, int start, Boolean asc, Integer max) {
- try {
-
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- SearchResult<PrivateMessage> searchResult = new
SearchResult<PrivateMessage>();
-
searchResult.setObjectName(User.class.getName());
- List<PrivateMessage> userList =
privateMessagesDao
-
.getPrivateMessagesByUser(users_id, search, orderBy,
- start, asc, 0L,
max);
-
- searchResult.setResult(userList);
-
- Long resultInt =
privateMessagesDao.countPrivateMessagesByUser(
- users_id, search, 0L);
-
- searchResult.setRecords(resultInt);
-
- return searchResult;
-
- }
-
- } catch (Exception err) {
- log.error("[getInbox]", err);
- }
- return null;
- }
-
- public SearchResult<PrivateMessage> getSend(String SID, String search,
- String orderBy, Integer start, Boolean asc, Integer
max) {
- try {
-
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- SearchResult<PrivateMessage> searchResult = new
SearchResult<PrivateMessage>();
-
searchResult.setObjectName(User.class.getName());
- List<PrivateMessage> userList =
privateMessagesDao
-
.getSendPrivateMessagesByUser(users_id, search,
- orderBy, start,
asc, 0L, max);
-
- searchResult.setResult(userList);
-
- Long resultInt = privateMessagesDao
-
.countSendPrivateMessagesByUser(users_id, search, 0L);
-
- searchResult.setRecords(resultInt);
-
- return searchResult;
-
- }
-
- } catch (Exception err) {
- log.error("[getInbox]", err);
- }
- return null;
- }
-
- public SearchResult<PrivateMessage> getTrash(String SID, String search,
- String orderBy, Integer start, Boolean asc, Integer
max) {
- try {
-
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- SearchResult<PrivateMessage> searchResult = new
SearchResult<PrivateMessage>();
-
searchResult.setObjectName(User.class.getName());
- List<PrivateMessage> userList =
privateMessagesDao
-
.getTrashPrivateMessagesByUser(users_id, search,
- orderBy, start,
asc, max);
-
- searchResult.setResult(userList);
-
- Long resultInt = privateMessagesDao
-
.countTrashPrivateMessagesByUser(users_id, search);
-
- searchResult.setRecords(resultInt);
-
- return searchResult;
-
- }
-
- } catch (Exception err) {
- log.error("[getInbox]", err);
- }
- return null;
- }
-
- public SearchResult<PrivateMessage> getFolder(String SID,
- Long privateMessageFolderId, String search, String
orderBy,
- Integer start, Boolean asc, Integer max) {
- try {
-
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- SearchResult<PrivateMessage> searchResult = new
SearchResult<PrivateMessage>();
-
searchResult.setObjectName(User.class.getName());
- List<PrivateMessage> userList =
privateMessagesDao
-
.getFolderPrivateMessagesByUser(users_id, search,
- orderBy, start,
asc, privateMessageFolderId,
- max);
-
- searchResult.setResult(userList);
-
- Long resultInt = privateMessagesDao
-
.countFolderPrivateMessagesByUser(users_id,
-
privateMessageFolderId, search);
-
- searchResult.setRecords(resultInt);
-
- return searchResult;
-
- }
-
- } catch (Exception err) {
- log.error("[getInbox]", err);
- }
- return null;
- }
-
- public Long getFolderCount(String SID, Long privateMessageFolderId) {
- try {
-
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- return
privateMessagesDao.countFolderPrivateMessagesByUser(
- users_id,
privateMessageFolderId, "");
-
- }
-
- } catch (Exception err) {
- log.error("[getInbox]", err);
- }
- return null;
- }
-
- public Integer moveMailsToFolder(String SID,
- @SuppressWarnings("rawtypes") List
privateMessageIntsIds,
- Long newFolderId) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- List<Long> privateMessageIds = new
LinkedList<Long>();
-
- for (Object pMessageId : privateMessageIntsIds)
{
-
privateMessageIds.add(Long.valueOf(pMessageId.toString())
- .longValue());
- }
-
- return
privateMessagesDao.moveMailsToFolder(privateMessageIds,
- newFolderId);
-
- }
- } catch (Exception err) {
- log.error("[moveMailsToFolder]", err);
- }
- return null;
- }
-
- public Integer moveMailsToTrash(String SID,
- @SuppressWarnings("rawtypes") List
privateMessageIntsIds,
- Boolean isTrash) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- List<Long> privateMessageIds = new
LinkedList<Long>();
-
- for (Object pMessageId : privateMessageIntsIds)
{
-
privateMessageIds.add(Long.valueOf(pMessageId.toString())
- .longValue());
- }
-
- log.debug("moveMailsToTrash :: " + isTrash);
-
- return
privateMessagesDao.updatePrivateMessagesToTrash(
- privateMessageIds, isTrash, 0L);
-
- }
- } catch (Exception err) {
- log.error("[moveMailsToTrash]", err);
- }
- return -1;
- }
-
- public Integer deletePrivateMessages(String SID, List<?>
privateMessageIntsIds) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- List<Long> privateMessageIds = new
LinkedList<Long>();
-
- for (Object pMessageId : privateMessageIntsIds)
{
-
privateMessageIds.add(Long.valueOf(pMessageId.toString()));
- }
-
- return
privateMessagesDao.deletePrivateMessages(privateMessageIds);
-
- }
- } catch (Exception err) {
- log.error("[markReadStatusMails]", err);
- }
- return -1;
- }
-
- public Integer markReadStatusMails(String SID,
- @SuppressWarnings("rawtypes") List
privateMessageIntsIds,
- Boolean isRead) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- List<Long> privateMessageIds = new
LinkedList<Long>();
-
- for (Object pMessageId : privateMessageIntsIds)
{
-
privateMessageIds.add(Long.valueOf(pMessageId.toString())
- .longValue());
- }
-
- log.debug("markReadStatusMails :: " + isRead);
-
- return
privateMessagesDao.updatePrivateMessagesReadStatus(
- privateMessageIds, isRead);
-
- }
- } catch (Exception err) {
- log.error("[markReadStatusMails]", err);
- }
- return -1;
- }
-
- public Integer markReadStatusMail(String SID, Long privateMessageId,
- Boolean isRead) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- List<Long> privateMessageIds = new
LinkedList<Long>();
- privateMessageIds.add(privateMessageId);
-
- return
privateMessagesDao.updatePrivateMessagesReadStatus(
- privateMessageIds, isRead);
-
- // PrivateMessages privateMessage =
- //
privateMessagesDao.getPrivateMessagesById(privateMessageId);
- //
- // privateMessage.setIsRead(isRead);
- //
- //
privateMessagesDao.updatePrivateMessages(privateMessage);
-
- }
- } catch (Exception err) {
- log.error("[markReadStatusMail]", err);
- }
- return null;
- }
-
- public List<PrivateMessageFolder> getPrivateMessageFoldersByUser(String
SID) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- return privateMessageFolderDao
-
.getPrivateMessageFolderByUserId(users_id);
-
- }
-
- } catch (Exception err) {
- log.error("[getPrivateMessageFolderByUser]", err);
- }
- return null;
- }
-
- public Long addPrivateMessageFolder(String SID, String folderName) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
-
privateMessageFolderDao.addPrivateMessageFolder(folderName,
- users_id);
-
- }
-
- } catch (Exception err) {
- log.error("[addPrivateMessageFolder]", err);
- }
- return null;
- }
-
public Boolean checkUserIsInContactList(String SID, Long user_id) {
try {
Long users_id = sessiondataDao.checkSession(SID);
@@ -1187,51 +827,6 @@ public class UserService {
}
}
- public Long updatePrivateMessageFolder(String SID,
- Long privateMessageFolderId, String folderName) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- PrivateMessageFolder privateMessageFolder =
privateMessageFolderDao.get(privateMessageFolderId);
-
- privateMessageFolder.setFolderName(folderName);
- privateMessageFolder.setUpdated(new Date());
-
-
privateMessageFolderDao.update(privateMessageFolder, users_id);
-
- return privateMessageFolderId;
-
- }
-
- } catch (Exception err) {
- log.error("[updatePrivateMessageFolder]", err);
- }
- return null;
- }
-
- public Long deletePrivateMessageFolder(String SID,
- Long privateMessageFolderId) {
- try {
- Long users_id = sessiondataDao.checkSession(SID);
- Long user_level =
userManager.getUserLevelByID(users_id);
- // users only
- if (authLevelUtil.checkUserLevel(user_level)) {
-
- PrivateMessageFolder privateMessageFolder =
privateMessageFolderDao.get(privateMessageFolderId);
-
-
privateMessageFolderDao.delete(privateMessageFolder, users_id);
-
- }
-
- } catch (Exception err) {
- log.error("[deletePrivateMessageFolder]", err);
- }
- return null;
- }
-
/**
* Kick a user by its publicSID.<br/>
* <br/>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomsPanel.html?rev=1513211&r1=1513210&r2=1513211&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
Mon Aug 12 18:03:52 2013
@@ -37,7 +37,7 @@
</tr>
</table>
</td>
- <td>
+ <td style="vertical-align: top">
<!-- Users in this Room -->
<fieldset>
<div class="formelement">
