Browse Source

[svn r17078] changes in logic - multiple dokeos browser tabs open - see(FS#2960)

Isaac Flores 16 years ago
parent
commit
dbe104b052

+ 8 - 8
main/chat/chat.php

@@ -1,4 +1,4 @@
-<?php // $Id: chat.php 15067 2008-04-24 17:39:03Z juliomontoya $
+<?php // $Id: chat.php 17078 2008-12-04 23:23:53Z iflorespaz $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -100,18 +100,18 @@ switch($my_style){
 		$footer_size = 48;
 		break;
 }
+$cidreq=$_GET['cidReq'];
 ?>
-
 <frameset rows="130,*,<?php echo $footer_size;?>" border="0" frameborder="0" framespacing="1">
-	<frame src="chat_banner.php" name="chat_banner" scrolling="no">
+	<frame src="chat_banner.php?<?php echo 'cidReq='.$cidreq; ?>" 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">
+		<frame src="chat_whoisonline.php?<?php echo 'cidReq='.$cidreq; ?>" name="chat_whoisonline" scrolling="auto">
 		<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">
+			<frame src="chat_chat.php?origin=<?php echo $_GET["origin"]; ?>&target=<?php echo $_GET["target"].'&amp;cidReq='.$cidreq; ?>" name="chat_chat" scrolling="auto">
+			<frame src="chat_message.php?<?php echo 'cidReq='.$cidreq; ?>" name="chat_message" scrolling="no">
 		</frameset>
-		<frame src="chat_hidden.php" name="chat_hidden" scrolling="no">
+		<frame src="chat_hidden.php?<?php echo 'cidReq='.$cidreq; ?>" name="chat_hidden" scrolling="no">
 	</frameset>
-	<frame src="chat_footer.php" name="chat_footer" scrolling="no">
+	<frame src="chat_footer.php?<?php echo 'cidReq='.$cidreq; ?>" name="chat_footer" scrolling="no">
 </frameset>
 </html>

+ 3 - 2
main/chat/chat_chat.php

@@ -36,7 +36,8 @@ $language_file = array ('chat');
 require('../inc/global.inc.php');
 include(api_get_path(LIBRARY_PATH).'document.lib.php');
 include (api_get_path(LIBRARY_PATH).'fileUpload.lib.php');
-$course=api_get_course_id();
+//$course=api_get_course_id();
+$course=$_GET['cidReq'];
 
 // if we have the session set up 
 if (!empty($course))
@@ -146,7 +147,7 @@ if (!empty($course))
 	{
 		$rand=mt_rand(1,1000);		
 		echo '<div style="margin-left: 5px;">';
-		echo '<a href="'.api_get_self().'?rand='.$rand.'&reset=1#bottom" onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang('ConfirmReset'),ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.gif', get_lang('ClearList')).' '.get_lang('ClearList').'</a>';
+		echo '<a href="'.api_get_self().'?rand='.$rand.'&reset=1&cidReq='.$_GET['cidReq'].'#bottom" onclick="javascript:if(!confirm(\''.addslashes(htmlentities(get_lang('ConfirmReset'),ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.gif', get_lang('ClearList')).' '.get_lang('ClearList').'</a>';
 		echo '</div>';
 	}
 }

+ 2 - 1
main/chat/chat_hidden.php

@@ -66,6 +66,7 @@ $sql="SELECT user_id FROM $tbl_chat_connected WHERE user_id='".$_user['user_id']
 $result=api_sql_query($sql);
 
 //The user_id exists so we must do an UPDATE and not a INSERT
+$current_time=date('Y-m-d H:i:s');
 if(mysql_num_rows($result)==0){
 	$query="INSERT INTO $tbl_chat_connected(user_id,last_connection) VALUES('".$_user['user_id']."',NOW())";
 }
@@ -84,7 +85,7 @@ list($connected_new)=mysql_fetch_row($result);
 include("header_frame.inc.php");
 ?>
 
-<form name="formHidden" method="post" action="<?php echo api_get_self(); ?>">
+<form name="formHidden" method="post" action="<?php echo api_get_self().'?cidReq='.$_GET['cidReq']; ?>">
 <input type="hidden" name="chat_size_old" value="<?php echo $chat_size_new; ?>">
 <input type="hidden" name="connected_old" value="<?php echo $connected_new; ?>">
 </form>

+ 1 - 1
main/chat/chat_message.php

@@ -145,7 +145,7 @@ if (!empty($course))
 		}
 	}
 	?>
