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 2014/10/09 08:42:31 UTC

svn commit: r1630298 [1/2] - in /openmeetings: branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/calendar/ branches/3.0.x/src/main/java/org/apache/openmeetings/remote/ branches/3.0.x/src/main/webapp/languages/ trunk/singlewebapp/openmeetings-db...

Author: solomax
Date: Thu Oct  9 06:42:29 2014
New Revision: 1630298

URL: http://svn.apache.org/r1630298
Log:
[OPENMEETINGS-1092] Access rights are checked on room enter; code clean-up;

Modified:
    openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
    openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java
    openmeetings/branches/3.0.x/src/main/webapp/languages/arabic.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/bulgarian.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/catalan.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/chinese simplified.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/chinese traditional.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/czech.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/danish.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch (studIP).xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/dutch.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/english.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/finnish.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/french.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/galician.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/greek.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/hebrew.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/hungarian.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/indonesian.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/italian.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/korean.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/persian.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/polish.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/portugues brazil.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/portugues.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/russian.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/slovak.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/spanish.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/swedish.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/thai.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/turkish.xml
    openmeetings/branches/3.0.x/src/main/webapp/languages/ukrainian.xml
    openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
    openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
    openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
    openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java
    openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
    openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
    openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/arabic.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/bulgarian.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/catalan.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese simplified.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese traditional.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/czech.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/danish.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch (studIP).xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/dutch.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/english.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/finnish.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/french.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/galician.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/greek.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hebrew.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hungarian.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/indonesian.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/italian.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/japanese.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/korean.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/persian.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/polish.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues brazil.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/russian.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/slovak.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/spanish.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/swedish.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/thai.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/turkish.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/ukrainian.xml
    openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java

