More fixes due the date changes in the session table

skala
Julio Montoya 13 years ago
parent 2b2cc3cbf7
commit c2f526e6a2
  1. 4
      main/inc/lib/banner.lib.php
  2. 1
      main/inc/lib/online.inc.php
  3. 365
      main/mySpace/user_add.php
  4. 5
      main/tracking/logins_details.php
  5. 25
      main/tracking/userLog.php
  6. 15
      main/tracking/userlogCSV.php
  7. 29
      main/webservices/registration.soap.php
  8. 11
      plugin/dashboard/block_session/block_session.class.php
  9. 4
      whoisonline.php
  10. 81
      whoisonlinesession.php

@ -194,8 +194,10 @@ function return_notification_menu() {
// Display the who's online for the session
if (isset($user_id) && api_get_session_id() != 0) {
$html .= '<li><a href="'.api_get_path(WEB_PATH).'whoisonlinesession.php?id_coach='.$user_id.'&amp;referer='.urlencode($_SERVER['REQUEST_URI']).'" target="_top">'.
if (api_is_allowed_to_edit()) {
$html .= '<li><a href="'.api_get_path(WEB_PATH).'whoisonlinesession.php?session_id='.api_get_session_id().'&id_coach='.$user_id.'" >'.
Display::return_icon('session.png', get_lang('UsersConnectedToMySessions'), array(), ICON_SIZE_TINY).' </a></li>';
}
}
}

@ -316,7 +316,6 @@ function who_is_online_in_this_course($from, $number_of_items, $uid, $time_limit
} else {
$time_limit = intval($time_limit);
}
$online_time = time() - $time_limit*60;
$current_date = api_get_utc_datetime($online_time);
$track_online_table = Database::get_statistic_table(TABLE_STATISTIC_TRACK_E_ONLINE);

