Skip to content

BackgroundTasks 42358: Add grp to folder-type whitelist #11532

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
matheuszych wants to merge 1 commit into
base: release_10
Choose a base branch
from
+26 −10
Open

BackgroundTasks 42358: Add grp to folder-type whitelist #11532

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
36 changes: 26 additions & 10 deletions components/ILIAS/BackgroundTasks_/classes/Jobs/class.ilCollectFilesJob.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,25 +92,41 @@ public function run(array $input, \ILIAS\BackgroundTasks\Observer $observer): Va
$definition = $input[0];
$initiated_by_folder_action = $input[1]->getValue();
$object_ref_ids = $definition->getObjectRefIds();
$files = array();
$files = [];

foreach ($object_ref_ids as $object_ref_id) {
$object = ilObjectFactory::getInstanceByRefId($object_ref_id);
if (!$object instanceof ilObject) {
continue;
}

$object_type = $object->getType();
$object_name = $object->getTitle();
$object_temp_dir = ""; // empty as content will be added in recurseFolder and getFileDirs
$object_temp_dir = ''; // empty as content will be added in recurseFolder and getFileDirs

if ($object_type === "fold" || $object_type === "crs") {
if (in_array($object_type, ['fold', 'crs', 'grp'], true)) {
$num_recursions = 0;
$files_from_folder = $this->recurseFolder($object_ref_id, $object_name, $object_temp_dir, $num_recursions, $initiated_by_folder_action);
$files_from_folder = $this->recurseFolder(
$object_ref_id,
$object_name,
$object_temp_dir,
$num_recursions,
$initiated_by_folder_action
);
$files = array_merge($files, $files_from_folder);
} elseif (($object_type === "file") && (($file_dirs = $this->getFileDirs(
$object_ref_id,
$object_name,
$object_temp_dir
)) !== false)) {
$files[] = $file_dirs;
continue;
}

if ($object_type !== 'file') {
continue;
}

$file_dirs = $this->getFileDirs($object_ref_id, $object_name, $object_temp_dir);
if (!is_array($file_dirs)) {
continue;
}

$files[] = $file_dirs;
}
$this->logger->debug('Collected files:');
$this->logger->dump($files);
Expand Down
Loading