Index: openacs-4/packages/chat/java/adClientSession.java
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/java/adClientSession.java,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/chat/java/adClientSession.java	14 Mar 2006 12:16:08 -0000	1.2
+++ openacs-4/packages/chat/java/adClientSession.java	25 Apr 2006 07:37:03 -0000	1.2.2.1
@@ -105,7 +105,8 @@
 
                             datasource.addSession(this, room_id);
                             datasource.broadcastAppletOnly(adChatSystemMessage.buildUserEnterMsg(user_id, user_name), room_id);
-                            datasource.broadcast(adChatMessage.buildBroadcastMsg(user_id, user_name, room_id, " has entered the room."), room_id);
+                            datasource.broadcastAppletOnly(adChatMessage.buildBroadcastMsg(user_id, user_name, room_id, " has entered the room!"), room_id);
+                            datasource.broadcastAolOnly(adChatMessage.buildBroadcastMsg(user_id, user_name, room_id, "/enter"), room_id);
                             authenticate_p = true;
                         }
                     }
@@ -130,7 +131,14 @@
                     adChatMessage msg = new adChatMessage(str);
                     str = adChatMessage.buildModerateMsg(msg.getFromUser(), msg.getRoomId(), msg.getBody());
                 }
-            datasource.broadcast(str, room_id);
+                
+                if (from_HTML_client) {
+                	//System.out.println("BroadCasting to applets only!");
+                	datasource.broadcastAppletOnly(str, room_id);
+                } else {
+                	//System.out.println("BroadCasting to all stations!");
+                	datasource.broadcast(str, room_id);
+                }
                     
             }
             socket.close();
@@ -139,7 +147,8 @@
         }
         // Remove user from room. And broadcast message to everyone in the room.
         datasource.removeSession(this, room_id);
-        datasource.broadcast(adChatMessage.buildBroadcastMsg(user_id, user_name, room_id, " has leave the room."), room_id);
+        datasource.broadcastAppletOnly(adChatMessage.buildBroadcastMsg(user_id, user_name, room_id, " has left the room!"), room_id);
+        datasource.broadcastAolOnly(adChatMessage.buildBroadcastMsg(user_id, user_name, room_id, "/leave"), room_id);
     }
 
     public void postMessage(String msg) {