Modified: openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java (original)
+++ openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java Thu Oct  9 06:42:29 2014
@@ -79,7 +79,7 @@ public class AppointmentDao {
 	 * @author o.becherer Retrievment of Appointment for room
 	 */
 	// -----------------------------------------------------------------------------------------------
-	public Appointment getAppointmentByRoom(Long room_id) throws Exception {
+	public Appointment getAppointmentByRoom(Long room_id) {
 		log.debug("AppointMentDaoImpl.getAppointmentByRoom");
 
 		TypedQuery<Appointment> query = em.createNamedQuery("getAppointmentByRoomId", Appointment.class);

Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/MainService.java Thu Oct  9 06:42:29 2014
@@ -34,7 +34,9 @@ import org.apache.openmeetings.data.conf
 import org.apache.openmeetings.data.conference.RoomManager;
 import org.apache.openmeetings.data.user.UserManager;
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
 import org.apache.openmeetings.db.dao.log.ConferenceLogDao;
+import org.apache.openmeetings.db.dao.room.RoomDao;
 import org.apache.openmeetings.db.dao.server.ISessionManager;
 import org.apache.openmeetings.db.dao.server.LdapConfigDao;
 import org.apache.openmeetings.db.dao.server.SOAPLoginDao;
@@ -42,11 +44,16 @@ import org.apache.openmeetings.db.dao.se
 import org.apache.openmeetings.db.dao.user.StateDao;
 import org.apache.openmeetings.db.dao.user.UserDao;
 import org.apache.openmeetings.db.entity.basic.Configuration;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.db.entity.calendar.MeetingMember;
 import org.apache.openmeetings.db.entity.room.Client;
+import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.room.RoomOrganisation;
 import org.apache.openmeetings.db.entity.server.RemoteSessionObject;
 import org.apache.openmeetings.db.entity.server.SOAPLogin;
 import org.apache.openmeetings.db.entity.server.Sessiondata;
 import org.apache.openmeetings.db.entity.user.Address;
+import org.apache.openmeetings.db.entity.user.Organisation_Users;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.db.entity.user.User.Right;
 import org.apache.openmeetings.db.entity.user.Userdata;
@@ -94,6 +101,10 @@ public class MainService implements IPen
 	@Autowired
 	private UserDao userDao;
 	@Autowired
+	private RoomDao roomDao;
+	@Autowired
+	private AppointmentDao appointmentDao;
+	@Autowired
 	private LdapConfigDao ldapConfigDao;
 	@Autowired
 	private SOAPLoginDao soapLoginDao;
@@ -168,7 +179,51 @@ public class MainService implements IPen
 	public User loginWicket(String SID, String wicketSID, Long wicketroomid) {
 		Long userId = sessiondataDao.checkSession(wicketSID);
 		User u = userId == null ? null : userDao.get(userId);
-		if (u != null) {
+		if (u != null && wicketroomid != null) {
+			boolean allowed = false;
+			Room r = roomDao.get(wicketroomid);
+			if (r.getAppointment() != null && r.getAppointment()) {
+				Appointment a = appointmentDao.getAppointmentByRoom(wicketroomid);
+				if (a != null && !a.isDeleted()) {
+					allowed = a.getOwner().getUser_id() == userId;
+					if (!allowed) {
+						for (MeetingMember mm : a.getMeetingMembers()) {
+							if (mm.getUser().getUser_id() == userId) {
+								allowed = true;
+								break;
+							}
+						}
+					}
+					/*
+					TODO need to be reviewed
+					Calendar c = WebSession.getCalendar();
+					if (c.getTime().after(a.getStart()) && c.getTime().before(a.getEnd())) {
+						allowed = true;
+					} else {
+						SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm"); //FIXME format
+						deniedMessage = WebSession.getString(1271) + String.format(" %s - %s", sdf.format(a.getStart()), sdf.format(a.getEnd()));
+					}
+					*/
+				}
+			} else {
+				allowed = r.getIspublic() || (r.getOwnerId() != null && r.getOwnerId() == userId);
+				if (!allowed) {
+					for (RoomOrganisation ro : r.getRoomOrganisations()) {
+						for (Organisation_Users ou : u.getOrganisation_users()) {
+							if (ro.getOrganisation().getOrganisation_id() == ou.getOrganisation().getOrganisation_id()) {
+								allowed = true;
+								break;
+							}
+						}
+						if (allowed) {
+							break;
+						}
+					}
+				}
+			}
+			if (!allowed) {
+				return null;
+			}
 			IConnection current = Red5.getConnectionLocal();
 			String streamId = current.getClient().getId();
 			Client currentClient = sessionManager.getClientByStreamId(streamId, null);

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/arabic.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/arabic.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/arabic.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/arabic.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/bulgarian.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/bulgarian.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/bulgarian.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/bulgarian.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/catalan.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/catalan.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/catalan.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/catalan.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/chinese simplified.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/chinese%20simplified.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/chinese simplified.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/chinese simplified.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/chinese traditional.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/chinese%20traditional.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/chinese traditional.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/chinese traditional.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/czech.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/czech.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/czech.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/czech.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/danish.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/danish.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/danish.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/danish.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch (studIP).xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch%20%28studIP%29.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch (studIP).xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch (studIP).xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/deutsch.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/dutch.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/dutch.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/dutch.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/dutch.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/english.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/english.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/english.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/english.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/finnish.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/finnish.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/finnish.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/finnish.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/french.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/french.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/french.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/french.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/galician.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/galician.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/galician.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/galician.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/greek.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/greek.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/greek.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/greek.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/hebrew.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/hebrew.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/hebrew.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/hebrew.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/hungarian.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/hungarian.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/hungarian.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/hungarian.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/indonesian.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/indonesian.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/indonesian.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/indonesian.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/italian.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/italian.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/italian.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/italian.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/japanese.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/korean.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/korean.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/korean.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/korean.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/persian.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/persian.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/persian.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/persian.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/polish.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/polish.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/polish.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/polish.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/portugues brazil.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/portugues%20brazil.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/portugues brazil.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/portugues brazil.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/portugues.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/portugues.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/portugues.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/portugues.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/russian.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/russian.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/russian.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/russian.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Безопасность</value>
   </string>
+  <string id="1599" name="security">
+    <value>Доступ запрещён. У вас нет прав для входа в эту комнату.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/slovak.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/slovak.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/slovak.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/slovak.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/spanish.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/spanish.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/spanish.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/spanish.xml Thu Oct  9 06:42:29 2014
@@ -4825,4 +4825,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/swedish.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/swedish.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/swedish.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/swedish.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/thai.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/thai.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/thai.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/thai.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/turkish.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/turkish.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/turkish.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/turkish.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/branches/3.0.x/src/main/webapp/languages/ukrainian.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/languages/ukrainian.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/languages/ukrainian.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/languages/ukrainian.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java Thu Oct  9 06:42:29 2014
@@ -76,25 +76,6 @@ public class AppointmentDao {
 	 * insert, update, delete, select
 	 */
 
-	/**
-	 * @author o.becherer Retrievment of Appointment for room
-	 */
-	// -----------------------------------------------------------------------------------------------
-	public Appointment getAppointmentByRoom(Long room_id) throws Exception {
-		log.debug("AppointMentDaoImpl.getAppointmentByRoom");
-
-		TypedQuery<Appointment> query = em.createNamedQuery("getAppointmentByRoomId", Appointment.class);
-		query.setParameter("room_id", room_id);
-
-		List<Appointment> appoint = query.getResultList();
-
-		if (appoint.size() > 0) {
-			return appoint.get(0);
-		}
-
-		return null;
-	}
-
 	// -----------------------------------------------------------------------------------------------
 
 	public Appointment get(Long id) {
@@ -207,23 +188,6 @@ public class AppointmentDao {
 		return null;
 	}
 
-	public List<Appointment> getAppointmentsByRoomId(Long roomId) {
-		try {
-
-			String hql = "select a from Appointment a WHERE a.room.id = :roomId ";
-
-			TypedQuery<Appointment> query = em.createQuery(hql,
-					Appointment.class);
-			query.setParameter("roomId", roomId);
-			List<Appointment> ll = query.getResultList();
-
-			return ll;
-		} catch (Exception e) {
-			log.error("[getAppointmentsByRoomId]", e);
-		}
-		return null;
-	}
-
 	// ----------------------------------------------------------------------------------------------------------
 
 	public void delete(Appointment a, Long userId) {
@@ -369,9 +333,9 @@ public class AppointmentDao {
 
 	// ---------------------------------------------------------------------------------------------
 
-	public Appointment getAppointmentByRoomId(Long userId, Long roomId) {
+	public Appointment getAppointmentByOwnerRoom(Long userId, Long roomId) {
 		try {
-			TypedQuery<Appointment> query = em.createNamedQuery("getAppointmentByRoomId", Appointment.class);
+			TypedQuery<Appointment> query = em.createNamedQuery("getAppointmentByOwnerRoomId", Appointment.class);
 
 			query.setParameter("userId", userId);
 			query.setParameter("roomId", roomId);
@@ -385,4 +349,11 @@ public class AppointmentDao {
 		}
 	}
 
+	public Appointment getAppointmentByRoom(Long roomId) {
+		List<Appointment> list = em.createNamedQuery("getAppointmentByRoomId", Appointment.class)
+				.setParameter("roomId", roomId)
+				.getResultList();
+
+		return list.size() > 0 ? list.get(0) : null;
+	}
 }

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java Thu Oct  9 06:42:29 2014
@@ -81,7 +81,8 @@ import org.simpleframework.xml.Root;
 			+ "		OR (a.start < :starttime AND a.end > :endtime) "
 			+ "	)"
     	)
-    , @NamedQuery(name="getAppointmentByRoomId", query="SELECT a FROM Appointment a WHERE a.deleted = false AND a.owner.id = :userId AND a.room.id = :roomId")
+    , @NamedQuery(name="getAppointmentByRoomId", query="SELECT a FROM Appointment a WHERE a.room.id = :roomId")
+    , @NamedQuery(name="getAppointmentByOwnerRoomId", query="SELECT a FROM Appointment a WHERE a.deleted = false AND a.owner.id = :userId AND a.room.id = :roomId")
 	//TODO this query returns duplicates if the user books an appointment with his own user as second meeting-member, swagner 19.02.2012
     , @NamedQuery(name="appointmentsInRangeByUser",
 		query="SELECT a FROM MeetingMember mm, IN(mm.appointment) a "

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java Thu Oct  9 06:42:29 2014
@@ -116,7 +116,7 @@ public class Room implements IDataProvid
 	private boolean deleted;
 
 	@Column(name = "ispublic")
-	@Element(data = true, required = false)
+	@Element(name = "ispublic", data = true, required = false)
 	private boolean ispublic;
 
 	@Column(name = "numberOfPartizipants")
@@ -317,11 +317,11 @@ public class Room implements IDataProvid
 		this.deleted = deleted;
 	}
 
-	public Boolean getIspublic() {
+	public boolean getIspublic() {
 		return ispublic;
 	}
 
-	public void setIspublic(Boolean ispublic) {
+	public void setIspublic(boolean ispublic) {
 		this.ispublic = ispublic;
 	}
 

Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPClientPublish.java Thu Oct  9 06:42:29 2014
@@ -76,7 +76,6 @@ class RTMPClientPublish extends RTMPClie
 	
 	@Override
 	protected void onCommand(RTMPConnection conn, Channel channel, Header source, ICommand command) {
-		// TODO Auto-generated method stub
 		super.onCommand(conn, channel, source, command);
 	}
 	

Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPSScreenShare.java Thu Oct  9 06:42:29 2014
@@ -71,9 +71,7 @@ public class RTMPSScreenShare extends RT
 
 	@Override
 	protected void onCommand(RTMPConnection conn, Channel channel, Header source, ICommand command) {
-		// TODO Auto-generated method stub
 		super.onCommand(conn, channel, source, command);
-		
 		core.onCommand(conn, channel, source, command);
 	}
 

Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPScreenShare.java Thu Oct  9 06:42:29 2014
@@ -60,9 +60,7 @@ public class RTMPScreenShare extends RTM
 
 	@Override
 	protected void onCommand(RTMPConnection conn, Channel channel, Header source, ICommand command) {
-		// TODO Auto-generated method stub
 		super.onCommand(conn, channel, source, command);
-
 		core.onCommand(conn, channel, source, command);
 	}
 

Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/RTMPTScreenShare.java Thu Oct  9 06:42:29 2014
@@ -60,9 +60,7 @@ public class RTMPTScreenShare extends RT
 
 	@Override
 	protected void onCommand(RTMPConnection conn, Channel channel, Header source, ICommand command) {
-		// TODO Auto-generated method stub
 		super.onCommand(conn, channel, source, command);
-		
 		core.onCommand(conn, channel, source, command);
 	}
 

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html Thu Oct  9 06:42:29 2014
@@ -27,39 +27,42 @@
 	</script>
 </wicket:head>
 <wicket:panel>
-	<div wicket:id="roomMenu"></div>
-	<div class="room menu right">
-		<span wicket:id="ask" class="icon ask"></span>
-		<span wicket:id="share" class="icon share"></span>
-		<span wicket:id="recording" class="room recording"></span>
-		<span wicket:id="roomName" class="room name"></span>
-	</div>
-	<div class="room sidebar left">
-		<div class="tabs">
-			<ul>
-				<li><a href="#utab"><wicket:ommessage key="613"/></a></li>
-				<li><a wicket:id="flink" href="#ftab"><wicket:ommessage key="614"/></a></li>
-			</ul>
-			<div id="utab">
-				<div wicket:id="userList" class="user list">
-					<div wicket:id="user" class="user ui-corner-all ui-widget-content">
-						<div wicket:id="name" class="user name"></div>
-						<div class="user actions">
-							<span wicket:id="privateChat" class="private-chat om-icon align-right clickable" wicket:ommessage="title:1493" onclick="startPrivateChat($(this));"></span>
-							<div class="clear"></div>
+	<div wicket:id="roomContainer" style="height: 100%">
+		<div wicket:id="roomMenu"></div>
+		<div class="room menu right">
+			<span wicket:id="ask" class="icon ask"></span>
+			<span wicket:id="share" class="icon share"></span>
+			<span wicket:id="recording" class="room recording"></span>
+			<span wicket:id="roomName" class="room name"></span>
+		</div>
+		<div class="room sidebar left">
+			<div class="tabs">
+				<ul>
+					<li><a href="#utab"><wicket:ommessage key="613"/></a></li>
+					<li><a wicket:id="flink" href="#ftab"><wicket:ommessage key="614"/></a></li>
+				</ul>
+				<div id="utab">
+					<div wicket:id="userList" class="user list">
+						<div wicket:id="user" class="user ui-corner-all ui-widget-content">
+							<div wicket:id="name" class="user name"></div>
+							<div class="user actions">
+								<span wicket:id="privateChat" class="private-chat om-icon align-right clickable" wicket:ommessage="title:1493" onclick="startPrivateChat($(this));"></span>
+								<div class="clear"></div>
+							</div>
 						</div>
 					</div>
 				</div>
+				<div wicket:id="ftab" id="ftab"><div class="file list" wicket:id="tree"></div></div>
 			</div>
-			<div wicket:id="ftab" id="ftab"><div class="file list" wicket:id="tree"></div></div>
 		</div>
+		<div class="room wb area">
+			<div class="wb" wicket:id="whiteboard"></div>
+		</div>
+		<div wicket:id="invite"></div>
+		<div wicket:id="createPoll"></div>
+		<div wicket:id="vote"></div>
+		<div wicket:id="pollResults"></div>
 	</div>
-	<div class="room wb area">
-		<div class="wb" wicket:id="whiteboard"></div>
-	</div>
-	<div wicket:id="invite"></div>
-	<div wicket:id="createPoll"></div>
-	<div wicket:id="vote"></div>
-	<div wicket:id="pollResults"></div>
+	<div wicket:id="accessDenied"></div>
 </wicket:panel>
 </html>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java Thu Oct  9 06:42:29 2014
@@ -39,16 +39,20 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
 import org.apache.openmeetings.db.dao.file.FileExplorerItemDao;
 import org.apache.openmeetings.db.dao.room.PollDao;
 import org.apache.openmeetings.db.dao.room.RoomDao;
 import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.calendar.Appointment;
+import org.apache.openmeetings.db.entity.calendar.MeetingMember;
 import org.apache.openmeetings.db.entity.file.FileExplorerItem;
 import org.apache.openmeetings.db.entity.file.FileItem;
 import org.apache.openmeetings.db.entity.file.FileItem.Type;
 import org.apache.openmeetings.db.entity.record.FlvRecording;
 import org.apache.openmeetings.db.entity.room.Room;
 import org.apache.openmeetings.db.entity.room.RoomModerator;
+import org.apache.openmeetings.db.entity.room.RoomOrganisation;
 import org.apache.openmeetings.db.entity.user.Organisation;
 import org.apache.openmeetings.db.entity.user.OrganisationUser;
 import org.apache.openmeetings.db.entity.user.User;
@@ -70,6 +74,7 @@ import org.apache.openmeetings.web.room.
 import org.apache.openmeetings.web.room.poll.CreatePollDialog;
 import org.apache.openmeetings.web.room.poll.PollResultsDialog;
 import org.apache.openmeetings.web.room.poll.VoteDialog;
+import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -108,6 +113,10 @@ import org.wicketstuff.whiteboard.Whiteb
 import com.googlecode.wicket.jquery.core.JQueryBehavior;
 import com.googlecode.wicket.jquery.core.Options;
 import com.googlecode.wicket.jquery.ui.form.button.Button;
+import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
+import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons;
+import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon;
+import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
 
 @AuthorizeInstantiation("Room")
 public class RoomPanel extends BasePanel {
@@ -115,6 +124,7 @@ public class RoomPanel extends BasePanel
 	private static final Logger log = Red5LoggerFactory.getLogger(RoomPanel.class, webAppRootKey);
 	private long roomId;
 	private Client c;
+	private final WebMarkupContainer room = new WebMarkupContainer("roomContainer");
 	private final StartSharingEventBehavior startSharing;
 	private final AbstractDefaultAjaxBehavior aab = new AbstractDefaultAjaxBehavior() {
 		private static final long serialVersionUID = 1L;
@@ -155,15 +165,7 @@ public class RoomPanel extends BasePanel
 
 		@Override
 		public void onClick(MainPage page, AjaxRequestTarget target) {
-			if (WebSession.getRights().contains(Right.Dashboard)) {
-				page.updateContents(ROOMS_PUBLIC, target);
-			} else {
-				String url = getBean(ConfigurationDao.class).getConfValue(CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY, String.class, "");
-				if (Strings.isEmpty(url)) {
-					url = getBean(ConfigurationDao.class).getConfValue(CONFIG_APPLICATION_BASE_URL, String.class, "");
-				}
-				throw new RedirectToUrlException(url);
-			}
+			exit(target);
 		}
 	};
 	private final RoomMenuItem filesMenu = new RoomMenuItem(WebSession.getString(245), null, false);
@@ -227,14 +229,64 @@ public class RoomPanel extends BasePanel
 	public RoomPanel(String id, final Room r) {
 		super(id);
 		this.roomId = r.getId();
-		add((menuPanel = new MenuPanel("roomMenu", getMenu())).setVisible(!r.getHideTopBar()));
+		Component accessDenied = new WebMarkupContainer("accessDenied").setVisible(false);
+		boolean allowed = false;
+		String deniedMessage = null;
+		if (r.isAppointment()) {
+			Appointment a = getBean(AppointmentDao.class).getAppointmentByRoom(roomId);
+			if (a != null && !a.isDeleted()) {
+				allowed = a.getOwner().getId() == getUserId();
+				if (!allowed) {
+					for (MeetingMember mm : a.getMeetingMembers()) {
+						if (mm.getUser().getId() == getUserId()) {
+							allowed = true;
+							break;
+						}
+					}
+				}
+				/*
+				TODO need to be reviewed
+				Calendar c = WebSession.getCalendar();
+				if (c.getTime().after(a.getStart()) && c.getTime().before(a.getEnd())) {
+					allowed = true;
+				} else {
+					SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm"); //FIXME format
+					deniedMessage = WebSession.getString(1271) + String.format(" %s - %s", sdf.format(a.getStart()), sdf.format(a.getEnd()));
+				}
+				*/
+			}
+		} else {
+			allowed = r.getIspublic() || (r.getOwnerId() != null && r.getOwnerId() == getUserId());
+			if (!allowed) {
+				User u = getBean(UserDao.class).get(getUserId());
+				for (RoomOrganisation ro : r.getRoomOrganisations()) {
+					for (OrganisationUser ou : u.getOrganisationUsers()) {
+						if (ro.getOrganisation().getId() == ou.getOrganisation().getId()) {
+							allowed = true;
+							break;
+						}
+					}
+					if (allowed) {
+						break;
+					}
+				}
+			}
+		}
+		if (!allowed) {
+			if (deniedMessage == null) {
+				deniedMessage = WebSession.getString(1599);
+			}
+			accessDenied = new ExpiredMessageDialog("accessDenied", deniedMessage);
+			room.setVisible(false);
+		}
+		room.add((menuPanel = new MenuPanel("roomMenu", getMenu())).setVisible(!r.getHideTopBar()));
 		WebMarkupContainer wb = new WebMarkupContainer("whiteboard");
-		add(wb.setOutputMarkupId(true));
-		add(new WhiteboardBehavior("1", wb.getMarkupId(), null, null, null));
-		add(aab, AttributeAppender.append("style", "height: 100%;"));
+		room.add(wb.setOutputMarkupId(true));
+		room.add(new WhiteboardBehavior("1", wb.getMarkupId(), null, null, null));
+		room.add(aab);
 		showFiles = !r.getHideFilesExplorer();
-		add(new WebMarkupContainer("flink").setVisible(showFiles));
-		add(new WebMarkupContainer("ftab").add(new FileTreePanel("tree") {
+		room.add(new WebMarkupContainer("flink").setVisible(showFiles));
+		room.add(new WebMarkupContainer("ftab").add(new FileTreePanel("tree") {
 			private static final long serialVersionUID = 1L;
 
 			@Override
@@ -283,7 +335,7 @@ public class RoomPanel extends BasePanel
 				}
 			}
 		}).setVisible(showFiles));
-		add(userList.add(users = new ListView<RoomClient>("user", getUsers()) {
+		room.add(userList.add(users = new ListView<RoomClient>("user", getUsers()) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
@@ -298,7 +350,7 @@ public class RoomPanel extends BasePanel
 				}
 			}
 		}).setOutputMarkupId(true));
-		add(new JQueryBehavior(".room.sidebar.left .tabs", "tabs", new Options("active", showFiles && r.isFilesOpened() ? "ftab" : "utab")) {
+		room.add(new JQueryBehavior(".room.sidebar.left .tabs", "tabs", new Options("active", showFiles && r.isFilesOpened() ? "ftab" : "utab")) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
@@ -306,11 +358,11 @@ public class RoomPanel extends BasePanel
 				response.render(new PriorityHeaderItem(script));
 			}
 		});
-		add(new Label("roomName", r.getName()));
-		add(new Label("recording", "Recording started").setVisible(false)); //FIXME add/remove
-		add(askBtn.setOutputMarkupPlaceholderTag(true).setVisible(false).add(new AttributeAppender("title", WebSession.getString(906))));
-		add(startSharing = new StartSharingEventBehavior(roomId));
-		add(shareBtn.add(new AjaxEventBehavior("click") {
+		room.add(new Label("roomName", r.getName()));
+		room.add(new Label("recording", "Recording started").setVisible(false)); //FIXME add/remove
+		room.add(askBtn.setOutputMarkupPlaceholderTag(true).setVisible(false).add(new AttributeAppender("title", WebSession.getString(906))));
+		room.add(startSharing = new StartSharingEventBehavior(roomId));
+		room.add(shareBtn.add(new AjaxEventBehavior("click") {
 			private static final long serialVersionUID = 1L;
 			
 			@Override
@@ -318,10 +370,11 @@ public class RoomPanel extends BasePanel
 				startSharing.respond(target);
 			}
 		}).setOutputMarkupPlaceholderTag(true).setVisible(false).add(new AttributeAppender("title", WebSession.getString(1480))));
-		add(invite = new InvitationDialog("invite", roomId));
-		add(createPoll = new CreatePollDialog("createPoll", roomId));
-		add(vote = new VoteDialog("vote", roomId));
-		add(pollResults = new PollResultsDialog("pollResults", roomId));
+		room.add(invite = new InvitationDialog("invite", roomId));
+		room.add(createPoll = new CreatePollDialog("createPoll", roomId));
+		room.add(vote = new VoteDialog("vote", roomId));
+		room.add(pollResults = new PollResultsDialog("pollResults", roomId));
+		add(room, accessDenied);
 	}
 
 	@Override
@@ -372,21 +425,23 @@ public class RoomPanel extends BasePanel
 	@Override
 	protected void onBeforeRender() {
 		super.onBeforeRender();
-		c = addUserToRoom(roomId, getPage().getPageId());
-		User u = getBean(UserDao.class).get(getUserId());
-		//TODO do we need to check OrgModerationRights ????
-		if (AuthLevelUtil.hasAdminLevel(u.getRights())) {
-			c.getRights().add(Client.Right.moderator);
-		} else {
-			Room r = getBean(RoomDao.class).get(roomId);
-			if (!r.isModerated() && 1 == getRoomUsers(roomId).size()) {
+		if (room.isVisible()) {
+			c = addUserToRoom(roomId, getPage().getPageId());
+			User u = getBean(UserDao.class).get(getUserId());
+			//TODO do we need to check OrgModerationRights ????
+			if (AuthLevelUtil.hasAdminLevel(u.getRights())) {
 				c.getRights().add(Client.Right.moderator);
-			} else if (r.isModerated()) {
-				//TODO why do we need supermoderator ????
-				for (RoomModerator rm : r.getModerators()) {
-					if (getUserId() == rm.getUser().getId()) {
-						c.getRights().add(Client.Right.moderator);
-						break;
+			} else {
+				Room r = getBean(RoomDao.class).get(roomId);
+				if (!r.isModerated() && 1 == getRoomUsers(roomId).size()) {
+					c.getRights().add(Client.Right.moderator);
+				} else if (r.isModerated()) {
+					//TODO why do we need supermoderator ????
+					for (RoomModerator rm : r.getModerators()) {
+						if (getUserId() == rm.getUser().getId()) {
+							c.getRights().add(Client.Right.moderator);
+							break;
+						}
 					}
 				}
 			}
@@ -494,7 +549,11 @@ public class RoomPanel extends BasePanel
 	@Override
 	public void cleanup(AjaxRequestTarget target) {
 		target.add(getMainPage().getHeader().setVisible(true), getMainPage().getMenu().setVisible(true)
-				, getMainPage().getTopLinks().setVisible(true), getMainPage().getChat().setVisible(true));
+				, getMainPage().getTopLinks().setVisible(true));
+		Room r = getBean(RoomDao.class).get(roomId);
+		if (r.isChatHidden()) {
+			target.add(getMainPage().getChat().setVisible(true)); //FIXME chat is broken on this step
+		}
 		target.appendJavaScript("$(window).off('resize.openmeetings'); $('.room.video').dialog('destroy');");
 	}
 
@@ -506,7 +565,9 @@ public class RoomPanel extends BasePanel
 	public void renderHead(IHeaderResponse response) {
 		super.renderHead(response);
 		response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(newResourceReference())));
-		response.render(OnDomReadyHeaderItem.forScript(aab.getCallbackScript()));
+		if (room.isVisible()) {
+			response.render(OnDomReadyHeaderItem.forScript(aab.getCallbackScript()));
+		}
 	}
 
 	private List<RoomClient> getUsers() {
@@ -517,6 +578,18 @@ public class RoomPanel extends BasePanel
 		return list;
 	}
 	
+	private void exit(AjaxRequestTarget target) {
+		if (WebSession.getRights().contains(Right.Dashboard)) {
+			getMainPage().updateContents(ROOMS_PUBLIC, target);
+		} else {
+			String url = getBean(ConfigurationDao.class).getConfValue(CONFIG_REDIRECT_URL_FOR_EXTERNAL_KEY, String.class, "");
+			if (Strings.isEmpty(url)) {
+				url = getBean(ConfigurationDao.class).getConfValue(CONFIG_APPLICATION_BASE_URL, String.class, "");
+			}
+			throw new RedirectToUrlException(url);
+		}
+	}
+
 	static class RoomClient implements Serializable {
 		private static final long serialVersionUID = 1L;
 		private final Client c;
@@ -577,5 +650,30 @@ public class RoomPanel extends BasePanel
 			}
 			return Arrays.asList(f).iterator();
 		}
-	}		
+	}
+	
+	class ExpiredMessageDialog extends MessageDialog {
+		private static final long serialVersionUID = 1L;
+		public boolean autoOpen = false;
+		
+		public ExpiredMessageDialog(String id, String message) {
+			super(id, WebSession.getString(204), message, DialogButtons.OK, DialogIcon.ERROR);
+			autoOpen = true;
+		}
+		
+		public boolean isModal() {
+			return true;
+		}
+		
+		@Override
+		public void onConfigure(JQueryBehavior behavior) {
+			super.onConfigure(behavior);
+			behavior.setOption("autoOpen", autoOpen);
+		}
+		
+		@Override
+		public void onClose(AjaxRequestTarget target, DialogButton button) {
+			RoomPanel.this.exit(target);
+		}
+	}
 }

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.java Thu Oct  9 06:42:29 2014
@@ -186,12 +186,15 @@ public class ChatPanel extends BasePanel
 			target.add(setVisible(false));
 			return;
 		}
-		StringBuilder sb = new StringBuilder(String.format("addChatTab('%1$s%2$d', '%3$s %2$d');", ID_ROOM_PREFIX, r.getId(), WebSession.getString(406)));
+		StringBuilder sb = new StringBuilder();
+		sb.append("$(function() {");
+		sb.append(String.format("addChatTab('%1$s%2$d', '%3$s %2$d');", ID_ROOM_PREFIX, r.getId(), WebSession.getString(406)));
 		sb.append(r.isChatOpened() ? "openChat();" : "closeChat();");
 		List<ChatMessage> list = getBean(ChatDao.class).getRoom(r.getId(), 0, 30, !r.isChatModerated() || isModerator(getUserId(), r.getId()));
 		if (list.size() > 0) {
 			sb.append("addChatMessage(").append(getMessage(list).toString()).append(");");
 		}
+		sb.append("});");
 		target.appendJavaScript(sb);
 	}
 	

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html Thu Oct  9 06:42:29 2014
@@ -40,7 +40,7 @@
 					<td><select wicket:id="remind" ></select></td>
 				</tr>
 				<tr>
-					<td colspan="2"><input type="checkbox" wicket:id="createRoom" /><wicket:ommessage key="1509" /></td>
+					<td colspan="2"><input type="checkbox" wicket:id="createRoom" /><label wicket:for="createRoom"><wicket:ommessage key="1509" /></label></td>
 				</tr>
 				<tr>
 					<td><wicket:ommessage key="619" /></td>
@@ -51,7 +51,7 @@
 					<td><select wicket:id="room" ></select></td>
 				</tr>
 				<tr>
-					<td colspan="2"><input type="checkbox" wicket:id="passwordProtected" /><wicket:ommessage key="524" /></td>
+					<td colspan="2"><input type="checkbox" wicket:id="passwordProtected" /><label wicket:for="passwordProtected"><wicket:ommessage key="524" /></label></td>
 				</tr>
 				<tr>
 					<td><wicket:ommessage key="525" /></td>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/arabic.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/arabic.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/arabic.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/arabic.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/bulgarian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/bulgarian.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/bulgarian.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/bulgarian.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/catalan.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/catalan.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/catalan.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/catalan.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese simplified.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese%20simplified.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese simplified.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese simplified.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese traditional.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese%20traditional.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese traditional.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/chinese traditional.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/czech.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/czech.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/czech.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/czech.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/danish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/danish.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/danish.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/danish.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch (studIP).xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch%20%28studIP%29.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch (studIP).xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch (studIP).xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/deutsch.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/dutch.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/dutch.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/dutch.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/dutch.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/english.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/english.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/english.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/english.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/finnish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/finnish.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/finnish.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/finnish.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/french.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/french.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/french.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/french.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/galician.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/galician.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/galician.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/galician.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/greek.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/greek.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/greek.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/greek.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hebrew.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hebrew.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hebrew.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hebrew.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hungarian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hungarian.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hungarian.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/hungarian.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/indonesian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/indonesian.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/indonesian.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/indonesian.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/italian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/italian.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/italian.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/italian.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/japanese.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/japanese.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/japanese.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/japanese.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/korean.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/korean.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/korean.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/korean.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/persian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/persian.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/persian.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/persian.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/polish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/polish.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/polish.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/polish.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues brazil.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues%20brazil.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues brazil.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues brazil.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/portugues.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Security</value>
   </string>
+  <string id="1599" name="security">
+    <value>Access denied. You have no rights to enter this room.</value>
+  </string>
 </language>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/russian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/russian.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/russian.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/russian.xml Thu Oct  9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
   <string id="1598" name="security">
     <value>Безопасность</value>
   </string>
+  <string id="1599" name="security">
+    <value>Доступ запрещён. У вас нет прав для входа в эту комнату.</value>
+  </string>
 </language>