chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Using the Datetime class in order to compare dates, log out the global chat when user leaves the session

Browse Source
skala
Julio Montoya 13 years ago
parent 8c07b1b7e7
commit 81571a14af
6 changed files with 69 additions and 78 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      main/inc/ajax/chat.ajax.php
  2. 5
      main/inc/lib/message.lib.php
  3. 100
      main/inc/lib/online.inc.php
  4. 10
      main/inc/lib/social.lib.php
  5. 11
      main/inc/lib/userportal.lib.php
  6. 20
      whoisonline.php

1
main/inc/ajax/chat.ajax.php
Unescape View File

@ -7,7 +7,6 @@
$_dont_save_user_course_access = true;
require_once '../global.inc.php';
require_once api_get_path(LIBRARY_PATH).'chat.lib.php';
$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : null;

5
main/inc/lib/message.lib.php
Unescape View File

@ -37,9 +37,8 @@ class MessageManager
$count = who_is_online_count();
$userlist = who_is_online(0, $count, null, null, 30, true);
$online_user_list = array();
foreach($userlist as $row) {
$receiver_id = $row[0];
$online_user_list[$receiver_id] = GetFullUserName($receiver_id).($current_user_id==$receiver_id?(" (".get_lang('Myself').")"):(""));
foreach ($userlist as $user_id) {
$online_user_list[$user_id] = GetFullUserName($user_id).($current_user_id==$user_id?(" (".get_lang('Myself').")"):(""));
}
return $online_user_list;
}

100
main/inc/lib/online.inc.php
Unescape View File

