svn commit: r1458691 - in /openmeetings/trunk/singlewebapp: WebContent/src/modules/conference/conference/conferenceMenubar.lzx src/org/apache/openmeetings/remote/PollService.java

[so...@apache.org]

Author: solomax
Date: Wed Mar 20 08:57:45 2013
New Revision: 1458691

URL: http://svn.apache.org/r1458691
Log:
[OPENMEETINGS-513] invitations are disabled for invited users

Modified:
    openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/PollService.java

Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1458691&r1=1458690&r2=1458691&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx Wed Mar 20 08:57:45 2013
@@ -248,7 +248,7 @@
 						enabled="true" />
 			<horizontalDropDownSpacer />
 			<conferencDropDownMenuItem labelid="42" command="cmd_checkPollVoted" 
-						 enabled="true"/>
+						 enabled="${ canvas.user_id != -1 }" />
 			<horizontalDropDownSpacer
 						 visible="$once{ canvas.RED5_SIP_ENABLE == 'yes' &amp;&amp; canvas.currentRoomObject.sipEnabled }" />
             <conferencDropDownMenuItem labelid="1447" command="cmd_showSipDialer" 

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/PollService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/PollService.java?rev=1458691&r1=1458690&r2=1458691&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/PollService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/PollService.java Wed Mar 20 08:57:45 2013
@@ -29,8 +29,8 @@ import org.apache.openmeetings.data.user
 import org.apache.openmeetings.persistence.beans.poll.PollType;
 import org.apache.openmeetings.persistence.beans.poll.RoomPoll;
 import org.apache.openmeetings.persistence.beans.poll.RoomPollAnswers;
-import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
 import org.apache.openmeetings.persistence.beans.room.Client;
+import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter;
 import org.apache.openmeetings.session.ISessionManager;
 import org.red5.logging.Red5LoggerFactory;
 import org.red5.server.api.IConnection;
@@ -152,7 +152,8 @@ public class PollService implements IPen
 								&& rcl.getIsScreenClient()) {
 							// continue;
 						} else {
-							if (rcl.getRoom_id() != null && rcl.getRoom_id().equals(rc.getRoom_id())) {
+							if (rcl.getRoom_id() != null && rcl.getRoom_id().equals(rc.getRoom_id())
+									&& userManager.getUserById(rcl.getUser_id())!=null) {
 								((IServiceCapableConnection) conn).invoke(
 										clientFunction, obj,
 										scopeApplicationAdapter);
@@ -188,6 +189,11 @@ public class PollService implements IPen
 				log.error("POLL IS NULL for RoomId: " + rc.getRoom_id());
 				return -1;
 			}
+			
+			if(userManager.getUserById(rc.getUser_id())==null){
+				log.debug("vote: Invited users can not vote");
+				return -1;
+			}
 			if (pollManager.hasVoted(roomId, rc.getUser_id())) {
 				log.debug("hasVoted: true");
 				return -1;
@@ -246,6 +252,10 @@ public class PollService implements IPen
 					.getClientByStreamId(streamid, null);
 
 			long roomId = rc.getRoom_id();
+			if(userManager.getUserById(rc.getUser_id())==null){
+				log.debug("checkHasVoted: Invited users can not vote");
+				return -1;
+			}
 			if (pollManager.hasPoll(roomId)) {
 				return pollManager.hasVoted(roomId, rc.getUser_id()) ? -1 : 1;
 			} else {