mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-29 11:46:19 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-63785-master' of git://github.com/rezaies/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2019-02-06 00:04:14 +01:00
commit f706dabd50
17 changed files with 100 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
auth/mnet/classes/privacy/provider.php
View File

@ -161,18 +161,10 @@ class provider implements
return;
}
$params = [
'contextuser' => CONTEXT_USER,
'contextid' => $context->id
];
$sql = "SELECT ctx.instanceid as userid
FROM {mnet_log} ml
JOIN {context} ctx
ON ctx.instanceid = ml.userid
AND ctx.contextlevel = :contextuser
WHERE ctx.id = :contextid";
$sql = "SELECT userid
FROM {mnet_log}
WHERE userid = ?";
$params = [$context->instanceid];
$userlist->add_from_sql('userid', $sql, $params);
}

16
auth/oauth2/classes/privacy/provider.php
View File

@ -99,18 +99,10 @@ class provider implements
return;
}
$params = [
'contextuser' => CONTEXT_USER,
'contextid' => $context->id
];
$sql = "SELECT ctx.instanceid as userid
FROM {auth_oauth2_linked_login} ao
JOIN {context} ctx
ON ctx.instanceid = ao.userid
AND ctx.contextlevel = :contextuser
WHERE ctx.id = :contextid";
$sql = "SELECT userid
FROM {auth_oauth2_linked_login}
WHERE userid = ?";
$params = [$context->instanceid];
$userlist->add_from_sql('userid', $sql, $params);
}

16
blocks/community/classes/privacy/provider.php
View File

@ -105,18 +105,10 @@ class provider implements
return;
}
$params = [
'contextid' => $context->id,
'contextuser' => CONTEXT_USER,
];
$sql = "SELECT bc.userid as userid
FROM {block_community} bc
JOIN {context} ctx
ON ctx.instanceid = bc.userid
AND ctx.contextlevel = :contextuser
WHERE ctx.id = :contextid";
$sql = "SELECT userid
FROM {block_community}
WHERE userid = ?";
$params = [$context->instanceid];
$userlist->add_from_sql('userid', $sql, $params);
}

23
blocks/html/classes/privacy/provider.php
View File

@ -98,22 +98,25 @@ class provider implements
* @param userlist $userlist The userlist containing the list of users who have data in this context/plugin combination.
*/
public static function get_users_in_context(userlist $userlist) {
// This block doesn't know who information is stored against unless it
// is at the user context.
$context = $userlist->get_context();
if (!is_a($context, \context_block::class)) {
if (!$context instanceof \context_block) {
return;
}
$params = [
'contextid' => $context->id,
'contextuser' => CONTEXT_USER,
];
$sql = "SELECT bpc.instanceid AS userid
FROM {context} c
JOIN {block_instances} bi ON bi.id = c.instanceid AND bi.blockname = 'html'
JOIN {context} bpc ON bpc.id = bi.parentcontextid AND bpc.contextlevel = :contextuser
WHERE c.id = :contextid";
FROM {block_instances} bi
JOIN {context} bpc ON bpc.id = bi.parentcontextid
WHERE bi.blockname = 'html'
AND bpc.contextlevel = :contextuser
AND bi.id = :blockinstanceid";
$params = [
'contextuser' => CONTEXT_USER,
'blockinstanceid' => $context->instanceid
];
$userlist->add_from_sql('userid', $sql, $params);
}

16
blocks/rss_client/classes/privacy/provider.php
View File

@ -98,18 +98,10 @@ class provider implements
return;
}
$params = [
'contextid' => $context->id,
'contextuser' => CONTEXT_USER,
];
$sql = "SELECT brc.userid as userid
FROM {block_rss_client} brc
JOIN {context} ctx
ON ctx.instanceid = brc.userid
AND ctx.contextlevel = :contextuser
WHERE ctx.id = :contextid";
$sql = "SELECT userid
FROM {block_rss_client}
WHERE userid = ?";
$params = [$context->instanceid];
$userlist->add_from_sql('userid', $sql, $params);
}

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

@ -105,20 +105,11 @@ class provider implements
return;
}
$params = [
'contextid' => $context->id,
'contextcourse' => CONTEXT_COURSE,
];
$sql = "SELECT ue.userid as userid
FROM {user_enrolments} ue
JOIN {enrol} e
ON e.id = ue.enrolid
JOIN {context} ctx
ON ctx.instanceid = e.courseid
AND ctx.contextlevel = :contextcourse
WHERE ctx.id = :contextid";
JOIN {enrol} e ON e.id = ue.enrolid
WHERE e.courseid = ?";
$params = [$context->instanceid];
$userlist->add_from_sql('userid', $sql, $params);
}

17
message/output/airnotifier/classes/privacy/provider.php
View File

