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

Improve function is_lp_visible_for_student see BT#15881

Browse Source
pull/2958/head
Julio Montoya 6 years ago
parent 514b3c7322
commit a348c8f4d2
11 changed files with 67 additions and 86 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. 2
      main/document/download_scorm.php
  2. 8
      main/inc/lib/course_home.lib.php
  3. 2
      main/inc/lib/display.lib.php
  4. 10
      main/inc/lib/groupmanager.lib.php
  5. 2
      main/inc/lib/webservices/Rest.php
  6. 1
      main/lp/download.php
  7. 18
      main/lp/learnpath.class.php
  8. 2
      main/lp/learnpathList.class.php
  9. 2
      main/lp/lp_controller.php
  10. 2
      main/lp/lp_impress.php
  11. 104
      main/lp/lp_list.php

2
main/document/download_scorm.php
Unescape View File

@ -29,7 +29,7 @@ if (empty($obj)) {
} }
// If is visible for the current user // If is visible for the current user
if (!learnpath::is_lp_visible_for_student($obj->get_id(), api_get_user_id())) { if (!learnpath::is_lp_visible_for_student($obj->get_id(), api_get_user_id(), $_course)) {
api_not_allowed(); api_not_allowed();
} }

8
main/inc/lib/course_home.lib.php
Unescape View File

@ -140,7 +140,7 @@ class CourseHome
!learnpath::is_lp_visible_for_student( !learnpath::is_lp_visible_for_student(
$lpId, $lpId,
api_get_user_id(), api_get_user_id(),
api_get_course_id(), api_get_course_info(),
api_get_session_id() api_get_session_id()
) )
) { ) {
@ -352,7 +352,7 @@ class CourseHome
!learnpath::is_lp_visible_for_student( !learnpath::is_lp_visible_for_student(
$lpId, $lpId,
api_get_user_id(), api_get_user_id(),
api_get_course_id(), api_get_course_info(),
api_get_session_id() api_get_session_id()
) )
) { ) {
@ -679,7 +679,7 @@ class CourseHome
$add = learnpath::is_lp_visible_for_student( $add = learnpath::is_lp_visible_for_student(
$lpId, $lpId,
$userId, $userId,
$courseInfo['code'], $courseInfo,
$sessionId $sessionId
); );
} }
@ -868,7 +868,7 @@ class CourseHome
!learnpath::is_lp_visible_for_student( !learnpath::is_lp_visible_for_student(
$lpId, $lpId,
api_get_user_id(), api_get_user_id(),
api_get_course_id(), api_get_course_info(),
api_get_session_id() api_get_session_id()
) )
) { ) {

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

@ -1725,7 +1725,7 @@ class Display
} }
if ($notification['tool'] == TOOL_LEARNPATH) { if ($notification['tool'] == TOOL_LEARNPATH) {
if (!learnpath::is_lp_visible_for_student($notification['ref'], $user_id, $course_code)) { if (!learnpath::is_lp_visible_for_student($notification['ref'], $user_id, $courseInfo)) {
continue; continue;
} }
} }

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