-	<form name="formMessage" method="post" action="<?php echo api_get_self(); ?>" onsubmit="javascript:if(document.formMessage.message.value == '') { alert('<?php echo addslashes(htmlentities(get_lang('TypeMessage'),ENT_QUOTES,$charset)); ?>'); document.formMessage.message.focus(); return false; }" autocomplete="off">
+	<form name="formMessage" method="post" action="<?php echo api_get_self().'?'.api_get_cidreq(); ?>" onsubmit="javascript:if(document.formMessage.message.value == '') { alert('<?php echo addslashes(htmlentities(get_lang('TypeMessage'),ENT_QUOTES,$charset)); ?>'); document.formMessage.message.focus(); return false; }" autocomplete="off">
 	<input type="hidden" name="sent" value="1">
 	<table border="0" cellpadding="5" cellspacing="0" width="100%">
 	<tr>

+ 4 - 4
main/chat/chat_whoisonline.php

@@ -46,17 +46,17 @@ if (!empty($course))
 	$tbl_session	= Database::get_main_table(TABLE_MAIN_SESSION);
 	$tbl_session_course	= Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
 	$tbl_user		= Database::get_main_table(TABLE_MAIN_USER);
-	$tbl_chat_connected	= Database::get_course_chat_connected_table();
+	$tbl_chat_connected	= Database::get_course_table(CHAT_CONNECTED_TABLE,$_course['dbName']);
 	
 	$query="SELECT username FROM $tbl_user WHERE user_id='".$_user['user_id']."'";
 	$result=api_sql_query($query,__FILE__,__LINE__);
 	
-	list($pseudoUser)=mysql_fetch_row($result);
+	list($pseudoUser)=Database::fetch_array($result);
 	
 	$isAllowed=(empty($pseudoUser) || !$_cid)?false:true;
 	$isMaster=$is_courseAdmin?true:false;
 		
-	$date_inter=date('Y-m-d H:i:s',time()-60); 
+	$date_inter=date('Y-m-d H:i:s',time()-120); 
 	
 	$Users = array(); 
 	
@@ -110,7 +110,7 @@ if (!empty($course))
 	?>
 	<tr>
 	  <td width="1%" valign="top"><?php if($status == 1) echo Display::return_icon('teachers.gif', get_lang('Edit')).' '; else echo Display::return_icon('students.gif');?></td>
-	  <td width="99%"><a <?php if($status == 1) echo 'class="master"'; ?> name="user_<?php echo $enreg['user_id']; ?>" href="<?php echo api_get_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>
+	  <td width="99%"><a <?php if($status == 1) echo 'class="master"';// ?> name="user_<?php echo $enreg['user_id']; ?>" href="<?php echo api_get_self(); ?>?<?php echo api_get_cidreq();?>&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
 	$user_image=UserManager::get_user_picture_path_by_id($enreg['user_id'],'web',false,true);

+ 3 - 3
main/chat/header_frame.inc.php

@@ -87,7 +87,7 @@ if (empty($mycourseid))
 	// if it is not set $mycourse id we reload the chat_message window in order to hide the
 	// textarea to submit a message
 	echo '<script type="text/javascript" language="javascript">';
-	echo "parent.chat_message.location.href='chat_whoisonline.php';";
+	echo "parent.chat_message.location.href='chat_whoisonline.php?".api_get_cidreq()."';";
 	echo '</script>';
 }
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -116,7 +116,7 @@ function updateChat()
 {
 	if('<?php echo $chat_size_old; ?>' != '<?php echo $chat_size_new; ?>')
 	{
-		parent.chat_chat.location.href='chat_chat.php?size=<?php echo $chat_size_new; ?>#bottom';				
+		parent.chat_chat.location.href='chat_chat.php?size=<?php echo $chat_size_new.'&cidReq='.$_GET['cidReq']; ?>#bottom';				
 	}
 }
 
@@ -137,7 +137,7 @@ function eventMessage()
 {
 	<?php if($chat_size): ?>
 	parent.chat_hidden.document.formHidden.chat_size_old.value='<?php echo $chat_size; ?>';
-	parent.chat_chat.location.href='chat_chat.php?size=<?php echo $chat_size; ?>#bottom';
+	parent.chat_chat.location.href='chat_chat.php?size=<?php echo $chat_size.'&cidReq='.$_GET['cidReq']; ?>#bottom';
 	<?php endif; ?>
 
 	document.formMessage.message.focus();