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 2012/09/18 20:40:16 UTC
svn commit: r1387311 - in /incubator/openmeetings/trunk/singlewebapp: ./
WebContent/ WebContent/languages/ WebContent/src/base/hibernate/
WebContent/src/modules/admin/connections/
WebContent/src/modules/admin/roomadmin/ WebContent/src/modules/chat/ Web...
Author: solomax
Date: Tue Sep 18 18:40:14 2012
New Revision: 1387311
URL: http://svn.apache.org/viewvc?rev=1387311&view=rev
Log:
OPENMEETINGS-436 Ability to moderate room chat is added;
code cleanup
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottomRoomList.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/.classpath
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/project.xsd
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClientListItem.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/globalAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatOutput.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTab.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomClient.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
Modified: incubator/openmeetings/trunk/singlewebapp/.classpath
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/.classpath?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/.classpath (original)
+++ incubator/openmeetings/trunk/singlewebapp/.classpath Tue Sep 18 18:40:14 2012
@@ -15,6 +15,7 @@
<classpath>
<classpathentry kind="src" path="WebContent/WEB-INF"/>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="WebContent/openmeetings/WEB-INF/classes"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
<attributes>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/arabic.xml Tue Sep 18 18:40:14 2012
@@ -4573,4 +4573,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/bulgarian.xml Tue Sep 18 18:40:14 2012
@@ -4571,4 +4571,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/catalan.xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20simplified.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese simplified.xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese%20traditional.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/chinese traditional.xml Tue Sep 18 18:40:14 2012
@@ -4584,4 +4584,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/czech.xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/danish.xml Tue Sep 18 18:40:14 2012
@@ -4571,4 +4571,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch%20%28studIP%29.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/deutsch.xml Tue Sep 18 18:40:14 2012
@@ -6039,4 +6039,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/dutch.xml Tue Sep 18 18:40:14 2012
@@ -4568,4 +4568,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/english.xml Tue Sep 18 18:40:14 2012
@@ -6015,4 +6015,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/finnish.xml Tue Sep 18 18:40:14 2012
@@ -4571,4 +4571,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/french.xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/galician.xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/greek.xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hebrew.xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/hungarian.xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/indonesian.xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/italian.xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/japanese.xml Tue Sep 18 18:40:14 2012
@@ -4571,4 +4571,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/korean.xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/persian.xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/polish.xml Tue Sep 18 18:40:14 2012
@@ -4645,4 +4645,10 @@ transmitowania gÅosu i obrazu wideo.<
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues%20brazil.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues brazil.xml Tue Sep 18 18:40:14 2012
@@ -4573,4 +4573,10 @@ Details
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/portugues.xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/russian.xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>ÐÑемодеÑиÑÑемÑй ÑаÑ</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>ÐпÑбликоваÑÑ ÑообÑение</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/slovak.xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/spanish.xml Tue Sep 18 18:40:14 2012
@@ -4580,4 +4580,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/swedish.xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/thai.xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/turkish.xml Tue Sep 18 18:40:14 2012
@@ -4571,4 +4571,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/languages/ukrainian.xml Tue Sep 18 18:40:14 2012
@@ -4572,4 +4572,10 @@ see http://incubator.apache.org/openmeet
<string id="1512" name="microphone_volume">
<value>Adjust microphone volume</value>
</string>
+ <string id="1513" name="chat_moderated">
+ <value>Is chat moderated</value>
+ </string>
+ <string id="1514" name="chat_moderated">
+ <value>Allow message</value>
+ </string>
</language>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/project.xsd
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/project.xsd?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/project.xsd (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/project.xsd Tue Sep 18 18:40:14 2012
@@ -4708,18 +4708,6 @@ This is used in the conference.
</xs:extension>
</xs:complexContent>
</xs:complexType>
-<xs:element name="chatTabBottomRoomList" type="project:chatTabBottomRoomList" >
-</xs:element>
- <xs:complexType name="chatTabBottomRoomList" mixed="true">
- <xs:complexContent>
- <xs:extension base="lzx:view">
- <xs:attribute name="objMessage" type="xs:string" default="null" >
-</xs:attribute>
- <xs:attribute name="doUpdate" type="lzx:boolean" default="false" >
-</xs:attribute>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
<xs:element name="chatTabItem" type="project:chatTabItem" >
</xs:element>
<xs:complexType name="chatTabItem" mixed="true">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Tue Sep 18 18:40:14 2012
@@ -1542,7 +1542,24 @@
]]>
</handler>
</netRemoteCallHib>
-
+
+ <netRemoteCallHib name="sendChatMessageWithClient"
+ funcname="chatservice.sendMessageWithClient" remotecontext="$once{ canvas.thishib }">
+ <attribute name="messageObj" value="null" />
+ <netparam><method name="getValue">return parent.messageObj;</method></netparam>
+
+ <method name="sendMessage" args="messageObject">
+ this.messageObj = messageObject;
+ this.doCall();
+ </method>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the rtmpconnection
+ if ($debug) Debug.write("chatservice.sendMessageWithClient getValue : ",value);
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+
<netRemoteCallHib name="sendMessageWithClient" funcname="sendMessageWithClient"
remotecontext="$once{ canvas.thishib }" >
@@ -1611,7 +1628,6 @@
canvas._currentChatPanel.privatechat(value.message,value.client);
} else if (value.message[0]=='chat'){
if (canvas._chatcontent) canvas._chatcontent.addChatHistory(value.message,value.client);
- if (canvas._chatcontentRPC) canvas._chatcontentRPC.addChatHistory(value.message,value.client);
} else if (value.message[0]=='avsettings'){
canvas._videocontainer.setAVSettingsToClient(value.client);
} else if (value.message[0]=='whiteboard'){
@@ -1800,13 +1816,6 @@
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="removeClientFromChatNotification"
- funcname="chatservice.removeClientFromChatNotification" >
- <handler name="ondata" args="value">
- if ($debug) Debug.write("removeClientFromChatNotification: ",value);
- </handler>
- </netRemoteCallHib>
-
<!-- recordContentings Notifications -->
<netRemoteCallHib name="stopedRecording" funcname="stopedRecording" >
<handler name="ondata" args="value">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClientListItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClientListItem.lzx?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClientListItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClientListItem.lzx Tue Sep 18 18:40:14 2012
@@ -30,8 +30,8 @@
String userip, int userport, Long room_id, Date roomEnter,
long broadCastID, Long user_id, String firstname, String lastname,
String mail, String lastLogin, String official_code,
- String picture_uri, String language, Boolean isChatNotification,
- Long chatUserRoomId, String avsettings, String swfurl,
+ String picture_uri, String language
+ String avsettings, String swfurl,
Boolean isRecording, String roomRecordingName,
Boolean zombieCheckFlag)
-->
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomValueForm.lzx Tue Sep 18 18:40:14 2012
@@ -67,6 +67,7 @@
this.hideScreenSharing.setValue(false);
this.hideWhiteboard.setValue(false);
this.showMicrophoneStatus.setValue(false);
+ this.chatModerated.setValue(false);
this.server.selectItem(this.server.firstItem);
</handler>
@@ -224,6 +225,7 @@
} else {
this.showMicrophoneStatus.setValue(false);
}
+ this.chatModerated.setValue(obj.chatModerated != null && obj.chatModerated);
this._listRoomModerators.getRoomModeratorsByRoomId.doCall();
@@ -329,7 +331,8 @@
this.sendObject["hideWhiteboard"] = parent.hideWhiteboard.getValue();
- this.sendObject["showMicrophoneStatus"] = parent.showMicrophoneStatus.getValue();
+ this.sendObject["showMicrophoneStatus"] = parent.showMicrophoneStatus.getValue();
+ this.sendObject["chatModerated"] = parent.chatModerated.getValue();
this.sendObject["serverId"] = parent.server.getValue();
var ownerId = parent.ownerId.getText();
@@ -572,6 +575,9 @@
<labelText labelid="1442" width="200" y="1100" resize="false" x="2" />
<labelCheckbox name="showMicrophoneStatus" width="270" y="1100" x="180" fontsize="11" />
+ <labelText labelid="1513" width="200" y="1120" resize="false" x="2" />
+ <labelCheckbox name="chatModerated" width="270" y="1120" x="180" fontsize="11" />
+
<!-- RoomClient List Right Side -->
<labelText labelid="587" width="300" y="40" resize="false"
x="398" fontstyle="bold" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/globalAttributes.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/globalAttributes.lzx?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/globalAttributes.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/chat/globalAttributes.lzx Tue Sep 18 18:40:14 2012
@@ -32,9 +32,6 @@
<!--- chat modules: chat content -->
<attribute name="_currentChatPanel" value="null" />
-<!--- chat modules: chat content RPC -->
-<attribute name="_chatcontentRPC" value="null" />
-
<!--- chat modules: overall chat content -->
<attribute name="_overallchatcontent" value="null" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx Tue Sep 18 18:40:14 2012
@@ -197,7 +197,7 @@
<handler name="ondata" args="value">
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("chatservice.sendMessageWithClientByPublicSID getValue : ",value);
+ if ($debug) Debug.write("sendMessageWithClientByPublicSID getValue : ",value);
]]>
</handler>
</netRemoteCallHib>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatOutput.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatOutput.lzx?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatOutput.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatOutput.lzx Tue Sep 18 18:40:14 2012
@@ -100,7 +100,7 @@
} else {
var username = client.firstname+" "+client.lastname;
}
- var messageObj = value[9];
+ var messageObj = value[value.length - 1];
//var newmessage = "<FONT COLOR='"+value[5]+"' size='11'>"+client.firstname+" "+client.lastname+"</FONT>:<FONT COLOR='0x000000' size='11'>"+value[4]+"</FONT><br />";
//Debug.write("newmessage: ",newmessage);
//this._cbtext.setAttribute('text',this._cbtext.text+newmessage);
@@ -124,6 +124,7 @@
if ($debug) Debug.write("addChatHistory userID: ",value[8],isDirectLink);
new lz.chatTabItemEmoticons(this._cbtext,{
+ rawMessage: value,
messageObj:messageObj,
user_id:value[8],
publicSID:value[6],
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTab.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTab.lzx?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTab.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTab.lzx Tue Sep 18 18:40:14 2012
@@ -68,7 +68,7 @@ This is used in the conference.
<handler name="ondata" args="value">
<![CDATA[
//The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("chatservice.sendMessageWithClientByPublicSID getValue : ",value);
+ if ($debug) Debug.write("sendMessageWithClientByPublicSID getValue : ",value);
]]>
</handler>
</netRemoteCallHib>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabBottom.lzx Tue Sep 18 18:40:14 2012
@@ -52,6 +52,7 @@
<simpleLabelButton name="_button" labelid="220"
height="21" width="80" x="$once{ parent.width-80 }">
<handler name="onclick">
+ <![CDATA[
var message = this.parent.getText();
if (message.length != 0) {
parent.objMessage = new Array();
@@ -68,27 +69,19 @@
om[6] = parent.parent.isPrivate ? parent.parent.parent.refObj.publicSID : canvas.publicSID;
om[7] = canvas.isrtl;
om[8] = hib.userobject.user_id;
+ om[9] = canvas.currentRoomObject.chatModerated && !canvas.ismoderator;
if ($debug) Debug.write("send: ", parent.parent.parent);
if (parent.parent.isPrivate) {
parent.sendMessageWithClientByPublicSID.doCall();
} else {
- parent.sendMessageWithClient.doCall();
+ hib.sendChatMessageWithClient.sendMessage(om);
}
this.parent.setText('');
}
+ ]]>
</handler>
</simpleLabelButton>
- <netRemoteCallHib name="sendMessageWithClient"
- funcname="chatservice.sendMessageWithClient" remotecontext="$once{ canvas.thishib }">
- <netparam><method name="getValue">return parent.parent.objMessage;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("chatservice.sendMessageWithClient getValue : ",value);
- ]]>
- </handler>
- </netRemoteCallHib>
<netRemoteCallHib name="sendMessageWithClientByPublicSID"
funcname="chatservice.sendMessageWithClientByPublicSID" remotecontext="$once{ canvas.thishib }">
<netparam><method name="getValue">return parent.parent.objMessage;</method></netparam>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx Tue Sep 18 18:40:14 2012
@@ -32,6 +32,7 @@
<attribute name="isDirectLink" value="false" type="boolean" />
<attribute name="message" value="" type="string" />
<attribute name="picture_uri" value="" type="string"/>
+ <attribute name="rawMessage" value="null" />
<handler name="oninit">
<![CDATA[
@@ -94,6 +95,21 @@
name="header_user">
</text>
+ <state applied="$once{ parent.rawMessage[9] }">
+ <miniIcons resource="allow_ok_icon_rsc" width="16" height="16"
+ y="2" x="$once{ parent.width - 140 }" showhandcursor="true" >
+ <handler name="onclick">
+ this.setAttribute('visible', false);
+ parent.setAttribute('visible', false);
+ parent.rawMessage.length = parent.rawMessage.length - 1;
+ parent.rawMessage[parent.rawMessage.length - 1] = false;
+ //if ($debug) Debug.write("!!!!!!!!!!!!! allow message ", parent, parent.rawMessage);
+ hib.sendChatMessageWithClient.sendMessage(parent.rawMessage);
+ </handler>
+ <labelTooltip labelid="1514" />
+ </miniIcons>
+ </state>
+
<state applied="$once{ !parent.isDirectLink }">
<miniIconsImage name="add" src="$once{ canvas.getThemeImage('edit_add_rsc') }" width="16" height="16"
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/library.lzx Tue Sep 18 18:40:14 2012
@@ -28,7 +28,6 @@
<include href="simpleBaseTabpane.lzx" />
<include href="showChatLog.lzx" />
<include href="baseTabChatPanel.lzx" />
- <include href="chatTabBottomRoomList.lzx" />
<include href="chatTabItem.lzx" />
<include href="chatTabItemEmoticons.lzx" />
<include href="chatOutput.lzx" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx Tue Sep 18 18:40:14 2012
@@ -54,8 +54,6 @@
<handler name="ontabcontentleave">
_mainScrollBar.setAttribute("visibility","visible");
- //canvas._chatcontentRPC = null;
- //canvas.thishib.removeClientFromChatNotification.doCall();
</handler>
<attribute name="refObjItem" value="null" />
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/axis/services/RoomWebService.java Tue Sep 18 18:40:14 2012
@@ -698,6 +698,7 @@ public class RoomWebService {
false, // hideScreenSharing
false, // hideWhiteboard
false, // showMicrophoneStatus
+ false, // chatModerated
u.getServer());
}
} catch (Exception err) {
@@ -756,6 +757,7 @@ public class RoomWebService {
false, // hideScreenSharing
false, // hideWhiteboard
false, // showMicrophoneStatus
+ false, // chatModerated
u.getServer());
}
} catch (Exception err) {
@@ -821,6 +823,7 @@ public class RoomWebService {
false, // hideScreenSharing
false, // hideWhiteboard
false, // showMicrophoneStatus
+ false, // chatModerated
u.getServer());
}
} catch (Exception err) {
@@ -888,6 +891,7 @@ public class RoomWebService {
false, // hideScreenSharing
false, // hideWhiteboard
false, // showMicrophoneStatus
+ false, // chatModerated
u.getServer());
}
return -1L;
@@ -971,7 +975,7 @@ public class RoomWebService {
null, null, null, hideTopBar, hideChat,
hideActivitiesAndActions, hideFilesExplorer,
hideActionsMenu, hideScreenSharing, hideWhiteboard,
- false, u.getServer());
+ false, false, u.getServer());
}
return -1L;
} catch (Exception err) {
@@ -1107,7 +1111,8 @@ public class RoomWebService {
false, // hideActionsMenu
false, // hideScreenSharing
false, // hideWhiteboard
- false // showMicrophoneStatus
+ false, // showMicrophoneStatus
+ false // chatModerated
);
}
} catch (Exception err) {
@@ -1167,7 +1172,8 @@ public class RoomWebService {
false, // hideActionsMenu
false, // hideScreenSharing
false, // hideWhiteboard
- false // showMicrophoneStatus
+ false, // showMicrophoneStatus
+ false // chatModerated
);
}
} catch (Exception err) {
@@ -1230,7 +1236,8 @@ public class RoomWebService {
false, // hideActionsMenu
false, // hideScreenSharing
false, // hideWhiteboard
- false // showMicrophoneStatus
+ false, // showMicrophoneStatus
+ false // chatModerated
);
}
} catch (Exception err) {
@@ -1312,7 +1319,8 @@ public class RoomWebService {
null, null, null, hideTopBar, hideChat,
hideActivitiesAndActions, hideFilesExplorer,
hideActionsMenu, hideScreenSharing, hideWhiteboard,
- false // showMicrophoneStatus
+ false, // showMicrophoneStatus
+ false // chatModerated
);
}
} catch (Exception err) {
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/calendar/management/AppointmentLogic.java Tue Sep 18 18:40:14 2012
@@ -186,6 +186,7 @@ public class AppointmentLogic {
false, // hideScreenSharing
false, // hideWhiteboard
false, //showMicrophoneStatus
+ false, // chatModerated
user.getServer()
);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/conference/Roommanagement.java Tue Sep 18 18:40:14 2012
@@ -749,7 +749,7 @@ public class Roommanagement {
Long ownerId, Boolean waitForRecording, Boolean allowRecording,
Boolean hideTopBar, Boolean hideChat, Boolean hideActivitiesAndActions, Boolean hideFilesExplorer,
Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard,
- Boolean showMicrophoneStatus, Server server) {
+ Boolean showMicrophoneStatus, Boolean chatModerated, Server server) {
try {
if (authLevelManagement.checkAdminLevel(user_level)) {
@@ -791,6 +791,7 @@ public class Roommanagement {
r.setHideScreenSharing(hideScreenSharing);
r.setHideWhiteboard(hideWhiteboard);
r.setShowMicrophoneStatus(showMicrophoneStatus);
+ r.setChatModerated(chatModerated);
r.setServer(server);
// handle SIP Issues
@@ -1334,7 +1335,7 @@ public class Roommanagement {
Long ownerId, Boolean waitForRecording, Boolean allowRecording,
Boolean hideTopBar, Boolean hideChat, Boolean hideActivitiesAndActions,
Boolean hideFilesExplorer, Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard,
- Boolean showMicrophoneStatus) {
+ Boolean showMicrophoneStatus, Boolean chatModerated) {
try {
log.debug("*** updateRoom numberOfPartizipants: "
@@ -1348,7 +1349,7 @@ public class Roommanagement {
isClosed, redirectURL, sipNumber, conferencePin,
ownerId, waitForRecording, allowRecording, hideTopBar, hideChat,
hideActivitiesAndActions, hideFilesExplorer, hideActionsMenu,
- hideScreenSharing, hideWhiteboard, showMicrophoneStatus);
+ hideScreenSharing, hideWhiteboard, showMicrophoneStatus, chatModerated);
}
@@ -1368,7 +1369,7 @@ public class Roommanagement {
Long ownerId, Boolean waitForRecording, Boolean allowRecording,
Boolean hideTopBar, Boolean hideChat, Boolean hideActivitiesAndActions, Boolean hideFilesExplorer,
Boolean hideActionsMenu, Boolean hideScreenSharing, Boolean hideWhiteboard,
- Boolean showMicrophoneStatus) {
+ Boolean showMicrophoneStatus, Boolean chatModerated) {
try {
log.debug("*** updateRoom numberOfPartizipants: "
+ numberOfPartizipants);
@@ -1408,6 +1409,7 @@ public class Roommanagement {
r.setHideScreenSharing(hideScreenSharing);
r.setHideWhiteboard(hideWhiteboard);
r.setShowMicrophoneStatus(showMicrophoneStatus);
+ r.setChatModerated(chatModerated);
if (r.getRooms_id() == null) {
em.persist(r);
@@ -1774,6 +1776,7 @@ public class Roommanagement {
false, // hideScreenSharing
false, // hideWhiteboard
false, //showMicrophoneStatus
+ false, // chatModerated
null //server
);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java Tue Sep 18 18:40:14 2012
@@ -602,6 +602,7 @@ public class ImportInitvalues {
false, // hideScreenSharing
false, // hideWhiteboard
false, // showMicrophoneStatus
+ false, // chatModerated
null
);
@@ -616,6 +617,7 @@ public class ImportInitvalues {
false, // hideScreenSharing
false, // hideWhiteboard
false, // showMicrophoneStatus
+ false, // chatModerated
null
);
@@ -630,6 +632,7 @@ public class ImportInitvalues {
false, // hideScreenSharing
false, // hideWhiteboard
false, // showMicrophoneStatus
+ false, // chatModerated
null
);
@@ -644,6 +647,7 @@ public class ImportInitvalues {
false, // hideScreenSharing
false, // hideWhiteboard
false, // showMicrophoneStatus
+ false, // chatModerated
null
);
@@ -658,6 +662,7 @@ public class ImportInitvalues {
false, // hideScreenSharing
false, // hideWhiteboard
false, // showMicrophoneStatus
+ false, // chatModerated
null
);
@@ -672,6 +677,7 @@ public class ImportInitvalues {
false, // hideScreenSharing
false, // hideWhiteboard
true, // showMicrophoneStatus
+ false, // chatModerated
null
);
@@ -686,6 +692,7 @@ public class ImportInitvalues {
false, // hideScreenSharing
false, // hideWhiteboard
true, // showMicrophoneStatus
+ false, // chatModerated
null
);
@@ -700,6 +707,7 @@ public class ImportInitvalues {
false, // hideScreenSharing
false, // hideWhiteboard
false, // showMicrophoneStatus
+ false, // chatModerated
null
);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomClient.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomClient.java?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomClient.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/RoomClient.java Tue Sep 18 18:40:14 2012
@@ -220,16 +220,6 @@ public class RoomClient implements Seria
private String language = "";
/*
- * these vars are necessary to send notifications from the chatroom of a
- * conference to outside of the conference room
- */
- @Column(name="is_chat_notification")
- private Boolean isChatNotification = false;
-
- @Column(name="chat_user_room_id")
- private Long chatUserRoomId = null;
-
- /*
* avsettings can be:
* av - video and audio
* a - audio only
@@ -469,20 +459,6 @@ public class RoomClient implements Seria
this.roomEnter = roomEnter;
}
- public Boolean getIsChatNotification() {
- return isChatNotification;
- }
- public void setIsChatNotification(Boolean isChatNotification) {
- this.isChatNotification = isChatNotification;
- }
-
- public Long getChatUserRoomId() {
- return chatUserRoomId;
- }
- public void setChatUserRoomId(Long chatUserRoomId) {
- this.chatUserRoomId = chatUserRoomId;
- }
-
public Boolean getIsRecording() {
return isRecording;
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/rooms/Rooms.java Tue Sep 18 18:40:14 2012
@@ -191,6 +191,10 @@ public class Rooms implements Serializab
@Element(data=true, required=false)
private Boolean showMicrophoneStatus = false;
+ @Column(name = "chat_moderated")
+ @Element(data=true, required=false)
+ private Boolean chatModerated = false;
+
@OneToMany(fetch = FetchType.LAZY)
@JoinColumn(name = "roomId")
@ElementList(name="room_moderators")
@@ -448,4 +452,10 @@ public class Rooms implements Serializab
public void setModerators(List<RoomModerators> moderators) {
this.moderators = moderators;
}
+ public Boolean getChatModerated() {
+ return chatModerated;
+ }
+ public void setChatModerated(Boolean chatModerated) {
+ this.chatModerated = chatModerated;
+ }
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ChatService.java Tue Sep 18 18:40:14 2012
@@ -102,37 +102,55 @@ public class ChatService implements IPen
Long room_id = currentClient.getRoom_id();
log.debug("room_id: " + room_id);
- log.debug("currentClient.getIsChatNotification(): " + currentClient.getIsChatNotification());
- if (currentClient.getIsChatNotification()) {
- room_id = currentClient.getChatUserRoomId();
- }
+ if (room_id == null) {
+ return 1; //TODO weird
+ }
@SuppressWarnings("rawtypes")
ArrayList messageMap = (ArrayList) newMessage;
// adding delimiter space, cause otherwise an emoticon in the last
// string would not be found
- String messageText = messageMap.get(4).toString() + " ";
- // add server time
- messageMap.set(1, parseDateAsTimeString());
+ String messageText = messageMap.get(4) + " ";
LinkedList<String[]> parsedStringObjects = ChatString.parseChatString(messageText, emoticonsManager.getEmotfilesList());
// log.error("parsedStringObjects"+parsedStringObjects.size());
log.debug("size:" + messageMap.size());
messageMap.add(parsedStringObjects);
newMessage = messageMap;
-
- HashMap<String, Object> hsm = new HashMap<String, Object>();
- hsm.put("client", currentClient);
- hsm.put("message", newMessage);
-
+
+ boolean needModeration = Boolean.valueOf("" + messageMap.get(9));
List<HashMap<String, Object>> myChatList = myChats.get(room_id);
if (myChatList == null) myChatList = new LinkedList<HashMap<String, Object>>();
+ HashMap<String, Object> hsm = new HashMap<String, Object>();
+ hsm.put("message", newMessage);
+ String publicSID = "" + messageMap.get(6);
+ if (!publicSID.equals(currentClient.getPublicSID())) {
+ hsm.put("client", clientListManager.getClientByPublicSID("" + messageMap.get(6), false));
+ //need to remove unconfirmed chat message if any
+ for (int i = myChatList.size() - 1; i > -1; --i) {
+ RoomClient msgClient = (RoomClient)myChatList.get(i).get("client");
+ @SuppressWarnings("rawtypes")
+ List msgList = (List)myChatList.get(i).get("message");
+ if (publicSID.equals(msgClient.getPublicSID())
+ && ("" + msgList.get(4)).equals(messageMap.get(4))
+ && ("" + msgList.get(1)).equals(messageMap.get(1))
+ && Boolean.valueOf("" + msgList.get(9))) {
+ myChatList.remove(i);
+ break;
+ }
+ }
+
+ } else {
+ // add server time
+ messageMap.set(1, parseDateAsTimeString());
+ hsm.put("client", currentClient);
+ }
+
if (myChatList.size() == chatRoomHistory) myChatList.remove(0);
myChatList.add(hsm);
myChats.put(room_id, myChatList);
-
log.debug("SET CHATROOM: " + room_id);
-
+
//broadcast to everybody in the room/domain
Collection<Set<IConnection>> conCollection = current.getScope().getConnections();
for (Set<IConnection> conset : conCollection) {
@@ -151,16 +169,14 @@ public class ChatService implements IPen
if (rcl.getIsScreenClient() != null && rcl.getIsScreenClient()) {
continue;
}
-
+ if (needModeration && Boolean.TRUE != rcl.getIsMod() && Boolean.TRUE != rcl.getIsSuperModerator()) {
+ continue;
+ }
log.debug("*..*idremote room_id: " + room_id);
log.debug("*..*my idstreamid room_id: " + rcl.getRoom_id());
- if (room_id != null && room_id.equals(rcl.getRoom_id())) {
+ if (room_id.equals(rcl.getRoom_id())) {
((IServiceCapableConnection) conn).invoke("sendVarsToMessageWithClient",new Object[] { hsm }, this);
log.debug("sending sendVarsToMessageWithClient to " + conn);
- } else if (rcl.getIsChatNotification()) {
- if (room_id.equals(rcl.getChatUserRoomId()) && room_id != null) {
- ((IServiceCapableConnection) conn).invoke("sendVarsToMessageWithClient",new Object[] { hsm }, this);
- }
}
}
}
@@ -182,10 +198,6 @@ public class ChatService implements IPen
Long room_id = currentClient.getRoom_id();
log.debug("room_id: " + room_id);
- log.debug("currentClient.getIsChatNotification(): " + currentClient.getIsChatNotification());
- if (currentClient.getIsChatNotification()) {
- room_id = currentClient.getChatUserRoomId();
- }
@SuppressWarnings("rawtypes")
ArrayList messageMap = (ArrayList) newMessage;
@@ -274,11 +286,23 @@ public class ChatService implements IPen
RoomClient currentClient = this.clientListManager.getClientByStreamId(current.getClient().getId());
Long room_id = currentClient.getRoom_id();
- Long chatroom = room_id;
- log.debug("GET CHATROOM: "+chatroom);
+ log.debug("GET CHATROOM: " + room_id);
- List<HashMap<String,Object>> myChatList = myChats.get(chatroom);
- if (myChatList==null) myChatList = new LinkedList<HashMap<String,Object>>();
+ List<HashMap<String,Object>> myChatList = myChats.get(room_id);
+ if (myChatList==null) myChatList = new LinkedList<HashMap<String,Object>>();
+
+ if (Boolean.TRUE != currentClient.getIsMod() && Boolean.TRUE != currentClient.getIsSuperModerator()) {
+ //current user is not moderator, chat history need to be filtered
+ List<HashMap<String,Object>> tmpChatList = new LinkedList<HashMap<String,Object>>(myChatList);
+ for (int i = tmpChatList.size() - 1; i > -1; --i) {
+ @SuppressWarnings("rawtypes")
+ List msgList = (List)tmpChatList.get(i).get("message");
+ if (Boolean.valueOf("" + msgList.get(9))) { //needModeration
+ tmpChatList.remove(i);
+ }
+ }
+ myChatList = tmpChatList;
+ }
return myChatList;
} catch (Exception err) {
@@ -309,53 +333,6 @@ public class ChatService implements IPen
}
}
- /**
- * adds a Client to the additional List of Users to Chat
- * @param userroom
- * @param room_id
- * @param orgdomain
- * @return
- */
- public Long addClientToChatNotification(Long room_id){
- try {
- IConnection current = Red5.getConnectionLocal();
- RoomClient currentClient = this.clientListManager.getClientByStreamId(current.getClient().getId());
- String streamid = currentClient.getStreamid();
-
- currentClient.setIsChatNotification(true);
- currentClient.setChatUserRoomId(room_id);
-
- this.clientListManager.updateClientByStreamId(streamid, currentClient);
- } catch (Exception err) {
- log.error("[addClientToCahtNotification]",err);
- }
- return new Long(-1);
- }
-
- /**
- * remove's a Client from the additional List of users to chat
- * @param userroom
- * @param room_id
- * @param orgdomain
- * @return
- */
- public Long removeClientFromChatNotification(){
- try {
- IConnection current = Red5.getConnectionLocal();
- RoomClient currentClient = this.clientListManager.getClientByStreamId(current.getClient().getId());
- String streamid = currentClient.getStreamid();
-
- currentClient.setIsChatNotification(false);
- currentClient.setChatUserRoomId(null);
-
- this.clientListManager.updateClientByStreamId(streamid, currentClient);
- } catch (Exception err) {
- log.error("[addClientToCahtNotification]",err);
- }
- return new Long(-1);
- }
-
-
public void resultReceived(IPendingServiceCall arg0) {
// TODO Auto-generated method stub
log.error("resultReceived ChatService "+arg0);
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/ConferenceService.java Tue Sep 18 18:40:14 2012
@@ -636,6 +636,7 @@ public class ConferenceService {
Boolean.valueOf(argObjectMap.get("hideScreenSharing").toString()),
Boolean.valueOf(argObjectMap.get("hideWhiteboard").toString()),
Boolean.valueOf(argObjectMap.get("showMicrophoneStatus").toString()),
+ Boolean.valueOf(argObjectMap.get("chatModerated").toString()),
null
);
} else if (rooms_id > 0) {
@@ -685,7 +686,8 @@ public class ConferenceService {
Boolean.valueOf(argObjectMap.get("hideActionsMenu").toString()),
Boolean.valueOf(argObjectMap.get("hideScreenSharing").toString()),
Boolean.valueOf(argObjectMap.get("hideWhiteboard").toString()),
- Boolean.valueOf(argObjectMap.get("showMicrophoneStatus").toString())
+ Boolean.valueOf(argObjectMap.get("showMicrophoneStatus").toString()),
+ Boolean.valueOf(argObjectMap.get("chatModerated").toString())
);
}
long serverId = -1;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java?rev=1387311&r1=1387310&r2=1387311&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/UserService.java Tue Sep 18 18:40:14 2012
@@ -1023,6 +1023,7 @@ public class UserService {
false, // hideScreenSharing
false, // hideWhiteboard
false, //showMicrophoneStatus
+ false, // chatModerated
from.getServer()
);