@ -2233,16 +2233,18 @@ class GroupManager
* Get all groups where a specific user is subscribed. * Get all groups where a specific user is subscribed.
* *
* @param int $user_id * @param int $user_id
* @param int $courseId
* *
* @return array * @return array
*/ */
public static function getAllGroupPerUserSubscription($user_id) public static function getAllGroupPerUserSubscription($user_id, $courseId = 0)
{ {
$table_group_user = Database::get_course_table(TABLE_GROUP_USER); $table_group_user = Database::get_course_table(TABLE_GROUP_USER);
$table_tutor_user = Database::get_course_table(TABLE_GROUP_TUTOR); $table_tutor_user = Database::get_course_table(TABLE_GROUP_TUTOR);
$table_group = Database::get_course_table(TABLE_GROUP); $table_group = Database::get_course_table(TABLE_GROUP);
$user_id = intval($user_id); $user_id = (int) $user_id;
$course_id = api_get_course_int_id(); $courseId = empty($courseId) ? api_get_course_int_id() : (int) $courseId;
$sql = "SELECT DISTINCT g.* $sql = "SELECT DISTINCT g.*
FROM $table_group g FROM $table_group g
LEFT JOIN $table_group_user gu LEFT JOIN $table_group_user gu
@ -2250,7 +2252,7 @@ class GroupManager
LEFT JOIN $table_tutor_user tu LEFT JOIN $table_tutor_user tu
ON (tu.group_id = g.iid AND g.c_id = tu.c_id) ON (tu.group_id = g.iid AND g.c_id = tu.c_id)
WHERE WHERE
g.c_id = $course_id AND g.c_id = $courseId AND
(gu.user_id = $user_id OR tu.user_id = $user_id) "; (gu.user_id = $user_id OR tu.user_id = $user_id) ";
$res = Database::query($sql); $res = Database::query($sql);
$groups = []; $groups = [];

2
main/inc/lib/webservices/Rest.php
Unescape View File

@ -760,7 +760,7 @@ class Rest extends WebService
if (!learnpath::is_lp_visible_for_student( if (!learnpath::is_lp_visible_for_student(
$lpId, $lpId,
$this->user->getId(), $this->user->getId(),
$this->course->getCode(), api_get_course_info($this->course->getCode()),
$sessionId $sessionId
)) { )) {
continue; continue;

1
main/lp/download.php
Unescape View File

@ -14,6 +14,7 @@ $this_section = SECTION_COURSES;
// Protection // Protection
api_protect_course_script(); api_protect_course_script();
$_course = api_get_course_info();
if (!isset($_course)) { if (!isset($_course)) {
api_not_allowed(true); api_not_allowed(true);

18
main/lp/learnpath.class.php
Unescape View File

@ -2491,20 +2491,20 @@ class learnpath
* of its prerequisite is completed, considering the time availability and * of its prerequisite is completed, considering the time availability and
* the LP visibility. * the LP visibility.
* *
* @param int $lp_id * @param int $lp_id
* @param int $student_id * @param int $student_id
* @param null $courseCode * @param array $courseInfo
* @param int $sessionId * @param int $sessionId
* *
* @return bool * @return bool
*/ */
public static function is_lp_visible_for_student( public static function is_lp_visible_for_student(
$lp_id, $lp_id,
$student_id, $student_id,
$courseCode = null, $courseInfo = [],
$sessionId = 0 $sessionId = 0
) { ) {
$courseInfo = api_get_course_info($courseCode); $courseInfo = empty($courseInfo) ? api_get_course_info() : $courseInfo;
$lp_id = (int) $lp_id; $lp_id = (int) $lp_id;
$sessionId = (int) $sessionId; $sessionId = (int) $sessionId;
@ -2516,8 +2516,10 @@ class learnpath
$sessionId = api_get_session_id(); $sessionId = api_get_session_id();
} }
$courseId = $courseInfo['real_id'];
$itemInfo = api_get_item_property_info( $itemInfo = api_get_item_property_info(
$courseInfo['real_id'], $courseId,
TOOL_LEARNPATH, TOOL_LEARNPATH,
$lp_id, $lp_id,
$sessionId $sessionId
@ -2599,7 +2601,7 @@ class learnpath
if ($userVisibility == 1) { if ($userVisibility == 1) {
$is_visible = true; $is_visible = true;
} else { } else {
$userGroups = GroupManager::getAllGroupPerUserSubscription($student_id); $userGroups = GroupManager::getAllGroupPerUserSubscription($student_id, $courseId);
if (!empty($userGroups)) { if (!empty($userGroups)) {
foreach ($userGroups as $groupInfo) { foreach ($userGroups as $groupInfo) {
$groupId = $groupInfo['iid']; $groupId = $groupInfo['iid'];

2
main/lp/learnpathList.class.php
Unescape View File

@ -152,7 +152,7 @@ class LearnpathList
$lpVisibility = learnpath::is_lp_visible_for_student( $lpVisibility = learnpath::is_lp_visible_for_student(
$row->getId(), $row->getId(),
$user_id, $user_id,
$course_code $course_info
); );
if ($lpVisibility === false) { if ($lpVisibility === false) {
continue; continue;

2
main/lp/lp_controller.php
Unescape View File

@ -895,7 +895,7 @@ switch ($action) {
// Teachers can export to PDF // Teachers can export to PDF
if (!$is_allowed_to_edit) { if (!$is_allowed_to_edit) {
if (!learnpath::is_lp_visible_for_student($_SESSION['oLP']->lp_id, api_get_user_id())) { if (!learnpath::is_lp_visible_for_student($_SESSION['oLP']->lp_id, api_get_user_id(), $_course)) {
api_not_allowed(); api_not_allowed();
} }
} }

2
main/lp/lp_impress.php
Unescape View File

@ -19,7 +19,7 @@ $lp_id = intval($_GET['lp_id']);
// Check if the learning path is visible for student - (LP requisites) // Check if the learning path is visible for student - (LP requisites)
if (!api_is_allowed_to_edit(null, true) && if (!api_is_allowed_to_edit(null, true) &&
!learnpath::is_lp_visible_for_student($lp_id, api_get_user_id()) !learnpath::is_lp_visible_for_student($lp_id, api_get_user_id(), api_get_course_info())
) { ) {
api_not_allowed(); api_not_allowed();
} }

104
main/lp/lp_list.php
Unescape View File

@ -189,6 +189,8 @@ $courseSettingsDisableIcon = Display::return_icon(
get_lang('CourseSettings') get_lang('CourseSettings')
); );
$enableAutoLaunch = api_get_course_setting('enable_lp_auto_launch');
$data = []; $data = [];
/** @var CLpCategory $item */ /** @var CLpCategory $item */
foreach ($categories as $item) { foreach ($categories as $item) {
@ -261,19 +263,19 @@ foreach ($categories as $item) {
continue; continue;
} }
$lpVisibility = learnpath::is_lp_visible_for_student($id, $userId); $lpVisibility = learnpath::is_lp_visible_for_student($id, $userId, $courseInfo);
$isBlocked = learnpath::isBlockedByPrerequisite(
$userId,
$details['prerequisite'],
$courseInfo,
api_get_session_id()
);
// Check if the learnpath is visible for student. // Check if the learnpath is visible for student.
if (!$is_allowed_to_edit && $lpVisibility === false if (!$is_allowed_to_edit) {
&& ($isBlocked && $showBlockedPrerequisite === false) $isBlocked = learnpath::isBlockedByPrerequisite(
) { $userId,
continue; $details['prerequisite'],
$courseInfo,
api_get_session_id()
);
if ($lpVisibility === false && $isBlocked && $showBlockedPrerequisite === false) {
continue;
}
} }
$start_time = $end_time = ''; $start_time = $end_time = '';
@ -537,22 +539,20 @@ foreach ($categories as $item) {
'invisible.png', 'invisible.png',
get_lang('Show') get_lang('Show')
), ),
api_get_self().'?'.$cidReq api_get_self().'?'.$cidReq."&lp_id=$id&action=toggle_visible&new_status=1"
."&lp_id=$id&action=toggle_visible&new_status=1"
); );
} else { } else {
$dsp_visible = Display::url( $dsp_visible = Display::url(
Display::return_icon('visible.png', get_lang('Hide')), Display::return_icon('visible.png', get_lang('Hide')),
api_get_self().'?'.$cidReq api_get_self().'?'.$cidReq."&lp_id=$id&action=toggle_visible&new_status=0"
."&lp_id=$id&action=toggle_visible&new_status=0"
); );
} }
} }
// Tracking command // Tracking command
$trackingActionUrl = 'lp_controller.php?' $trackingActionUrl = 'lp_controller.php?'.$cidReq.'&'.http_build_query(
.$cidReq.'&' ['action' => 'report', 'lp_id' => $id]
.http_build_query(['action' => 'report', 'lp_id' => $id]); );
$trackingAction = Display::url( $trackingAction = Display::url(
Display::return_icon( Display::return_icon(
@ -597,17 +597,14 @@ foreach ($categories as $item) {
* It is thus a mix betwenn multiple attempt and mono attempt * It is thus a mix betwenn multiple attempt and mono attempt
*/ */
if ($sessionId == $details['lp_session']) { if ($sessionId == $details['lp_session']) {
if ($details['seriousgame_mode'] == 1 if ($details['seriousgame_mode'] == 1 && $details['lp_prevent_reinit'] == 1) {
&& $details['lp_prevent_reinit'] == 1
) {
// seriousgame mode | next = single // seriousgame mode | next = single
$dsp_reinit = Display::url( $dsp_reinit = Display::url(
Display::return_icon( Display::return_icon(
'reload.png', 'reload.png',
get_lang('PreventMultipleAttempts') get_lang('PreventMultipleAttempts')
), ),
'lp_controller.php?'.$cidReq 'lp_controller.php?'.$cidReq."&action=switch_attempt_mode&lp_id=$id"
."&action=switch_attempt_mode&lp_id=$id"
); );
} }
if ($details['seriousgame_mode'] == 0 && if ($details['seriousgame_mode'] == 0 &&
@ -619,8 +616,7 @@ foreach ($categories as $item) {
'reload_na.png', 'reload_na.png',
get_lang('AllowMultipleAttempts') get_lang('AllowMultipleAttempts')
), ),
'lp_controller.php?'.$cidReq 'lp_controller.php?'.$cidReq."&action=switch_attempt_mode&lp_id=$id"
."&action=switch_attempt_mode&lp_id=$id"
); );
} }
if ($details['seriousgame_mode'] == 0 && if ($details['seriousgame_mode'] == 0 &&
@ -632,8 +628,7 @@ foreach ($categories as $item) {
'reload.png', 'reload.png',
get_lang('AllowMultipleAttempts') get_lang('AllowMultipleAttempts')
), ),
'lp_controller.php?'.$cidReq 'lp_controller.php?'.$cidReq."&action=switch_attempt_mode&lp_id=$id"
."&action=switch_attempt_mode&lp_id=$id"
); );
} }
} else { } else {
@ -652,9 +647,7 @@ foreach ($categories as $item) {
'view_fullscreen.png', 'view_fullscreen.png',
get_lang('ViewModeFullScreen') get_lang('ViewModeFullScreen')
), ),
'lp_controller.php?'.$cidReq 'lp_controller.php?'.$cidReq.'&action=switch_view_mode&lp_id='.$id.$token_parameter
.'&action=switch_view_mode&lp_id='.$id
.$token_parameter
); );
break; break;
case 'embedded': case 'embedded':
@ -663,9 +656,7 @@ foreach ($categories as $item) {
'view_left_right.png', 'view_left_right.png',
get_lang('ViewModeEmbedded') get_lang('ViewModeEmbedded')
), ),
'lp_controller.php?'.$cidReq 'lp_controller.php?'.$cidReq.'&action=switch_view_mode&lp_id='.$id.$token_parameter
.'&action=switch_view_mode&lp_id='.$id
.$token_parameter
); );
break; break;
case 'embedframe': case 'embedframe':
@ -674,9 +665,7 @@ foreach ($categories as $item) {
'view_nofullscreen.png', 'view_nofullscreen.png',
get_lang('ViewModeEmbedFrame') get_lang('ViewModeEmbedFrame')
), ),
'lp_controller.php?'.$cidReq 'lp_controller.php?'.$cidReq.'&action=switch_view_mode&lp_id='.$id.$token_parameter
.'&action=switch_view_mode&lp_id='.$id
.$token_parameter
); );
break; break;
case 'impress': case 'impress':
@ -685,9 +674,7 @@ foreach ($categories as $item) {
'window_list_slide.png', 'window_list_slide.png',
get_lang('ViewModeImpress') get_lang('ViewModeImpress')
), ),
'lp_controller.php?'.$cidReq 'lp_controller.php?'.$cidReq.'&action=switch_view_mode&lp_id='.$id.$token_parameter
.'&action=switch_view_mode&lp_id='.$id
.$token_parameter
); );
break; break;
} }
@ -730,15 +717,13 @@ foreach ($categories as $item) {
if ($details['lp_type'] == 1) { if ($details['lp_type'] == 1) {
$dsp_disk = Display::url( $dsp_disk = Display::url(
Display::return_icon('cd.png', get_lang('ExportShort')), Display::return_icon('cd.png', get_lang('ExportShort')),
api_get_self()."?".$cidReq api_get_self()."?$cidReq&action=export&lp_id=$id"
."&action=export&lp_id=$id"
); );
} elseif ($details['lp_type'] == 2) { } elseif ($details['lp_type'] == 2) {
$dsp_disk = Display::url( $dsp_disk = Display::url(
Display::return_icon('cd.png', get_lang('ExportShort')), Display::return_icon('cd.png', get_lang('ExportShort')),
api_get_self()."?".$cidReq api_get_self()."?$cidReq&action=export&lp_id=$id&export_name="
."&action=export&lp_id=$id&export_name=" .api_replace_dangerous_char($name).'.zip'
.api_replace_dangerous_char($name).".zip"
); );
} else { } else {
$dsp_disk = Display::return_icon( $dsp_disk = Display::return_icon(
@ -768,7 +753,7 @@ foreach ($categories as $item) {
} }
/* Auto launch LP code */ /* Auto launch LP code */
if (api_get_course_setting('enable_lp_auto_launch') == 1) { if ($enableAutoLaunch == 1) {
if ($details['autolaunch'] == 1 && if ($details['autolaunch'] == 1 &&
$autolaunch_exists == false $autolaunch_exists == false
) { ) {
@ -778,8 +763,7 @@ foreach ($categories as $item) {
'launch.png', 'launch.png',
get_lang('DisableLPAutoLaunch') get_lang('DisableLPAutoLaunch')
), ),
api_get_self().'?'.$cidReq api_get_self().'?'.$cidReq."&action=auto_launch&status=0&lp_id=$id"
."&action=auto_launch&status=0&lp_id=$id"
); );
} else { } else {
$lp_auto_launch_icon = Display::url( $lp_auto_launch_icon = Display::url(
@ -787,8 +771,7 @@ foreach ($categories as $item) {
'launch_na.png', 'launch_na.png',
get_lang('EnableLPAutoLaunch') get_lang('EnableLPAutoLaunch')
), ),
api_get_self().'?'.$cidReq api_get_self().'?'.$cidReq."&action=auto_launch&status=1&lp_id=$id"
."&action=auto_launch&status=1&lp_id=$id"
); );
} }
} }
@ -799,8 +782,7 @@ foreach ($categories as $item) {
'pdf.png', 'pdf.png',
get_lang('ExportToPDFOnlyHTMLAndImages') get_lang('ExportToPDFOnlyHTMLAndImages')
), ),
api_get_self().'?'.$cidReq api_get_self().'?'.$cidReq."&action=export_to_pdf&lp_id=$id"
."&action=export_to_pdf&lp_id=$id"
); );
/* Delete */ /* Delete */
@ -828,27 +810,23 @@ foreach ($categories as $item) {
if ($details['lp_display_order'] == 1 && $max != 1) { if ($details['lp_display_order'] == 1 && $max != 1) {
$dsp_order .= Display::url( $dsp_order .= Display::url(
Display::return_icon('down.png', get_lang('MoveDown')), Display::return_icon('down.png', get_lang('MoveDown')),
"lp_controller.php?".$cidReq "lp_controller.php?$cidReq&action=move_lp_down&lp_id=$id&category_id=$categoryId"
."&action=move_lp_down&lp_id=$id&category_id=$categoryId"
); );
} elseif ($current == $max - 1 && $max != 1) { } elseif ($current == $max - 1 && $max != 1) {
$dsp_order .= Display::url( $dsp_order .= Display::url(
Display::return_icon('up.png', get_lang('MoveUp')), Display::return_icon('up.png', get_lang('MoveUp')),
"lp_controller.php?".$cidReq "lp_controller.php?$cidReq&action=move_lp_up&lp_id=$id&category_id=$categoryId"
."&action=move_lp_up&lp_id=$id&category_id=$categoryId"
); );
} elseif ($max == 1) { } elseif ($max == 1) {
$dsp_order = ''; $dsp_order = '';
} else { } else {
$dsp_order .= Display::url( $dsp_order .= Display::url(
Display::return_icon('down.png', get_lang('MoveDown')), Display::return_icon('down.png', get_lang('MoveDown')),
"lp_controller.php?".$cidReq "lp_controller.php?$cidReq&action=move_lp_down&lp_id=$id&category_id=$categoryId"
."&action=move_lp_down&lp_id=$id&category_id=$categoryId"
); );
$dsp_order .= Display::url( $dsp_order .= Display::url(
Display::return_icon('up.png', get_lang('MoveUp')), Display::return_icon('up.png', get_lang('MoveUp')),
"lp_controller.php?".$cidReq "lp_controller.php?$cidReq&action=move_lp_up&lp_id=$id&category_id=$categoryId"
."&action=move_lp_up&lp_id=$id&category_id=$categoryId"
); );
} }
} }
@ -867,8 +845,7 @@ foreach ($categories as $item) {
'backup.png', 'backup.png',
get_lang('ExportToChamiloFormat') get_lang('ExportToChamiloFormat')
), ),
api_get_self().'?'.$cidReq api_get_self().'?'.$cidReq."&action=export_to_course_build&lp_id=$id"
."&action=export_to_course_build&lp_id=$id"
); );
} }
@ -910,8 +887,7 @@ foreach ($categories as $item) {
// Student // Student
$export_icon = Display::url( $export_icon = Display::url(
Display::return_icon('pdf.png', get_lang('ExportToPDF')), Display::return_icon('pdf.png', get_lang('ExportToPDF')),
api_get_self().'?'.$cidReq api_get_self().'?'.$cidReq."&action=export_to_pdf&lp_id=$id"
."&action=export_to_pdf&lp_id=$id"
); );
} }
@ -994,7 +970,7 @@ DocumentManager::removeGeneratedAudioTempFile();
$template = new Template($nameTools); $template = new Template($nameTools);
$template->assign('subscription_settings', $subscriptionSettings); $template->assign('subscription_settings', $subscriptionSettings);
$template->assign('is_allowed_to_edit', $is_allowed_to_edit); $template->assign('is_allowed_to_edit', $is_allowed_to_edit);
$template->assign('is_invitee', api_is_invitee()); $template->assign('is_invitee', $isInvitee);
$template->assign('is_ending', $ending); $template->assign('is_ending', $ending);
$template->assign('actions', $actions); $template->assign('actions', $actions);
$template->assign('categories', $categories); $template->assign('categories', $categories);

Write Preview
Loading…
Cancel
Save