@ -105,20 +105,11 @@ class provider implements
return;
}
$params = [
'contextid' => $context->id,
'contextuser' => CONTEXT_USER,
];
$sql = "SELECT ud.userid as userid
$sql = "SELECT ud.userid
FROM {message_airnotifier_devices} mad
JOIN {user_devices} ud
ON ud.id = mad.userdeviceid
JOIN {context} ctx
ON ctx.instanceid = ud.userid
AND ctx.contextlevel = :contextuser
WHERE ctx.id = :contextid";
JOIN {user_devices} ud ON ud.id = mad.userdeviceid
WHERE ud.userid = ?";
$params = [$context->instanceid];
$userlist->add_from_sql('userid', $sql, $params);
}

25
portfolio/classes/privacy/provider.php
View File

@ -113,27 +113,16 @@ class provider implements
return;
}
$params = [
'contextid' => $context->id,
'contextuser' => CONTEXT_USER,
];
$sql = "SELECT ctx.instanceid as userid
FROM {portfolio_instance_user} piu
JOIN {context} ctx
ON ctx.instanceid = piu.userid
AND ctx.contextlevel = :contextuser
WHERE ctx.id = :contextid";
$params = [$context->instanceid];
$sql = "SELECT userid
FROM {portfolio_instance_user}
WHERE userid = ?";
$userlist->add_from_sql('userid', $sql, $params);
$sql = "SELECT ctx.instanceid as userid
FROM {portfolio_log} pl
JOIN {context} ctx
ON ctx.instanceid = pl.userid
AND ctx.contextlevel = :contextuser
WHERE ctx.id = :contextid";
$sql = "SELECT userid
FROM {portfolio_log}
WHERE userid = ?";
$userlist->add_from_sql('userid', $sql, $params);
}

13
repository/classes/privacy/provider.php
View File

@ -109,15 +109,10 @@ class provider implements
return;
}
$params = [
'contextid' => $context->id,
'contextuser' => CONTEXT_USER,
];
$sql = "SELECT c.instanceid as userid
FROM {repository_instances} ri
JOIN {context} c ON c.instanceid = ri.userid AND c.contextlevel = :contextuser
WHERE c.id = :contextid";
$sql = "SELECT userid
FROM {repository_instances}
WHERE userid = ?";
$params = [$context->instanceid];
$userlist->add_from_sql('userid', $sql, $params);
}

16
repository/onedrive/classes/privacy/provider.php
View File

