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

Rename properly $is_courseCoach and api_is_course_coach - refs BT#12881

Browse Source
pull/2487/head
Angel Fernando Quiroz Campos 9 years ago
parent 0a0fda5b8b
commit 0532419f13
28 changed files with 63 additions and 75 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. 4
      main/announcements/announcements.php
  2. 2
      main/auth/shibboleth/lib/shibboleth_session.class.php
  3. 2
      main/calendar/agenda.php
  4. 4
      main/exercise/exercise_report.php
  5. 4
      main/exercise/hotpotatoes_exercise_report.php
  6. 2
      main/forum/editthread.php
  7. 2
      main/forum/forumfunction.inc.php
  8. 2
      main/forum/viewforum.php
  9. 2
      main/forum/viewthread.php
  10. 8
      main/forum/viewthread_flat.inc.php
  11. 8
      main/forum/viewthread_nested.inc.php
  12. 6
      main/forum/viewthread_threaded.inc.php
  13. 2
      main/gradebook/gradebook_flatview.php
  14. 2
      main/inc/ajax/announcement.ajax.php
  15. 2
      main/inc/lib/AnnouncementManager.php
  16. 2
      main/inc/lib/CourseChatUtils.php
  17. 16
      main/inc/lib/api.lib.php
  18. 4
      main/inc/lib/groupmanager.lib.php
  19. 14
      main/inc/lib/login.lib.php
  20. 26
      main/inc/local.inc.php
  21. 2
      main/survey/create_new_survey.php
  22. 2
      main/survey/survey.php
  23. 8
      main/survey/survey_list.php
  24. 2
      main/tracking/course_session_report.php
  25. 2
      main/tracking/exams.php
  26. 2
      main/tracking/lp_results_by_user.php
  27. 2
      main/tracking/question_course_report.php
  28. 2
      user_portal.php

4
main/announcements/announcements.php
Unescape View File

