[svn r11199] Update for chat logs

main/chat/chat_chat.php

@@ -40,7 +40,6 @@ include (api_get_path(LIBRARY_PATH).'fileUpload.lib.php');
 
 $reset=$_GET['reset']?true:false;
 
-//$tbl_user=$mainDbName."`.`user";
 $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
 
 $query="SELECT username FROM $tbl_user WHERE user_id='".$_user['user_id']."'";
@@ -51,10 +50,6 @@ list($pseudoUser)=mysql_fetch_row($result);
 $isAllowed=(empty($pseudoUser) || !$_cid)?false:true;
 $isMaster=$is_courseAdmin?true:false;
 
-/*if(!$isAllowed)
-{
-	exit();
-}*/
 
 $dateNow=date('Y-m-d');
 
@@ -78,11 +73,11 @@ if(!is_dir($chatPath))
 	
 }
 
-if(!file_exists($chatPath.'messages-'.$dateNow.'.log'))
+if(!file_exists($chatPath.'messages-'.$dateNow.'.log.html'))
 {
-	fclose(fopen($chatPath.'messages-'.$dateNow.'.log','w'));
+	fclose(fopen($chatPath.'messages-'.$dateNow.'.log.html','w'));
 
-	$doc_id=add_document($_course,'/chat_files/messages-'.$dateNow.'.log','file',0,'messages-'.$dateNow.'.log');
+	$doc_id=add_document($_course,'/chat_files/messages-'.$dateNow.'.log.html','file',0,'messages-'.$dateNow.'.log.html');
 
 	api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id']);
 	item_property_update_on_folder($_course,'/chat_files', $_user['user_id']);
@@ -92,26 +87,26 @@ if($reset && $isMaster)
 {
 	$i=1;
 
-	while(file_exists($chatPath.'messages-'.$dateNow.'-'.$i.'.log'))
+	while(file_exists($chatPath.'messages-'.$dateNow.'-'.$i.'.log.html'))
 	{
 		$i++;
 	}
 
-	rename($chatPath.'messages-'.$dateNow.'.log',$chatPath.'messages-'.$dateNow.'-'.$i.'.log');
+	rename($chatPath.'messages-'.$dateNow.'.log.html',$chatPath.'messages-'.$dateNow.'-'.$i.'.log.html');
 
-	fclose(fopen($chatPath.'messages-'.$dateNow.'.log','w'));
+	fclose(fopen($chatPath.'messages-'.$dateNow.'.log.html','w'));
 
-	$doc_id=add_document($_course,'/chat_files/messages-'.$dateNow.'-'.$i.'.log','file',filesize($chatPath.'messages-'.$dateNow.'-'.$i.'.log'),'messages-'.$dateNow.'-'.$i.'.log');
+	$doc_id=add_document($_course,'/chat_files/messages-'.$dateNow.'-'.$i.'.log.html','file',filesize($chatPath.'messages-'.$dateNow.'-'.$i.'.log.html'),'messages-'.$dateNow.'-'.$i.'.log.html');
 
 	api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id']);
 	item_property_update_on_folder($_course,'/chat_files', $_user['user_id']);
 
-	$doc_id = DocumentManager::get_document_id($_course,'/chat_files/messages-'.$dateNow.'.log');
+	$doc_id = DocumentManager::get_document_id($_course,'/chat_files/messages-'.$dateNow.'.log.html');
 
 	update_existing_document($_course, $doc_id,0);
 }
 
-$content=file($chatPath.'messages-'.$dateNow.'.log');
+$content=file($chatPath.'messages-'.$dateNow.'.log.html');
 $nbr_lines=sizeof($content);
 $remove=$nbr_lines-100;
 
@@ -136,7 +131,7 @@ if ($_GET["origin"]=='whoisonlinejoin') {   //the joiner (we have to delete the
 echo '<div style="margin-left: 5px;">';
 foreach($content as $thisLine)
 {
-	echo "$thisLine<br>";
+	echo "$thisLine";
 }
 echo '</div>';
 

main/chat/chat_hidden.php

@@ -60,7 +60,7 @@ $documentPath=api_get_path(SYS_COURSE_PATH).$_course['path'].'/document/';
 $chatPath=$documentPath.'chat_files/';
 
 $chat_size_old=intval($_POST['chat_size_old']);
-$chat_size_new=filesize($chatPath.'messages-'.$dateNow.'.log');
+$chat_size_new=filesize($chatPath.'messages-'.$dateNow.'.log.html');
 
 $sql="SELECT user_id FROM $tbl_chat_connected WHERE user_id='".$_user['user_id']."'";
 $result=api_sql_query($sql);

main/chat/chat_message.php

@@ -54,7 +54,6 @@ include_once (api_get_path(LIBRARY_PATH).'fileUpload.lib.php');
 */
 $tbl_user	= Database::get_main_table(TABLE_MAIN_USER);
 $sent = $_REQUEST['sent'];
-$question = $_REQUEST['question'];
 
 /*
 ==============================================================================
@@ -104,37 +103,32 @@ if($sent)
 	{
 		$message=make_clickable($message);
 
-		if($question)
+		if(!file_exists($chatPath.'messages-'.$dateNow.'.log.html'))
 		{
-			$message='<span class="question"><b>'.get_lang('Question').' :</b> '.$message.'</span>';
-		}
-
-		if(!file_exists($chatPath.'messages-'.$dateNow.'.log'))
-		{
-			$doc_id=add_document($_course,'/chat_files/messages-'.$dateNow.'.log','file',0,'messages-'.$dateNow.'.log');
+			$doc_id=add_document($_course,'/chat_files/messages-'.$dateNow.'.log.html','file',0,'messages-'.$dateNow.'.log.html');
 
 			api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id']);
 			item_property_update_on_folder($_course,'/chat_files', $_user['user_id']);
 		}
 		else
 		{
-			$doc_id = DocumentManager::get_document_id($_course,'/chat_files/messages-'.$dateNow.'.log');
+			$doc_id = DocumentManager::get_document_id($_course,'/chat_files/messages-'.$dateNow.'.log.html');
 		}
 
-		$fp=fopen($chatPath.'messages-'.$dateNow.'.log','a');
+		$fp=fopen($chatPath.'messages-'.$dateNow.'.log.html','a');
 
 		if($isMaster)
 		{
-			fputs($fp,"<span style='color: #00F;'><b>$firstname $lastname</b></span> : $message\n");
+			fputs($fp,"<span style='color: #00F;'><b>$firstname $lastname</b></span> : $message<br>\n");
 		}
 		else
 		{
-			fputs($fp,"<b>$firstname $lastname</b> : $message\n");
+			fputs($fp,"<b>$firstname $lastname</b> : $message<br>\n");
 		}
 
 		fclose($fp);
 
-		$chat_size=filesize($chatPath.'messages-'.$dateNow.'.log');
+		$chat_size=filesize($chatPath.'messages-'.$dateNow.'.log.html');
 
 		update_existing_document($_course, $doc_id,$chat_size);
 		item_property_update_on_folder($_course,'/chat_files', $_user['user_id']);