diff --git a/main/chat/chat.php b/main/chat/chat.php index 9229f20c6d..1bce036796 100644 --- a/main/chat/chat.php +++ b/main/chat/chat.php @@ -1,4 +1,4 @@ - - + - + &target=" name="chat_chat" scrolling="auto"> diff --git a/main/chat/chat_footer.php b/main/chat/chat_footer.php index 2482eddb0e..38b09163b5 100644 --- a/main/chat/chat_footer.php +++ b/main/chat/chat_footer.php @@ -1,12 +1,20 @@ '; +echo '
'; /* ============================================================================== diff --git a/main/chat/chat_message.php b/main/chat/chat_message.php index 2fa64f873c..80a27a4e6e 100755 --- a/main/chat/chat_message.php +++ b/main/chat/chat_message.php @@ -61,7 +61,7 @@ $question = $_REQUEST['question']; MAIN CODE ============================================================================== */ -$query="SELECT username FROM $tbl_user WHERE user_id='".$_user['user_id']."'"; +$query="SELECT lastname, firstname, username FROM $tbl_user WHERE user_id='".$_user['user_id']."'"; $result=api_sql_query($query,__FILE__,__LINE__); list($pseudoUser)=mysql_fetch_row($result); @@ -69,10 +69,8 @@ list($pseudoUser)=mysql_fetch_row($result); $isAllowed=(empty($pseudoUser) || !$_cid)?false:true; $isMaster=$is_courseAdmin?true:false; -/*if(!$isAllowed) -{ - exit(); -}*/ +$firstname=mysql_result($result,0,'firstname'); +$lastname=mysql_result($result,0,'lastname'); $dateNow=date('Y-m-d'); @@ -101,7 +99,7 @@ $chat_size=0; if($sent) { $message=trim(htmlspecialchars(stripslashes($_POST['message']))); - + if(!empty($message)) { $message=make_clickable($message); @@ -127,11 +125,11 @@ if($sent) if($isMaster) { - fputs($fp,"$pseudoUser : $message\n"); + fputs($fp,"$firstname $lastname : $message\n"); } else { - fputs($fp,"$pseudoUser : $message\n"); + fputs($fp,"$firstname $lastname : $message\n"); } fclose($fp); @@ -150,7 +148,12 @@ include('header_frame.inc.php'); - + +
  + + + " class="background_submit"> +
diff --git a/main/chat/chat_whoisonline.php b/main/chat/chat_whoisonline.php index 2a11f005b9..168b9aa93c 100755 --- a/main/chat/chat_whoisonline.php +++ b/main/chat/chat_whoisonline.php @@ -38,9 +38,6 @@ include('../inc/global.inc.php'); $showPic=intval($_GET['showPic']); -//$tbl_user=$mainDbName."`.`user"; -//$tbl_cours_user=$mainDbName."`.`cours_user"; -//updated for 1.6 - YW $tbl_course_user = Database::get_main_table(TABLE_MAIN_COURSE_USER); $tbl_user = Database::get_main_table(TABLE_MAIN_USER); $tbl_chat_connected = Database::get_course_chat_connected_table(); @@ -53,11 +50,6 @@ list($pseudoUser)=mysql_fetch_row($result); $isAllowed=(empty($pseudoUser) || !$_cid)?false:true; $isMaster=$is_courseAdmin?true:false; -/*if(!$isAllowed) -{ - exit(); -}*/ - $pictureURL=api_get_path(WEB_CODE_PATH).'upload/users/'; $query="SELECT t1.user_id,username,firstname,lastname,picture_uri,t3.status FROM $tbl_user t1,$tbl_chat_connected t2,$tbl_course_user t3 WHERE t1.user_id=t2.user_id AND t3.user_id=t2.user_id AND t3.course_code = '".$_course[sysCode]."' AND t2.last_connection>'".date('Y-m-d H:i:s',time()-60*5)."' ORDER BY username"; @@ -69,7 +61,9 @@ $Users=api_store_result($result); include('header_frame.inc.php'); ?> - +
+ + - - + + - - - - - Chat - +/default.css"> + +
'; else echo '';?> name="user_" href="?showPic=#user_">'; else echo '';?> name="user_" href="?showPic=#user_">