@ -297,7 +297,7 @@ switch ($action) {
api_not_allowed(); api_not_allowed();
} }
if (!api_is_course_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $id)) { if (!api_is_session_general_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $id)) {
AnnouncementManager::delete_announcement($_course, $id); AnnouncementManager::delete_announcement($_course, $id);
Display::addFlash(Display::return_message(get_lang('AnnouncementDeleted'))); Display::addFlash(Display::return_message(get_lang('AnnouncementDeleted')));
} }
@ -331,7 +331,7 @@ switch ($action) {
api_not_allowed(); api_not_allowed();
} }
if (!api_is_course_coach() || if (!api_is_session_general_coach() ||
api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $_GET['id']) api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $_GET['id'])
) { ) {
AnnouncementManager::change_visibility_announcement( AnnouncementManager::change_visibility_announcement(

2
main/auth/shibboleth/lib/shibboleth_session.class.php
Unescape View File

@ -56,7 +56,7 @@ class ShibbolethSession
* This is BAD. Logic should be migrated into a function and stop relying on global variables. * This is BAD. Logic should be migrated into a function and stop relying on global variables.
*/ */
global $_uid, $is_allowedCreateCourse, $is_platformAdmin, $_real_cid, $is_courseAdmin; global $_uid, $is_allowedCreateCourse, $is_platformAdmin, $_real_cid, $is_courseAdmin;
global $is_courseMember, $is_courseTutor, $is_courseCoach, $is_allowed_in_course, $is_sessionAdmin, $_gid; global $is_courseMember, $is_courseTutor, $is_session_general_coach, $is_allowed_in_course, $is_sessionAdmin, $_gid;
$_uid = $uid; $_uid = $uid;
//is_allowedCreateCourse //is_allowedCreateCourse

2
main/calendar/agenda.php
Unescape View File

@ -285,7 +285,7 @@ if ($allowToEdit) {
$content = $form->returnForm(); $content = $form->returnForm();
break; break;
case "delete": case "delete":
if (!(api_is_course_coach() && !api_is_element_in_the_session(TOOL_AGENDA, $eventId))) { if (!(api_is_session_general_coach() && !api_is_element_in_the_session(TOOL_AGENDA, $eventId))) {
// a coach can only delete an element belonging to his session // a coach can only delete an element belonging to his session
$content = $agenda->deleteEvent($eventId); $content = $agenda->deleteEvent($eventId);
} }

4
main/exercise/exercise_report.php
Unescape View File

@ -74,7 +74,7 @@ if (!empty($_GET['path'])) {
if (!empty($_REQUEST['export_report']) && $_REQUEST['export_report'] == '1') { if (!empty($_REQUEST['export_report']) && $_REQUEST['export_report'] == '1') {
if (api_is_platform_admin() || api_is_course_admin() || if (api_is_platform_admin() || api_is_course_admin() ||
api_is_course_tutor() || api_is_course_coach() api_is_course_tutor() || api_is_session_general_coach()
) { ) {
$loadExtraData = false; $loadExtraData = false;
if (isset($_REQUEST['extra_data']) && $_REQUEST['extra_data'] == 1) { if (isset($_REQUEST['extra_data']) && $_REQUEST['extra_data'] == 1) {
@ -262,7 +262,7 @@ $actions = null;
if ($is_allowedToEdit && $origin != 'learnpath') { if ($is_allowedToEdit && $origin != 'learnpath') {
// the form // the form
if (api_is_platform_admin() || api_is_course_admin() || if (api_is_platform_admin() || api_is_course_admin() ||
api_is_course_tutor() || api_is_course_coach() api_is_course_tutor() || api_is_session_general_coach()
) { ) {
$actions .= '<a href="admin.php?exerciseId='.intval($_GET['exerciseId']).'">'.Display::return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>'; $actions .= '<a href="admin.php?exerciseId='.intval($_GET['exerciseId']).'">'.Display::return_icon('back.png', get_lang('GoBackToQuestionList'), '', ICON_SIZE_MEDIUM).'</a>';
$actions .= '<a href="live_stats.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'">'.Display::return_icon('activity_monitor.png', get_lang('LiveResults'), '', ICON_SIZE_MEDIUM).'</a>'; $actions .= '<a href="live_stats.php?'.api_get_cidreq().'&exerciseId='.$exercise_id.'">'.Display::return_icon('activity_monitor.png', get_lang('LiveResults'), '', ICON_SIZE_MEDIUM).'</a>';

4
main/exercise/hotpotatoes_exercise_report.php
Unescape View File

@ -54,7 +54,7 @@ if (!empty($_REQUEST['path'])) {
$origin = isset($origin) ? $origin : null; $origin = isset($origin) ? $origin : null;
if (!empty($_REQUEST['export_report']) && $_REQUEST['export_report'] == '1') { if (!empty($_REQUEST['export_report']) && $_REQUEST['export_report'] == '1') {
if (api_is_platform_admin() || api_is_course_admin() || api_is_course_tutor() || api_is_course_coach()) { if (api_is_platform_admin() || api_is_course_admin() || api_is_course_tutor() || api_is_session_general_coach()) {
$load_extra_data = false; $load_extra_data = false;
if (isset($_REQUEST['extra_data']) && $_REQUEST['extra_data'] == 1) { if (isset($_REQUEST['extra_data']) && $_REQUEST['extra_data'] == 1) {
$load_extra_data = true; $load_extra_data = true;
@ -71,7 +71,7 @@ if (!empty($_REQUEST['export_report']) && $_REQUEST['export_report'] == '1') {
$actions = null; $actions = null;
if ($is_allowedToEdit && $origin != 'learnpath') { if ($is_allowedToEdit && $origin != 'learnpath') {
// the form // the form
if (api_is_platform_admin() || api_is_course_admin() || api_is_course_tutor() || api_is_course_coach()) { if (api_is_platform_admin() || api_is_course_admin() || api_is_course_tutor() || api_is_session_general_coach()) {
$actions .= '<a id="export_opener" href="'.api_get_self().'?export_report=1&path='.$hotpotatoes_path.' ">'. $actions .= '<a id="export_opener" href="'.api_get_self().'?export_report=1&path='.$hotpotatoes_path.' ">'.
Display::return_icon('save.png', get_lang('Export'), '', ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('save.png', get_lang('Export'), '', ICON_SIZE_MEDIUM).'</a>';
} }

2
main/forum/editthread.php
Unescape View File

@ -168,7 +168,7 @@ $form->addElement('text', 'thread_title', get_lang('Title'));
$form->addElement('advanced_settings', 'advanced_params', get_lang('AdvancedParameters')); $form->addElement('advanced_settings', 'advanced_params', get_lang('AdvancedParameters'));
$form->addElement('html', '<div id="advanced_params_options" style="display:none">'); $form->addElement('html', '<div id="advanced_params_options" style="display:none">');
if ((api_is_course_admin() || api_is_course_coach() || api_is_course_tutor()) && ($threadId)) { if ((api_is_course_admin() || api_is_session_general_coach() || api_is_course_tutor()) && ($threadId)) {
// Thread qualify // Thread qualify
if (Gradebook::is_active()) { if (Gradebook::is_active()) {
//Loading gradebook select //Loading gradebook select

2
main/forum/forumfunction.inc.php
Unescape View File

@ -2879,7 +2879,7 @@ function show_add_post_form($current_forum, $forum_setting, $action, $id = '', $
} }
if (Gradebook::is_active() && if (Gradebook::is_active() &&
(api_is_course_admin() || api_is_course_coach() || api_is_course_tutor()) && !($myThread) (api_is_course_admin() || api_is_session_general_coach() || api_is_course_tutor()) && !($myThread)
) { ) {
$form->addElement('advanced_settings', 'advanced_params', get_lang('AdvancedParameters')); $form->addElement('advanced_settings', 'advanced_params', get_lang('AdvancedParameters'));
$form->addElement('html', '<div id="advanced_params_options" style="display:none">'); $form->addElement('html', '<div id="advanced_params_options" style="display:none">');

2
main/forum/viewforum.php
Unescape View File

@ -574,7 +574,7 @@ if (is_array($threads)) {
$iconsEdit = ''; $iconsEdit = '';
if ($origin != 'learnpath') { if ($origin != 'learnpath') {
if (api_is_allowed_to_edit(false, true) && if (api_is_allowed_to_edit(false, true) &&
!(api_is_course_coach() && $current_forum['session_id'] != $sessionId) !(api_is_session_general_coach() && $current_forum['session_id'] != $sessionId)
) { ) {
$iconsEdit .= '<a href="'.$forumUrl.'editthread.php?'.$cidreq $iconsEdit .= '<a href="'.$forumUrl.'editthread.php?'.$cidreq
. '&forum='.$my_forum.'&thread=' . '&forum='.$my_forum.'&thread='

2
main/forum/viewthread.php
Unescape View File

@ -198,7 +198,7 @@ if ($my_message != 'PostDeletedSpecial') {
// new thread link // new thread link
if (( if ((
api_is_allowed_to_edit(false, true) && api_is_allowed_to_edit(false, true) &&
!(api_is_course_coach() && $current_forum['session_id'] != $sessionId) !(api_is_session_general_coach() && $current_forum['session_id'] != $sessionId)
) || ) ||
($current_forum['allow_new_threads'] == 1 && isset($_user['user_id'])) || ($current_forum['allow_new_threads'] == 1 && isset($_user['user_id'])) ||
($current_forum['allow_new_threads'] == 1 && !isset($_user['user_id']) && $current_forum['allow_anonymous'] == 1) ($current_forum['allow_new_threads'] == 1 && !isset($_user['user_id']) && $current_forum['allow_anonymous'] == 1)

8
main/forum/viewthread_flat.inc.php
Unescape View File

@ -162,7 +162,7 @@ if (isset($current_thread['thread_id'])) {
($current_forum['allow_edit'] == 1 && $row['user_id'] == $_user['user_id']) || ($current_forum['allow_edit'] == 1 && $row['user_id'] == $_user['user_id']) ||
( (
api_is_allowed_to_edit(false, true) && api_is_allowed_to_edit(false, true) &&
!(api_is_course_coach() && $current_forum['session_id'] != $sessionId) !(api_is_session_general_coach() && $current_forum['session_id'] != $sessionId)
) )
) { ) {
if (api_is_allowed_to_session_edit(false, true)) { if (api_is_allowed_to_session_edit(false, true)) {
@ -178,7 +178,7 @@ if (isset($current_thread['thread_id'])) {
if ($origin != 'learnpath') { if ($origin != 'learnpath') {
if (GroupManager::is_tutor_of_group($userId, $groupInfo) || if (GroupManager::is_tutor_of_group($userId, $groupInfo) ||
api_is_allowed_to_edit(false, true) && api_is_allowed_to_edit(false, true) &&
!(api_is_course_coach() && $current_forum['session_id'] != $sessionId) !(api_is_session_general_coach() && $current_forum['session_id'] != $sessionId)
) { ) {
if ($locked === false) { if ($locked === false) {
$deleteUrl = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([ $deleteUrl = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([
@ -205,7 +205,7 @@ if (isset($current_thread['thread_id'])) {
if (GroupManager::is_tutor_of_group($userId, $groupInfo) || if (GroupManager::is_tutor_of_group($userId, $groupInfo) ||
(api_is_allowed_to_edit(false, true) && (api_is_allowed_to_edit(false, true) &&
!(api_is_course_coach() && $current_forum['session_id'] != $sessionId) !(api_is_session_general_coach() && $current_forum['session_id'] != $sessionId)
) )
) { ) {
$iconEdit .= return_visible_invisible_icon( $iconEdit .= return_visible_invisible_icon(
@ -318,7 +318,7 @@ if (isset($current_thread['thread_id'])) {
$html .= '<a href="download.php?file='.$realname.'"> '.$user_filename.' </a>'; $html .= '<a href="download.php?file='.$realname.'"> '.$user_filename.' </a>';
if (($current_forum['allow_edit'] == 1 && $row['user_id'] == $_user['user_id']) || if (($current_forum['allow_edit'] == 1 && $row['user_id'] == $_user['user_id']) ||
(api_is_allowed_to_edit(false, true) && !(api_is_course_coach() && $current_forum['session_id'] != $sessionId)) (api_is_allowed_to_edit(false, true) && !(api_is_session_general_coach() && $current_forum['session_id'] != $sessionId))
) { ) {
$html .= '&nbsp;&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete_attach&id_attach=' $html .= '&nbsp;&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete_attach&id_attach='
. $attachment['iid'].'&forum='.$clean_forum_id.'&thread='.$clean_thread_id . $attachment['iid'].'&forum='.$clean_forum_id.'&thread='.$clean_thread_id

8
main/forum/viewthread_nested.inc.php
Unescape View File

@ -118,7 +118,7 @@ foreach ($posts as $post) {
if ((isset($groupInfo['iid']) && $tutorGroup) || if ((isset($groupInfo['iid']) && $tutorGroup) ||
($current_forum['allow_edit'] == 1 && $post['user_id'] == $userId) || ($current_forum['allow_edit'] == 1 && $post['user_id'] == $userId) ||
(api_is_allowed_to_edit(false, true) && (api_is_allowed_to_edit(false, true) &&
!(api_is_course_coach() && $current_forum['session_id'] != $sessionId)) !(api_is_session_general_coach() && $current_forum['session_id'] != $sessionId))
) { ) {
if ($locked == false && postIsEditableByStudent($current_forum, $post)) { if ($locked == false && postIsEditableByStudent($current_forum, $post)) {
$editUrl = api_get_path(WEB_CODE_PATH).'forum/editpost.php?'.api_get_cidreq(); $editUrl = api_get_path(WEB_CODE_PATH).'forum/editpost.php?'.api_get_cidreq();
@ -139,7 +139,7 @@ foreach ($posts as $post) {
if ((isset($groupInfo['iid']) && $tutorGroup) || if ((isset($groupInfo['iid']) && $tutorGroup) ||
api_is_allowed_to_edit(false, true) && api_is_allowed_to_edit(false, true) &&
!(api_is_course_coach() && $current_forum['session_id'] != $sessionId) !(api_is_session_general_coach() && $current_forum['session_id'] != $sessionId)
) { ) {
if ($locked == false) { if ($locked == false) {
$deleteUrl = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([ $deleteUrl = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([
@ -164,7 +164,7 @@ foreach ($posts as $post) {
if (api_is_allowed_to_edit(false, true) && if (api_is_allowed_to_edit(false, true) &&
!( !(
api_is_course_coach() && api_is_session_general_coach() &&
$current_forum['session_id'] != $sessionId $current_forum['session_id'] != $sessionId
) )
) { ) {
@ -333,7 +333,7 @@ foreach ($posts as $post) {
$html .= ' "> '.$user_filename.' </a>'; $html .= ' "> '.$user_filename.' </a>';
$html .= '<span class="forum_attach_comment" >'.$attachment['comment'].'</span>'; $html .= '<span class="forum_attach_comment" >'.$attachment['comment'].'</span>';
if (($current_forum['allow_edit'] == 1 && $post['user_id'] == $userId) || if (($current_forum['allow_edit'] == 1 && $post['user_id'] == $userId) ||
(api_is_allowed_to_edit(false, true) && !(api_is_course_coach() && $current_forum['session_id'] != $sessionId)) (api_is_allowed_to_edit(false, true) && !(api_is_session_general_coach() && $current_forum['session_id'] != $sessionId))
) { ) {
$html .= '&nbsp;&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete_attach&id_attach=' $html .= '&nbsp;&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&action=delete_attach&id_attach='
. $attachment['iid'].'&forum='.$clean_forum_id.'&thread='.$clean_thread_id . $attachment['iid'].'&forum='.$clean_forum_id.'&thread='.$clean_thread_id

6
main/forum/viewthread_threaded.inc.php
Unescape View File

@ -242,7 +242,7 @@ if (
$row['user_id'] == $_user['user_id'] $row['user_id'] == $_user['user_id']
) || ( ) || (
api_is_allowed_to_edit(false, true) && !( api_is_allowed_to_edit(false, true) && !(
api_is_course_coach() && api_is_session_general_coach() &&
$current_forum['session_id'] != $sessionId $current_forum['session_id'] != $sessionId
) )
) )
@ -279,7 +279,7 @@ if (!empty($my_post) && is_array($my_post)) {
if ( if (
(isset($groupInfo['iid']) && GroupManager::is_tutor_of_group(api_get_user_id(), $groupInfo)) || (isset($groupInfo['iid']) && GroupManager::is_tutor_of_group(api_get_user_id(), $groupInfo)) ||
api_is_allowed_to_edit(false, true) && api_is_allowed_to_edit(false, true) &&
!(api_is_course_coach() && $current_forum['session_id'] != $sessionId) !(api_is_session_general_coach() && $current_forum['session_id'] != $sessionId)
) { ) {
if ($locked == false) { if ($locked == false) {
echo "<a href=\"".api_get_self()."?".api_get_cidreq(). echo "<a href=\"".api_get_self()."?".api_get_cidreq().
@ -434,7 +434,7 @@ if (!empty($attachment_list) && is_array($attachment_list)) {
if ( if (
($current_forum['allow_edit'] == 1 && $rows[$display_post_id]['user_id'] == $_user['user_id']) || ($current_forum['allow_edit'] == 1 && $rows[$display_post_id]['user_id'] == $_user['user_id']) ||
(api_is_allowed_to_edit(false, true) && !(api_is_course_coach() && $current_forum['session_id'] != $sessionId)) (api_is_allowed_to_edit(false, true) && !(api_is_session_general_coach() && $current_forum['session_id'] != $sessionId))
) { ) {
echo '&nbsp;&nbsp;<a href="'.api_get_self().'?'. echo '&nbsp;&nbsp;<a href="'.api_get_self().'?'.
api_get_cidreq().'&action=delete_attach&id_attach='.$attachment['id'].'&forum='.$forumId. api_get_cidreq().'&action=delete_attach&id_attach='.$attachment['id'].'&forum='.$forumId.

2
main/gradebook/gradebook_flatview.php
Unescape View File

@ -210,7 +210,7 @@ if (isset($_GET['print'])) {
if (!empty($_GET['export_report']) && if (!empty($_GET['export_report']) &&
$_GET['export_report'] == 'export_report' $_GET['export_report'] == 'export_report'
) { ) {
if (api_is_platform_admin() || api_is_course_admin() || api_is_course_coach() || $isDrhOfCourse) { if (api_is_platform_admin() || api_is_course_admin() || api_is_session_general_coach() || $isDrhOfCourse) {
$user_id = null; $user_id = null;
if (empty($_SESSION['export_user_fields'])) { if (empty($_SESSION['export_user_fields'])) {

2
main/inc/ajax/announcement.ajax.php
Unescape View File

@ -24,7 +24,7 @@ switch ($action) {
$list = explode(',', $_REQUEST['id']); $list = explode(',', $_REQUEST['id']);
foreach ($list as $itemId) { foreach ($list as $itemId) {
if (!api_is_course_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $itemId)) { if (!api_is_session_general_coach() || api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $itemId)) {
AnnouncementManager::delete_announcement($courseInfo, $itemId); AnnouncementManager::delete_announcement($courseInfo, $itemId);
} }
} }

2
main/inc/lib/AnnouncementManager.php
Unescape View File

@ -1620,7 +1620,7 @@ class AnnouncementManager
// we can edit if : we are the teacher OR the element belongs to // we can edit if : we are the teacher OR the element belongs to
// the session we are coaching OR the option to allow users to edit is on // the session we are coaching OR the option to allow users to edit is on
if (api_is_allowed_to_edit(false, true) || if (api_is_allowed_to_edit(false, true) ||
(api_is_course_coach() && api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $myrow['id'])) (api_is_session_general_coach() && api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $myrow['id']))
|| (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous()) || (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())
) { ) {
$modify_icons = "<a href=\"".$actionUrl."&action=modify&id=".$myrow['id']."\">". $modify_icons = "<a href=\"".$actionUrl."&action=modify&id=".$myrow['id']."\">".

2
main/inc/lib/CourseChatUtils.php
Unescape View File

@ -1678,7 +1678,7 @@ class CourseChatUtils
} }
$history .= '</div>'; $history .= '</div>';
if ($isMaster || $GLOBALS['is_courseCoach']) { if ($isMaster || $GLOBALS['is_session_general_coach']) {
$history .= ' $history .= '
<div id="clear-chat"> <div id="clear-chat">
<button type="button" id="chat-reset" class="btn btn-danger btn-sm"> <button type="button" id="chat-reset" class="btn btn-danger btn-sm">

16
main/inc/lib/api.lib.php
Unescape View File

@ -2628,9 +2628,9 @@ function api_is_course_admin()
* Based on the presence of user in session.id_coach (session general coach) * Based on the presence of user in session.id_coach (session general coach)
* @return bool True if current user is a course coach * @return bool True if current user is a course coach
*/ */
function api_is_course_coach() function api_is_session_general_coach()
{ {
return Session::read('is_courseCoach'); return Session::read('is_session_general_coach');
} }
/** /**
@ -5494,7 +5494,6 @@ function api_is_course_visible_for_user($userid = null, $cid = null) {
// This user has got a recorded state for this course. // This user has got a recorded state for this course.
$cuData = Database::fetch_array($result); $cuData = Database::fetch_array($result);
$is_courseMember = true; $is_courseMember = true;
$is_courseTutor = ($cuData['is_tutor'] == 1);
$is_courseAdmin = ($cuData['status'] == 1); $is_courseAdmin = ($cuData['status'] == 1);
} }
@ -5519,17 +5518,11 @@ function api_is_course_visible_for_user($userid = null, $cid = null) {
if ($row[0]['id_coach'] == $userid) { if ($row[0]['id_coach'] == $userid) {
$is_courseMember = true; $is_courseMember = true;
$is_courseTutor = true;
$is_courseAdmin = false; $is_courseAdmin = false;
$is_courseCoach = true;
$is_sessionAdmin = false;
} }
elseif ($row[0]['session_admin_id'] == $userid) { elseif ($row[0]['session_admin_id'] == $userid) {
$is_courseMember = false; $is_courseMember = false;
$is_courseTutor = false;
$is_courseAdmin = false; $is_courseAdmin = false;
$is_courseCoach = false;
$is_sessionAdmin = true;
} else { } else {
// Check if the current user is the course coach. // Check if the current user is the course coach.
$sql = "SELECT 1 $sql = "SELECT 1
@ -5543,9 +5536,6 @@ function api_is_course_visible_for_user($userid = null, $cid = null) {
//if ($row = Database::fetch_array($result)) { //if ($row = Database::fetch_array($result)) {
if (Database::num_rows($result) > 0) { if (Database::num_rows($result) > 0) {
$is_courseMember = true; $is_courseMember = true;
$is_courseTutor = true;
$is_courseCoach = true;
$is_sessionAdmin = false;
$tbl_user = Database::get_main_table(TABLE_MAIN_USER); $tbl_user = Database::get_main_table(TABLE_MAIN_USER);
@ -5573,9 +5563,7 @@ function api_is_course_visible_for_user($userid = null, $cid = null) {
// This user haa got a recorded state for this course. // This user haa got a recorded state for this course.
while ($row = Database::fetch_array($result)) { while ($row = Database::fetch_array($result)) {
$is_courseMember = true; $is_courseMember = true;
$is_courseTutor = false;
$is_courseAdmin = false; $is_courseAdmin = false;
$is_sessionAdmin = false;
} }
} }
} }

4
main/inc/lib/groupmanager.lib.php
Unescape View File

@ -2027,7 +2027,7 @@ class GroupManager
return true; return true;
} }
if (api_is_course_coach() && $groupInfo['session_id'] == $sessionId) { if (api_is_session_general_coach() && $groupInfo['session_id'] == $sessionId) {
return true; return true;
} }
@ -2267,7 +2267,7 @@ class GroupManager
$url = api_get_path(WEB_CODE_PATH).'group/'; $url = api_get_path(WEB_CODE_PATH).'group/';
// Edit-links // Edit-links
if (api_is_allowed_to_edit(false, true) && if (api_is_allowed_to_edit(false, true) &&
!(api_is_course_coach() && intval($this_group['session_id']) != $session_id) !(api_is_session_general_coach() && intval($this_group['session_id']) != $session_id)
) { ) {
$edit_actions = '<a href="'.$url.'settings.php?'.api_get_cidreq(true, false).'&gidReq='.$this_group['id'].'" title="'.get_lang('Edit').'">'. $edit_actions = '<a href="'.$url.'settings.php?'.api_get_cidreq(true, false).'&gidReq='.$this_group['id'].'" title="'.get_lang('Edit').'">'.
Display::return_icon('edit.png', get_lang('EditGroup'), '', ICON_SIZE_SMALL).'</a>&nbsp;'; Display::return_icon('edit.png', get_lang('EditGroup'), '', ICON_SIZE_SMALL).'</a>&nbsp;';

14
main/inc/lib/login.lib.php
Unescape View File

@ -361,7 +361,7 @@ class Login
* @global type $_courseUser * @global type $_courseUser
* @global type $is_courseAdmin * @global type $is_courseAdmin
* @global type $is_courseTutor * @global type $is_courseTutor
* @global type $is_courseCoach * @global type $is_session_general_coach
* @global type $is_courseMember * @global type $is_courseMember
* @global type $is_sessionAdmin * @global type $is_sessionAdmin
* @global type $is_allowed_in_course * @global type $is_allowed_in_course
@ -380,7 +380,7 @@ class Login
global $is_courseAdmin; //course teacher global $is_courseAdmin; //course teacher
global $is_courseTutor; //course teacher - some rights global $is_courseTutor; //course teacher - some rights
global $is_courseCoach; //course coach global $is_session_general_coach; //course coach
global $is_courseMember; //course student global $is_courseMember; //course student
global $is_sessionAdmin; global $is_sessionAdmin;
global $is_allowed_in_course; global $is_allowed_in_course;
@ -635,7 +635,7 @@ class Login
$is_courseMember = false; $is_courseMember = false;
$is_courseTutor = false; $is_courseTutor = false;
$is_courseAdmin = false; $is_courseAdmin = false;
$is_courseCoach = false; $is_session_general_coach = false;
$is_sessionAdmin = true; $is_sessionAdmin = true;
} else { } else {
//Im a coach or a student? //Im a coach or a student?
@ -656,7 +656,7 @@ class Login
case '2': // coach - teacher case '2': // coach - teacher
$is_courseMember = true; $is_courseMember = true;
$is_courseTutor = true; $is_courseTutor = true;
$is_courseCoach = true; $is_session_general_coach = true;
$is_sessionAdmin = false; $is_sessionAdmin = false;
if (api_get_setting('extend_rights_for_coach') == 'true') { if (api_get_setting('extend_rights_for_coach') == 'true') {
@ -699,7 +699,7 @@ class Login
$is_courseMember = false; $is_courseMember = false;
$is_courseAdmin = false; $is_courseAdmin = false;
$is_courseTutor = false; $is_courseTutor = false;
$is_courseCoach = false; $is_session_general_coach = false;
$is_sessionAdmin = false; $is_sessionAdmin = false;
} }
@ -758,14 +758,14 @@ class Login
Session::write('is_courseAdmin', $is_courseAdmin); Session::write('is_courseAdmin', $is_courseAdmin);
Session::write('is_courseMember', $is_courseMember); Session::write('is_courseMember', $is_courseMember);
Session::write('is_courseTutor', $is_courseTutor); Session::write('is_courseTutor', $is_courseTutor);
Session::write('is_courseCoach', $is_courseCoach); Session::write('is_session_general_coach', $is_session_general_coach);
Session::write('is_allowed_in_course', $is_allowed_in_course); Session::write('is_allowed_in_course', $is_allowed_in_course);
Session::write('is_sessionAdmin', $is_sessionAdmin); Session::write('is_sessionAdmin', $is_sessionAdmin);
} else { } else {
// continue with the previous values // continue with the previous values
$is_courseAdmin = Session::read('is_courseAdmin'); $is_courseAdmin = Session::read('is_courseAdmin');
$is_courseTutor = Session::read('is_courseTutor'); $is_courseTutor = Session::read('is_courseTutor');
$is_courseCoach = Session::read('is_courseCoach'); $is_session_general_coach = Session::read('is_session_general_coach');
$is_courseMember = Session::read('is_courseMember'); $is_courseMember = Session::read('is_courseMember');
$is_allowed_in_course = Session::read('is_allowed_in_course'); $is_allowed_in_course = Session::read('is_allowed_in_course');
} }

26
main/inc/local.inc.php
Unescape View File

@ -1079,11 +1079,11 @@ $user_id = isset($_user['user_id']) ? $_user['user_id'] : null;
/*$is_courseAdmin = false; //course teacher /*$is_courseAdmin = false; //course teacher
$is_courseTutor = false; //course teacher - some rights $is_courseTutor = false; //course teacher - some rights
$is_courseMember = false; //course student $is_courseMember = false; //course student
$is_courseCoach = false; //course coach $is_session_general_coach = false; //course coach
*/ */
// Course - User permissions // Course - User permissions
$is_sessionAdmin = false; $is_sessionAdmin = false;
$is_courseCoach = false; //course coach $is_session_general_coach = false; //course coach
$is_courseAdmin = false; $is_courseAdmin = false;
$is_courseTutor = false; $is_courseTutor = false;
$is_courseMember = false; $is_courseMember = false;
@ -1223,7 +1223,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) {
$is_courseMember = false; $is_courseMember = false;
$is_courseTutor = false; $is_courseTutor = false;
$is_courseAdmin = false; $is_courseAdmin = false;
$is_courseCoach = false; $is_session_general_coach = false;
$is_sessionAdmin = true; $is_sessionAdmin = true;
} else { } else {
// Am I a session coach for this session? // Am I a session coach for this session?
@ -1239,7 +1239,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) {
if (Database::num_rows($result)) { if (Database::num_rows($result)) {
$is_courseMember = true; $is_courseMember = true;
$is_courseTutor = false; $is_courseTutor = false;
$is_courseCoach = true; $is_session_general_coach = true;
$is_sessionAdmin = false; $is_sessionAdmin = false;
} else { } else {
// Am I a course coach or a student? // Am I a course coach or a student?
@ -1261,7 +1261,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) {
case '2': // coach - teacher case '2': // coach - teacher
$is_courseMember = true; $is_courseMember = true;
$is_courseTutor = true; $is_courseTutor = true;
$is_courseCoach = false; $is_session_general_coach = false;
$is_sessionAdmin = false; $is_sessionAdmin = false;
if (api_get_setting('extend_rights_for_coach') == 'true') { if (api_get_setting('extend_rights_for_coach') == 'true') {
@ -1274,7 +1274,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) {
$is_courseMember = true; $is_courseMember = true;
$is_courseTutor = false; $is_courseTutor = false;
$is_courseAdmin = false; $is_courseAdmin = false;
$is_courseCoach = false; $is_session_general_coach = false;
$is_sessionAdmin = false; $is_sessionAdmin = false;
break; break;
@ -1284,7 +1284,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) {
$is_courseTutor = false; $is_courseTutor = false;
$is_courseAdmin = false; $is_courseAdmin = false;
$is_sessionAdmin = false; $is_sessionAdmin = false;
$is_courseCoach = false; $is_session_general_coach = false;
break; break;
} }
} else { } else {
@ -1293,7 +1293,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) {
$is_courseTutor = false; $is_courseTutor = false;
$is_courseAdmin = false; $is_courseAdmin = false;
$is_sessionAdmin = false; $is_sessionAdmin = false;
$is_courseCoach = false; $is_session_general_coach = false;
} }
} }
} }
@ -1305,7 +1305,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) {
if (isset($sessionInfo['course_list'][$_course['real_id']])) { if (isset($sessionInfo['course_list'][$_course['real_id']])) {
$is_courseMember = true; $is_courseMember = true;
$is_courseTutor = false; $is_courseTutor = false;
$is_courseCoach = false; $is_session_general_coach = false;
$is_sessionAdmin = false; $is_sessionAdmin = false;
} }
} }
@ -1348,7 +1348,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) {
$is_courseMember = false; $is_courseMember = false;
$is_courseAdmin = false; $is_courseAdmin = false;
$is_courseTutor = false; $is_courseTutor = false;
$is_courseCoach = false; $is_session_general_coach = false;
$is_sessionAdmin = false; $is_sessionAdmin = false;
} }
@ -1417,7 +1417,7 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) {
$is_courseMember = false; $is_courseMember = false;
$is_courseAdmin = false; $is_courseAdmin = false;
$is_courseTutor = false; $is_courseTutor = false;
$is_courseCoach = false; $is_session_general_coach = false;
$is_sessionAdmin = false; $is_sessionAdmin = false;
$is_allowed_in_course = false; $is_allowed_in_course = false;
} }
@ -1456,14 +1456,14 @@ if ((isset($uidReset) && $uidReset) || (isset($cidReset) && $cidReset)) {
$is_allowed_in_course = true; $is_allowed_in_course = true;
} }
} }
Session::write('is_courseCoach', $is_courseCoach); Session::write('is_session_general_coach', $is_session_general_coach);
Session::write('is_allowed_in_course', $is_allowed_in_course); Session::write('is_allowed_in_course', $is_allowed_in_course);
Session::write('is_sessionAdmin', $is_sessionAdmin); Session::write('is_sessionAdmin', $is_sessionAdmin);
} else { } else {
// Continue with the previous values // Continue with the previous values
$is_courseAdmin = isset($_SESSION['is_courseAdmin']) ? $_SESSION['is_courseAdmin'] : false; $is_courseAdmin = isset($_SESSION['is_courseAdmin']) ? $_SESSION['is_courseAdmin'] : false;
$is_courseTutor = isset($_SESSION['is_courseTutor']) ? $_SESSION['is_courseTutor'] : false; $is_courseTutor = isset($_SESSION['is_courseTutor']) ? $_SESSION['is_courseTutor'] : false;
$is_courseCoach = isset($_SESSION['is_courseCoach']) ? $_SESSION['is_courseCoach'] : false; $is_session_general_coach = isset($_SESSION['is_session_general_coach']) ? $_SESSION['is_session_general_coach'] : false;
$is_courseMember = isset($_SESSION['is_courseMember']) ? $_SESSION['is_courseMember'] : false; $is_courseMember = isset($_SESSION['is_courseMember']) ? $_SESSION['is_courseMember'] : false;
$is_allowed_in_course = isset($_SESSION ['is_allowed_in_course']) ? $_SESSION ['is_allowed_in_course'] : false; $is_allowed_in_course = isset($_SESSION ['is_allowed_in_course']) ? $_SESSION ['is_allowed_in_course'] : false;
} }

2
main/survey/create_new_survey.php
Unescape View File

@ -26,7 +26,7 @@ $table_gradebook_link = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINK);
/** @todo this has to be moved to a more appropriate place (after the display_header of the code) */ /** @todo this has to be moved to a more appropriate place (after the display_header of the code) */
// If user is not teacher or if he's a coach trying to access an element out of his session // If user is not teacher or if he's a coach trying to access an element out of his session
if (!api_is_allowed_to_edit()) { if (!api_is_allowed_to_edit()) {
if (!api_is_course_coach() || if (!api_is_session_general_coach() ||
(!empty($_GET['survey_id']) && (!empty($_GET['survey_id']) &&
!api_is_element_in_the_session(TOOL_SURVEY, $_GET['survey_id'])) !api_is_element_in_the_session(TOOL_SURVEY, $_GET['survey_id']))
) { ) {

2
main/survey/survey.php
Unescape View File

@ -30,7 +30,7 @@ if ($isDrhOfCourse) {
exit; exit;
} }
if (!api_is_allowed_to_edit(false, true) || if (!api_is_allowed_to_edit(false, true) ||
(api_is_course_coach() && $extend_rights_for_coachs == 'false') (api_is_session_general_coach() && $extend_rights_for_coachs == 'false')
) { ) {
api_not_allowed(true); api_not_allowed(true);
exit; exit;

8
main/survey/survey_list.php
Unescape View File

@ -94,7 +94,7 @@ $sessionId = api_get_session_id();
if ($action === 'delete' && isset($_GET['survey_id'])) { if ($action === 'delete' && isset($_GET['survey_id'])) {
// Getting the information of the survey (used for when the survey is shared) // Getting the information of the survey (used for when the survey is shared)
$survey_data = SurveyManager::get_survey($_GET['survey_id']); $survey_data = SurveyManager::get_survey($_GET['survey_id']);
if (api_is_course_coach() && $sessionId != $survey_data['session_id']) { if (api_is_session_general_coach() && $sessionId != $survey_data['session_id']) {
// The coach can't delete a survey not belonging to his session // The coach can't delete a survey not belonging to his session
api_not_allowed(); api_not_allowed();
exit; exit;
@ -118,7 +118,7 @@ if ($action === 'delete' && isset($_GET['survey_id'])) {
if ($action == 'empty') { if ($action == 'empty') {
$mysession = api_get_session_id(); $mysession = api_get_session_id();
if ($mysession != 0) { if ($mysession != 0) {
if (!((api_is_course_coach() || api_is_platform_admin()) && if (!((api_is_session_general_coach() || api_is_platform_admin()) &&
api_is_element_in_the_session(TOOL_SURVEY, $_GET['survey_id']))) { api_is_element_in_the_session(TOOL_SURVEY, $_GET['survey_id']))) {
// The coach can't empty a survey not belonging to his session // The coach can't empty a survey not belonging to his session
api_not_allowed(); api_not_allowed();
@ -158,7 +158,7 @@ if (isset($_POST['action']) && $_POST['action']) {
} }
echo '<div class="actions">'; echo '<div class="actions">';
if (!api_is_course_coach() || $extend_rights_for_coachs == 'true') { if (!api_is_session_general_coach() || $extend_rights_for_coachs == 'true') {
// Action links // Action links
echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/create_new_survey.php?'.api_get_cidreq().'&amp;action=add">'. echo '<a href="'.api_get_path(WEB_CODE_PATH).'survey/create_new_survey.php?'.api_get_cidreq().'&amp;action=add">'.
Display::return_icon('new_survey.png', get_lang('CreateNewSurvey'), '', ICON_SIZE_MEDIUM).'</a> '; Display::return_icon('new_survey.png', get_lang('CreateNewSurvey'), '', ICON_SIZE_MEDIUM).'</a> ';
@ -168,7 +168,7 @@ echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;search=advanced">'.
echo '</div>'; echo '</div>';
// Load main content // Load main content
if (api_is_course_coach() && $extend_rights_for_coachs == 'false') { if (api_is_session_general_coach() && $extend_rights_for_coachs == 'false') {
SurveyUtil::display_survey_list_for_coach(); SurveyUtil::display_survey_list_for_coach();
} else { } else {
SurveyUtil::display_survey_list(); SurveyUtil::display_survey_list();

2
main/tracking/course_session_report.php
Unescape View File

@ -11,7 +11,7 @@ require_once __DIR__.'/../inc/global.inc.php';
$this_section = "session_my_space"; $this_section = "session_my_space";
$is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_courseCoach || $is_sessionAdmin; $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_session_general_coach || $is_sessionAdmin;
if (!$is_allowedToTrack) { if (!$is_allowedToTrack) {
api_not_allowed(true); api_not_allowed(true);

2
main/tracking/exams.php
Unescape View File

@ -12,7 +12,7 @@ $toolTable = Database::get_course_table(TABLE_TOOL_LIST);
$quizTable = Database::get_course_table(TABLE_QUIZ_TEST); $quizTable = Database::get_course_table(TABLE_QUIZ_TEST);
$this_section = SECTION_TRACKING; $this_section = SECTION_TRACKING;
$is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_courseCoach || $is_sessionAdmin; $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_session_general_coach || $is_sessionAdmin;
if (!$is_allowedToTrack) { if (!$is_allowedToTrack) {
api_not_allowed(); api_not_allowed();

2
main/tracking/lp_results_by_user.php
Unescape View File

@ -13,7 +13,7 @@ require_once __DIR__.'/../inc/global.inc.php';
$this_section = SECTION_TRACKING; $this_section = SECTION_TRACKING;
$is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_courseCoach || $is_sessionAdmin; $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_session_general_coach || $is_sessionAdmin;
if (!$is_allowedToTrack) { if (!$is_allowedToTrack) {
Display :: display_header(null); Display :: display_header(null);

2
main/tracking/question_course_report.php
Unescape View File

@ -11,7 +11,7 @@ require_once __DIR__.'/../inc/global.inc.php';
$this_section = "session_my_space"; $this_section = "session_my_space";
$is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_courseCoach || $is_sessionAdmin; $is_allowedToTrack = $is_courseAdmin || $is_platformAdmin || $is_session_general_coach || $is_sessionAdmin;
if (!$is_allowedToTrack) { if (!$is_allowedToTrack) {
Display::display_header(null); Display::display_header(null);

2
user_portal.php
Unescape View File

@ -142,7 +142,7 @@ if (isset($_COOKIE['defaultMyCourseView'.$userId]) &&
// if teacher, session coach or admin, display the button to change te course view // if teacher, session coach or admin, display the button to change te course view
if ($displayMyCourseViewBySessionLink && if ($displayMyCourseViewBySessionLink &&
(api_is_drh() || api_is_course_coach() || api_is_platform_admin() || api_is_session_admin() || api_is_teacher()) (api_is_drh() || api_is_session_general_coach() || api_is_platform_admin() || api_is_session_admin() || api_is_teacher())
) { ) {
$courseAndSessions['html'] = "<div class='view-by-session-link'> $courseAndSessions['html'] = "<div class='view-by-session-link'>
<div class='btn-group pull-right'> <div class='btn-group pull-right'>

Write Preview
Loading…
Cancel
Save