Minor - use courseInfo instead of course code in Document::check_visibility_tree

pull/2782/head
Julio Montoya 7 years ago
parent 36b70b4abc
commit 01345a1745
  1. 2
      main/document/document.php
  2. 2
      main/document/edit_odf.php
  3. 2
      main/document/show_content.php
  4. 2
      main/document/showinframes.php
  5. 41
      main/inc/lib/document.lib.php

@ -612,7 +612,7 @@ if (isset($document_id) && empty($action)) {
$visibility = DocumentManager::check_visibility_tree(
$document_id,
api_get_course_id(),
$courseInfo,
$sessionId,
api_get_user_id(),
$groupIid

@ -27,7 +27,7 @@ if (empty($documentInfo)) {
//Check user visibility
$is_visible = DocumentManager::check_visibility_tree(
$documentId,
api_get_course_id(),
api_get_course_info(),
api_get_session_id(),
api_get_user_id(),
api_get_group_id()

@ -76,7 +76,7 @@ if ($is_allowed_in_course == false) {
// Check user visibility
$is_visible = DocumentManager::check_visibility_tree(
$document_id,
api_get_course_id(),
api_get_course_info(),
api_get_session_id(),
api_get_user_id(),
api_get_group_id()

@ -91,7 +91,7 @@ if ($is_allowed_in_course == false) {
// Check user visibility.
$is_visible = DocumentManager::check_visibility_tree(
$document_id,
api_get_course_id(),
api_get_course_info(),
api_get_session_id(),
api_get_user_id(),
api_get_group_id()

@ -601,7 +601,7 @@ class DocumentManager
foreach ($documentData as $row) {
$isVisible = self::check_visibility_tree(
$row['id'],
$courseInfo['code'],
$courseInfo,
$sessionId,
api_get_user_id(),
$toGroupId
@ -3508,8 +3508,8 @@ class DocumentManager
/**
* @param int $doc_id
* @param string $course_code
* @param int $session_id
* @param array $courseInfo
* @param int $sessionId
* @param int $user_id
* @param int $groupId iid
*
@ -3517,21 +3517,32 @@ class DocumentManager
*/
public static function check_visibility_tree(
$doc_id,
$course_code,
$session_id,
$courseInfo,
$sessionId,
$user_id,
$groupId = 0
) {
if (empty($courseInfo)) {
return false;
}
$courseCode = $courseInfo['code'];
if (empty($courseCode)) {
return false;
}
$document_data = self::get_document_data_by_id(
$doc_id,
$course_code,
$courseCode,
null,
$session_id
$sessionId
);
if ($session_id != 0 && !$document_data) {
if ($sessionId != 0 && !$document_data) {
$document_data = self::get_document_data_by_id(
$doc_id,
$course_code,
$courseCode,
null,
0
);
@ -3539,27 +3550,27 @@ class DocumentManager
if (!empty($document_data)) {
// If admin or course teacher, allow anyway
if (api_is_platform_admin() || CourseManager::is_course_teacher($user_id, $course_code)) {
if (api_is_platform_admin() || CourseManager::is_course_teacher($user_id, $courseCode)) {
return true;
}
$course_info = api_get_course_info($course_code);
if ($document_data['parent_id'] == false || empty($document_data['parent_id'])) {
if (!empty($groupId)) {
return true;
}
$visible = self::is_visible_by_id($doc_id, $course_info, $session_id, $user_id);
$visible = self::is_visible_by_id($doc_id, $courseInfo, $sessionId, $user_id);
return $visible;
} else {
$visible = self::is_visible_by_id($doc_id, $course_info, $session_id, $user_id);
$visible = self::is_visible_by_id($doc_id, $courseInfo, $sessionId, $user_id);
if (!$visible) {
return false;
} else {
return self::check_visibility_tree(
$document_data['parent_id'],
$course_code,
$session_id,
$courseInfo,
$sessionId,
$user_id,
$groupId
);

Loading…
Cancel
Save