@ -1,365 +0,0 @@
<?php
/* For licensing terms, see /license.txt */
// name of the language file that needs to be included
$language_file = array('admin', 'registration');
$cidReset = true;
exit; //@deprecated file seems to be unused
// including necessary libraries
require_once '../inc/global.inc.php';
$libpath = api_get_path(LIBRARY_PATH);
require_once $libpath.'fileManage.lib.php';
require_once $libpath.'fileUpload.lib.php';
require_once $libpath.'mail.lib.inc.php';
// user permissions
api_protect_admin_script(true);
api_block_anonymous_users();
// Database table definitions
$table_admin = Database :: get_main_table(TABLE_MAIN_ADMIN);
$table_user = Database :: get_main_table(TABLE_MAIN_USER);
$database = Database::get_main_database();
$htmlHeadXtra[] = '
<script type="text/javascript">
<!--
function enable_expiration_date() { //v2.0
document.user_add.radio_expiration_date[0].checked=false;
document.user_add.radio_expiration_date[1].checked=true;
}
function password_switch_radio_button(form, input){
var NodeList = document.getElementsByTagName("input");
for(var i=0; i< NodeList.length; i++){
if(NodeList.item(i).name=="password[password_auto]" && NodeList.item(i).value=="0"){
NodeList.item(i).checked=true;
}
}
}
function display_drh_list(){
if(document.getElementById("status_select").value=='.STUDENT.')
{
document.getElementById("drh_list").style.display="block";
}
else
{
document.getElementById("drh_list").style.display="none";
document.getElementById("drh_select").options[0].selected="selected";
}
}
//-->
</script>';
if (!empty($_GET['message'])) {
$message = urldecode($_GET['message']);
}
$id_session='';
if (isset($_GET["id_session"]) && $_GET["id_session"] != "") {
$id_session = Security::remove_XSS($_GET["id_session"]);
}
$interbreadcrumb[] = array ('url' => '../admin/index.php', 'name' => get_lang('PlatformAdmin'));
$tool_name = get_lang('AddUsers');
// Create the form
$form = new FormValidator('user_add');
if (api_is_western_name_order()) {
// Firstname
$form->addElement('text','firstname', get_lang('FirstName'));
$form->applyFilter('firstname', 'html_filter');
$form->applyFilter('firstname', 'trim');
$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
// Lastname
$form->addElement('text','lastname', get_lang('LastName'));
$form->applyFilter('lastname', 'html_filter');
$form->applyFilter('lastname', 'trim');
$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
} else {
// Lastname
$form->addElement('text','lastname', get_lang('LastName'));
$form->applyFilter('lastname', 'html_filter');
$form->applyFilter('lastname', 'trim');
$form->addRule('lastname', get_lang('ThisFieldIsRequired'), 'required');
// Firstname
$form->addElement('text','firstname', get_lang('FirstName'));
$form->applyFilter('firstname', 'html_filter');
$form->applyFilter('firstname', 'trim');
$form->addRule('firstname', get_lang('ThisFieldIsRequired'), 'required');
}
// Official code
$form->addElement('text', 'official_code', get_lang('OfficialCode'), array('size' => '40'));
$form->applyFilter('official_code', 'html_filter');
$form->applyFilter('official_code', 'trim');
// Email
$form->addElement('text', 'email', get_lang('Email'), array('size' => '40'));
$form->addRule('email', get_lang('EmailWrong'), 'email');
$form->addRule('email', get_lang('EmailWrong'), 'required');
// Phone
$form->addElement('text', 'phone', get_lang('PhoneNumber'));
// Picture
$form->addElement('file', 'picture', get_lang('AddPicture'));
$allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
$form->addRule('picture', get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', 'filetype', $allowed_picture_types);
// Username
$form->addElement('text', 'username', get_lang('LoginName'), array('maxlength' => USERNAME_MAX_LENGTH));
$form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
$form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
$form->addRule('username', get_lang('OnlyLettersAndNumbersAllowed'), 'username');
$form->addRule('username', get_lang('UserTaken'), 'username_available', $user_data['username']);
// Password
$group = array();
$auth_sources = 0; //make available wider as we need it in case of form reset (see below)
if (count($extAuthSource) > 0) {
$group[] =& HTML_QuickForm::createElement('radio', 'password_auto', null, get_lang('ExternalAuthentication').' ', 2);
$auth_sources = array();
foreach ($extAuthSource as $key => $info) {
$auth_sources[$key] = $key;
}
$group[] =& HTML_QuickForm::createElement('select', 'auth_source', null, $auth_sources);
$group[] =& HTML_QuickForm::createElement('static', '', '', '<br />');
}
$group[] =& HTML_QuickForm::createElement('radio', 'password_auto', get_lang('Password'), get_lang('AutoGeneratePassword').'<br />', 1);
$group[] =& HTML_QuickForm::createElement('radio', 'password_auto', 'id="radio_user_password"', null, 0);
$group[] =& HTML_QuickForm::createElement('password', 'password', null, array('onkeydown' => 'javascript: password_switch_radio_button(document.user_add,"password[password_auto]");'));
$form->addGroup($group, 'password', get_lang('Password'), '');
// Send email
$group = array();
$group[] =& HTML_QuickForm::createElement('radio', 'send_mail',null,get_lang('Yes'), 1);
$group[] =& HTML_QuickForm::createElement('radio', 'send_mail',null,get_lang('No'), 0);
$form->addGroup($group, 'mail', get_lang('SendMailToNewUser'), '&nbsp;');
// Expiration Date
$form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
$group = array ();
$group[] = & $form->createElement('radio', 'radio_expiration_date', null, get_lang('On'), 1);
$group[] = & $form->createElement('datepicker', 'expiration_date', null, array('form_name' => $form->getAttribute('name'), 'onchange' => 'javascript: enable_expiration_date();'));
$form->addGroup($group, 'max_member_group', null, '', false);
// Active account or inactive account
$form->addElement('radio', 'active', get_lang('ActiveAccount'), get_lang('Active'), 1);
$form->addElement('radio', 'active', '', get_lang('Inactive'), 0);
$now = api_get_utc_datetime();
//Session list
if (api_is_session_admin()) {
$where = 'WHERE session_admin_id='.intval(api_get_user_id());
$where .= ' AND ( (session.date_start <= "'.$now.'" AND session.date_end >= "'.$now.'") OR session.date_start="0000-00-00" ) ';
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$sql="SELECT id,name,nbr_courses,date_start,date_end FROM $tbl_session $where ORDER BY name";
$result = Database::query($sql);
$a_sessions = Database::store_result($result);
$session_list = array();
$session_list[0] = get_lang('SelectSession');
if (is_array($a_sessions)) {
foreach ($a_sessions as $session) {
$session_list[$session['id']]=$session['name'];
}
}
//asort($session_list);
//api_asort($session_list, SORT_STRING);
api_natsort($session_list);
$form->addElement('select', 'session_id', get_lang('Session'), $session_list);
}
UserManager::set_extra_fields_in_form($form, null, 'registration');
// Set default values
$defaults['admin']['platform_admin'] = 0;
$defaults['mail']['send_mail'] = 0;
$defaults['password']['password_auto'] = 1;
$defaults['active'] = 1;
$defaults['expiration_date'] = array();
$days = api_get_setting('account_valid_duration');
$time = strtotime('+'.$days.' day');
$defaults['expiration_date']['d'] = date('d', $time);
$defaults['expiration_date']['F'] = date('m', $time);
$defaults['expiration_date']['Y'] = date('Y', $time);
$defaults['radio_expiration_date'] = 0;
$defaults['status'] = STUDENT;
$defaults['session_id'] = api_get_session_id();
$form->setDefaults($defaults);
// Submit button
$select_level = array ();
$html_results_enabled[] = FormValidator :: createElement ('style_submit_button', 'submit_plus', get_lang('Add').'+', 'class="add"');
$html_results_enabled[] = FormValidator :: createElement ('style_submit_button', 'submit', get_lang('Add'), 'class="add"');
$form->addGroup($html_results_enabled);
// Validate form
if ($form->validate()) {
$check = Security::check_token('post');
if ($check) {
$user = $form->exportValues();
$picture_element = & $form->getElement('picture');
$picture = $picture_element->getValue();
$picture_uri = '';
if (strlen($picture['name']) > 0) {
if (!is_dir(api_get_path(SYS_CODE_PATH).'upload/users/')) {
mkdir(api_get_path(SYS_CODE_PATH).'upload/users/', api_get_permissions_for_new_directories());
}
$picture_uri = uniqid('').'_'.replace_dangerous_char($picture['name']);
$picture_location = api_get_path(SYS_CODE_PATH).'upload/users/'.$picture_uri;
move_uploaded_file($picture['tmp_name'], $picture_location);
}
$lastname = $user['lastname'];
$firstname = $user['firstname'];
$official_code = $user['official_code'];
$email = $user['email'];
$phone = $user['phone'];
$username = $user['username'];
$status = intval($user['status']);
$picture = $_FILES['picture'];
$platform_admin = intval($user['admin']['platform_admin']);
$send_mail = intval($user['mail']['send_mail']);
$hr_dept_id = intval($user['hr_dept_id']);
if (count($extAuthSource) > 0 && $user['password']['password_auto'] == '2') {
$auth_source = $user['password']['auth_source'];
$password = 'PLACEHOLDER';
} else {
$auth_source = PLATFORM_AUTH_SOURCE;
$password = $user['password']['password_auto'] == '1' ? api_generate_password() : $user['password']['password'];
}
if ($user['radio_expiration_date'] == '1') {
$expiration_date = $user['expiration_date'];
} else {
$expiration_date = '0000-00-00 00:00:00';
}
$active = intval($user['active']);
// default status = student
$status = 5;
//create user
$user_id = UserManager::create_user($firstname, $lastname, $status, $email, $username, $password, $official_code, api_get_setting('platformLanguage'), $phone, $picture_uri, $auth_source, $expiration_date, $active, $hr_dept_id);
//adding to the session
if (api_is_session_admin()) {
$tbl_session_rel_course = Database::get_main_table(TABLE_MAIN_SESSION_COURSE);
$tbl_session_rel_course_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$tbl_session_rel_user = Database::get_main_table(TABLE_MAIN_SESSION_USER);
$id_session = $user['session_id'];
if ($id_session != 0) {
$result = Database::query("SELECT course_code FROM $tbl_session_rel_course WHERE id_session='$id_session'");
$CourseList=array();
while ($row = Database::fetch_array($result)) {
$CourseList[] = $row['course_code'];
}
foreach ($CourseList as $enreg_course) {
Database::query("INSERT INTO $tbl_session_rel_course_rel_user(id_session,course_code,id_user) VALUES('$id_session','$enreg_course','$user_id')");
// updating the total
$sql = "SELECT COUNT(id_user) as nbUsers FROM $tbl_session_rel_course_rel_user WHERE id_session='$id_session' AND course_code='$enreg_course'";
$rs = Database::query($sql);
list($nbr_users) = Database::fetch_array($rs);
Database::query("UPDATE $tbl_session_rel_course SET nbr_users=$nbr_users WHERE id_session='$id_session' AND course_code='$enreg_course'");
}
Database::query("INSERT INTO $tbl_session_rel_user(id_session, id_user) VALUES('$id_session','$user_id')");
$sql = "SELECT COUNT(nbr_users) as nbUsers FROM $tbl_session WHERE id='$id_session' ";
$rs = Database::query($sql);
list($nbr_users) = Database::fetch_array($rs);
Database::query("UPDATE $tbl_session SET nbr_users= $nbr_users WHERE id='$id_session' ");
}
}
$extras = array();
foreach ($user as $key => $value) {
if (substr($key, 0, 6) == 'extra_') {
//an extra field
$myres = UserManager::update_extra_field_value($user_id, substr($key, 6), $value);
}
}
if ($platform_admin) {
$sql = "INSERT INTO $table_admin SET user_id = '".$user_id."'";
Database::query($sql);
}
if (!empty ($email) && $send_mail) {
$emailto = '"'.api_get_person_name($firstname, $lastname, null, PERSON_NAME_EMAIL_ADDRESS).'" <'.$email.'>';
$emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
$emailheaders = 'From: '.api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS).' <'.api_get_setting('emailAdministrator').">\n";
$emailheaders .= 'Reply-To: '.api_get_setting('emailAdministrator');
$portal_url = $_configuration['root_web'];
if ($_configuration['multiple_access_urls']) {
$access_url_id = api_get_current_access_url_id();
if ($access_url_id != -1) {
$url = api_get_access_url($access_url_id);
$portal_url = $url['url'];
}
}
$emailbody=get_lang('Dear')." ".stripslashes(api_get_person_name($firstname, $lastname)).",\n\n".get_lang('YouAreReg')." ". api_get_setting('siteName') ." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : ". $username ."\n". get_lang('Pass')." : ".stripslashes($password)."\n\n" .get_lang('Address') ." ". api_get_setting('siteName') ." ". get_lang('Is') ." : ".$portal_url."\n\n". get_lang('Problem'). "\n\n". get_lang('Formula').",\n\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n". get_lang('Manager'). " ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n" .get_lang('Email') ." : ".api_get_setting('emailAdministrator');
@api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders);
}
Security::clear_token();
if (isset($user['submit_plus'])) {
//we want to add more. Prepare report message and redirect to the same page (to clean the form)
$tok = Security::get_token();
header('Location: user_add.php?message='.urlencode(get_lang('UserAdded')).'&sec_token='.$tok);
exit ();
} else {
$tok = Security::get_token();
header('Location: ../admin/user_list.php?action=show_message&message='.urlencode(get_lang('UserAdded')).'&sec_token='.$tok);
exit ();
}
}
} else {
if (isset($_POST['submit'])) {
Security::clear_token();
}
$token = Security::get_token();
$form->addElement('hidden', 'sec_token');
$form->setConstants(array('sec_token' => $token));
}
// Display form
Display::display_header($tool_name);
//api_display_tool_title($tool_name);
if (!empty($message)) {
Display::display_normal_message(stripslashes($message));
}
$form->display();
/*
==============================================================================
FOOTER
==============================================================================
*/
Display::display_footer();

