SAK-28099; backup code in case event doesn't have a userid; prevent S…

…afari from having scroll bar where not needed

git-svn-id: https://source.sakaiproject.org/svn/chat/trunk@315764 66ffb92e-73f9-0310-93c1-f5514f145a0a

chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/PresenceObserverHelper.java

@@ -31,7 +31,9 @@
 import org.sakaiproject.event.api.EventTrackingService;
 import org.sakaiproject.presence.cover.PresenceService;
 import org.sakaiproject.user.cover.UserDirectoryService;
+import org.sakaiproject.event.cover.UsageSessionService;
 import org.sakaiproject.user.api.User;
+import org.sakaiproject.event.api.UsageSession;
 
 /**
  * <p>
@@ -144,17 +146,27 @@ public void update(Observable o, Object arg)
 		if (!check(arg)) return;
 
       Event event = (Event) arg;
+      String username = "";
 
       String userId = event.getUserId();
-      String username = "";
+      if (userId == null) {
+	  String sessionId = event.getSessionId();
+	  if (sessionId != null) {
+	      UsageSession session = UsageSessionService.getSession(sessionId);
+	      if (session != null) {
+		  userId = session.getUserId();
+	      }
+	  }
+      }
+
       User user = null;
       if (userId != null)
 	  try {
 	      user = UserDirectoryService.getUser(userId);
 	  } catch (Exception e) {}
       if (user != null)
 	  username = user.getDisplayName();
-      
+
       if(event.getEvent().equals(PresenceService.EVENT_PRESENCE))
          presenceObserver.userJoined(location, username);
       else

chat/chat-tool/tool/src/webapp/css/chat.css

@@ -57,6 +57,7 @@ h3 {
    padding:0px !important;
    margin:0px !important;
    padding-top:0.5em !important;
+   padding-bottom:0.5em !important;
    max-height: 40em; 
    overflow-y: auto;
    overflow-x: hidden;