Skip to content

[Bugfix]48178: Added some filtering to rev.title in SQLs to reduce false positive cases #12180

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
jochen-ac wants to merge 3 commits into
base: release_10
Choose a base branch
from
Open

[Bugfix]48178: Added some filtering to rev.title in SQLs to reduce false positive cases #12180

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c68414
Update class.ilExerciseSubmissionMigrationFix48178.php
jochen-ac Oct 7, 2026
af3bb55
Update class.ilExerciseSubmissionMigrationFix48178.php
jochen-ac Oct 8, 2026
71ac0ca
Update class.ilExerciseSubmissionMigrationFix48178.php
jochen-ac Oct 11, 2026
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
9 changes: 6 additions & 3 deletions components/ILIAS/Exercise/classes/Setup/class.ilExerciseSubmissionMigrationFix48178.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ public function prepare(Environment $environment): void

public function getSql(bool $count = false): string
{
$sub_filename = "SUBSTRING_INDEX(er.filename, '/', -1)";
$sub_filename = "REGEXP_REPLACE(REPLACE(REPLACE(REPLACE(SUBSTRING_INDEX(rev.title, '/', -1), '&amp;', '&'), '<', '&lt;'), '&#039;', '\''),'\\.sec|\\.', '')";
$sub_title = "REGEXP_REPLACE(SUBSTRING_INDEX(er.filename, '/', -1), '\\.sec|\\.', '')";
if (!$count) {
$fields = " DISTINCT er.user_id, er.ass_id, er.team_id ";
} else {
Expand All @@ -61,7 +62,7 @@ public function getSql(bool $count = false): string
JOIN il_resource_revision rev ON rev.rid = er.rid
JOIN il_resource_info i ON i.rid = rev.rid AND i.version_number = rev.version_number
WHERE er.rid IS NOT NULL AND er.rid <> ''
AND rev.title <> $sub_filename
AND $sub_title <> $sub_filename
AND er.filename IS NOT NULL AND er.filename <> '' ORDER BY `er`.`returned_id` DESC";

return $sql;
Expand Down Expand Up @@ -89,12 +90,14 @@ public function getRemainingAmountOfSteps(): int
protected function fixCase(int $user_id, int $ass_id, int $team_id): void
{
$db = $this->helper->getDatabase();
$sub_filename = "REGEXP_REPLACE(REPLACE(REPLACE(REPLACE(SUBSTRING_INDEX(rev.title, '/', -1), '&amp;', '&'), '<', '&lt;'), '&#039;', '\''),'\\.sec|\\.', '')";
$sub_title = "REGEXP_REPLACE(SUBSTRING_INDEX(er.filename, '/', -1), '\\.sec|\\.', '')";
$sql = "SELECT er.returned_id, rev.title, SUBSTRING_INDEX(er.filename, '/', -1) subname, rev.rid
FROM exc_returned er
LEFT JOIN il_resource_revision rev ON rev.rid = er.rid
LEFT JOIN il_resource_info i ON i.rid = rev.rid AND i.version_number = rev.version_number
WHERE er.user_id = %s AND er.ass_id = %s AND er.team_id = %s
AND (rev.title <> SUBSTRING_INDEX(er.filename, '/', -1) OR rev.title IS NULL)
AND ($sub_title <> $sub_filename) OR rev.title IS NULL)
AND er.filename IS NOT NULL AND er.filename <> ''";
$set = $db->queryF(
$sql,
Expand Down
Loading