Skip to content

Documents: Safely attach shared files to multiple courses - refs #6372 #7139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
christianbeeznest wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Documents: Safely attach shared files to multiple courses - refs #6372 #7139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions assets/vue/components/documents/ResourceFileLink.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,14 @@ export default {
},
computed: {
getDataType() {
if (this.resource.resourceNode.firstResourceFile.image) {
const node = this.resource && this.resource.resourceNode
const file = node && node.firstResourceFile

if (file && file.image) {
return "image"
}
if (this.resource.resourceNode.firstResourceFile.video) {

if (file && file.video) {
return "video"
}

Expand Down
30 changes: 24 additions & 6 deletions assets/vue/components/documents/ResourceIcon.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
icon="folder-generic"
/>
<BaseIcon
v-else-if="resourceData.resourceNode.firstResourceFile.image"
v-else-if="isImage(resourceData)"
icon="file-image"
/>
<BaseIcon
v-else-if="resourceData.resourceNode.firstResourceFile.video"
v-else-if="isVideo(resourceData)"
icon="file-video"
/>
<BaseIcon
v-else-if="resourceData.resourceNode.firstResourceFile.text"
v-else-if="hasTextFlag"
icon="file-text"
/>
<BaseIcon
v-else-if="'application/pdf' === resourceData.resourceNode.firstResourceFile.mimeType"
v-else-if="isPdfFile"
icon="file-pdf"
/>
<BaseIcon
Expand All @@ -30,15 +30,33 @@
</template>

<script setup>
import { computed } from "vue"
import BaseIcon from "../basecomponents/BaseIcon.vue"
import { useFileUtils } from "../../composables/fileUtils"

const { isAudio } = useFileUtils()
const { isImage, isVideo, isAudio } = useFileUtils()

defineProps({
const props = defineProps({
resourceData: {
type: Object,
required: true,
},
})

const hasTextFlag = computed(() => {
const file = props.resourceData?.resourceNode?.firstResourceFile
return !!file && !!file.text
})

const isPdfFile = computed(() => {
const file = props.resourceData?.resourceNode?.firstResourceFile

if (!file || !file.mimeType) {
return false
}

const mime = String(file.mimeType).split(";")[0].trim().toLowerCase()

return mime === "application/pdf"
})
</script>
11 changes: 9 additions & 2 deletions assets/vue/views/documents/DocumentsList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
>
<template #body="slotProps">
{{
slotProps.data.resourceNode.firstResourceFile
slotProps.data.resourceNode && slotProps.data.resourceNode.firstResourceFile
? prettyBytes(slotProps.data.resourceNode.firstResourceFile.size)
: ""
}}
Expand Down Expand Up @@ -654,7 +654,14 @@ const showBackButtonIfNotRootFolder = computed(() => {
})

function goToAddVariation(item) {
const resourceFileId = item.resourceNode.firstResourceFile.id
const firstFile = item.resourceNode?.firstResourceFile
if (!firstFile) {
console.warn("Missing firstResourceFile for document", item.iid)
return
}

const resourceFileId = firstFile.id

router.push({
name: "DocumentsAddVariation",
params: { resourceFileId, node: route.params.node },
Expand Down
191 changes: 36 additions & 155 deletions public/main/inc/lib/document.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Entity\ResourceLink;
use Chamilo\CoreBundle\Entity\ResourceNode;
use Chamilo\CoreBundle\Entity\Session;
use Chamilo\CoreBundle\Enums\ObjectIcon;
use Chamilo\CoreBundle\Framework\Container;
use Chamilo\CourseBundle\Entity\CDocument;
use Chamilo\CourseBundle\Entity\CGroup;
use Chamilo\CourseBundle\Repository\CDocumentRepository;
use Doctrine\ORM\EntityManagerInterface;

Expand Down Expand Up @@ -541,172 +543,51 @@ public static function get_all_document_folders(
return [];
}

$TABLE_DOCUMENT = Database::get_course_table(TABLE_DOCUMENT);
$groupIid = (int) $groupIid;
$courseId = $courseInfo['real_id'];
$sessionId = api_get_session_id();

$folders = [];
$students = CourseManager::get_user_list_from_course_code(
$courseInfo['code'],
api_get_session_id()
);

$conditionList = [];
if (!empty($students)) {
foreach ($students as $studentId => $studentInfo) {
$conditionList[] = '/shared_folder/sf_user_'.$studentInfo['user_id'];
}
/** @var Course|null $course */
$course = api_get_course_entity();
if (!$course instanceof Course) {
return [];
}

$groupCondition = " l.group_id = $groupIid";
if (empty($groupIid)) {
$groupCondition = ' (l.group_id = 0 OR l.group_id IS NULL)';
/** @var Session|null $session */
$session = null;
if (!empty($sessionId)) {
$session = Container::$container
->get('doctrine')
->getRepository(Session::class)
->find($sessionId);
}

$show_users_condition = '';
if ($can_see_invisible) {
$sessionId = $sessionId ?: api_get_session_id();
$condition_session = " AND (l.session_id = '$sessionId' OR (l.session_id = '0' OR l.session_id IS NULL) )";
$condition_session .= self::getSessionFolderFilters($path, $sessionId);

$sql = "SELECT DISTINCT docs.iid, n.path
FROM resource_node AS n
INNER JOIN $TABLE_DOCUMENT AS docs
ON (docs.resource_node_id = n.id)
INNER JOIN resource_link l
ON (l.resource_node_id = n.id)
WHERE
l.c_id = $courseId AND
docs.filetype = 'folder' AND
$groupCondition AND
n.path NOT LIKE '%shared_folder%' AND
l.deleted_at IS NULL
$condition_session ";

if (0 != $groupIid) {
$sql .= " AND n.path NOT LIKE '%shared_folder%' ";
} else {
$sql .= $show_users_condition;
}

$result = Database::query($sql);
if ($result && 0 != Database::num_rows($result)) {
while ($row = Database::fetch_assoc($result)) {
if (self::is_folder_to_avoid($row['path'])) {
continue;
}

if (false !== strpos($row['path'], '/shared_folder/')) {
if (!in_array($row['path'], $conditionList)) {
continue;
}
}

$folders[$row['iid']] = $row['path'];
}

if (!empty($folders)) {
natsort($folders);
}

return $folders;
}

return false;
} else {
// No invisible folders
// Condition for the session
$condition_session = api_get_session_condition(
$sessionId,
true,
false,
'docs.session_id'
);

$visibilityCondition = 'l.visibility = 1';
$fileType = "docs.filetype = 'folder' AND";
if ($getInvisibleList) {
$visibilityCondition = 'l.visibility = 0';
$fileType = '';
}

//get visible folders
$sql = "SELECT DISTINCT docs.id
FROM resource_node AS n
INNER JOIN $TABLE_DOCUMENT AS docs
ON (docs.resource_node_id = n.id)
INNER JOIN resource_link l
ON (l.resource_node_id = n.id)
WHERE
$fileType
$groupCondition AND
$visibilityCondition
$show_users_condition
$condition_session AND
l.c_id = $courseId ";
$result = Database::query($sql);
$visibleFolders = [];
while ($row = Database::fetch_assoc($result)) {
$visibleFolders[$row['id']] = $row['path'];
}

if ($getInvisibleList) {
return $visibleFolders;
}

// get invisible folders
$sql = "SELECT DISTINCT docs.iid, n.path
FROM resource_node AS n
INNER JOIN $TABLE_DOCUMENT AS docs
ON (docs.resource_node_id = n.id)
INNER JOIN resource_link l
ON (l.resource_node_id = n.id)
WHERE
docs.filetype = 'folder' AND
$groupCondition AND
l.visibility IN ('".ResourceLink::VISIBILITY_PENDING."')
$condition_session AND
l.c_id = $courseId ";
$result = Database::query($sql);
$invisibleFolders = [];
while ($row = Database::fetch_assoc($result)) {
//get visible folders in the invisible ones -> they are invisible too
$sql = "SELECT DISTINCT docs.iid, n.path
FROM resource_node AS n
INNER JOIN $TABLE_DOCUMENT AS docs
ON (docs.resource_node_id = n.id)
INNER JOIN resource_link l
ON (l.resource_node_id = n.id)
WHERE
docs.filetype = 'folder' AND
$groupCondition AND
l.deleted_at IS NULL
$condition_session AND
l.c_id = $courseId ";
$folder_in_invisible_result = Database::query($sql);
while ($folders_in_invisible_folder = Database::fetch_assoc($folder_in_invisible_result)) {
$invisibleFolders[$folders_in_invisible_folder['id']] = $folders_in_invisible_folder['path'];
}
}

// If both results are arrays -> //calculate the difference between the 2 arrays -> only visible folders are left :)
if (is_array($visibleFolders) && is_array($invisibleFolders)) {
$folders = array_diff($visibleFolders, $invisibleFolders);
natsort($folders);

return $folders;
}
/** @var CGroup|null $group */
$group = null;
if (!empty($groupIid)) {
$group = Container::$container
->get('doctrine')
->getRepository(CGroup::class)
->find($groupIid);
}

if (is_array($visibleFolders)) {
natsort($visibleFolders);
/** @var CDocumentRepository $docRepo */
$docRepo = Container::$container->get('doctrine')
->getRepository(CDocument::class);

return $visibleFolders;
}
$folders = $docRepo->getAllFoldersForContext(
$course,
$session,
$group,
(bool) $can_see_invisible,
(bool) $getInvisibleList
);

// no visible folders found
if (empty($folders)) {
// Keep backward compatibility: some legacy callers expect "false"
// when there are no visible folders.
return false;
}

return $folders;
}

/**
Expand Down
Loading
Loading