@ -111,21 +111,15 @@ class provider implements
public static function get_users_in_context(userlist $userlist) {
$context = $userlist->get_context();
if (!is_a($context, \context_user::class)) {
if (!$context instanceof \context_user) {
return;
}
// The data is associated at the user context level, so retrieve the user's context id.
$sql = "SELECT roa.usermodified AS userid
FROM {repository_onedrive_access} roa
JOIN {context} c ON c.instanceid = roa.usermodified AND c.contextlevel = :contextuser
WHERE c.id = :contextid";
$params = [
'contextuser' => CONTEXT_USER,
'contextid' => $context->id,
];
$sql = "SELECT usermodified AS userid
FROM {repository_onedrive_access}
WHERE usermodified = ?";
$params = [$context->instanceid];
$userlist->add_from_sql('userid', $sql, $params);
}

11
user/classes/privacy/provider.php
View File

@ -213,16 +213,7 @@ class provider implements
return;
}
$params = [
'contextid' => $context->id,
'contextuser' => CONTEXT_USER,
];
$sql = "SELECT instanceid as userid
FROM {context}
WHERE id = :contextid and contextlevel = :contextuser";
$userlist->add_from_sql('userid', $sql, $params);
$userlist->add_user($context->instanceid);
}
/**

18
user/profile/field/checkbox/classes/privacy/provider.php
View File

@ -95,22 +95,18 @@ class provider implements
return;
}
$params = [
'contextuser' => CONTEXT_USER,
'contextid' => $context->id,
'datatype' => 'checkbox'
];
$sql = "SELECT ctx.instanceid as userid
$sql = "SELECT uda.userid
FROM {user_info_data} uda
JOIN {user_info_field} uif
ON uda.fieldid = uif.id
JOIN {context} ctx
ON ctx.instanceid = uda.userid
AND ctx.contextlevel = :contextuser
WHERE ctx.id = :contextid
WHERE uda.userid = :userid
AND uif.datatype = :datatype";
$params = [
'userid' => $context->instanceid,
'datatype' => 'checkbox'
];
$userlist->add_from_sql('userid', $sql, $params);
}

18
user/profile/field/datetime/classes/privacy/provider.php
View File

@ -96,22 +96,18 @@ class provider implements
return;
}
$params = [
'contextuser' => CONTEXT_USER,
'contextid' => $context->id,
'datatype' => 'datetime'
];
$sql = "SELECT ctx.instanceid as userid
$sql = "SELECT uda.userid
FROM {user_info_data} uda
JOIN {user_info_field} uif
ON uda.fieldid = uif.id
JOIN {context} ctx
ON ctx.instanceid = uda.userid
AND ctx.contextlevel = :contextuser
WHERE ctx.id = :contextid
WHERE uda.userid = :userid
AND uif.datatype = :datatype";
$params = [
'userid' => $context->instanceid,
'datatype' => 'datetime'
];
$userlist->add_from_sql('userid', $sql, $params);
}

18
user/profile/field/menu/classes/privacy/provider.php
View File

@ -95,22 +95,18 @@ class provider implements
return;
}
$params = [
'contextuser' => CONTEXT_USER,
'contextid' => $context->id,
'datatype' => 'menu'
];
$sql = "SELECT ctx.instanceid as userid
$sql = "SELECT uda.userid
FROM {user_info_data} uda
JOIN {user_info_field} uif
ON uda.fieldid = uif.id
JOIN {context} ctx
ON ctx.instanceid = uda.userid
AND ctx.contextlevel = :contextuser
WHERE ctx.id = :contextid
WHERE uda.userid = :userid
AND uif.datatype = :datatype";
$params = [
'userid' => $context->instanceid,
'datatype' => 'menu'
];
$userlist->add_from_sql('userid', $sql, $params);
}

18
user/profile/field/text/classes/privacy/provider.php
View File

@ -95,22 +95,18 @@ class provider implements
return;
}
$params = [
'contextuser' => CONTEXT_USER,
'contextid' => $context->id,
'datatype' => 'text'
];
$sql = "SELECT ctx.instanceid as userid
$sql = "SELECT uda.userid
FROM {user_info_data} uda
JOIN {user_info_field} uif
ON uda.fieldid = uif.id
JOIN {context} ctx
ON ctx.instanceid = uda.userid
AND ctx.contextlevel = :contextuser
WHERE ctx.id = :contextid
WHERE uda.userid = :userid
AND uif.datatype = :datatype";
$params = [
'userid' => $context->instanceid,
'datatype' => 'text'
];
$userlist->add_from_sql('userid', $sql, $params);
}

18
user/profile/field/textarea/classes/privacy/provider.php
View File

@ -95,22 +95,18 @@ class provider implements
return;
}
$params = [
'contextuser' => CONTEXT_USER,
'contextid' => $context->id,
'datatype' => 'textarea'
];
$sql = "SELECT ctx.instanceid as userid
$sql = "SELECT uda.userid
FROM {user_info_data} uda
JOIN {user_info_field} uif
ON uda.fieldid = uif.id
JOIN {context} ctx
ON ctx.instanceid = uda.userid
AND ctx.contextlevel = :contextuser
WHERE ctx.id = :contextid
WHERE uda.userid = :userid
AND uif.datatype = :datatype";
$params = [
'userid' => $context->instanceid,
'datatype' => 'textarea'
];
$userlist->add_from_sql('userid', $sql, $params);
}

40
webservice/classes/privacy/provider.php
View File

@ -115,39 +115,23 @@ class provider implements
* @param userlist $userlist The userlist containing the list of users who have data in this context/plugin combination.
*/
public static function get_users_in_context(userlist $userlist) {
global $DB;
$context = $userlist->get_context();
$params = [
'contextid' => $context->id,
'contextuser' => CONTEXT_USER,
];
if (!$context instanceof \context_user) {
return;
}
$sql = "SELECT ctx.instanceid as userid
FROM {external_tokens} t
JOIN {context} ctx
ON ctx.instanceid = t.userid
AND ctx.contextlevel = :contextuser
WHERE ctx.id = :contextid";
$userid = $context->instanceid;
$userlist->add_from_sql('userid', $sql, $params);
$hasdata = false;
$hasdata = $hasdata || $DB->record_exists_select('external_tokens', 'userid = ? OR creatorid = ?', [$userid, $userid]);
$hasdata = $hasdata || $DB->record_exists('external_services_users', ['userid' => $userid]);
$sql = "SELECT ctx.instanceid as userid
FROM {external_tokens} t
JOIN {context} ctx
ON ctx.instanceid = t.creatorid
AND ctx.contextlevel = :contextuser
WHERE ctx.id = :contextid";
$userlist->add_from_sql('userid', $sql, $params);
$sql = "SELECT ctx.instanceid as userid
FROM {external_services_users} su
JOIN {context} ctx
ON ctx.instanceid = su.userid
AND ctx.contextlevel = :contextuser
WHERE ctx.id = :contextid";
$userlist->add_from_sql('userid', $sql, $params);
if ($hasdata) {
$userlist->add_user($userid);
}
}
/**