Browse Source

[svn r11196] Display update for the chat

Julian Prud'homme 18 years ago
parent
commit
6f3ba7c7e6

+ 3 - 3
main/chat/chat.php

@@ -1,4 +1,4 @@
-<?php // $Id: chat.php 11141 2007-02-19 09:00:55Z elixir_julian $
+<?php // $Id: chat.php 11196 2007-02-22 15:44:40Z elixir_julian $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -51,11 +51,11 @@ event_access_tool(TOOL_CHAT);
 
 ?>
 
-<frameset rows="115,*,125" border="0" frameborder="0" framespacing="1">
+<frameset rows="115,*,130" border="0" frameborder="0" framespacing="1">
 	<frame src="chat_banner.php" name="chat_banner" scrolling="no">
 	<frameset cols="200,*,0" border="1" frameborder="1" framespacing="1">
 		<frame src="chat_whoisonline.php" name="chat_whoisonline" scrolling="auto">
-		<frameset rows="75,7" border="1" frameborder="1" framespacing="1">
+		<frameset rows="75,15" border="1" frameborder="1" framespacing="1">
 			<frame src="chat_chat.php?origin=<?php echo $_GET["origin"]; ?>&target=<?php echo $_GET["target"]; ?>" name="chat_chat" scrolling="auto">
 			<frame src="chat_message.php" name="chat_message" scrolling="no">
 		</frameset>

+ 11 - 3
main/chat/chat_footer.php

@@ -1,12 +1,20 @@
 <?php
-
 require ('../inc/global.inc.php');
 
+define('FRAME','footer');
+
 echo '<html><head><style>';
 
-echo '@import "'.api_get_path(WEB_CODE_PATH).'css/'.api_get_setting('stylesheets').'/default.css'.'";';
+if(api_get_setting('stylesheets')!=""){
+	$css=api_get_setting('stylesheets');
+}
+else{
+	$css='default';
+}
+
+echo '@import "'.api_get_path(WEB_CODE_PATH).'css/'.$css.'/default.css'.'";';
 
-echo '</style></head><body>';
+echo '</style></head><body><br>';
 
 /*
 ==============================================================================

+ 12 - 9
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,"<span class=\"master\"><b>$pseudoUser</b></span> : $message\n");
+			fputs($fp,"<span style='color: #00F;'><b>$firstname $lastname</b></span> : $message\n");
 		}
 		else
 		{
-			fputs($fp,"<b>$pseudoUser</b> : $message\n");
+			fputs($fp,"<b>$firstname $lastname</b> : $message\n");
 		}
 
 		fclose($fp);
@@ -150,7 +148,12 @@ include('header_frame.inc.php');
 <input type="hidden" name="sent" value="1">
 <table border="0" cellpadding="5" cellspacing="0" width="100%">
 <tr>
-  <td width="95%"><input type="text" name="message" value="" style="width: 500px">&nbsp;<input type="submit" value="OK"></td>
+  <td width="520" valign="middle">
+  	<textarea name="message" style="width: 520px; height: 35px" onkeydown="send_message(event);"></textarea>
+  </td>
+  <td>
+  	<input type="submit" value="<?php echo get_lang("Send"); ?>" class="background_submit">
+  </td>
 </tr>
 </table>
 </form>

+ 5 - 16
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');
 ?>
 
-<table border="0" cellpadding="0" cellspacing="0" width="100%">
+<table border="0" cellpadding="0" cellspacing="0" width="100%" class="data_table">
+
+<tr><th colspan="2"><?php echo get_lang("Connected"); ?></th></tr>
 
 <?php
 foreach($Users as $enreg)
@@ -77,21 +71,16 @@ foreach($Users as $enreg)
 ?>
 
 <tr>
-  <td width="1%" rowspan="2" valign="top"><?php if($enreg['status'] == 1) echo '<img src="../img/teachers.gif" align="absbottom" border="0" alt="" style="margin: 1px;">'; else echo '<img src="../img/students.gif" align="absbottom" border="0" alt="" style="margin: 1px;">';?></td>
-  <td width="99%"><a <?php if($enreg['status'] == 1) echo 'class="master"'; ?> name="user_<?php echo $enreg['user_id']; ?>" href="<?php echo $_SERVER['PHP_SELF']; ?>?showPic=<?php if($showPic == $enreg['user_id']) echo '0'; else echo $enreg['user_id']; ?>#user_<?php echo $enreg['user_id']; ?>"><b><?php echo ucfirst($enreg['lastname']).' '.ucfirst($enreg['firstname']); ?></b></a></td>
+  <td width="1%" valign="top"><?php if($enreg['status'] == 1) echo '<img src="../img/teachers.gif" align="absbottom" border="0" alt="" style="margin: 1px;">'; else echo '<img src="../img/students.gif" align="absbottom" border="0" alt="" style="margin: 1px;">';?></td>
+  <td width="99%"><a <?php if($enreg['status'] == 1) echo 'class="master"'; ?> name="user_<?php echo $enreg['user_id']; ?>" href="<?php echo $_SERVER['PHP_SELF']; ?>?showPic=<?php if($showPic == $enreg['user_id']) echo '0'; else echo $enreg['user_id']; ?>#user_<?php echo $enreg['user_id']; ?>"><?php echo ucfirst($enreg['firstname']).' '.ucfirst($enreg['lastname']); ?></a></td>
 </tr>
 
-
 <?php if($showPic == $enreg['user_id']): ?>
 <tr>
   <td colspan="2" align="center"><img src="<?php if(empty($enreg['picture_uri'])) echo '../img/unknown.jpg'; else echo $pictureURL.$enreg['picture_uri']; ?>" border="0" width="100" alt="" style="margin-top: 5px;"></td>
 </tr>
 <?php endif; ?>
 
-<tr>
-  <td height="5"></td>
-</tr>
-
 <?php
 }
 

+ 28 - 1
main/chat/header_frame.inc.php

@@ -55,7 +55,21 @@ elseif(FRAME == 'message')
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Chat</title>
 
-<link rel="stylesheet" type="text/css" href="../css/default/chat.css">
+<link rel="stylesheet" type="text/css" href="../css/<?php if(api_get_setting('stylesheets')=="") echo 'default'; else echo api_get_setting('stylesheets'); ?>/default.css">
+
+<style>
+	a{
+		font-size: 12px;
+	}
+	
+	.background_submit{
+		background: url(../img/chat_little.gif) 2px 2px no-repeat;
+		padding: 2px 1px 1px 20px;
+	}
+	TH{
+		font-size: 12px;
+	}
+</style>
 
 <script type="text/javascript" language="javascript">
 <!--
@@ -90,6 +104,19 @@ function eventMessage()
 	document.formMessage.message.focus();
 }
 
+function send_message(evenement){
+
+    for (prop in evenement)
+    {
+    	if(prop == 'which') touche = evenement.which; else touche = evenement.keyCode;
+    }
+    
+    if (touche == 13)
+    {
+    	document.formMessage.submit();
+    }
+
+}
 
 //-->
 </script>