moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-71215 core_user: User fields - remaining deprecated functions

Browse source 
This change removes references in code and comments to a few
deprecated functions that were accidentally missed in the larger
change.

The code changes only affect service_users.php. I made it support
custom user profile fields in this query, because it was easy
enough, rather than adding another TODO to fix later.
This commit is contained in:
sam marshall 2021-03-29 13:59:49 +01:00
parent f0eb6a5729
commit 611e2569aa
5 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
webservice/lib.php
View file

@ -288,21 +288,19 @@ class webservice {
$params = array($CFG->siteguest, $serviceid);
$namefields = get_all_user_name_fields(true, 'u');
$userfields = \core_user\fields::for_identity(context_system::instance())->with_name()->excluding('id');
$fieldsql = $userfields->get_sql('u');
foreach (get_extra_user_fields(context_system::instance()) as $extrafield) {
$namefields .= ',u.' . $extrafield;
}
$sql = " SELECT u.id as id, esu.id as serviceuserid, {$namefields},
$sql = " SELECT u.id as id, esu.id as serviceuserid {$fieldsql->selects},
esu.iprestriction as iprestriction, esu.validuntil as validuntil,
esu.timecreated as timecreated
FROM {user} u, {external_services_users} esu
FROM {user} u
JOIN {external_services_users} esu ON esu.userid = u.id
{$fieldsql->joins}
WHERE u.id <> ? AND u.deleted = 0 AND u.confirmed = 1
AND esu.userid = u.id
AND esu.externalserviceid = ?";
$users = $DB->get_records_sql($sql, $params);
$users = $DB->get_records_sql($sql, array_merge($fieldsql->params, $params));
return $users;
}

2
webservice/renderer.php
View file

@ -106,7 +106,7 @@ class core_webservice_renderer extends plugin_renderer_base {
global $CFG;
$listitems = [];
$extrafields = get_extra_user_fields(context_system::instance());
$extrafields = \core_user\fields::get_identity_fields(context_system::instance());
foreach ($users as $user) {
$settingsurl = new moodle_url('/admin/webservice/service_user_settings.php',