@ -14,6 +14,9 @@
*/
// TODO: Is this file deprecated?
exit;
/* INIT SECTION */
$uInfo = $_REQUEST['uInfo'];
if (!isset($_REQUEST['reqdate']))
@ -104,7 +107,7 @@ $is_allowedToTrackEverybodyInCourse = $is_courseAdmin; // allowed to track all s
/* * ***** MENU ******* */
echo "<tr>
<td>
[<a href='userLog.php?uInfo=$uInfo&view=$view'>" . get_lang('Back') . "</a>]
";
echo " &nbsp;&nbsp;&nbsp;||&nbsp;&nbsp;&nbsp;
[<a href='" . api_get_self() . "?uInfo=$uInfo&view=$view&period=week&reqdate=$reqdate' class='specialLink'>" . get_lang('PeriodWeek') . "</a>]

@ -2,6 +2,7 @@
/* For licensing terms, see /license.txt */
// TODO: Is this file deprecated?
exit;
/**
* @package chamilo.tracking
@ -13,8 +14,9 @@
/* INIT SECTION */
$uInfo = $_REQUEST['uInfo'];
$view = $_REQUEST['view'];
$uInfo = isset($_REQUEST['uInfo']) ? $_REQUEST['uInfo'] : null;
$view = isset($_REQUEST['view']) ? $_REQUEST['view'] : null;
// name of the language file that needs to be included
$language_file = 'tracking';
@ -45,7 +47,7 @@ $interbreadcrumb[]= array ("url"=>"../group/group.php", "name"=> get_lang('BredC
$interbreadcrumb[]= array ("url"=>"../group/group_space.php?gidReq=$_gid", "name"=> get_lang('BredCrumpGroupSpace'));
*/
if(isset($uInfo)) {
if ($uInfo) {
$interbreadcrumb[]= array ('url'=>'../user/userInfo.php?uInfo='.Security::remove_XSS($uInfo), "name"=> api_ucfirst(get_lang('Users')));
}
@ -74,23 +76,8 @@ $is_course_member = CourseManager::is_user_subscribed_in_real_or_linked_course($
// Database Table Definitions
$TABLECOURSUSER = Database::get_main_table(TABLE_MAIN_COURSE_USER);
$TABLEUSER = Database::get_main_table(TABLE_MAIN_USER);
$tbl_session_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$TABLECOURSE_GROUPSUSER = Database::get_course_table(TABLE_GROUP_USER);
$sql = "SELECT 1
FROM $tbl_session_course_user AS session_course_user
INNER JOIN $tbl_session AS session
ON session_course_user.id_session = session.id
AND ((date_start<=NOW()
AND date_end>=NOW())
OR (date_start='0000-00-00' AND date_end='0000-00-00'))
WHERE id_session='".$_SESSION['id_session']."' AND course_code='$_cid'";
//echo $sql;
$result=Database::query($sql);
if(!Database::num_rows($result)){
$disabled = true;
}
$TABLECOURSE_GROUPSUSER = Database::get_course_table(TABLE_GROUP_USER);
$tbl_learnpath_main = Database::get_course_table(TABLE_LP_MAIN);
$tbl_learnpath_item = Database::get_course_table(TABLE_LP_ITEM);

@ -68,21 +68,6 @@ $tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
$TABLECOURSE_GROUPSUSER = Database::get_course_table(TABLE_GROUP_USER);
$sql = "SELECT 1
FROM $tbl_session_course_user AS session_course_user
INNER JOIN $tbl_session AS session
ON session_course_user.id_session = session.id
AND ((date_start<=NOW()
AND date_end>=NOW())
OR (date_start='0000-00-00' AND date_end='0000-00-00'))
WHERE id_session='".$_SESSION['id_session']."' AND course_code='$_cid'";
//echo $sql;
$result=Database::query($sql);
if(!Database::num_rows($result)){
$disabled = true;
}
$tbl_learnpath_main = Database::get_course_table(TABLE_LP_MAIN);
$tbl_learnpath_item = Database::get_course_table(TABLE_LP_ITEM);
$tbl_learnpath_view = Database::get_course_table(TABLE_LP_VIEW);

@ -3106,6 +3106,10 @@ function WSCreateSession($params) {
foreach ($sessions_params as $session_param) {
$name = trim($session_param['name']);
$access_start_date = $session_param['access_start_date'];
$access_end_date = $session_param['access_end_date'];
/*
$year_start = intval($session_param['year_start']);
$month_start = intval($session_param['month_start']);
@ -3129,19 +3133,11 @@ function WSCreateSession($params) {
$results[] = 0;
continue;
}
if (empty($nolimit)){
$date_start="$year_start-".(($month_start < 10)?"0$month_start":$month_start)."-".(($day_start < 10)?"0$day_start":$day_start);
$date_end="$year_end-".(($month_end < 10)?"0$month_end":$month_end)."-".(($day_end < 10)?"0$day_end":$day_end);
} else {
$date_start="000-00-00";
$date_end="000-00-00";
}
if(empty($name)) {
if (empty($name)) {
$results[] = 0;
continue;
} elseif (empty($nolimit) && (!$month_start || !$day_start || !$year_start || !checkdate($month_start, $day_start, $year_start))) {
/*} elseif (empty($nolimit) && (!$month_start || !$day_start || !$year_start || !checkdate($month_start, $day_start, $year_start))) {
$results[] = 0;
continue;
} elseif (empty($nolimit) && (!$month_end || !$day_end || !$year_end || !checkdate($month_end,$day_end,$year_end))) {
@ -3149,9 +3145,9 @@ function WSCreateSession($params) {
continue;
} elseif (empty($nolimit) && $date_start >= $date_end) {
$results[] = 0;
continue;
continue;*/
} else {
$rs = Database::query("SELECT 1 FROM $tbl_session WHERE name='".addslashes($name)."'");
$rs = Database::query("SELECT 1 FROM $tbl_session WHERE name='".Datanbase::escape_string($name)."'");
if (Database::num_rows($rs)) {
$results[] = 0;
continue;
@ -3159,12 +3155,13 @@ function WSCreateSession($params) {
$params = array(
'name' => $name,
'id_coach'=> $id_coach,
'session_admin_id' => $_user['user_id'] ,
'session_admin_id' => $_user['user_id'],
'access_start_date' => $access_start_date,
'access_end_date' => $access_end_date,
);
$id_session = SessionManager::add($params);
//Database::query("INSERT INTO $tbl_session(name,date_start,date_end,id_coach,session_admin_id, VALUES('".addslashes($name)."','$date_start','$date_end','$id_coach',".intval($_user['user_id']).",".$nb_days_acess_before.", ".$nb_days_acess_after.")");
//Database::query("INSERT INTO $tbl_session(name,date_start,date_end,id_coach,session_admin_id, VALUES('".addslashes($name)."','$date_start','$date_end','$id_coach',".intval($_user['user_id']).",".$nb_days_acess_before.", ".$nb_days_acess_after.")");
//$id_session = Database::insert_id();

@ -108,13 +108,8 @@ class BlockSession extends Block {
foreach ($sessions as $session) {
$session_id = intval($session['id']);
$title = $session['name'];
if ($session['date_start'] != '0000-00-00' && $session['date_end'] != '0000-00-00') {
$date = get_lang('From').' '.api_convert_and_format_date($session['date_start'], DATE_FORMAT_SHORT, date_default_timezone_get()).' '.get_lang('To').' '.api_convert_and_format_date($session['date_end'], DATE_FORMAT_SHORT, date_default_timezone_get());
} else {
$date = ' - ';
}
$title = $session['name'];
$date_string = SessionManager::parse_session_dates($session);
$count_courses_in_session = count(Tracking::get_courses_list_from_session($session_id));
@ -123,7 +118,7 @@ class BlockSession extends Block {
$sessions_table .= '<tr class="'.$class_tr.'">
<td>'.$title.'</td>
<td align="center">'.$date.'</td>
<td align="center">'.$date_string.'</td>
<td align="center">'.$count_courses_in_session.'</td>
</tr>';
$i++;

@ -97,7 +97,7 @@ if ($_GET['chatid'] != '') {
$time = date("Y-m-d H:i:s", $time);
$chatid = intval($_GET['chatid']);
if ($_GET['chatid'] == strval(intval($_GET['chatid']))) {
$sql = "update $track_user_table set chatcall_user_id = '".Database::escape_string($_user['user_id'])."', chatcall_date = '".Database::escape_string($time)."', chatcall_text = '' where (user_id = ".(int)Database::escape_string($chatid).")";
$sql = "UPDATE $track_user_table SET chatcall_user_id = '".Database::escape_string($_user['user_id'])."', chatcall_date = '".Database::escape_string($time)."', chatcall_text = '' where (user_id = ".(int)Database::escape_string($chatid).")";
$result = Database::query($sql);
//redirect caller to chat
header("Location: ".api_get_path(WEB_CODE_PATH)."chat/chat.php?".api_get_cidreq()."&origin=whoisonline&target=".Security::remove_XSS($chatid));
@ -113,7 +113,7 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
} else {
$user_list = who_is_online(0, 9);
}
if (!isset($_GET['id'])) {
if (api_get_setting('allow_social_tool') == 'true') {
if (!api_is_anonymous()) {

@ -10,27 +10,29 @@
// name of the language file that needs to be included
$language_file = array ('index', 'chat', 'tracking');
include_once './main/inc/global.inc.php';
require_once './main/inc/global.inc.php';
api_block_anonymous_users();
$tbl_session = Database :: get_main_table(TABLE_MAIN_SESSION);
$tbl_session_course = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE);
$tbl_session_course_user = Database :: get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
/**
* Header
* include the HTTP, HTML headers plus the top banner
*/
if (isset($_REQUEST['session_id'])) {
$session_id = intval($_REQUEST['session_id']);
} else {
$session_id = api_get_session_id();
}
if (empty($session_id)) {
api_not_allowed(true);
}
Display::display_header(get_lang('UserOnlineListSession'));
echo Display::page_header(get_lang('UserOnlineListSession'));
?>
<br /><br />
<table class="data_table" width="60%">
<tr class="tableName">
<td colspan="4">
<strong><?php echo get_lang('UserOnlineListSession'); ?></strong>
</td>
</tr>
<table class="data_table">
<tr>
<th>
<?php echo get_lang('Name'); ?>
@ -48,7 +50,8 @@ Display::display_header(get_lang('UserOnlineListSession'));
<?php
$session_is_coach = array();
if (isset($_user['user_id']) && $_user['user_id'] != '') {
$_user['user_id'] = intval($_user['user_id']);
/*$_user['user_id'] = intval($_user['user_id']);
$result = Database::query("SELECT DISTINCT id,
name,
date_start,
@ -72,10 +75,18 @@ Display::display_header(get_lang('UserOnlineListSession'));
ORDER BY date_start, date_end, name");
while ($session = Database:: fetch_array($result)) {
$session_is_coach[$session['id']] = $session;
}
}*/
$session_is_coach = SessionManager::get_sessions_coached_by_user(api_get_user_id());
$students_online = array();
foreach ($session_is_coach as $session) {
$now = api_get_utc_datetime();
$time_limit = api_get_setting('time_limit_whosonline');
$online_time = time() - $time_limit*60;
$current_date = api_get_utc_datetime($online_time);
foreach ($session_is_coach as $session) {
$sql = "SELECT DISTINCT last_access.access_user_id,
last_access.access_date,
last_access.access_cours_code,
@ -86,7 +97,7 @@ Display::display_header(get_lang('UserOnlineListSession'));
INNER JOIN ".Database::get_main_table(TABLE_MAIN_USER)." AS user
ON user.user_id = last_access.access_user_id
WHERE access_session_id='".$session['id']."'
AND NOW()-access_date<1000 GROUP BY access_user_id";
AND access_date >= '$current_date' GROUP BY access_user_id";
$result = Database::query($sql);
@ -97,26 +108,24 @@ Display::display_header(get_lang('UserOnlineListSession'));
if (count($students_online) > 0) {
foreach ($students_online as $student_online) {
echo "<tr>
<td>
";
echo "<tr><td>";
echo $student_online['name'];
echo " </td>
<td align='center'>
";
echo "</td><td align='center'>";
echo $student_online['access_cours_code'];
echo "</td><td align='center'>";
if (api_get_setting('show_email_addresses') == 'true') {
if (!empty($student_online['email'])) {
echo $student_online['email'];
} else {
echo get_lang('NoEmail');
}
}
echo " </td>
<td align='center'>
";
if (!empty($student_online['email'])) {
echo $student_online['email'];
} else {
echo get_lang('NoEmail');
}
echo " </td>
<td align='center'>
";
echo '<a href="main/chat/chat.php?cidReq='.$student_online['access_cours_code'].'&id_session='.$student_online['access_session_id'].'"> -> </a>';
echo '<a target="_blank" class="btn" href="main/chat/chat.php?cidReq='.$student_online['access_cours_code'].'&id_session='.$student_online['access_session_id'].'">
'.get_lang('Chat').'
</a>';
echo " </td>
</tr>
";
@ -133,10 +142,4 @@ Display::display_header(get_lang('UserOnlineListSession'));
?>
</table>
<?php
/*
==============================================================================
FOOTER
==============================================================================
*/
Display::display_footer();
Display::display_footer();
Loading…
Cancel
Save