mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-77965' of https://github.com/NeillM/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2024-02-23 17:59:58 +08:00
commit 45ba52afce
No known key found for this signature in database
GPG Key ID: F83510526D99E2C7
10 changed files with 329 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/classes/privacy/provider.php
View File

@ -118,9 +118,9 @@ class provider implements
(e.courseid = ctx.instanceid AND e.eventtype = 'course' AND ctx.contextlevel = :coursecontext) OR
(e.courseid = ctx.instanceid AND e.eventtype = 'group' AND ctx.contextlevel = :groupcontext) OR
(e.userid = ctx.instanceid AND e.eventtype = 'user' AND ctx.contextlevel = :usercontext)
WHERE e.userid = :cuserid
UNION
SELECT ctx.id
WHERE e.userid = :cuserid";
$contextlist->add_from_sql($sql, $params);
$sql = "SELECT ctx.id
FROM {context} ctx
JOIN {course_modules} cm ON cm.id = ctx.instanceid AND ctx.contextlevel = :modulecontext
JOIN {modules} m ON m.id = cm.module

1
calendar/tests/privacy/provider_test.php
View File

@ -42,6 +42,7 @@ use core_privacy\local\request\approved_userlist;
*
* @copyright 2018 Zig Tan <zig@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @covers \core_calendar\privacy\provider
*/
class provider_test extends provider_testcase {

248
competency/classes/privacy/provider.php
View File

@ -223,16 +223,28 @@ class provider implements
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {" . competency_framework::TABLE . "} cf
ON cf.contextid = ctx.id
LEFT JOIN {" . competency::TABLE . "} c
ON c.competencyframeworkid = cf.id
LEFT JOIN {" . related_competency::TABLE . "} cr
ON cr.competencyid = c.id
WHERE cf.usermodified = :userid1
OR c.usermodified = :userid2
OR cr.usermodified = :userid3";
$params = ['userid1' => $userid, 'userid2' => $userid, 'userid3' => $userid];
JOIN {" . competency_framework::TABLE . "} cf ON cf.contextid = ctx.id
WHERE cf.usermodified = :userid1";
$params = ['userid1' => $userid];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {" . competency_framework::TABLE . "} cf ON cf.contextid = ctx.id
JOIN {" . competency::TABLE . "} c ON c.competencyframeworkid = cf.id
WHERE c.usermodified = :userid2";
$params = ['userid2' => $userid];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {" . competency_framework::TABLE . "} cf ON cf.contextid = ctx.id
JOIN {" . competency::TABLE . "} c ON c.competencyframeworkid = cf.id
JOIN {" . related_competency::TABLE . "} cr ON cr.competencyid = c.id
WHERE cr.usermodified = :userid3";
$params = ['userid3' => $userid];
$contextlist->add_from_sql($sql, $params);
// Find the contexts of the templates, and related data, modified by the user.
@ -241,16 +253,30 @@ class provider implements
FROM {context} ctx
JOIN {" . template::TABLE . "} tpl
ON tpl.contextid = ctx.id
LEFT JOIN {" . template_cohort::TABLE . "} tch
WHERE tpl.usermodified = :userid1";
$params = ['userid1' => $userid];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {" . template::TABLE . "} tpl
ON tpl.contextid = ctx.id
JOIN {" . template_cohort::TABLE . "} tch
ON tch.templateid = tpl.id
AND tch.usermodified = :userid2
LEFT JOIN {" . template_competency::TABLE . "} tc
AND tch.usermodified = :userid2";
$params = ['userid2' => $userid];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {" . template::TABLE . "} tpl
ON tpl.contextid = ctx.id
JOIN {" . template_competency::TABLE . "} tc
ON tc.templateid = tpl.id
AND tc.usermodified = :userid3
WHERE tpl.usermodified = :userid1
OR tch.id IS NOT NULL
OR tc.id IS NOT NULL";
$params = ['userid1' => $userid, 'userid2' => $userid, 'userid3' => $userid];
AND tc.usermodified = :userid3";
$params = ['userid3' => $userid];
$contextlist->add_from_sql($sql, $params);
// Find the possible course contexts.
@ -302,21 +328,52 @@ class provider implements
JOIN {context} ctx
ON ctx.instanceid = p.userid
AND ctx.contextlevel = :userlevel
LEFT JOIN {" . plan_competency::TABLE . "} pc
ON pc.planid = p.id
AND pc.usermodified = :userid3
LEFT JOIN {" . user_competency_plan::TABLE . "} upc
ON upc.planid = p.id
AND upc.usermodified = :userid4
WHERE p.usermodified = :userid1
OR p.reviewerid = :userid2
OR pc.id IS NOT NULL
OR upc.id IS NOT NULL";
WHERE p.usermodified = :userid1";
$params = [
'userlevel' => CONTEXT_USER,
'userid1' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {" . plan::TABLE . "} p
JOIN {context} ctx
ON ctx.instanceid = p.userid
AND ctx.contextlevel = :userlevel
WHERE p.reviewerid = :userid2";
$params = [
'userlevel' => CONTEXT_USER,
'userid2' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {" . plan::TABLE . "} p
JOIN {context} ctx
ON ctx.instanceid = p.userid
AND ctx.contextlevel = :userlevel
JOIN {" . plan_competency::TABLE . "} pc
ON pc.planid = p.id
AND pc.usermodified = :userid3";
$params = [
'userlevel' => CONTEXT_USER,
'userid3' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {" . plan::TABLE . "} p
JOIN {context} ctx
ON ctx.instanceid = p.userid
AND ctx.contextlevel = :userlevel
JOIN {" . user_competency_plan::TABLE . "} upc
ON upc.planid = p.id
AND upc.usermodified = :userid4";
$params = [
'userlevel' => CONTEXT_USER,
'userid4' => $userid,
];
$contextlist->add_from_sql($sql, $params);
@ -325,32 +382,78 @@ class provider implements
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
LEFT JOIN {" . user_competency::TABLE . "} uc
JOIN {" . user_competency::TABLE . "} uc
ON uc.userid = ctx.instanceid
AND ctx.contextlevel = :userlevel1
LEFT JOIN {" . evidence::TABLE . "} e
ON e.usercompetencyid = uc.id
AND (e.usermodified = :userid3 OR e.actionuserid = :userid4)
LEFT JOIN {" . user_evidence::TABLE . "} ue
ON ue.userid = ctx.instanceid
AND ctx.contextlevel = :userlevel2
AND ue.usermodified = :userid5
LEFT JOIN {" . user_evidence_competency::TABLE . "} uec
ON uec.userevidenceid = ue.id
AND uec.usermodified = :userid6
WHERE uc.usermodified = :userid1
OR uc.reviewerid = :userid2
OR e.id IS NOT NULL
OR ue.id IS NOT NULL
OR uec.id IS NOT NULL";
WHERE uc.usermodified = :userid1";
$params = [
'userlevel1' => CONTEXT_USER,
'userlevel2' => CONTEXT_USER,
'userid1' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {" . user_competency::TABLE . "} uc
ON uc.userid = ctx.instanceid
AND ctx.contextlevel = :userlevel1
WHERE uc.reviewerid = :userid2";
$params = [
'userlevel1' => CONTEXT_USER,
'userid2' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {" . user_competency::TABLE . "} uc
ON uc.userid = ctx.instanceid
AND ctx.contextlevel = :userlevel1
JOIN {" . evidence::TABLE . "} e
ON e.usercompetencyid = uc.id
AND e.usermodified = :userid3";
$params = [
'userlevel1' => CONTEXT_USER,
'userid3' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {" . user_competency::TABLE . "} uc
ON uc.userid = ctx.instanceid
AND ctx.contextlevel = :userlevel1
JOIN {" . evidence::TABLE . "} e
ON e.usercompetencyid = uc.id
AND e.actionuserid = :userid4";
$params = [
'userlevel1' => CONTEXT_USER,
'userid4' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {" . user_evidence::TABLE . "} ue
ON ue.userid = ctx.instanceid
AND ctx.contextlevel = :userlevel2
AND ue.usermodified = :userid5";
$params = [
'userlevel2' => CONTEXT_USER,
'userid5' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {" . user_evidence::TABLE . "} ue
ON ue.userid = ctx.instanceid
AND ctx.contextlevel = :userlevel2
JOIN {" . user_evidence_competency::TABLE . "} uec
ON uec.userevidenceid = ue.id
AND uec.usermodified = :userid6";
$params = [
'userlevel2' => CONTEXT_USER,
'userid6' => $userid,
];
$contextlist->add_from_sql($sql, $params);
@ -360,33 +463,48 @@ class provider implements
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
LEFT JOIN {" . plan::TABLE . "} p
JOIN {" . plan::TABLE . "} p
ON p.userid = ctx.instanceid
AND ctx.contextlevel = :userlevel1
LEFT JOIN {" . user_competency::TABLE . "} uc
ON uc.userid = ctx.instanceid
AND ctx.contextlevel = :userlevel2
AND uc.userid = :userid2
LEFT JOIN {" . user_evidence::TABLE . "} ue
ON ue.userid = ctx.instanceid
AND ctx.contextlevel = :userlevel3
AND ue.userid = :userid3
LEFT JOIN {" . user_competency_course::TABLE . "} ucc
ON ucc.courseid = ctx.instanceid
AND ctx.contextlevel = :courselevel
AND ucc.userid = :userid4
WHERE p.userid = :userid1
OR uc.id IS NOT NULL
OR ue.id IS NOT NULL
OR ucc.id IS NOT NULL";
WHERE p.userid = :userid1";
$params = [
'userlevel1' => CONTEXT_USER,
'userlevel2' => CONTEXT_USER,
'userlevel3' => CONTEXT_USER,
'courselevel' => CONTEXT_COURSE,
'userid1' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {" . user_competency::TABLE . "} uc
ON uc.userid = ctx.instanceid
AND ctx.contextlevel = :userlevel2
AND uc.userid = :userid2";
$params = [
'userlevel2' => CONTEXT_USER,
'userid2' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {" . user_evidence::TABLE . "} ue
ON ue.userid = ctx.instanceid
AND ctx.contextlevel = :userlevel3
AND ue.userid = :userid3";
$params = [
'userlevel3' => CONTEXT_USER,
'userid3' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {" . user_competency_course::TABLE . "} ucc
ON ucc.courseid = ctx.instanceid
AND ctx.contextlevel = :courselevel
AND ucc.userid = :userid4";
$params = [
'courselevel' => CONTEXT_COURSE,
'userid4' => $userid,
];
$contextlist->add_from_sql($sql, $params);

21
competency/tests/privacy/provider_test.php
View File

@ -46,6 +46,7 @@ use core_competency\privacy\provider;
* @copyright 2018 Frédéric Massart
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @covers \core_competency\privacy\provider
*/
class provider_test extends provider_testcase {
@ -666,6 +667,7 @@ class provider_test extends provider_testcase {
$u2 = $dg->create_user();
$u3 = $dg->create_user();
$u4 = $dg->create_user();
$u5 = $dg->create_user();
$c1ctx = \context_course::instance($c1->id);
$u1ctx = \context_user::instance($u1->id);
@ -681,30 +683,45 @@ class provider_test extends provider_testcase {
$this->assert_contextlist(provider::get_contexts_for_userid($u2->id), []);
$this->assert_contextlist(provider::get_contexts_for_userid($u3->id), []);
$this->assert_contextlist(provider::get_contexts_for_userid($u4->id), []);
$this->assert_contextlist(provider::get_contexts_for_userid($u5->id), []);
$ccg->create_plan(['userid' => $u1->id]);
$this->assert_contextlist(provider::get_contexts_for_userid($u1->id), [$u1ctx]);
$this->assert_contextlist(provider::get_contexts_for_userid($u2->id), []);
$this->assert_contextlist(provider::get_contexts_for_userid($u3->id), []);
$this->assert_contextlist(provider::get_contexts_for_userid($u4->id), []);
$this->assert_contextlist(provider::get_contexts_for_userid($u5->id), []);
$ccg->create_user_competency(['userid' => $u2->id, 'competencyid' => $comp1->get('id')]);
$this->assert_contextlist(provider::get_contexts_for_userid($u1->id), [$u1ctx]);
$this->assert_contextlist(provider::get_contexts_for_userid($u2->id), [$u2ctx]);
$this->assert_contextlist(provider::get_contexts_for_userid($u3->id), []);
$this->assert_contextlist(provider::get_contexts_for_userid($u4->id), []);
$this->assert_contextlist(provider::get_contexts_for_userid($u5->id), []);
$ccg->create_user_competency_course(['userid' => $u3->id, 'competencyid' => $comp1->get('id'), 'courseid' => $c1->id]);
$this->assert_contextlist(provider::get_contexts_for_userid($u1->id), [$u1ctx]);
$this->assert_contextlist(provider::get_contexts_for_userid($u2->id), [$u2ctx]);
$this->assert_contextlist(provider::get_contexts_for_userid($u3->id), [$c1ctx]);
$this->assert_contextlist(provider::get_contexts_for_userid($u4->id), []);
$this->assert_contextlist(provider::get_contexts_for_userid($u5->id), []);
$ccg->create_user_evidence(['userid' => $u4->id]);
$ue = $ccg->create_user_evidence(['userid' => $u4->id]);
$this->assert_contextlist(provider::get_contexts_for_userid($u1->id), [$u1ctx]);
$this->assert_contextlist(provider::get_contexts_for_userid($u2->id), [$u2ctx]);
$this->assert_contextlist(provider::get_contexts_for_userid($u3->id), [$c1ctx]);
$this->assert_contextlist(provider::get_contexts_for_userid($u4->id), [$u4ctx]);
$this->assert_contextlist(provider::get_contexts_for_userid($u5->id), []);
// A user editing a context relationship.
$this->setUser($u5);
$ccg->create_user_evidence_competency(['userevidenceid' => $ue->get('id'), 'competencyid' => $comp1->get('id')]);
$this->setAdminUser();
$this->assert_contextlist(provider::get_contexts_for_userid($u1->id), [$u1ctx]);
$this->assert_contextlist(provider::get_contexts_for_userid($u2->id), [$u2ctx]);
$this->assert_contextlist(provider::get_contexts_for_userid($u3->id), [$c1ctx]);
$this->assert_contextlist(provider::get_contexts_for_userid($u4->id), [$u4ctx]);
$this->assert_contextlist(provider::get_contexts_for_userid($u5->id), [$u4ctx]);
}
public function test_get_users_in_context_with_actual_data_and_actual_data_is_goooood() {
@ -2598,7 +2615,7 @@ class provider_test extends provider_testcase {
$expectedids = array_unique(array_map(function($item) {
return $item instanceof \context ? $item->id : $id;
}, $expectedcontextsorids));
$this->assert_array_match($contextids, $expectedids);
$this->assert_array_match($expectedids, $contextids);
}
/**

93
grade/classes/privacy/provider.php
View File

@ -170,39 +170,80 @@ class provider implements
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
LEFT JOIN {grade_outcomes_history} goh ON goh.loggeduser = :userid1 AND (
(goh.courseid > 0 AND goh.courseid = ctx.instanceid AND ctx.contextlevel = :courselevel1)
OR ((goh.courseid IS NULL OR goh.courseid < 1) AND ctx.id = :syscontextid1)
)
LEFT JOIN {grade_categories_history} gch ON gch.loggeduser = :userid2 AND (
gch.courseid = ctx.instanceid
AND ctx.contextlevel = :courselevel2
)
LEFT JOIN {grade_items_history} gih ON gih.loggeduser = :userid3 AND (
gih.courseid = ctx.instanceid
AND ctx.contextlevel = :courselevel3
)
LEFT JOIN {scale_history} sh
ON (sh.userid = :userid4 OR sh.loggeduser = :userid5)
AND (
(sh.courseid > 0 AND sh.courseid = ctx.instanceid AND ctx.contextlevel = :courselevel4)
OR (sh.courseid = 0 AND ctx.id = :syscontextid2)
)
WHERE goh.id IS NOT NULL
OR gch.id IS NOT NULL
OR gih.id IS NOT NULL
OR sh.id IS NOT NULL";
JOIN {grade_outcomes_history} goh ON goh.loggeduser = :userid1 AND goh.courseid > 0
AND goh.courseid = ctx.instanceid AND ctx.contextlevel = :courselevel1";
$params = [
'courselevel1' => CONTEXT_COURSE,
'userid1' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {grade_outcomes_history} goh ON goh.loggeduser = :userid1
AND (goh.courseid IS NULL OR goh.courseid < 1) AND ctx.id = :syscontextid1";
$params = [
'syscontextid1' => SYSCONTEXTID,
'syscontextid2' => SYSCONTEXTID,
'courselevel1' => CONTEXT_COURSE,
'courselevel2' => CONTEXT_COURSE,
'courselevel3' => CONTEXT_COURSE,
'courselevel4' => CONTEXT_COURSE,
'userid1' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {grade_categories_history} gch ON gch.loggeduser = :userid2
AND gch.courseid = ctx.instanceid AND ctx.contextlevel = :courselevel2";
$params = [
'courselevel2' => CONTEXT_COURSE,
'userid2' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {grade_items_history} gih ON gih.loggeduser = :userid3
AND gih.courseid = ctx.instanceid AND ctx.contextlevel = :courselevel3";
$params = [
'courselevel3' => CONTEXT_COURSE,
'userid3' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {scale_history} sh ON sh.userid = :userid4
AND sh.courseid > 0 AND sh.courseid = ctx.instanceid AND ctx.contextlevel = :courselevel4";
$params = [
'courselevel4' => CONTEXT_COURSE,
'userid4' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {scale_history} sh ON sh.loggeduser = :userid5
AND sh.courseid > 0 AND sh.courseid = ctx.instanceid AND ctx.contextlevel = :courselevel4";
$params = [
'courselevel4' => CONTEXT_COURSE,
'userid5' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {scale_history} sh ON sh.userid = :userid4 AND sh.courseid = 0 AND ctx.id = :syscontextid2";
$params = [
'syscontextid2' => SYSCONTEXTID,
'userid4' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "
SELECT DISTINCT ctx.id
FROM {context} ctx
JOIN {scale_history} sh ON sh.loggeduser = :userid5 AND sh.courseid = 0 AND ctx.id = :syscontextid2";
$params = [
'syscontextid2' => SYSCONTEXTID,
'userid5' => $userid,
];
$contextlist->add_from_sql($sql, $params);

1
grade/tests/privacy/provider_test.php
View File

@ -44,6 +44,7 @@ require_once($CFG->libdir . '/gradelib.php');
* @copyright 2018 Frédéric Massart
* @author Frédéric Massart <fred@branchup.tech>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @covers \core_grades\privacy\provider
*/
class provider_test extends provider_testcase {

57
mod/quiz/classes/privacy/provider.php
View File

@ -480,31 +480,60 @@ class provider implements
$userid = $contextlist->get_user()->id;
list($contextsql, $contextparams) = $DB->get_in_or_equal($contextlist->get_contextids(), SQL_PARAMS_NAMED);
$qubaid = \core_question\privacy\provider::get_related_question_usages_for_user('rel', 'mod_quiz', 'qa.uniqueid', $userid);
$qubaid1 = \core_question\privacy\provider::get_related_question_usages_for_user(
'rel1',
'mod_quiz',
'qa.uniqueid',
$userid
);
$qubaid2 = \core_question\privacy\provider::get_related_question_usages_for_user(
'rel2',
'mod_quiz',
'qa.uniqueid',
$userid
);
// The layout column causes the union in the following query to fail on Oracle, it also appears to not be used.
// So we can filter the return values to be only those used to generate the data, this will have the benefit
// improving performance on all databases as we will no longer be returning a text field for each row.
$attemptfields = 'qa.id, qa.quiz, qa.userid, qa.attempt, qa.uniqueid, qa.preview, qa.state, qa.timestart, ' .
'qa.timefinish, qa.timemodified, qa.timemodifiedoffline, qa.timecheckstate, qa.sumgrades, ' .
'qa.gradednotificationsenttime';
$sql = "SELECT
c.id AS contextid,
cm.id AS cmid,
qa.*
$attemptfields
FROM {context} c
JOIN {course_modules} cm ON cm.id = c.instanceid AND c.contextlevel = :contextlevel
JOIN {course_modules} cm ON cm.id = c.instanceid AND c.contextlevel = :contextlevel1
JOIN {modules} m ON m.id = cm.module AND m.name = 'quiz'
JOIN {quiz} q ON q.id = cm.instance
JOIN {quiz_attempts} qa ON qa.quiz = q.id
" . $qubaid->from. "
WHERE (
qa.userid = :qauserid OR
" . $qubaid->where() . "
) AND qa.preview = 0
" . $qubaid1->from. "
WHERE qa.userid = :qauserid AND qa.preview = 0
UNION
SELECT
c.id AS contextid,
cm.id AS cmid,
$attemptfields
FROM {context} c
JOIN {course_modules} cm ON cm.id = c.instanceid AND c.contextlevel = :contextlevel2
JOIN {modules} m ON m.id = cm.module AND m.name = 'quiz'
JOIN {quiz} q ON q.id = cm.instance
JOIN {quiz_attempts} qa ON qa.quiz = q.id
" . $qubaid2->from. "
WHERE " . $qubaid2->where() . " AND qa.preview = 0
";
$params = array_merge(
[
'contextlevel' => CONTEXT_MODULE,
'qauserid' => $userid,
],
$qubaid->from_where_params()
);
[
'contextlevel1' => CONTEXT_MODULE,
'contextlevel2' => CONTEXT_MODULE,
'qauserid' => $userid,
],
$qubaid1->from_where_params(),
$qubaid2->from_where_params(),
);
$attempts = $DB->get_recordset_sql($sql, $params);
foreach ($attempts as $attempt) {

1
mod/quiz/tests/privacy/provider_test.php
View File

@ -41,6 +41,7 @@ require_once($CFG->dirroot . '/question/tests/privacy_helper.php');
* @package mod_quiz
* @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @covers \mod_quiz\privacy\provider
*/
class provider_test extends \core_privacy\tests\provider_testcase {

15
notes/classes/privacy/provider.php
View File

@ -95,9 +95,16 @@ class provider implements
FROM {context} c
INNER JOIN {post} p ON p.courseid = c.instanceid AND c.contextlevel = :contextcoursewrittenby
WHERE p.module = 'notes'
AND p.usermodified = :usermodified
UNION
SELECT c.id
AND p.usermodified = :usermodified";
$params = [
'contextcoursewrittenby' => CONTEXT_COURSE,
'usermodified' => $userid,
];
$contextlist->add_from_sql($sql, $params);
$sql = "SELECT c.id
FROM {context} c
INNER JOIN {post} p ON p.courseid = c.instanceid AND c.contextlevel = :contextcoursewrittenfor
WHERE p.module = 'notes'
@ -105,8 +112,6 @@ class provider implements
AND p.publishstate {$publishstatesql}";
$params = [
'contextcoursewrittenby' => CONTEXT_COURSE,
'usermodified' => $userid,
'contextcoursewrittenfor' => CONTEXT_COURSE,
'userid' => $userid
];

1
notes/tests/privacy/provider_test.php
View File

@ -39,6 +39,7 @@ use core_privacy\local\request\approved_userlist;
*
* @copyright 2018 Zig Tan <zig@moodle.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @covers \core_notes\privacy\provider
*/
class provider_test extends \core_privacy\tests\provider_testcase {