@ -138,13 +138,12 @@ function user_is_online($user_id) {
}
/**
* Gives a list of people online now (and in the last $valid minutes)
* @param int Number of minutes to account logins for
* @param bool optionally if it's set to true shows who friends from social network is online otherwise just shows all users online
* Gives a list of people online now (and in the last $valid minutes)
* @return array For each line, a list of user IDs and login dates, or FALSE on error or empty results
*/
function who_is_online($from, $number_of_items, $column = null, $direction = null, $time_limit = null, $friends = false) {
// Time limit in seconds?
if (empty($time_limit)) {
$time_limit = api_get_setting('time_limit_whosonline');
} else {
@ -179,12 +178,15 @@ function who_is_online($from, $number_of_items, $column = null, $direction = nul
// who friends from social network is online
$query = "SELECT DISTINCT login_user_id, login_date
FROM $track_online_table INNER JOIN $friend_user_table ON (friend_user_id = login_user_id)
WHERE DATE_ADD(login_date,INTERVAL $time_limit MINUTE) >= '".$current_date."' AND friend_user_id <> '".api_get_user_id()."' AND relation_type='".USER_RELATION_TYPE_FRIEND."' AND user_id = '".api_get_user_id()."'
WHERE DATE_ADD(login_date,INTERVAL $time_limit MINUTE) >= '".$current_date."' AND
friend_user_id <> '".api_get_user_id()."' AND
relation_type='".USER_RELATION_TYPE_FRIEND."' AND
user_id = '".api_get_user_id()."'
ORDER BY $column $direction
LIMIT $from, $number_of_items";
} else {
$query = "SELECT login_user_id, login_date FROM ".$track_online_table ." e INNER JOIN ".$table_user ." u ON (u.user_id=e.login_user_id)
WHERE DATE_ADD(login_date,INTERVAL $time_limit MINUTE) >= '".$current_date."'
WHERE u.status != ".ANONYMOUS." AND DATE_ADD(login_date,INTERVAL $time_limit MINUTE) >= '".$current_date."'
ORDER BY $column $direction
LIMIT $from, $number_of_items";
}
@ -196,13 +198,17 @@ function who_is_online($from, $number_of_items, $column = null, $direction = nul
// friends from social network is online
$query = "SELECT distinct login_user_id,login_date
FROM $track_online_table track INNER JOIN $friend_user_table ON (friend_user_id = login_user_id)
WHERE track.access_url_id = $access_url_id AND DATE_ADD(login_date,INTERVAL $time_limit MINUTE) >= '".$current_date."' AND friend_user_id <> '".api_get_user_id()."' AND relation_type='".USER_RELATION_TYPE_FRIEND."'
WHERE track.access_url_id = $access_url_id AND
DATE_ADD(login_date,INTERVAL $time_limit MINUTE) >= '".$current_date."' AND
friend_user_id <> '".api_get_user_id()."' AND
relation_type='".USER_RELATION_TYPE_FRIEND."'
ORDER BY $column $direction
LIMIT $from, $number_of_items";
} else {
// all users online
$query = "SELECT login_user_id,login_date FROM ".$track_online_table ." track INNER JOIN ".$table_user ." u ON (u.user_id=track.login_user_id)
WHERE track.access_url_id = $access_url_id AND DATE_ADD(login_date,INTERVAL $time_limit MINUTE) >= '".$current_date."'
$query = "SELECT login_user_id, login_date FROM ".$track_online_table ." track INNER JOIN ".$table_user ." u ON (u.user_id=track.login_user_id)
WHERE u.status != ".ANONYMOUS." AND track.access_url_id = $access_url_id AND
DATE_ADD(login_date,INTERVAL $time_limit MINUTE) >= '".$current_date."'
ORDER BY $column $direction
LIMIT $from, $number_of_items";
}
@ -213,33 +219,21 @@ function who_is_online($from, $number_of_items, $column = null, $direction = nul
/*$query = "SELECT DISTINCT u.user_id as login_user_id, login_date FROM ".$track_online_table ." e , $table_user u
GROUP by u.user_id
ORDER BY $column $direction
LIMIT $from, $number_of_items";
*/
LIMIT $from, $number_of_items"; */
$result = Database::query($query);
if ($result) {
$validtime = mktime(date("H"),date("i")-$time_limit,date("s"),date("m"),date("d"),date("Y"));
$rarray = array();
while(list($login_user_id,$login_date)= Database::fetch_row($result)) {
$barray = array();
array_push($barray,$login_user_id);
array_push($barray,$login_date);
// YYYY-MM-DD HH:MM:SS, db date format
$hour = substr($login_date,11,2);
$minute = substr($login_date,14,2);
$secund = substr($login_date,17,2);
$month = substr($login_date,5,2);
$day = substr($login_date,8,2);
$year = substr($login_date,0,4);
// db timestamp
$dbtime = mktime($hour,$minute,$secund,$month,$day,$year);
if ($dbtime>$validtime) {
array_push($rarray,$barray);
}
}
return $rarray;
if ($result) {
$valid_date_time = new DateTime();
$diff = "PT".$time_limit.'M';
$valid_date_time->sub(new DateInterval($diff));
$users_online = array();
while(list($login_user_id, $login_date) = Database::fetch_row($result)) {
$user_login_date = new DateTime($login_date);
if ($user_login_date > $valid_date_time) {
$users_online[] = $login_user_id;
}
}
return $users_online;
} else {
return false;
}
@ -384,34 +378,24 @@ function who_is_online_in_this_course($from, $number_of_items, $uid, $valid, $co
$from = intval($from);
$number_of_items = intval($number_of_items);
$query = "SELECT login_user_id,login_date FROM ".$track_online_table ."
$query = "SELECT login_user_id, login_date FROM ".$track_online_table ."
WHERE course='".$coursecode."' AND DATE_ADD(login_date,INTERVAL $valid MINUTE) >= NOW()
LIMIT $from, $number_of_items
";
LIMIT $from, $number_of_items ";
$result = Database::query($query);
if (count($result)>0) {
$validtime = mktime(date("H"),date("i")-$valid,date("s"),date("m"),date("d"),date("Y"));
$rarray = array();
if ($result) {
$valid_date_time = new DateTime();
$diff = "PT".$time_limit.'M';
$valid_date_time->sub(new DateInterval($diff));
$users_online = array();
while(list($login_user_id,$login_date)= Database::fetch_row($result)) {
$barray = array();
array_push($barray,$login_user_id);
array_push($barray,$login_date);
// YYYY-MM-DD HH:MM:SS, db date format
$hour = substr($login_date,11,2);
$minute = substr($login_date,14,2);
$secund = substr($login_date,17,2);
$month = substr($login_date,5,2);
$day = substr($login_date,8,2);
$year = substr($login_date,0,4);
// db timestamp
$dbtime = mktime($hour,$minute,$secund,$month,$day,$year);
if ($dbtime >= $validtime) {
array_push($rarray,$barray);
}
while(list($login_user_id, $login_date) = Database::fetch_row($result)) {
$user_login_date = new DateTime($login_date);
if ($user_login_date > $valid_date_time) {
$users_online[] = $login_user_id;
}
}
return $rarray;
return $users_online;
} else {
return false;
}

10
main/inc/lib/social.lib.php
Unescape View File

@ -750,8 +750,7 @@ class SocialManager extends UserManager {
$html .= '<div class="span'.$column_size.'">';
$html .= '<ul id="online_grid_container" class="thumbnails">';
foreach ($user_list as $user) {
$uid = $user[0];
foreach ($user_list as $uid) {
$user_info = api_get_user_info($uid);
//Anonymous users can't have access to the profile
if (!api_is_anonymous()) {
@ -780,8 +779,11 @@ class SocialManager extends UserManager {
$html .= '<li class="span'.($column_size/3).'"><div class="thumbnail">'.$img.'<div class="caption">'.$name.'</div</div></li>';
}
$counter = $_SESSION['who_is_online_counter'];
$html .= '</ul></div>';
$html .= '<div class="span'.$column_size.'"><a class="btn btn-large" id="link_load_more_items" data_link="'.$counter.'" >'.get_lang('More').'</a></div>';
$html .= '</ul></div>';
if (count($user_list) >= 9) {
$html .= '<div class="span'.$column_size.'"><a class="btn btn-large" id="link_load_more_items" data_link="'.$counter.'" >'.get_lang('More').'</a></div>';
}
if ($add_row) {
$html .= '</div>';
}

11
main/inc/lib/userportal.lib.php
Unescape View File

@ -124,6 +124,13 @@ class IndexManager {
// Selecting the last login of the user.
$uid = $this->user_id;
//Changing global chat status to offline
if (api_get_setting('allow_global_chat') == 'true') {
$chat = new Chat();
$chat->set_user_status(0);
}
$sql_last_connection = "SELECT login_id, login_date FROM $tbl_track_login WHERE login_user_id='$uid' ORDER BY login_date DESC LIMIT 0,1";
$q_last_connection = Database::query($sql_last_connection);
@ -158,7 +165,9 @@ class IndexManager {
}
exit_of_chat($uid);
Session::destroy();
$query_string = $query_string ? "$query_string&loggedout=true" : '?loggedout=true';
$query_string = $query_string ? "$query_string&loggedout=true" : '?loggedout=true';
header("Location: index.php$query_string");
exit();
}

20
whoisonline.php
Unescape View File

@ -23,16 +23,14 @@ $htmlHeadXtra[] = api_get_js('jquery.endless-scroll.js');
$this_section = SECTION_SOCIAL;
// table definitions
$track_user_table = Database::get_main_table(TABLE_MAIN_USER);
$htmlHeadXtra[] = '<script>
function show_image(image,width,height) {
width = parseInt(width) + 20;
height = parseInt(height) + 20;
window_x = window.open(image,\'windowX\',\'width=\'+ width + \', height=\'+ height + \'\');
}
$htmlHeadXtra[] = '<script type="text/javascript">
function show_image(image,width,height) {
width = parseInt(width) + 20;
height = parseInt(height) + 20;
window_x = window.open(image,\'windowX\',\'width=\'+ width + \', height=\'+ height + \'\');
}
</script>';
$htmlHeadXtra[] = '<script type="text/javascript">
$(document).ready(function (){
$("input#id_btn_send_invitation").bind("click", function(){
if (confirm("'.get_lang('SendMessageInvitation', '').'")) {
@ -111,9 +109,9 @@ if ($_GET['chatid'] != '') {
if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) || ((api_get_setting('showonline', 'users') == 'true' || api_get_setting('showonline', 'course') == 'true') && $_user['user_id'])) {
if(isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0) {
$user_list = who_is_online_in_this_course(0, 10, api_get_user_id(), api_get_setting('time_limit_whosonline'), $_GET['cidReq']);
$user_list = who_is_online_in_this_course(0, 9, api_get_user_id(), api_get_setting('time_limit_whosonline'), $_GET['cidReq']);
} else {
$user_list = who_is_online(0, 10);
$user_list = who_is_online(0, 9);
}
if (!isset($_GET['id'])) {

Write Preview
Loading…
Cancel
Save