Show user name in chat window - refs #7335 - refs BT#8884

main/chat/chat_message.php

@@ -80,6 +80,7 @@ if (!empty($course) && !empty($userId)) {
     $firstname = Database::result($result, 0, 'firstname');
     $lastname  = Database::result($result, 0, 'lastname');
     $picture  = Database::result($result, 0, 'picture_uri');
+    $fullName = api_get_person_name($firstname, $lastname);
 
     $date_now = date('Y-m-d');
 
@@ -220,9 +221,9 @@ if (!empty($course) && !empty($userId)) {
 
                 $filePhoto = '<img class="chat-image" src="'.$userPhoto.'"/>';
 				if ($isMaster) {
-					fputs($fp, '<div class="message-teacher"><div class="content-message"><div>'.$message.'</div><div class="message-date">'.$timeNow.'</div></div><div class="icon-message"></div>'.$filePhoto.'</div>'."\n");
+					fputs($fp, '<div class="message-teacher"><div class="content-message"><div class="chat-message-block-name">'.$fullName.'</div><div>'.$message.'</div><div class="message-date">'.$timeNow.'</div></div><div class="icon-message"></div>'.$filePhoto.'</div>'."\n");
 				} else {
-					fputs($fp, '<div class="message-student">'.$filePhoto.'<div class="icon-message"></div><div class="content-message"><div>'.$message.'</div><div class="message-date">'.$timeNow.'</div></div></div>'."\n");
+					fputs($fp, '<div class="message-student">'.$filePhoto.'<div class="icon-message"></div><div class="content-message"><div class="chat-message-block-name">'.$fullName.'</div><div>'.$message.'</div><div class="message-date">'.$timeNow.'</div></div></div>'."\n");
 				}
 				fclose($fp);
 

main/chat/chat_whoisonline.php

@@ -139,7 +139,7 @@ if (!empty($course)) {
 						}
 					?>
 				</div>
-				<div class="user-email"><?php echo $email; ?></div>
+				<div class="user-email"><?php echo $user['username']; ?></div>
 			</li>
 			<?php
                 }

main/css/chat.css

@@ -142,6 +142,10 @@ textarea {
 	padding: 0;
 	margin:0;
 }
+.chat-message-block-name {
+    font-style: italic;
+    color: #666;
+}
 .user-online .profile li{
 	margin-bottom: 5px;
 }