From 5290ab7c1db28eebdf41baa9fdf07193a08453f8 Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Sun, 27 Mar 2005 20:16:59 +0000
Subject: [PATCH] Pass the mode to the speaker validator.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3429 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 src/java/com/threerings/crowd/chat/server/SpeakProvider.java | 5 +++--
 src/java/com/threerings/crowd/server/PlaceManager.java       | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/java/com/threerings/crowd/chat/server/SpeakProvider.java b/src/java/com/threerings/crowd/chat/server/SpeakProvider.java
index f3c1833b7..8545d0e03 100644
--- a/src/java/com/threerings/crowd/chat/server/SpeakProvider.java
+++ b/src/java/com/threerings/crowd/chat/server/SpeakProvider.java
@@ -63,7 +63,8 @@ public class SpeakProvider
          * via the speak provider with which this validator was
          * registered.
          */
-        public boolean isValidSpeaker (DObject speakObj, ClientObject speaker);
+        public boolean isValidSpeaker (DObject speakObj, ClientObject speaker,
+                                       byte mode);
     }
 
     /**
@@ -133,7 +134,7 @@ public class SpeakProvider
         // have to do this validation here. Or not.
         if ((mode == BROADCAST_MODE) ||
             (_validator != null &&
-             !_validator.isValidSpeaker(_speakObj, caller))) {
+             !_validator.isValidSpeaker(_speakObj, caller, mode))) {
             Log.warning("Refusing invalid speak request " +
                         "[caller=" + caller.who() +
                         ", speakObj=" + _speakObj.which() +
diff --git a/src/java/com/threerings/crowd/server/PlaceManager.java b/src/java/com/threerings/crowd/server/PlaceManager.java
index 28aba608f..8bd9c4c98 100644
--- a/src/java/com/threerings/crowd/server/PlaceManager.java
+++ b/src/java/com/threerings/crowd/server/PlaceManager.java
@@ -602,7 +602,8 @@ public class PlaceManager
     }
 
     // documentation inherited from interface
-    public boolean isValidSpeaker (DObject speakObj, ClientObject speaker)
+    public boolean isValidSpeaker (DObject speakObj, ClientObject speaker,
+                                   byte mode)
     {
         // only allow people in the room to speak
         return _plobj.occupants.contains(speaker.getOid());