Minor - partial merge with 1.11.x

pull/2487/merge
Julio Montoya 7 years ago
parent f96d30f89a
commit cac83af385
  1. 9
      config/packages/ivory_ck_editor.yaml
  2. 10
      license.txt
  3. 10
      user_portal.php
  4. 66
      whoisonline.php
  5. 233
      whoisonlinesession.php

@ -0,0 +1,9 @@
ivory_ck_editor:
default_config: simple_toolbar
configs:
simple_toolbar:
toolbar:
- ['Bold', 'Italic', 'Strike', 'Link']
- ['BulletedList', 'NumberedList', '-', 'Outdent', 'Indent']
- ['Copy', 'Paste', 'PasteFromWord', '-', 'Undo', 'Redo']
- ['Source']

@ -1,16 +1,16 @@
Chamilo LMS - elearning and course management software
Copyright (c) 2008-2017 BeezNest Latino SAC, Peru & BeezNest Belgium SPRL, Belgium
Copyright (c) 2012 Université de Genève, Switzerland
Copyright (c) 2008-2018 BeezNest Latino SAC, Peru & BeezNest Belgium SPRL, Belgium
Copyright (c) 2016-2018 NoSoloRed S.L, Spain
Copyright (c) 2010-2017 Université de Grenoble, France
Copyright (c) 2011-2012 CBlue SPRL, Belgium
Copyright (c) 2012 Université de Genève, Switzerland
Copyright (c) 2004-2012 Juan Carlos Raña (independent), Spain
Copyright (c) 2004-2009 Dokeos SPRL, Belgium
Copyright (c) 2003-2007 Ghent University (UGent)
Copyright (c) 2001-2004 Universite catholique de Louvain (UCL)
Copyright (c) 2003-2008 Vrije Universiteit Brussel (VUB)
Copyright (c) 2004-2008 Hoogeschool Gent (HoGent)
Copyright (c) 2003-2007 Ghent University (UGent)
Copyright (c) 2001-2004 Universite catholique de Louvain (UCL)
For a full list of contributors detaining copyrights over parts of
the Chamilo software, see "documentation/credits.html".

