diff --git a/main/chat/chat.php b/main/chat/chat.php index c32937d0fb..6d66c03c48 100755 --- a/main/chat/chat.php +++ b/main/chat/chat.php @@ -50,6 +50,7 @@ $cidreq = Security::remove_XSS($_GET['cidReq']); + '.get_lang('Chat').' - '.$mycourseid.' - '.api_get_setting('siteName').''; @@ -74,10 +75,14 @@ if (!empty($groupId)) { if (empty($open_chat_window)) { Display::display_header($tool_name, 'Chat'); } -echo ''; -echo ''; -echo ''; + + +echo '
'; +echo ''; +echo ''; +echo ''; echo ''; +echo '
'; if (empty($open_chat_window)) { Display::display_footer(); diff --git a/main/chat/chat_chat.php b/main/chat/chat_chat.php index 59407ac0ff..b13e525b4e 100755 --- a/main/chat/chat_chat.php +++ b/main/chat/chat_chat.php @@ -141,19 +141,17 @@ if (!empty($course)) { $result = Database::query($sql); } - echo '
'; + echo '
'; foreach ($content as & $this_line) { echo strip_tags(api_html_entity_decode($this_line), '

'); } echo '
'; - echo '
'; echo ' '; if ($isMaster || $is_courseCoach) { $rand = mt_rand(1, 1000); - echo ''; } } else { echo '
'; @@ -161,5 +159,4 @@ if (!empty($course)) { $message = get_lang('CloseOtherSession'); Display :: display_error_message($message); } - -require 'footer_frame.inc.php'; +require 'footer_frame.inc.php'; \ No newline at end of file diff --git a/main/chat/chat_message.php b/main/chat/chat_message.php index 8b20a6e6b7..3b5a6fb77c 100755 --- a/main/chat/chat_message.php +++ b/main/chat/chat_message.php @@ -212,7 +212,7 @@ if (!empty($course) && !empty($_user['user_id'])) { $fp = fopen($chat_path.$basename_chat.'.log.html', 'a'); // view user picture $user_image = UserManager::get_user_picture_path_by_id($user_id, 'web', false, true); - $user_photo = $user_image['dir'].$user_image['file']; + $user_photo = $user_image['dir'].'medium_'.$user_image['file']; $file_photo = ''; if ($isMaster) { @@ -241,11 +241,11 @@ if (!empty($course) && !empty($_user['user_id'])) { diff --git a/main/chat/chat_whoisonline.php b/main/chat/chat_whoisonline.php index ccdc3d7c64..548c8f076d 100755 --- a/main/chat/chat_whoisonline.php +++ b/main/chat/chat_whoisonline.php @@ -52,7 +52,7 @@ if (!empty($course)) { $course_id = api_get_course_int_id(); if (empty($session_id)) { - $query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri,t3.status + $query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri,email,t3.status FROM $tbl_user t1, $tbl_chat_connected t2, $tbl_course_user t3 WHERE t2.c_id = $course_id AND t1.user_id=t2.user_id AND @@ -65,7 +65,7 @@ if (!empty($course)) { $users = Database::store_result($result); } else { // select learners - $query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri + $query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri,email FROM $tbl_user t1, $tbl_chat_connected t2, $tbl_session_course_user t3 WHERE t2.c_id = $course_id AND @@ -78,7 +78,7 @@ if (!empty($course)) { } // select session coach - $query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri + $query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri,email FROM $tbl_user t1,$tbl_chat_connected t2,$tbl_session t3 WHERE t2.c_id = $course_id AND t1.user_id=t2.user_id AND t3.id_coach=t2.user_id AND t3.id = '".$session_id."' AND t2.last_connection>'".$date_inter."' $extra_condition ORDER BY username"; @@ -88,7 +88,7 @@ if (!empty($course)) { } // select session course coach - $query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri + $query = "SELECT DISTINCT t1.user_id,username,firstname,lastname,picture_uri,email FROM $tbl_user t1,$tbl_chat_connected t2,$tbl_session_course_user t3 WHERE t2.c_id = $course_id AND @@ -107,9 +107,12 @@ if (!empty($course)) { require 'header_frame.inc.php'; ?> -
+
+
-
    +
    +
    +
      -
    • - - '18')).' '; else echo Display::return_icon('students.gif', get_lang('Student'), array('height' => '18')); ?> - name="user_" href="?&showPic=#user_"> - -
      - +
    • + +
      + + '18')).' '; else echo Display::return_icon('students.gif', get_lang('Student'), array('height' => '18')); ?>
      +
      +
    • - +
    -
    +
" /> Chat + + +
- - + + - +