@ -146,7 +146,6 @@ if (!$myCourseListAsCategory) {
}
// if teacher, session coach or admin, display the button to change te course view
if ($displayMyCourseViewBySessionLink &&
(
api_is_drh() ||
@ -213,7 +212,7 @@ if (api_get_setting('go_to_course_after_login') == 'true') {
// Session has many courses.
if (isset($sessionInfo['session_id'])) {
$url = api_get_path(WEB_CODE_PATH).'session/?session_id='.$sessionInfo['session_id'];
$url = api_get_path(WEB_CODE_PATH).'session/index.php?session_id='.$sessionInfo['session_id'];
header('Location:'.$url);
exit;
@ -226,10 +225,7 @@ if (api_get_setting('go_to_course_after_login') == 'true') {
$count_of_sessions == 0 &&
$count_of_courses_no_sessions == 1
) {
$courses = CourseManager::get_courses_list_by_user_id(
$userId
);
$courses = CourseManager::get_courses_list_by_user_id($userId);
if (!empty($courses) && isset($courses[0]) && isset($courses[0]['code'])) {
$courseInfo = api_get_course_info_by_id($courses[0]['real_id']);
if (!empty($courseInfo)) {
@ -287,7 +283,7 @@ $controller->tpl->assign('course_block', $controller->return_course_block());
$controller->tpl->assign('navigation_course_links', $controller->return_navigation_links());
$controller->tpl->assign('search_block', $controller->return_search_block());
$controller->tpl->assign('notice_block', $controller->return_notice());
$controller->tpl->assign('classes_block', $controller->return_classes_block());
$controller->tpl->assign('classes_block', $controller->returnClassesBlock());
$controller->tpl->assign('skills_block', $controller->returnSkillLinks());
$historyClass = '';

@ -8,7 +8,6 @@ if (!isset($_GET['cidReq'])) {
$cidReset = true;
}
// including necessary files
require_once './main/inc/global.inc.php';
if (isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0) {
@ -20,48 +19,45 @@ $social_right_content = '';
$whoisonline_list = '';
$social_search = '';
$userId = api_get_user_id();
$access = accessToWhoIsOnline();
// This if statement prevents users accessing the who's online feature when it has been disabled.
if ((api_get_setting('showonline', 'world') == 'true' && !$userId) ||
((api_get_setting('showonline', 'users') == 'true' ||
api_get_setting('showonline', 'course') == 'true') && $userId)
) {
if (isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0) {
$user_list = who_is_online_in_this_course(
0,
MAX_ONLINE_USERS,
api_get_user_id(),
api_get_setting('time_limit_whosonline'),
$_GET['cidReq']
);
} else {
$user_list = who_is_online(0, MAX_ONLINE_USERS);
}
if (!$access) {
api_not_allowed(true);
}
if ($user_list) {
if (!isset($_GET['id'])) {
if (api_get_setting('allow_social_tool') == 'true') {
if (!api_is_anonymous()) {
$query = isset($_GET['q']) ? $_GET['q'] : null;
$social_search = UserManager::get_search_form($query);
}
if (isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0) {
$user_list = who_is_online_in_this_course(
0,
MAX_ONLINE_USERS,
api_get_user_id(),
api_get_setting('time_limit_whosonline'),
$_GET['cidReq']
);
} else {
$user_list = who_is_online(0, MAX_ONLINE_USERS);
}
if ($user_list) {
if (!isset($_GET['id'])) {
if (api_get_setting('allow_social_tool') == 'true') {
if (!api_is_anonymous()) {
$query = isset($_GET['q']) ? $_GET['q'] : null;
$social_search = UserManager::get_search_form($query);
}
$social_right_content .= SocialManager::display_user_list($user_list);
}
$social_right_content .= SocialManager::display_user_list($user_list);
}
}
$whoisonline_list .= SocialManager::display_user_list($user_list);
$whoisonline_list .= SocialManager::display_user_list($user_list);
if (isset($_GET['id'])) {
if (api_get_setting('allow_social_tool') == 'true' && api_user_is_login()) {
header("Location: ".api_get_path(WEB_CODE_PATH)."social/profile.php?u=".intval($_GET['id']));
exit;
} else {
$social_right_content .= SocialManager::display_individual_user($_GET['id']);
}
if (isset($_GET['id'])) {
if (api_get_setting('allow_social_tool') == 'true' && api_user_is_login()) {
header("Location: ".api_get_path(WEB_CODE_PATH)."social/profile.php?u=".intval($_GET['id']));
exit;
} else {
$social_right_content .= SocialManager::display_individual_user($_GET['id']);
}
} else {
api_not_allowed(true);
}
$tpl = new Template(get_lang('UsersOnLineList'));

@ -6,71 +6,52 @@
*
* @package chamilo.main
*/
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_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
$userId = api_get_user_id();
if (empty($userId)) {
api_not_allowed(true);
}
/**
* Header
* include the HTTP, HTML headers plus the top banner.
*/
Display::display_header(get_lang('UserOnlineListSession'));
?>
<br />
<table class="data_table">
<tr class="tableName">
<td colspan="4">
<strong><?php echo get_lang('UserOnlineListSession'); ?></strong>
</td>
</tr>
<tr>
<th>
<?php echo get_lang('Name'); ?>
</th>
<th>
<?php echo get_lang('InCourse'); ?>
</th>
<th>
<?php echo get_lang('Email'); ?>
</th>
<th>
<?php echo get_lang('Chat'); ?>
</th>
</tr>
<?php
$session_is_coach = [];
if (isset($_user['user_id']) && $_user['user_id'] != '') {
$_user['user_id'] = intval($_user['user_id']);
$sql = "SELECT DISTINCT session.id,
name,
access_start_date,
access_end_date
FROM $tbl_session as session
INNER JOIN $tbl_session_course_user as srcru
ON
srcru.user_id = ".$_user['user_id']." AND
srcru.status=2 AND
session.id = srcru.session_id
ORDER BY access_start_date, access_end_date, name";
$result = Database::query($sql);
$sessionId = api_get_session_id();
if (empty($sessionId)) {
api_not_allowed(true);
}
while ($session = Database:: fetch_array($result)) {
$session_is_coach[$session['id']] = $session;
}
$allow = api_is_platform_admin(true) ||
api_is_coach($sessionId, null, false) ||
SessionManager::isUserSubscribedAsStudent($sessionId, api_get_user_id());
$sql = "SELECT DISTINCT session.id,
name,
access_start_date,
access_end_date
FROM $tbl_session as session
WHERE session.id_coach = ".$_user['user_id']."
ORDER BY access_start_date, access_end_date, name";
$result = Database::query($sql);
while ($session = Database:: fetch_array($result)) {
$session_is_coach[$session['id']] = $session;
if (!$allow) {
api_not_allowed(true);
}
$maxNumberItems = 20;
$sessionInfo = api_get_session_info($sessionId);
Display::display_header(get_lang('UsersOnLineList'));
echo Display::page_header($sessionInfo['name']);
function getUsers(
$from,
$numberItems,
$column,
$direction,
$getCount = false
) {
$sessionId = api_get_session_id();
$from = (int) $from;
$numberItems = (int) $numberItems;
$urlCondition = '';
$urlJoin = '';
if (api_is_multiple_url_enabled()) {
$accessUrlUser = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
$urlId = api_get_current_access_url_id();
$urlJoin = " INNER JOIN $accessUrlUser a ON (a.user_id = user.id) ";
$urlCondition = " AND a.access_url_id = $urlId ";
}
if (empty($time_limit)) {
@ -81,65 +62,89 @@ if (isset($_user['user_id']) && $_user['user_id'] != '') {
$online_time = time() - $time_limit * 60;
$current_date = api_get_utc_datetime($online_time);
$students_online = [];
foreach ($session_is_coach as $session) {
$sql = "SELECT DISTINCT last_access.access_user_id,
last_access.access_date,
last_access.c_id,
last_access.access_session_id,
".(api_is_western_name_order() ? "CONCAT(user.firstname,' ',user.lastname)" : "CONCAT(user.lastname,' ',user.firstname)")." as name,
user.email
FROM ".Database::get_main_table(TABLE_STATISTIC_TRACK_E_LASTACCESS)." AS last_access
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 access_date >= '$current_date'
GROUP BY access_user_id";
if ($getCount) {
$sql = "SELECT
count(DISTINCT last_access.login_user_id) count
FROM ".Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE)." AS last_access
INNER JOIN ".Database::get_main_table(TABLE_MAIN_USER)." AS user
ON user.id = last_access.login_user_id
$urlJoin
WHERE
session_id ='".$sessionId."' AND
login_date >= '$current_date'
$urlCondition";
$result = Database::query($sql);
while ($user_list = Database::fetch_array($result)) {
$students_online[$user_list['access_user_id']] = $user_list;
}
$result = Database::fetch_array($result);
return $result['count'];
}
if (count($students_online) > 0) {
foreach ($students_online as $student_online) {
echo "<tr>
<td>
";
echo $student_online['name'];
echo " </td>
<td>
";
$courseInfo = api_get_course_info_by_id($student_online['c_id']);
echo $courseInfo['title'];
echo " </td>
<td>
";
if (!empty($student_online['email'])) {
echo $student_online['email'];
} else {
echo get_lang('NoEmail');
}
echo " </td>
<td>
";
echo '<a href="main/chat/chat.php?cidReq='.$courseInfo['code'].'&id_session='.$student_online['access_session_id'].'"> -> </a>';
echo " </td>
</tr>
";
}
} else {
echo ' <tr>
<td colspan="4">
'.get_lang('NoOnlineStudents').'
</td>
</tr>
';
$sql = "SELECT DISTINCT
last_access.login_user_id,
last_access.c_id
FROM ".Database::get_main_table(TABLE_STATISTIC_TRACK_E_ONLINE)." AS last_access
INNER JOIN ".Database::get_main_table(TABLE_MAIN_USER)." AS user
ON user.id = last_access.login_user_id
$urlJoin
WHERE
session_id ='".$sessionId."' AND
login_date >= '$current_date'
$urlCondition
GROUP BY login_user_id
LIMIT $from, $numberItems";
$studentsOnline = [];
$result = Database::query($sql);
while ($user_list = Database::fetch_array($result)) {
$studentsOnline[$user_list['login_user_id']] = $user_list;
}
return $studentsOnline;
}
function getCountUsers()
{
return getUsers(0, 0, 0, 0, true);
}
$table = new SortableTable(
'users',
'getCountUsers',
'getUsers',
'1',
$maxNumberItems
);
$table->set_header(0, get_lang('Name'), false);
$table->set_header(1, get_lang('InCourse'), false);
$table->set_column_filter(0, 'user_filter');
$table->set_column_filter(1, 'course_filter');
$table->display();
function user_filter($userId, $urlParams, $row)
{
$userInfo = api_get_user_info($userId);
return $userInfo['complete_name_with_message_link'];
}
function course_filter($courseId, $urlParams, $row)
{
$sessionId = api_get_session_id();
$courseInfo = api_get_course_info_by_id($courseId);
return Display::url(
$courseInfo['title'],
$courseInfo['course_public_url'].'?id_session='.$sessionId,
['target' => '_blank']
).
'&nbsp;'.
Display::url(
get_lang('Chat'),
'main/chat/chat.php?cidReq='.$courseInfo['code'].'&id_session='.$sessionId,
['target' => '_blank', 'class' => 'btn btn-primary']
);
}
?>
</table>
<?php
Display::display_footer();

Loading…
Cancel
Save