diff --git a/admin/classes/task_log_table.php b/admin/classes/task_log_table.php
index c02458d9426..1ec045f3ff1 100644
--- a/admin/classes/task_log_table.php
+++ b/admin/classes/task_log_table.php
@@ -125,7 +125,7 @@ class task_log_table extends \table_sql {
}
// TODO Does not support custom user profile fields (MDL-70456).
- $userfieldsapi = \core\user_fields::for_identity(\context_system::instance(), false)->with_userpic();
+ $userfieldsapi = \core_user\fields::for_identity(\context_system::instance(), false)->with_userpic();
$userfields = $userfieldsapi->get_sql('u', false, 'user', 'userid2', false)->selects;
$where = '';
diff --git a/admin/roles/assign.php b/admin/roles/assign.php
index 17e6b65132e..50557d69f4c 100644
--- a/admin/roles/assign.php
+++ b/admin/roles/assign.php
@@ -271,7 +271,7 @@ if ($roleid) {
foreach ($assignableroles as $roleid => $notused) {
$roleusers = '';
if (0 < $assigncounts[$roleid] && $assigncounts[$roleid] <= MAX_USERS_TO_LIST_PER_ROLE) {
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$userfields = 'u.id, u.username' . $userfieldsapi->get_sql('u')->selects;
$roleusers = get_role_users($roleid, $context, false, $userfields);
if (!empty($roleusers)) {
diff --git a/admin/tool/cohortroles/classes/output/cohort_role_assignments_table.php b/admin/tool/cohortroles/classes/output/cohort_role_assignments_table.php
index 630f8a883c7..364544a649a 100644
--- a/admin/tool/cohortroles/classes/output/cohort_role_assignments_table.php
+++ b/admin/tool/cohortroles/classes/output/cohort_role_assignments_table.php
@@ -127,7 +127,7 @@ class cohort_role_assignments_table extends table_sql {
*/
protected function define_table_columns() {
// TODO Does not support custom user profile fields (MDL-70456).
- $extrafields = \core\user_fields::get_identity_fields($this->context, false);
+ $extrafields = \core_user\fields::get_identity_fields($this->context, false);
// Define headers and columns.
$cols = array(
@@ -175,7 +175,7 @@ class cohort_role_assignments_table extends table_sql {
// Add extra user fields that we need for the graded user.
// TODO Does not support custom user profile fields (MDL-70456).
- $userfieldsapi = \core\user_fields::for_identity($this->context, false)->with_name();
+ $userfieldsapi = \core_user\fields::for_identity($this->context, false)->with_name();
$fields .= $userfieldsapi->get_sql('u')->selects;
if ($count) {
diff --git a/admin/tool/dataprivacy/classes/api.php b/admin/tool/dataprivacy/classes/api.php
index ceaee01a9bb..454731965fe 100644
--- a/admin/tool/dataprivacy/classes/api.php
+++ b/admin/tool/dataprivacy/classes/api.php
@@ -189,7 +189,7 @@ class api {
$dpos = [];
$context = context_system::instance();
foreach ($dporoles as $roleid) {
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allnames = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$fields = 'u.id, u.confirmed, u.username, '. $allnames . ', ' .
'u.maildisplay, u.mailformat, u.maildigest, u.email, u.emailstop, u.city, '.
diff --git a/admin/tool/dataprivacy/classes/external.php b/admin/tool/dataprivacy/classes/external.php
index c2ab73195dd..92dd39858d7 100644
--- a/admin/tool/dataprivacy/classes/external.php
+++ b/admin/tool/dataprivacy/classes/external.php
@@ -700,7 +700,7 @@ class external extends external_api {
self::validate_context($context);
require_capability('tool/dataprivacy:managedatarequests', $context);
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allusernames = $userfieldsapi->get_sql('', false, '', '', false)->selects;
// Exclude admins and guest user.
$excludedusers = array_keys(get_admins()) + [guest_user()->id];
@@ -708,7 +708,7 @@ class external extends external_api {
$fields = 'id,' . $allusernames;
// TODO Does not support custom user profile fields (MDL-70456).
- $extrafields = \core\user_fields::get_identity_fields($context, false);
+ $extrafields = \core_user\fields::get_identity_fields($context, false);
if (!empty($extrafields)) {
$fields .= ',' . implode(',', $extrafields);
}
diff --git a/admin/tool/dataprivacy/classes/local/helper.php b/admin/tool/dataprivacy/classes/local/helper.php
index b34cb8f11a5..d05087e4c80 100644
--- a/admin/tool/dataprivacy/classes/local/helper.php
+++ b/admin/tool/dataprivacy/classes/local/helper.php
@@ -187,7 +187,7 @@ class helper {
global $DB;
// Get users that the user has role assignments to.
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allusernames = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$sql = "SELECT u.id, $allusernames
FROM {role_assignments} ra, {context} c, {user} u
diff --git a/admin/tool/dataprivacy/createdatarequest_form.php b/admin/tool/dataprivacy/createdatarequest_form.php
index 39c3e3c34d0..af2f3aabf11 100644
--- a/admin/tool/dataprivacy/createdatarequest_form.php
+++ b/admin/tool/dataprivacy/createdatarequest_form.php
@@ -62,7 +62,7 @@ class tool_dataprivacy_data_request_form extends \core\form\persistent {
'valuehtmlcallback' => function($value) {
global $OUTPUT;
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allusernames = $userfieldsapi->get_sql('', false, '', '', false)->selects;
$fields = 'id, email, ' . $allusernames;
$user = \core_user::get_user($value, $fields);
diff --git a/admin/tool/lp/classes/external.php b/admin/tool/lp/classes/external.php
index 0264bd0e5cc..b04ab761c4e 100644
--- a/admin/tool/lp/classes/external.php
+++ b/admin/tool/lp/classes/external.php
@@ -879,9 +879,9 @@ class external extends external_api {
$USER->id, SQL_PARAMS_NAMED);
// TODO Does not support custom user profile fields (MDL-70456).
- $userfieldsapi = \core\user_fields::for_identity($context, false)->with_userpic();
+ $userfieldsapi = \core_user\fields::for_identity($context, false)->with_userpic();
$fields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
- $extrasearchfields = $userfieldsapi->get_required_fields([\core\user_fields::PURPOSE_IDENTITY]);
+ $extrasearchfields = $userfieldsapi->get_required_fields([\core_user\fields::PURPOSE_IDENTITY]);
list($wheresql, $whereparams) = users_search_sql($query, 'u', true, $extrasearchfields);
list($sortsql, $sortparams) = users_order_by_sql('u', $query, $context);
diff --git a/admin/tool/lp/classes/output/template_plans_table.php b/admin/tool/lp/classes/output/template_plans_table.php
index ba171163a33..83829f62d7c 100644
--- a/admin/tool/lp/classes/output/template_plans_table.php
+++ b/admin/tool/lp/classes/output/template_plans_table.php
@@ -93,7 +93,7 @@ class template_plans_table extends table_sql {
*/
protected function define_table_columns() {
// TODO Does not support custom user profile fields (MDL-70456).
- $extrafields = \core\user_fields::get_identity_fields($this->context, false);
+ $extrafields = \core_user\fields::get_identity_fields($this->context, false);
// Define headers and columns.
$cols = array(
@@ -137,7 +137,7 @@ class template_plans_table extends table_sql {
// Add extra user fields that we need for the graded user.
// TODO Does not support custom user profile fields (MDL-70456).
- $userfieldsapi = \core\user_fields::for_identity($this->context, false)->with_name();
+ $userfieldsapi = \core_user\fields::for_identity($this->context, false)->with_name();
$fields .= $userfieldsapi->get_sql('u')->selects;
if ($count) {
diff --git a/admin/tool/policy/classes/acceptances_table.php b/admin/tool/policy/classes/acceptances_table.php
index b4492bcb4b8..135f5bc4c1e 100644
--- a/admin/tool/policy/classes/acceptances_table.php
+++ b/admin/tool/policy/classes/acceptances_table.php
@@ -92,9 +92,9 @@ class acceptances_table extends \table_sql {
}
// TODO Does not support custom user profile fields (MDL-70456).
- $userfieldsapi = \core\user_fields::for_identity(\context_system::instance(), false)->with_userpic();
+ $userfieldsapi = \core_user\fields::for_identity(\context_system::instance(), false)->with_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
- $extrafields = $userfieldsapi->get_required_fields([\core\user_fields::PURPOSE_IDENTITY]);
+ $extrafields = $userfieldsapi->get_required_fields([\core_user\fields::PURPOSE_IDENTITY]);
$this->set_sql("$userfields",
"{user} u",
@@ -105,7 +105,7 @@ class acceptances_table extends \table_sql {
}
$this->add_column_header('fullname', get_string('fullnameuser', 'core'));
foreach ($extrafields as $field) {
- $this->add_column_header($field, \core\user_fields::get_display_name($field));
+ $this->add_column_header($field, \core_user\fields::get_display_name($field));
}
if (!$this->is_downloading() && !has_capability('tool/policy:acceptbehalf', \context_system::instance())) {
@@ -170,7 +170,7 @@ class acceptances_table extends \table_sql {
* Helper configuration method.
*/
protected function configure_for_single_version() {
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$userfieldsmod = $userfieldsapi->get_sql('m', false, 'mod', '', false)->selects;
$v = key($this->versionids);
$this->sql->fields .= ", $userfieldsmod, a{$v}.status AS status{$v}, a{$v}.note, ".
diff --git a/admin/tool/policy/classes/api.php b/admin/tool/policy/classes/api.php
index 5366daa5152..9a7af22f1dd 100644
--- a/admin/tool/policy/classes/api.php
+++ b/admin/tool/policy/classes/api.php
@@ -343,7 +343,7 @@ class api {
global $DB;
$ctxfields = context_helper::get_preload_record_columns_sql('c');
- $userfieldsapi = \core\user_fields::for_name()->with_userpic()->including(...($extrafields ?? []));
+ $userfieldsapi = \core_user\fields::for_name()->with_userpic()->including(...($extrafields ?? []));
$userfields = $userfieldsapi->get_sql('u')->selects;
$sql = "SELECT $ctxfields $userfields
@@ -682,7 +682,7 @@ class api {
$vsql = ' AND a.policyversionid ' . $vsql;
}
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$userfieldsmod = $userfieldsapi->get_sql('m', false, 'mod', '', false)->selects;
$sql = "SELECT u.id AS mainuserid, a.policyversionid, a.status, a.lang, a.timemodified, a.usermodified, a.note,
u.policyagreed, $userfieldsmod
diff --git a/admin/tool/policy/classes/form/accept_policy.php b/admin/tool/policy/classes/form/accept_policy.php
index 6821daac8c5..9321c3843e0 100644
--- a/admin/tool/policy/classes/form/accept_policy.php
+++ b/admin/tool/policy/classes/form/accept_policy.php
@@ -128,7 +128,7 @@ class accept_policy extends \moodleform {
$usernames = [];
list($sql, $params) = $DB->get_in_or_equal($userids, SQL_PARAMS_NAMED);
$params['usercontextlevel'] = CONTEXT_USER;
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$users = $DB->get_records_sql("SELECT u.id" . $userfieldsapi->get_sql('u')->selects . ", " .
\context_helper::get_preload_record_columns_sql('ctx') .
" FROM {user} u JOIN {context} ctx ON ctx.contextlevel=:usercontextlevel AND ctx.instanceid = u.id
diff --git a/admin/tool/uploaduser/classes/process.php b/admin/tool/uploaduser/classes/process.php
index cde592919ae..4204c8b8ae5 100644
--- a/admin/tool/uploaduser/classes/process.php
+++ b/admin/tool/uploaduser/classes/process.php
@@ -155,7 +155,7 @@ class process {
'interests',
);
// Include all name fields.
- $this->standardfields = array_merge($this->standardfields, \core\user_fields::get_name_fields());
+ $this->standardfields = array_merge($this->standardfields, \core_user\fields::get_name_fields());
}
/**
diff --git a/admin/user.php b/admin/user.php
index 06ee33bc18e..4d491aac4e6 100644
--- a/admin/user.php
+++ b/admin/user.php
@@ -183,13 +183,13 @@
// These columns are always shown in the users list.
$requiredcolumns = array('city', 'country', 'lastaccess');
// Extra columns containing the extra user fields, excluding the required columns (city and country, to be specific).
- $userfields = \core\user_fields::for_identity($context, true)->with_name()->excluding(...$requiredcolumns);
+ $userfields = \core_user\fields::for_identity($context, true)->with_name()->excluding(...$requiredcolumns);
$extracolumns = $userfields->get_required_fields();
// Get all user name fields as an array.
$columns = array_merge($extracolumns, $requiredcolumns);
foreach ($columns as $column) {
- $string[$column] = \core\user_fields::get_display_name($column);
+ $string[$column] = \core_user\fields::get_display_name($column);
if ($sort != $column) {
$columnicon = "";
if ($column == "lastaccess") {
diff --git a/admin/user/user_bulk_cohortadd.php b/admin/user/user_bulk_cohortadd.php
index ab05021b6a8..21e949f5433 100644
--- a/admin/user/user_bulk_cohortadd.php
+++ b/admin/user/user_bulk_cohortadd.php
@@ -64,7 +64,7 @@ if (count($cohorts) < 2) {
}
$countries = get_string_manager()->get_list_of_countries(true);
-$userfieldsapi = \core\user_fields::for_name();
+$userfieldsapi = \core_user\fields::for_name();
$namefields = $userfieldsapi->get_sql('', false, '', '', false)->selects;
foreach ($users as $key => $id) {
$user = $DB->get_record('user', array('id' => $id), 'id, ' . $namefields . ', username,
diff --git a/admin/user/user_bulk_display.php b/admin/user/user_bulk_display.php
index 146f4c7dd5d..70c1eecdbcb 100644
--- a/admin/user/user_bulk_display.php
+++ b/admin/user/user_bulk_display.php
@@ -24,7 +24,7 @@ echo $OUTPUT->header();
$countries = get_string_manager()->get_list_of_countries(true);
-$userfieldsapi = \core\user_fields::for_name();
+$userfieldsapi = \core_user\fields::for_name();
$namefields = $userfieldsapi->get_sql('', false, '', '', false)->selects;
foreach ($users as $key => $id) {
$user = $DB->get_record('user', array('id'=>$id), 'id, ' . $namefields . ', username, email, country, lastaccess, city');
diff --git a/availability/condition/profile/classes/condition.php b/availability/condition/profile/classes/condition.php
index ce65bb0224f..39399b740a0 100644
--- a/availability/condition/profile/classes/condition.php
+++ b/availability/condition/profile/classes/condition.php
@@ -197,7 +197,7 @@ class condition extends \core_availability\condition {
$this->customfield);
}
} else {
- $translatedfieldname = \core\user_fields::get_display_name($this->standardfield);
+ $translatedfieldname = \core_user\fields::get_display_name($this->standardfield);
}
$context = \context_course::instance($course->id);
$a = new \stdClass();
diff --git a/availability/condition/profile/classes/frontend.php b/availability/condition/profile/classes/frontend.php
index e5026e57738..37fda5371f3 100644
--- a/availability/condition/profile/classes/frontend.php
+++ b/availability/condition/profile/classes/frontend.php
@@ -44,23 +44,23 @@ class frontend extends \core_availability\frontend {
\section_info $section = null) {
// Standard user fields.
$standardfields = array(
- 'firstname' => \core\user_fields::get_display_name('firstname'),
- 'lastname' => \core\user_fields::get_display_name('lastname'),
- 'email' => \core\user_fields::get_display_name('email'),
- 'city' => \core\user_fields::get_display_name('city'),
- 'country' => \core\user_fields::get_display_name('country'),
- 'url' => \core\user_fields::get_display_name('url'),
- 'icq' => \core\user_fields::get_display_name('icq'),
- 'skype' => \core\user_fields::get_display_name('skype'),
- 'aim' => \core\user_fields::get_display_name('aim'),
- 'yahoo' => \core\user_fields::get_display_name('yahoo'),
- 'msn' => \core\user_fields::get_display_name('msn'),
- 'idnumber' => \core\user_fields::get_display_name('idnumber'),
- 'institution' => \core\user_fields::get_display_name('institution'),
- 'department' => \core\user_fields::get_display_name('department'),
- 'phone1' => \core\user_fields::get_display_name('phone1'),
- 'phone2' => \core\user_fields::get_display_name('phone2'),
- 'address' => \core\user_fields::get_display_name('address')
+ 'firstname' => \core_user\fields::get_display_name('firstname'),
+ 'lastname' => \core_user\fields::get_display_name('lastname'),
+ 'email' => \core_user\fields::get_display_name('email'),
+ 'city' => \core_user\fields::get_display_name('city'),
+ 'country' => \core_user\fields::get_display_name('country'),
+ 'url' => \core_user\fields::get_display_name('url'),
+ 'icq' => \core_user\fields::get_display_name('icq'),
+ 'skype' => \core_user\fields::get_display_name('skype'),
+ 'aim' => \core_user\fields::get_display_name('aim'),
+ 'yahoo' => \core_user\fields::get_display_name('yahoo'),
+ 'msn' => \core_user\fields::get_display_name('msn'),
+ 'idnumber' => \core_user\fields::get_display_name('idnumber'),
+ 'institution' => \core_user\fields::get_display_name('institution'),
+ 'department' => \core_user\fields::get_display_name('department'),
+ 'phone1' => \core_user\fields::get_display_name('phone1'),
+ 'phone2' => \core_user\fields::get_display_name('phone2'),
+ 'address' => \core_user\fields::get_display_name('address')
);
\core_collator::asort($standardfields);
diff --git a/backup/moodle2/backup_stepslib.php b/backup/moodle2/backup_stepslib.php
index 29224d3732f..0a186deb67a 100644
--- a/backup/moodle2/backup_stepslib.php
+++ b/backup/moodle2/backup_stepslib.php
@@ -1366,7 +1366,7 @@ class backup_users_structure_step extends backup_structure_step {
'phone2', 'institution', 'department', 'address',
'city', 'country', 'lastip', 'picture',
'url', 'description', 'descriptionformat', 'imagealt', 'auth');
- $anonfields = array_merge($anonfields, \core\user_fields::get_name_fields());
+ $anonfields = array_merge($anonfields, \core_user\fields::get_name_fields());
// Add anonymized fields to $userfields with custom final element
foreach ($anonfields as $field) {
diff --git a/badges/classes/output/external_badge.php b/badges/classes/output/external_badge.php
index f56bde0f870..7fad503d1ee 100644
--- a/badges/classes/output/external_badge.php
+++ b/badges/classes/output/external_badge.php
@@ -58,7 +58,7 @@ class external_badge implements renderable {
global $DB;
// At this point a user has connected a backpack. So, we are going to get
// their backpack email rather than their account email.
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$namefields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$user = $DB->get_record_sql("SELECT {$namefields}, b.email
FROM {user} u INNER JOIN {badge_backpack} b ON u.id = b.userid
diff --git a/badges/classes/output/issued_badge.php b/badges/classes/output/issued_badge.php
index c3ce9a9d3c3..2b9e891efe1 100644
--- a/badges/classes/output/issued_badge.php
+++ b/badges/classes/output/issued_badge.php
@@ -76,7 +76,7 @@ class issued_badge implements renderable {
array('hash' => $hash), IGNORE_MISSING);
if ($rec) {
// Get a recipient from database.
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$namefields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$user = $DB->get_record_sql("SELECT u.id, $namefields, u.deleted, u.email
FROM {user} u WHERE u.id = :userid", array('userid' => $rec->userid));
diff --git a/badges/criteria/award_criteria_profile.php b/badges/criteria/award_criteria_profile.php
index dbba62aae38..6091b6281c2 100644
--- a/badges/criteria/award_criteria_profile.php
+++ b/badges/criteria/award_criteria_profile.php
@@ -89,7 +89,7 @@ class award_criteria_profile extends award_criteria {
$checked = true;
}
$this->config_options($mform, array('id' => $field, 'checked' => $checked,
- 'name' => \core\user_fields::get_display_name($field), 'error' => false));
+ 'name' => \core_user\fields::get_display_name($field), 'error' => false));
$none = false;
}
}
@@ -139,7 +139,7 @@ class award_criteria_profile extends award_criteria {
if (is_numeric($p['field'])) {
$str = $DB->get_field('user_info_field', 'name', array('id' => $p['field']));
} else {
- $str = \core\user_fields::get_display_name($p['field']);
+ $str = \core_user\fields::get_display_name($p['field']);
}
if (!$str) {
$output[] = $OUTPUT->error_text(get_string('error:nosuchfield', 'badges'));
diff --git a/badges/recipients.php b/badges/recipients.php
index 7f1e75f5c31..83121cdbb81 100644
--- a/badges/recipients.php
+++ b/badges/recipients.php
@@ -87,7 +87,7 @@ if ($badge->has_manual_award_criteria() && has_capability('moodle/badges:awardba
echo $OUTPUT->box($OUTPUT->single_button($url, get_string('award', 'badges')), 'clearfix mdl-align');
}
-$userfieldsapi = \core\user_fields::for_name();
+$userfieldsapi = \core_user\fields::for_name();
$namefields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$sql = "SELECT b.userid, b.dateissued, b.uniquehash, $namefields
FROM {badge_issued} b INNER JOIN {user} u
diff --git a/blocks/activity_results/block_activity_results.php b/blocks/activity_results/block_activity_results.php
index 7c19e4ca4d8..a673f704a89 100644
--- a/blocks/activity_results/block_activity_results.php
+++ b/blocks/activity_results/block_activity_results.php
@@ -508,12 +508,12 @@ class block_activity_results extends block_base {
// Now grab all the users from the database.
$userids = array_merge(array_keys($best), array_keys($worst));
- $fields = array_merge(array('id', 'idnumber'), \core\user_fields::get_name_fields());
+ $fields = array_merge(array('id', 'idnumber'), \core_user\fields::get_name_fields());
$fields = implode(',', $fields);
$users = $DB->get_records_list('user', 'id', $userids, '', $fields);
// If configured to view user idnumber, ensure current user can see it.
- $extrafields = \core\user_fields::for_identity($this->context)->get_required_fields();
+ $extrafields = \core_user\fields::for_identity($this->context)->get_required_fields();
$canviewidnumber = (array_search('idnumber', $extrafields) !== false);
// Ready for output!
diff --git a/blocks/mentees/block_mentees.php b/blocks/mentees/block_mentees.php
index 9ad847ce23c..efbe7a13f03 100644
--- a/blocks/mentees/block_mentees.php
+++ b/blocks/mentees/block_mentees.php
@@ -50,7 +50,7 @@ class block_mentees extends block_base {
$this->content = new stdClass();
// get all the mentees, i.e. users you have a direct assignment to
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allusernames = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
if ($usercontexts = $DB->get_records_sql("SELECT c.instanceid, c.instanceid, $allusernames
FROM {role_assignments} ra, {context} c, {user} u
diff --git a/blocks/online_users/classes/fetcher.php b/blocks/online_users/classes/fetcher.php
index c6777d2d850..4fcef20511e 100644
--- a/blocks/online_users/classes/fetcher.php
+++ b/blocks/online_users/classes/fetcher.php
@@ -86,7 +86,7 @@ class fetcher {
}
$params = array();
- $userfieldsapi = \core\user_fields::for_userpic()->including('username', 'deleted');
+ $userfieldsapi = \core_user\fields::for_userpic()->including('username', 'deleted');
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
// Add this to the SQL to show only group users.
diff --git a/blog/locallib.php b/blog/locallib.php
index c6d111cea76..f2b3f2293f6 100644
--- a/blog/locallib.php
+++ b/blog/locallib.php
@@ -646,7 +646,7 @@ class blog_listing {
if (!$userid) {
$userid = $USER->id;
}
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$allnamefields = $userfieldsapi->get_sql('u', false, '', 'useridalias', false)->selects;
// The query used to locate blog entries is complicated. It will be built from the following components:
$requiredfields = "p.*, $allnamefields"; // The SELECT clause.
diff --git a/blog/rsslib.php b/blog/rsslib.php
index 878f7a71cbf..04bbef4c60e 100644
--- a/blog/rsslib.php
+++ b/blog/rsslib.php
@@ -234,7 +234,7 @@ function blog_rss_get_feed($context, $args) {
switch ($type) {
case 'user':
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$info = fullname($DB->get_record('user', array('id' => $id),
$userfieldsapi->get_sql('', false, '', '', false)->selects));
break;
diff --git a/comment/lib.php b/comment/lib.php
index f9d5cffbb72..fe26ee20816 100644
--- a/comment/lib.php
+++ b/comment/lib.php
@@ -551,7 +551,7 @@ class comment {
$params = array();
$perpage = (!empty($CFG->commentsperpage))?$CFG->commentsperpage:15;
$start = $page * $perpage;
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$ufields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
list($componentwhere, $component) = $this->get_component_select_sql('c');
diff --git a/comment/locallib.php b/comment/locallib.php
index 0fb00f95a39..08265610de2 100644
--- a/comment/locallib.php
+++ b/comment/locallib.php
@@ -61,7 +61,7 @@ class comment_manager {
}
$comments = array();
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$usernamefields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$sql = "SELECT c.id, c.contextid, c.itemid, c.component, c.commentarea, c.userid, c.content, $usernamefields, c.timecreated
FROM {comments} c
@@ -76,7 +76,7 @@ class comment_manager {
$item->time = userdate($item->timecreated);
$item->content = format_text($item->content, FORMAT_MOODLE, $formatoptions);
// Unset fields not related to the comment
- foreach (\core\user_fields::get_name_fields() as $namefield) {
+ foreach (\core_user\fields::get_name_fields() as $namefield) {
unset($item->$namefield);
}
unset($item->timecreated);
diff --git a/course/classes/category.php b/course/classes/category.php
index e538368e02e..d2386b8c440 100644
--- a/course/classes/category.php
+++ b/course/classes/category.php
@@ -1033,7 +1033,7 @@ class core_course_category implements renderable, cacheable_object, IteratorAggr
list($sql2, $params2) = $DB->get_in_or_equal($managerroles, SQL_PARAMS_NAMED, 'rid');
list($sort, $sortparams) = users_order_by_sql('u');
$notdeleted = array('notdeleted' => 0);
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allnames = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$sql = "SELECT ra.contextid, ra.id AS raid,
r.id AS roleid, r.name AS rolename, r.shortname AS roleshortname,
diff --git a/course/recent_form.php b/course/recent_form.php
index b4c870dbb65..3af8cbe3db9 100644
--- a/course/recent_form.php
+++ b/course/recent_form.php
@@ -77,7 +77,7 @@ class recent_form extends moodleform {
$options[0] = get_string('allparticipants');
$options[$CFG->siteguest] = get_string('guestuser');
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$ufields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
if (isset($groupoptions[0])) {
diff --git a/enrol/ajax.php b/enrol/ajax.php
index 1bd9cc4465c..fab67db13f2 100644
--- a/enrol/ajax.php
+++ b/enrol/ajax.php
@@ -95,7 +95,7 @@ switch ($action) {
$page = optional_param('page', 0, PARAM_INT);
$outcome->response = $manager->search_other_users($search, $searchanywhere, $page);
// TODO Does not support custom user profile fields (MDL-70456).
- $extrafields = \core\user_fields::get_identity_fields($context, false);
+ $extrafields = \core_user\fields::get_identity_fields($context, false);
$useroptions = array();
// User is not enrolled, either link to site profile or do not link at all.
if (has_capability('moodle/user:viewdetails', context_system::instance())) {
diff --git a/enrol/externallib.php b/enrol/externallib.php
index 26dee5065d1..116d1ff6d6a 100644
--- a/enrol/externallib.php
+++ b/enrol/externallib.php
@@ -558,10 +558,10 @@ class core_enrol_external extends external_api {
$results = array();
// Add also extra user fields.
- $identityfields = \core\user_fields::get_identity_fields($context, true);
+ $identityfields = \core_user\fields::get_identity_fields($context, true);
$customprofilefields = [];
foreach ($identityfields as $key => $value) {
- if ($fieldname = \core\user_fields::match_custom_field($value)) {
+ if ($fieldname = \core_user\fields::match_custom_field($value)) {
unset($identityfields[$key]);
$customprofilefields[$fieldname] = true;
}
@@ -673,7 +673,7 @@ class core_enrol_external extends external_api {
$requiredfields = array_merge(
['id', 'fullname', 'profileimageurl', 'profileimageurlsmall'],
// TODO Does not support custom user profile fields (MDL-70456).
- \core\user_fields::get_identity_fields($context, false)
+ \core_user\fields::get_identity_fields($context, false)
);
foreach ($users['users'] as $user) {
if ($userdetails = user_get_user_details($user, $course, $requiredfields)) {
diff --git a/enrol/locallib.php b/enrol/locallib.php
index ba49c560265..48268bd6d4d 100644
--- a/enrol/locallib.php
+++ b/enrol/locallib.php
@@ -23,7 +23,7 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-use core\user_fields;
+use core_user\fields;
defined('MOODLE_INTERNAL') || die();
@@ -240,7 +240,7 @@ class course_enrolment_manager {
list($instancessql, $params, $filter) = $this->get_instance_sql();
list($filtersql, $moreparams) = $this->get_filter_sql();
$params += $moreparams;
- $userfields = user_fields::for_identity($this->get_context())->with_userpic()->excluding('lastaccess');
+ $userfields = fields::for_identity($this->get_context())->with_userpic()->excluding('lastaccess');
['selects' => $fieldselect, 'joins' => $fieldjoin, 'params' => $fieldjoinparams] =
(array)$userfields->get_sql('u', true, '', '', false);
$params += $fieldjoinparams;
@@ -273,7 +273,7 @@ class course_enrolment_manager {
// Search condition.
// TODO Does not support custom user profile fields (MDL-70456).
- $extrafields = user_fields::get_identity_fields($this->get_context(), false);
+ $extrafields = fields::get_identity_fields($this->get_context(), false);
list($sql, $params) = users_search_sql($this->searchfilter, 'u', true, $extrafields);
// Role condition.
@@ -346,7 +346,7 @@ class course_enrolment_manager {
list($ctxcondition, $params) = $DB->get_in_or_equal($this->context->get_parent_context_ids(true), SQL_PARAMS_NAMED, 'ctx');
$params['courseid'] = $this->course->id;
$params['cid'] = $this->course->id;
- $userfields = user_fields::for_identity($this->get_context())->with_userpic();
+ $userfields = fields::for_identity($this->get_context())->with_userpic();
['selects' => $fieldselect, 'joins' => $fieldjoin, 'params' => $fieldjoinparams] =
(array)$userfields->get_sql('u', true);
$params += $fieldjoinparams;
@@ -387,14 +387,14 @@ class course_enrolment_manager {
// Get custom user field SQL used for querying all the fields we need (identity, name, and
// user picture).
- $userfields = user_fields::for_identity($this->context)->with_name()->with_userpic()
+ $userfields = fields::for_identity($this->context)->with_name()->with_userpic()
->excluding('username', 'lastaccess', 'maildisplay');
['selects' => $fieldselects, 'joins' => $fieldjoins, 'params' => $params, 'mappings' => $mappings] =
(array)$userfields->get_sql('u', true, '', '', false);
// Searchable fields are only the identity and name ones (not userpic).
$searchable = array_fill_keys($userfields->get_required_fields(
- [user_fields::PURPOSE_IDENTITY, user_fields::PURPOSE_NAME]), true);
+ [fields::PURPOSE_IDENTITY, fields::PURPOSE_NAME]), true);
// Add some additional sensible conditions
$tests = array("u.id <> :guestid", 'u.deleted = 0', 'u.confirmed = 1');
@@ -1068,7 +1068,7 @@ class course_enrolment_manager {
$context = $this->get_context();
$now = time();
// TODO Does not support custom user profile fields (MDL-70456).
- $extrafields = user_fields::get_identity_fields($context, false);
+ $extrafields = fields::get_identity_fields($context, false);
$users = array();
foreach ($userroles as $userrole) {
@@ -1147,7 +1147,7 @@ class course_enrolment_manager {
$url = new moodle_url($pageurl, $this->get_url_params());
// TODO Does not support custom user profile fields (MDL-70456).
- $extrafields = user_fields::get_identity_fields($context, false);
+ $extrafields = fields::get_identity_fields($context, false);
$enabledplugins = $this->get_enrolment_plugins(true);
@@ -1324,7 +1324,7 @@ class course_enrolment_manager {
list($instancesql, $instanceparams) = $DB->get_in_or_equal(array_keys($instances), SQL_PARAMS_NAMED, 'instanceid0000');
}
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
list($idsql, $idparams) = $DB->get_in_or_equal($userids, SQL_PARAMS_NAMED, 'userid0000');
diff --git a/enrol/manual/classes/enrol_users_form.php b/enrol/manual/classes/enrol_users_form.php
index 959cf7224b8..c6f9a604ec4 100644
--- a/enrol/manual/classes/enrol_users_form.php
+++ b/enrol/manual/classes/enrol_users_form.php
@@ -93,7 +93,7 @@ class enrol_manual_enrol_users_form extends moodleform {
'courseid' => $course->id,
'enrolid' => $instance->id,
'perpage' => $CFG->maxusersperpage,
- 'userfields' => implode(',', \core\user_fields::get_identity_fields($context, true))
+ 'userfields' => implode(',', \core_user\fields::get_identity_fields($context, true))
);
$mform->addElement('autocomplete', 'userlist', get_string('selectusers', 'enrol_manual'), array(), $options);
diff --git a/enrol/otherusers.php b/enrol/otherusers.php
index 82846e03dda..826ebdc43a9 100644
--- a/enrol/otherusers.php
+++ b/enrol/otherusers.php
@@ -55,9 +55,9 @@ $userdetails = array (
'lastname' => get_string('lastname'),
);
// TODO Does not support custom user profile fields (MDL-70456).
-$extrafields = \core\user_fields::get_identity_fields($context, false);
+$extrafields = \core_user\fields::get_identity_fields($context, false);
foreach ($extrafields as $field) {
- $userdetails[$field] = \core\user_fields::get_display_name($field);
+ $userdetails[$field] = \core_user\fields::get_display_name($field);
}
$fields = array(
diff --git a/enrol/self/lib.php b/enrol/self/lib.php
index 9131f408d85..1252b060132 100644
--- a/enrol/self/lib.php
+++ b/enrol/self/lib.php
@@ -1021,7 +1021,7 @@ class enrol_self_plugin extends enrol_plugin {
// We only use the first user.
$i = 0;
do {
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allnames = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$rusers = get_role_users($croles[$i], $context, true, 'u.id, u.confirmed, u.username, '. $allnames . ',
u.email, r.sortorder, ra.id', 'r.sortorder, ra.id ASC, ' . $sort, null, '', '', '', '', $sortparams);
diff --git a/enrol/self/locallib.php b/enrol/self/locallib.php
index e360616f792..98f73c84c5a 100644
--- a/enrol/self/locallib.php
+++ b/enrol/self/locallib.php
@@ -82,7 +82,7 @@ class enrol_self_enrol_form extends moodleform {
$mform->addElement('password', 'enrolpassword', get_string('password', 'enrol_self'),
array('id' => 'enrolpassword_'.$instance->id));
$context = context_course::instance($this->instance->courseid);
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$ufields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$keyholders = get_users_by_capability($context, 'enrol/self:holdkey', $ufields);
$keyholdercount = 0;
diff --git a/grade/report/grader/ajax_callbacks.php b/grade/report/grader/ajax_callbacks.php
index a7e7ee81216..de6bf8d2881 100644
--- a/grade/report/grader/ajax_callbacks.php
+++ b/grade/report/grader/ajax_callbacks.php
@@ -91,7 +91,7 @@ switch ($action) {
}
if ($errorstr) {
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$user = $DB->get_record('user', array('id' => $userid), 'id' . $userfieldsapi->get_sql()->selects);
$gradestr = new stdClass();
$gradestr->username = fullname($user);
diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php
index 38a6659edaf..c411a84a986 100644
--- a/grade/report/grader/lib.php
+++ b/grade/report/grader/lib.php
@@ -293,7 +293,7 @@ class grade_report_grader extends grade_report {
}
if ($errorstr) {
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$userfields = 'id, ' . $userfieldsapi->get_sql('', false, '', '', false)->selects;
$user = $DB->get_record('user', array('id' => $userid), $userfields);
$gradestr = new stdClass();
@@ -439,7 +439,7 @@ class grade_report_grader extends grade_report {
// Fields we need from the user table.
// TODO Does not support custom user profile fields (MDL-70456).
- $userfieldsapi = \core\user_fields::for_identity($this->context, false)->with_userpic();
+ $userfieldsapi = \core_user\fields::for_identity($this->context, false)->with_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
// We want to query both the current context and parent contexts.
@@ -661,7 +661,7 @@ class grade_report_grader extends grade_report {
$strgrade = $this->get_lang_string('grade');
// TODO Does not support custom user profile fields (MDL-70456).
- $extrafields = \core\user_fields::get_identity_fields($this->context, false);
+ $extrafields = \core_user\fields::get_identity_fields($this->context, false);
$arrows = $this->get_sort_arrows($extrafields);
@@ -1946,7 +1946,7 @@ class grade_report_grader extends grade_report {
}
$arrows['studentname'] = '';
- $requirednames = order_in_string(\core\user_fields::get_name_fields(), $nameformat);
+ $requirednames = order_in_string(\core_user\fields::get_name_fields(), $nameformat);
if (!empty($requirednames)) {
foreach ($requirednames as $name) {
$arrows['studentname'] .= html_writer::link(
@@ -1963,7 +1963,7 @@ class grade_report_grader extends grade_report {
foreach ($extrafields as $field) {
$fieldlink = html_writer::link(new moodle_url($this->baseurl,
- array('sortitemid' => $field)), \core\user_fields::get_display_name($field));
+ array('sortitemid' => $field)), \core_user\fields::get_display_name($field));
$arrows[$field] = $fieldlink;
if ($field == $this->sortitemid) {
diff --git a/grade/report/history/classes/helper.php b/grade/report/history/classes/helper.php
index 050e6c4fa21..1ff2d1eb33e 100644
--- a/grade/report/history/classes/helper.php
+++ b/grade/report/history/classes/helper.php
@@ -132,7 +132,7 @@ class helper {
// Fields we need from the user table.
// TODO Does not support custom user profile fields (MDL-70456).
- $extrafields = \core\user_fields::get_identity_fields($context, false);
+ $extrafields = \core_user\fields::get_identity_fields($context, false);
$params = array();
if (!empty($search)) {
list($filtersql, $params) = users_search_sql($search, 'u', true, $extrafields);
@@ -141,7 +141,7 @@ class helper {
$filtersql = '';
}
- $userfieldsapi = \core\user_fields::for_userpic()->including(...(array_merge($extrafields, ['username'])));
+ $userfieldsapi = \core_user\fields::for_userpic()->including(...(array_merge($extrafields, ['username'])));
$ufields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
if ($count) {
$select = "SELECT COUNT(DISTINCT u.id) ";
@@ -203,7 +203,7 @@ class helper {
$groupwheresql = " AND gm.groupid $insql ";
}
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$ufields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$sql = "SELECT u.id, $ufields
FROM {user} u
diff --git a/grade/report/history/classes/output/tablelog.php b/grade/report/history/classes/output/tablelog.php
index 5cd19fbe9ee..663e29488f8 100644
--- a/grade/report/history/classes/output/tablelog.php
+++ b/grade/report/history/classes/output/tablelog.php
@@ -141,7 +141,7 @@ class tablelog extends \table_sql implements \renderable {
*/
protected function define_table_columns() {
// TODO Does not support custom user profile fields (MDL-70456).
- $extrafields = \core\user_fields::get_identity_fields($this->context, false);
+ $extrafields = \core_user\fields::get_identity_fields($this->context, false);
// Define headers and columns.
$cols = array(
@@ -396,11 +396,11 @@ class tablelog extends \table_sql implements \renderable {
// Add extra user fields that we need for the graded user.
// TODO Does not support custom user profile fields (MDL-70456).
- $extrafields = \core\user_fields::get_identity_fields($this->context, false);
+ $extrafields = \core_user\fields::get_identity_fields($this->context, false);
foreach ($extrafields as $field) {
$fields .= 'u.' . $field . ', ';
}
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$gradeduserfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$fields .= $gradeduserfields . ', ';
$groupby = $fields;
diff --git a/grade/report/history/users_ajax.php b/grade/report/history/users_ajax.php
index af43ee0a3d2..038cf0274d4 100644
--- a/grade/report/history/users_ajax.php
+++ b/grade/report/history/users_ajax.php
@@ -52,7 +52,7 @@ $outcome->response = array('users' => array());
$outcome->response['totalusers'] = \gradereport_history\helper::get_users_count($context, $search);;
// TODO Does not support custom user profile fields (MDL-70456).
-$extrafields = \core\user_fields::get_identity_fields($context, false);
+$extrafields = \core_user\fields::get_identity_fields($context, false);
$useroptions = array('link' => false, 'visibletoscreenreaders' => false);
// Format the user record.
diff --git a/group/autogroup.php b/group/autogroup.php
index 87df71ecdaf..111eb44af38 100644
--- a/group/autogroup.php
+++ b/group/autogroup.php
@@ -100,7 +100,7 @@ if ($editform->is_cancelled()) {
$onlyactive = !empty($data->includeonlyactiveenrol) || !has_capability('moodle/course:viewsuspendedusers', $context);
// TODO Does not support custom user profile fields (MDL-70456).
- $extrafields = \core\user_fields::get_identity_fields($context, false);
+ $extrafields = \core_user\fields::get_identity_fields($context, false);
$users = groups_get_potential_members($data->courseid, $data->roleid, $source, $orderby, !empty($data->notingroup),
$onlyactive, $extrafields);
$usercnt = count($users);
diff --git a/group/index.php b/group/index.php
index b61e87d07a0..ae8ac8ebeb7 100644
--- a/group/index.php
+++ b/group/index.php
@@ -82,9 +82,9 @@ switch ($action) {
$roles = array();
// TODO Does not support custom user profile fields (MDL-70456).
- $userfieldsapi = \core\user_fields::for_identity($context, false)->with_userpic();
+ $userfieldsapi = \core_user\fields::for_identity($context, false)->with_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
- $extrafields = $userfieldsapi->get_required_fields([\core\user_fields::PURPOSE_IDENTITY]);
+ $extrafields = $userfieldsapi->get_required_fields([\core_user\fields::PURPOSE_IDENTITY]);
if ($groupmemberroles = groups_get_members_by_role($groupids[0], $courseid,
'u.id, ' . $userfields)) {
@@ -206,9 +206,9 @@ if ($groups) {
$members = array();
if ($singlegroup) {
// TODO Does not support custom user profile fields (MDL-70456).
- $userfieldsapi = \core\user_fields::for_identity($context, false)->with_userpic();
+ $userfieldsapi = \core_user\fields::for_identity($context, false)->with_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
- $extrafields = $userfieldsapi->get_required_fields([\core\user_fields::PURPOSE_IDENTITY]);
+ $extrafields = $userfieldsapi->get_required_fields([\core_user\fields::PURPOSE_IDENTITY]);
if ($groupmemberroles = groups_get_members_by_role(reset($groupids), $courseid,
'u.id, ' . $userfields)) {
diff --git a/group/lib.php b/group/lib.php
index ebeab85b3b6..c755873777c 100644
--- a/group/lib.php
+++ b/group/lib.php
@@ -848,7 +848,7 @@ function groups_get_potential_members($courseid, $roleid = null, $source = null,
}
}
- $userfieldsapi = \core\user_fields::for_userpic()->including(...$extrafields);
+ $userfieldsapi = \core_user\fields::for_userpic()->including(...$extrafields);
$allusernamefields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$sql = "SELECT DISTINCT u.id, u.username, $allusernamefields, u.idnumber
FROM {user} u
diff --git a/group/overview.php b/group/overview.php
index ff73970c4c7..a6e84c0432e 100644
--- a/group/overview.php
+++ b/group/overview.php
@@ -111,9 +111,9 @@ if ($groupingid) {
list($sort, $sortparams) = users_order_by_sql('u');
// TODO Does not support custom user profile fields (MDL-70456).
-$userfieldsapi = \core\user_fields::for_identity($context, false)->with_userpic();
+$userfieldsapi = \core_user\fields::for_identity($context, false)->with_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
-$extrafields = $userfieldsapi->get_required_fields([\core\user_fields::PURPOSE_IDENTITY]);
+$extrafields = $userfieldsapi->get_required_fields([\core_user\fields::PURPOSE_IDENTITY]);
$allnames = 'u.id, ' . $userfields;
$sql = "SELECT g.id AS groupid, gg.groupingid, u.id AS userid, $allnames, u.idnumber, u.username
diff --git a/lib/accesslib.php b/lib/accesslib.php
index 7699a691e7b..bd67d89c98d 100644
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -3923,7 +3923,7 @@ function get_role_users($roleid, context $context, $parent = false, $fields = ''
global $DB;
if (empty($fields)) {
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allnames = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$fields = 'u.id, u.confirmed, u.username, '. $allnames . ', ' .
'u.maildisplay, u.mailformat, u.maildigest, u.email, u.emailstop, u.city, '.
diff --git a/lib/adminlib.php b/lib/adminlib.php
index b477d2e3eb8..0c2eac25a2d 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -4311,7 +4311,7 @@ class admin_setting_users_with_capability extends admin_setting_configmultiselec
'This is unexpected, and a problem because there is no way to pass these ' .
'parameters to get_users_by_capability. See MDL-34657.');
}
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$userfields = 'u.id, u.username, ' . $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$users = get_users_by_capability(context_system::instance(), $this->capability, $userfields, $sort);
$this->choices = array(
diff --git a/lib/authlib.php b/lib/authlib.php
index 26099d3f807..10be07e4e5e 100644
--- a/lib/authlib.php
+++ b/lib/authlib.php
@@ -1102,7 +1102,7 @@ function signup_setup_new_user($user) {
$user->secret = random_string(15);
$user->auth = $CFG->registerauth;
// Initialize alternate name fields to empty strings.
- $namefields = array_diff(\core\user_fields::get_name_fields(), useredit_get_required_name_fields());
+ $namefields = array_diff(\core_user\fields::get_name_fields(), useredit_get_required_name_fields());
foreach ($namefields as $namefield) {
$user->$namefield = '';
}
diff --git a/lib/badgeslib.php b/lib/badgeslib.php
index b4906dbb126..88a7ae6757c 100644
--- a/lib/badgeslib.php
+++ b/lib/badgeslib.php
@@ -143,7 +143,7 @@ function badges_notify_badge_award(badge $badge, $userid, $issued, $filepathhash
$userfrom = new stdClass();
$userfrom->id = $admin->id;
$userfrom->email = !empty($CFG->badges_defaultissuercontact) ? $CFG->badges_defaultissuercontact : $admin->email;
- foreach (\core\user_fields::get_name_fields() as $addname) {
+ foreach (\core_user\fields::get_name_fields() as $addname) {
$userfrom->$addname = !empty($CFG->badges_defaultissuername) ? '' : $admin->$addname;
}
$userfrom->firstname = !empty($CFG->badges_defaultissuername) ? $CFG->badges_defaultissuername : $admin->firstname;
diff --git a/lib/classes/check/access/riskadmin.php b/lib/classes/check/access/riskadmin.php
index 77bdec273d6..d751be88297 100644
--- a/lib/classes/check/access/riskadmin.php
+++ b/lib/classes/check/access/riskadmin.php
@@ -66,7 +66,7 @@ class riskadmin extends check {
*/
public function get_result(): result {
global $DB, $CFG;
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$sql = "SELECT $userfields
FROM {user} u
diff --git a/lib/classes/check/access/riskbackup_result.php b/lib/classes/check/access/riskbackup_result.php
index ee4e75bbf80..04105c70947 100644
--- a/lib/classes/check/access/riskbackup_result.php
+++ b/lib/classes/check/access/riskbackup_result.php
@@ -165,7 +165,7 @@ class riskbackup_result extends \core\check\result {
'context1' => CONTEXT_COURSE,
'context2' => CONTEXT_COURSE,
];
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$rs = $DB->get_recordset_sql("
SELECT DISTINCT $userfields,
diff --git a/lib/classes/check/access/riskxss_result.php b/lib/classes/check/access/riskxss_result.php
index 2041825cab0..adea6bcef29 100644
--- a/lib/classes/check/access/riskxss_result.php
+++ b/lib/classes/check/access/riskxss_result.php
@@ -90,7 +90,7 @@ class riskxss_result extends \core\check\result {
global $CFG, $DB;
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$users = $DB->get_records_sql("SELECT DISTINCT $userfields $this->sqlfrom", $this->params);
foreach ($users as $uid => $user) {
diff --git a/lib/classes/task/send_failed_login_notifications_task.php b/lib/classes/task/send_failed_login_notifications_task.php
index 019e0ba625f..5f3f3a2ea43 100644
--- a/lib/classes/task/send_failed_login_notifications_task.php
+++ b/lib/classes/task/send_failed_login_notifications_task.php
@@ -115,7 +115,7 @@ class send_failed_login_notifications_task extends scheduled_task {
// Now, select all the login error logged records belonging to the ips and infos
// since lastnotifyfailure, that we have stored in the cache_flags table.
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$namefields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$sql = "SELECT * FROM (
SELECT l.*, u.username, $namefields
diff --git a/lib/classes/task/send_new_user_passwords_task.php b/lib/classes/task/send_new_user_passwords_task.php
index ded1fb2caa9..678b29a40c7 100644
--- a/lib/classes/task/send_new_user_passwords_task.php
+++ b/lib/classes/task/send_new_user_passwords_task.php
@@ -47,7 +47,7 @@ class send_new_user_passwords_task extends scheduled_task {
// Generate new password emails for users - ppl expect these generated asap.
if ($DB->count_records('user_preferences', array('name' => 'create_password', 'value' => '1'))) {
mtrace('Creating passwords for new users...');
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$usernamefields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$newusers = $DB->get_recordset_sql("SELECT u.id as id, u.email, u.auth, u.deleted,
u.suspended, u.emailstop, u.mnethostid, u.mailformat,
diff --git a/lib/classes/user.php b/lib/classes/user.php
index eb15369318c..0cb5e4f8a7d 100644
--- a/lib/classes/user.php
+++ b/lib/classes/user.php
@@ -252,10 +252,10 @@ class core_user {
$extraparams = [];
// TODO Does not support custom user profile fields (MDL-70456).
- $userfieldsapi = \core\user_fields::for_identity(null, false)->with_userpic()->with_name()
+ $userfieldsapi = \core_user\fields::for_identity(null, false)->with_userpic()->with_name()
->including('username', 'deleted');
$selectfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
- $extra = $userfieldsapi->get_required_fields([\core\user_fields::PURPOSE_IDENTITY]);
+ $extra = $userfieldsapi->get_required_fields([\core_user\fields::PURPOSE_IDENTITY]);
$index = 1;
foreach ($extra as $fieldname) {
diff --git a/lib/completionlib.php b/lib/completionlib.php
index d39506ff4e5..0b920fefd80 100644
--- a/lib/completionlib.php
+++ b/lib/completionlib.php
@@ -1295,7 +1295,7 @@ class completion_info {
'moodle/course:isincompletionreports', $groupid, true);
// TODO Does not support custom user profile fields (MDL-70456).
- $userfieldsapi = \core\user_fields::for_identity($extracontext, false)->with_name();
+ $userfieldsapi = \core_user\fields::for_identity($extracontext, false)->with_name();
$allusernames = $userfieldsapi->get_sql('u')->selects;
$sql = 'SELECT u.id, u.idnumber ' . $allusernames;
$sql .= ' FROM (' . $enrolledsql . ') eu JOIN {user} u ON u.id = eu.id';
diff --git a/lib/datalib.php b/lib/datalib.php
index da16bca3e9f..4d302aad91f 100644
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -369,7 +369,7 @@ function users_order_by_sql($usertablealias = '', $search = null, context $conte
$paramkey++;
// TODO Does not support custom user profile fields (MDL-70456).
- $fieldstocheck = array_merge(array('firstname', 'lastname'), \core\user_fields::get_identity_fields($context, false));
+ $fieldstocheck = array_merge(array('firstname', 'lastname'), \core_user\fields::get_identity_fields($context, false));
foreach ($fieldstocheck as $key => $field) {
$exactconditions[] = 'LOWER(' . $tableprefix . $field . ') = LOWER(:' . $paramkey . ')';
$params[$paramkey] = $search;
@@ -517,7 +517,7 @@ function get_users_listing($sort='lastaccess', $dir='ASC', $page=0, $recordsperp
// If a context is specified, get extra user fields that the current user
// is supposed to see, otherwise just get the name fields.
- $userfields = \core\user_fields::for_name();
+ $userfields = \core_user\fields::for_name();
if ($extracontext) {
$userfields->with_identity($extracontext, true);
}
diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index 81acbd99512..fa9735f7ad7 100644
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -3084,8 +3084,8 @@ function user_get_participants_sql($courseid, $groupid = 0, $accesssince = 0, $r
$wheres = array();
// TODO Does not support custom user profile fields (MDL-70456).
- $userfields = \core\user_fields::get_identity_fields($context, false);
- $userfieldsapi = \core\user_fields::for_userpic()->including(...$userfields);
+ $userfields = \core_user\fields::get_identity_fields($context, false);
+ $userfieldsapi = \core_user\fields::for_userpic()->including(...$userfields);
$userfieldssql = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
if ($isfrontpage) {
@@ -3174,7 +3174,7 @@ function user_get_participants_sql($courseid, $groupid = 0, $accesssince = 0, $r
$conditions[] = $idnumber;
// TODO Does not support custom user profile fields (MDL-70456).
- $extrasearchfields = \core\user_fields::get_identity_fields($context, false);
+ $extrasearchfields = \core_user\fields::get_identity_fields($context, false);
if (!empty($extrasearchfields)) {
// Search all user identify fields.
foreach ($extrasearchfields as $extrasearchfield) {
@@ -3325,12 +3325,12 @@ function make_categories_options() {
* @return array Array of field names from user table, not including anything
* listed in $already
* @deprecated since Moodle 3.11 MDL-45242
- * @see \core\user_fields
+ * @see \core_user\fields
*/
function get_extra_user_fields($context, $already = array()) {
- debugging('get_extra_user_fields() is deprecated. Please use the \core\user_fields API instead.', DEBUG_DEVELOPER);
+ debugging('get_extra_user_fields() is deprecated. Please use the \core_user\fields API instead.', DEBUG_DEVELOPER);
- $fields = \core\user_fields::for_identity($context, false)->excluding(...$already);
+ $fields = \core_user\fields::for_identity($context, false)->excluding(...$already);
return $fields->get_required_fields();
}
@@ -3347,12 +3347,12 @@ function get_extra_user_fields($context, $already = array()) {
* @param array $already Array of fields that we're going to include anyway so don't list them (default none)
* @return string Partial SQL select clause, beginning with comma, for example ',u.idnumber,u.department' unless it is blank
* @deprecated since Moodle 3.11 MDL-45242
- * @see \core\user_fields
+ * @see \core_user\fields
*/
function get_extra_user_fields_sql($context, $alias='', $prefix='', $already = array()) {
- debugging('get_extra_user_fields_sql() is deprecated. Please use the \core\user_fields API instead.', DEBUG_DEVELOPER);
+ debugging('get_extra_user_fields_sql() is deprecated. Please use the \core_user\fields API instead.', DEBUG_DEVELOPER);
- $fields = \core\user_fields::for_identity($context, false)->excluding(...$already);
+ $fields = \core_user\fields::for_identity($context, false)->excluding(...$already);
// Note: There will never be any joins or join params because we turned off profile fields.
$selects = $fields->get_sql($alias, false, $prefix)->selects;
@@ -3367,12 +3367,12 @@ function get_extra_user_fields_sql($context, $alias='', $prefix='', $already = a
* @param string $field Field name, e.g. 'phone1'
* @return string Text description taken from language file, e.g. 'Phone number'
* @deprecated since Moodle 3.11 MDL-45242
- * @see \core\user_fields
+ * @see \core_user\fields
*/
function get_user_field_name($field) {
- debugging('get_user_field_name() is deprecated. Please use \core\user_fields::get_display_name() instead', DEBUG_DEVELOPER);
+ debugging('get_user_field_name() is deprecated. Please use \core_user\fields::get_display_name() instead', DEBUG_DEVELOPER);
- return \core\user_fields::get_display_name($field);
+ return \core_user\fields::get_display_name($field);
}
/**
@@ -3385,15 +3385,15 @@ function get_user_field_name($field) {
* @param bool $order moves firstname and lastname to the top of the array / start of the string.
* @return array|string All name fields.
* @deprecated since Moodle 3.11 MDL-45242
- * @see \core\user_fields
+ * @see \core_user\fields
*/
function get_all_user_name_fields($returnsql = false, $tableprefix = null, $prefix = null, $fieldprefix = null, $order = false) {
- debugging('get_all_user_name_fields() is deprecated. Please use the \core\user_fields API instead', DEBUG_DEVELOPER);
+ debugging('get_all_user_name_fields() is deprecated. Please use the \core_user\fields API instead', DEBUG_DEVELOPER);
// This array is provided in this order because when called by fullname() (above) if firstname is before
// firstnamephonetic str_replace() will change the wrong placeholder.
$alternatenames = [];
- foreach (\core\user_fields::get_name_fields() as $field) {
+ foreach (\core_user\fields::get_name_fields() as $field) {
$alternatenames[$field] = $field;
}
diff --git a/lib/grouplib.php b/lib/grouplib.php
index 8b7d8533fff..e513e5b441c 100644
--- a/lib/grouplib.php
+++ b/lib/grouplib.php
@@ -1321,7 +1321,7 @@ function groups_user_groups_visible($course, $userid, $cm = null) {
function groups_get_groups_members($groupsids, $extrafields=null, $sort='lastname ASC') {
global $DB;
- $userfieldsapi = \core\user_fields::for_userpic()->including(...($extrafields ?? []));
+ $userfieldsapi = \core_user\fields::for_userpic()->including(...($extrafields ?? []));
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
list($insql, $params) = $DB->get_in_or_equal($groupsids);
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index e7379a99e9e..ea25f8f8a73 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -3540,7 +3540,7 @@ function fullname($user, $override=false) {
}
// Get all of the name fields.
- $allnames = \core\user_fields::get_name_fields();
+ $allnames = \core_user\fields::get_name_fields();
if ($CFG->debugdeveloper) {
foreach ($allnames as $allname) {
if (!property_exists($user, $allname)) {
@@ -3646,7 +3646,7 @@ function fullname($user, $override=false) {
*/
function username_load_fields_from_object($addtoobject, $secondobject, $prefix = null, $additionalfields = null) {
$fields = [];
- foreach (\core\user_fields::get_name_fields() as $field) {
+ foreach (\core_user\fields::get_name_fields() as $field) {
$fields[$field] = $prefix . $field;
}
if ($additionalfields) {
diff --git a/lib/myprofilelib.php b/lib/myprofilelib.php
index e55d95da660..da370c899d6 100644
--- a/lib/myprofilelib.php
+++ b/lib/myprofilelib.php
@@ -126,7 +126,7 @@ function core_myprofile_navigation(core_user\output\myprofile\tree $tree, $user,
$hiddenfields = array_flip(explode(',', $CFG->hiddenuserfields));
}
// TODO Does not support custom user profile fields (MDL-70456).
- $identityfields = array_flip(\core\user_fields::get_identity_fields($courseorusercontext, false));
+ $identityfields = array_flip(\core_user\fields::get_identity_fields($courseorusercontext, false));
if (is_mnet_remote_user($user)) {
$sql = "SELECT h.id, h.name, h.wwwroot,
diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php
index 2a76c0f34e9..3adbfd69a22 100644
--- a/lib/outputcomponents.php
+++ b/lib/outputcomponents.php
@@ -220,18 +220,18 @@ class user_picture implements renderable {
// only touch the DB if we are missing data and complain loudly...
$needrec = false;
- foreach (\core\user_fields::get_picture_fields() as $field) {
+ foreach (\core_user\fields::get_picture_fields() as $field) {
if (!property_exists($user, $field)) {
$needrec = true;
debugging('Missing '.$field.' property in $user object, this is a performance problem that needs to be fixed by a developer. '
- .'Please use the \core\user_fields API to get the full list of required fields.', DEBUG_DEVELOPER);
+ .'Please use the \core_user\fields API to get the full list of required fields.', DEBUG_DEVELOPER);
break;
}
}
if ($needrec) {
$this->user = $DB->get_record('user', array('id' => $user->id),
- implode(',', \core\user_fields::get_picture_fields()), MUST_EXIST);
+ implode(',', \core_user\fields::get_picture_fields()), MUST_EXIST);
} else {
$this->user = clone($user);
}
@@ -250,11 +250,11 @@ class user_picture implements renderable {
* @param string $fieldprefix prefix to add to all columns in their aliases, does not apply to 'id'
* @return string
* @deprecated since Moodle 3.11 MDL-45242
- * @see \core\user_fields
+ * @see \core_user\fields
*/
public static function fields($tableprefix = '', array $extrafields = NULL, $idalias = 'id', $fieldprefix = '') {
- debugging('user_picture::fields() is deprecated. Please use the \core\user_fields API instead.', DEBUG_DEVELOPER);
- $userfields = \core\user_fields::for_userpic();
+ debugging('user_picture::fields() is deprecated. Please use the \core_user\fields API instead.', DEBUG_DEVELOPER);
+ $userfields = \core_user\fields::for_userpic();
if ($extrafields) {
$userfields->including(...$extrafields);
}
@@ -288,7 +288,7 @@ class user_picture implements renderable {
$return = new stdClass();
- foreach (\core\user_fields::get_picture_fields() as $field) {
+ foreach (\core_user\fields::get_picture_fields() as $field) {
if ($field === 'id') {
if (property_exists($record, $idalias)) {
$return->id = $record->{$idalias};
diff --git a/lib/tablelib.php b/lib/tablelib.php
index 37b8ee5538c..ad7343caedc 100644
--- a/lib/tablelib.php
+++ b/lib/tablelib.php
@@ -608,7 +608,7 @@ class flexible_table {
if (isset($this->columns[$column])) {
continue; // This column is OK.
}
- if (in_array($column, \core\user_fields::get_name_fields()) &&
+ if (in_array($column, \core_user\fields::get_name_fields()) &&
isset($this->columns['fullname'])) {
continue; // This column is OK.
}
@@ -1235,7 +1235,7 @@ class flexible_table {
$nameformat = get_string('fullnamedisplay');
}
- $requirednames = order_in_string(\core\user_fields::get_name_fields(), $nameformat);
+ $requirednames = order_in_string(\core_user\fields::get_name_fields(), $nameformat);
if (!empty($requirednames)) {
if ($this->is_sortable($column)) {
@@ -1315,7 +1315,7 @@ class flexible_table {
$sortdata = array_merge([$sortby => $sortorder], $sortdata);
}
- $usernamefields = \core\user_fields::get_name_fields();
+ $usernamefields = \core_user\fields::get_name_fields();
$sortdata = array_filter($sortdata, function($sortby) use ($usernamefields) {
$isvalidsort = $sortby && $this->is_sortable($sortby);
$isvalidsort = $isvalidsort && empty($this->prefs['collapse'][$sortby]);
diff --git a/lib/tests/moodlelib_test.php b/lib/tests/moodlelib_test.php
index 31df330d70e..bc8315c78ff 100644
--- a/lib/tests/moodlelib_test.php
+++ b/lib/tests/moodlelib_test.php
@@ -3827,7 +3827,7 @@ EOF;
// User information for showing a picture.
$user = new stdClass();
- $additionalfields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $additionalfields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
$user = username_load_fields_from_object($user, $userinfo, null, $additionalfields);
$user->id = $userinfo->userid;
$expectedarray = new stdClass();
@@ -3856,7 +3856,7 @@ EOF;
// Return an object with user picture information.
$user = new stdClass();
- $additionalfields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $additionalfields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
$user = username_load_fields_from_object($user, $userinfo, 'author', $additionalfields);
$user->id = $userinfo->userid;
$expectedarray = new stdClass();
diff --git a/lib/tests/outputcomponents_test.php b/lib/tests/outputcomponents_test.php
index 00ecbe9a559..a99830a2221 100644
--- a/lib/tests/outputcomponents_test.php
+++ b/lib/tests/outputcomponents_test.php
@@ -74,7 +74,7 @@ class core_outputcomponents_testcase extends advanced_testcase {
* Tests user_picture::unalias.
*/
public function test_fields_unaliasing() {
- $fields = implode(',', \core\user_fields::get_picture_fields());
+ $fields = implode(',', \core_user\fields::get_picture_fields());
$fields = array_map('trim', explode(',', $fields));
$fakerecord = new stdClass();
@@ -101,7 +101,7 @@ class core_outputcomponents_testcase extends advanced_testcase {
* Tests user_picture::unalias with null values.
*/
public function test_fields_unaliasing_null() {
- $fields = implode(',', \core\user_fields::get_picture_fields());
+ $fields = implode(',', \core_user\fields::get_picture_fields());
$fields = array_map('trim', explode(',', $fields));
$fakerecord = new stdClass();
diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index 3033d267e30..fdd0438a91c 100644
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -105,7 +105,7 @@ information provided here is intended especially for developers.
e.g. ['completionsubmit' => 'Must submit']
* Admin setting admin_setting_configmulticheckbox now supports lazy-loading the options list by
supplying a callback function instead of an array of options.
-* A new core API class \core\user_fields provides ways to get lists of user fields, and SQL related to
+* A new core API class \core_user\fields provides ways to get lists of user fields, and SQL related to
those fields. This replaces existing functions get_extra_user_fields(), get_extra_user_fields_sql(),
get_user_field_name(), get_all_user_name_fields(), and user_picture::fields(), which have all been
deprecated.
diff --git a/message/classes/api.php b/message/classes/api.php
index dcc69c05f25..f9f3fb42273 100644
--- a/message/classes/api.php
+++ b/message/classes/api.php
@@ -111,7 +111,7 @@ class api {
global $DB;
// Get the user fields we want.
- $userfieldsapi = \core\user_fields::for_userpic()->including('lastaccess');
+ $userfieldsapi = \core_user\fields::for_userpic()->including('lastaccess');
$ufields = $userfieldsapi->get_sql('u', false, 'userfrom_', '', false)->selects;
$ufields2 = $userfieldsapi->get_sql('u2', false, 'userto_', '', false)->selects;
// Add the uniqueid column to make each row unique and avoid SQL errors.
@@ -1023,7 +1023,7 @@ class api {
debugging('\core_message\api::get_contacts_with_unread_message_count is deprecated and no longer used',
DEBUG_DEVELOPER);
- $userfieldsapi = \core\user_fields::for_userpic()->including('lastaccess');
+ $userfieldsapi = \core_user\fields::for_userpic()->including('lastaccess');
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$unreadcountssql = "SELECT $userfields, count(m.id) as messagecount
FROM {message_contacts} mc
@@ -1065,7 +1065,7 @@ class api {
debugging('\core_message\api::get_non_contacts_with_unread_message_count is deprecated and no longer used',
DEBUG_DEVELOPER);
- $userfieldsapi = \core\user_fields::for_userpic()->including('lastaccess');
+ $userfieldsapi = \core_user\fields::for_userpic()->including('lastaccess');
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$unreadcountssql = "SELECT $userfields, count(m.id) as messagecount
FROM {user} u
@@ -1888,7 +1888,7 @@ class api {
public static function get_blocked_users($userid) {
global $DB;
- $userfieldsapi = \core\user_fields::for_userpic()->including('lastaccess');
+ $userfieldsapi = \core_user\fields::for_userpic()->including('lastaccess');
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$blockeduserssql = "SELECT $userfields
FROM {message_users_blocked} mub
diff --git a/message/classes/helper.php b/message/classes/helper.php
index 4517185bf9b..84d9bbcf12f 100644
--- a/message/classes/helper.php
+++ b/message/classes/helper.php
@@ -429,7 +429,7 @@ class helper {
}
list($useridsql, $usersparams) = $DB->get_in_or_equal($userids);
- $userfieldsapi = \core\user_fields::for_userpic()->including('lastaccess');
+ $userfieldsapi = \core_user\fields::for_userpic()->including('lastaccess');
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$userssql = "SELECT $userfields, u.deleted, mc.id AS contactid, mub.id AS blockedid
FROM {user} u
diff --git a/message/lib.php b/message/lib.php
index 3333f1874a3..a416ee5c2a5 100644
--- a/message/lib.php
+++ b/message/lib.php
@@ -183,7 +183,7 @@ function message_search_users($courseids, $searchtext, $sort='', $exceptions='')
}
$fullname = $DB->sql_fullname();
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$ufields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
if (!empty($sort)) {
@@ -550,7 +550,7 @@ function message_get_messages($useridto, $useridfrom = 0, $notifications = -1, $
global $DB;
// If the 'useridto' value is empty then we are going to retrieve messages sent by the useridfrom to any user.
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
if (empty($useridto)) {
$userfields = $userfieldsapi->get_sql('u', false, 'userto', '', false)->selects;
$messageuseridtosql = 'u.id as useridto';
diff --git a/message/output/email/classes/task/send_email_task.php b/message/output/email/classes/task/send_email_task.php
index 07ff2648dca..11bbcfbf994 100644
--- a/message/output/email/classes/task/send_email_task.php
+++ b/message/output/email/classes/task/send_email_task.php
@@ -161,7 +161,7 @@ class send_email_task extends scheduled_task {
protected function get_users_messages_for_conversation(int $conversationid, int $userid) : moodle_recordset {
global $DB;
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$usernamefields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$sql = "SELECT $usernamefields, m.*
FROM {messages} m
diff --git a/mod/assign/classes/output/grading_app.php b/mod/assign/classes/output/grading_app.php
index ea5381a9c59..587be8347b9 100644
--- a/mod/assign/classes/output/grading_app.php
+++ b/mod/assign/classes/output/grading_app.php
@@ -169,7 +169,7 @@ class grading_app implements templatable, renderable {
$export->larrow = $output->larrow();
// List of identity fields to display (the user info will not contain any fields the user cannot view anyway).
// TODO Does not support custom user profile fields (MDL-70456).
- $export->showuseridentity = implode(',', \core\user_fields::get_identity_fields(null, false));
+ $export->showuseridentity = implode(',', \core_user\fields::get_identity_fields(null, false));
$export->currentuserid = $USER->id;
$helpicon = new \help_icon('sendstudentnotifications', 'assign');
$export->helpicon = $helpicon->export_for_template($output);
diff --git a/mod/assign/extensionform.php b/mod/assign/extensionform.php
index 5f94b8cde06..1b32d00af85 100644
--- a/mod/assign/extensionform.php
+++ b/mod/assign/extensionform.php
@@ -59,7 +59,7 @@ class mod_assign_extension_form extends moodleform {
$usershtml = '';
// TODO Does not support custom user profile fields (MDL-70456).
- $extrauserfields = \core\user_fields::get_identity_fields($assign->get_context(), false);
+ $extrauserfields = \core_user\fields::get_identity_fields($assign->get_context(), false);
foreach ($userlist as $userid) {
if ($usercount >= 5) {
$usershtml .= get_string('moreusers', 'assign', count($userlist) - 5);
diff --git a/mod/assign/feedback/file/locallib.php b/mod/assign/feedback/file/locallib.php
index f42198935b0..dd65b23903d 100644
--- a/mod/assign/feedback/file/locallib.php
+++ b/mod/assign/feedback/file/locallib.php
@@ -475,7 +475,7 @@ class assign_feedback_file extends assign_feedback_plugin {
$this->assignment->is_blind_marking(),
$this->assignment->get_uniqueid_for_user($user->id),
// TODO Does not support custom user profile fields (MDL-70456).
- \core\user_fields::get_identity_fields($this->assignment->get_context(), false));
+ \core_user\fields::get_identity_fields($this->assignment->get_context(), false));
$usershtml .= $this->assignment->get_renderer()->render($usersummary);
$usercount += 1;
}
diff --git a/mod/assign/gradingtable.php b/mod/assign/gradingtable.php
index 77260037e40..aee75cd3779 100644
--- a/mod/assign/gradingtable.php
+++ b/mod/assign/gradingtable.php
@@ -135,9 +135,9 @@ class assign_grading_table extends table_sql implements renderable {
$params['newstatus'] = ASSIGN_SUBMISSION_STATUS_NEW;
// TODO Does not support custom user profile fields (MDL-70456).
- $userfieldsapi = \core\user_fields::for_identity($this->assignment->get_context(), false)->with_userpic();
+ $userfieldsapi = \core_user\fields::for_identity($this->assignment->get_context(), false)->with_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
- $extrauserfields = $userfieldsapi->get_required_fields([\core\user_fields::PURPOSE_IDENTITY]);
+ $extrauserfields = $userfieldsapi->get_required_fields([\core_user\fields::PURPOSE_IDENTITY]);
$fields = $userfields . ', ';
$fields .= 'u.id as userid, ';
$fields .= 's.status as status, ';
@@ -408,7 +408,7 @@ class assign_grading_table extends table_sql implements renderable {
foreach ($extrauserfields as $extrafield) {
$columns[] = $extrafield;
- $headers[] = \core\user_fields::get_display_name($extrafield);
+ $headers[] = \core_user\fields::get_display_name($extrafield);
}
} else {
// Record ID.
diff --git a/mod/assign/lib.php b/mod/assign/lib.php
index 0bcc7ebf1f9..f5a088e0925 100644
--- a/mod/assign/lib.php
+++ b/mod/assign/lib.php
@@ -587,7 +587,7 @@ function assign_print_recent_activity($course, $viewfullnames, $timestart) {
// Do not use log table if possible, it may be huge.
$dbparams = array($timestart, $course->id, 'assign', ASSIGN_SUBMISSION_STATUS_SUBMITTED);
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$namefields = $userfieldsapi->get_sql('u', false, '', 'userid', false)->selects;;
if (!$submissions = $DB->get_records_sql("SELECT asb.id, asb.timemodified, cm.id AS cmid, um.id as recordid,
$namefields
@@ -745,7 +745,7 @@ function assign_get_recent_mod_activity(&$activities,
$params['timestart'] = $timestart;
$params['submitted'] = ASSIGN_SUBMISSION_STATUS_SUBMITTED;
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', 'userid', false)->selects;
if (!$submissions = $DB->get_records_sql('SELECT asb.id, asb.timemodified, ' .
@@ -833,7 +833,7 @@ function assign_get_recent_mod_activity(&$activities,
$activity->grade = $grades->items[0]->grades[$submission->userid]->str_long_grade;
}
- $userfields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $userfields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
foreach ($userfields as $userfield) {
if ($userfield == 'id') {
// Aliased in SQL above.
diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index de1b93e216a..2573d71d606 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -2066,7 +2066,7 @@ class assign {
private function get_grading_sort_sql() {
$usersort = flexible_table::get_sort_for_table('mod_assign_grading');
// TODO Does not support custom user profile fields (MDL-70456).
- $userfieldsapi = \core\user_fields::for_identity($this->context, false)->with_userpic();
+ $userfieldsapi = \core_user\fields::for_identity($this->context, false)->with_userpic();
$userfields = $userfieldsapi->get_required_fields();
$orderfields = explode(',', $usersort);
$validlist = [];
@@ -4149,7 +4149,7 @@ class assign {
$this->is_blind_marking(),
$this->get_uniqueid_for_user($user->id),
// TODO Does not support custom user profile fields (MDL-70456).
- \core\user_fields::get_identity_fields($this->get_context(), false),
+ \core_user\fields::get_identity_fields($this->get_context(), false),
!$this->is_active_user($userid));
$o .= $this->get_renderer()->render($usersummary);
}
@@ -4999,7 +4999,7 @@ class assign {
$usercount = 0;
// TODO Does not support custom user profile fields (MDL-70456).
- $extrauserfields = \core\user_fields::get_identity_fields($this->get_context(), false);
+ $extrauserfields = \core_user\fields::get_identity_fields($this->get_context(), false);
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->get_context());
foreach ($userlist as $userid) {
if ($usercount >= 5) {
@@ -5064,7 +5064,7 @@ class assign {
$usercount = 0;
// TODO Does not support custom user profile fields (MDL-70456).
- $extrauserfields = \core\user_fields::get_identity_fields($this->get_context(), false);
+ $extrauserfields = \core_user\fields::get_identity_fields($this->get_context(), false);
$viewfullnames = has_capability('moodle/site:viewfullnames', $this->get_context());
foreach ($userlist as $userid) {
if ($usercount >= 5) {
diff --git a/mod/assign/override_form.php b/mod/assign/override_form.php
index 3a4d4cbada0..c9ef759892a 100644
--- a/mod/assign/override_form.php
+++ b/mod/assign/override_form.php
@@ -156,7 +156,7 @@ class assign_override_form extends moodleform {
list($sort) = users_order_by_sql('u');
// Get the list of appropriate users, depending on whether and how groups are used.
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
if ($accessallgroups) {
$users = get_enrolled_users($this->context, '', 0,
'u.id, u.email, ' . $userfieldsapi->get_sql('u', false, '', '', false)->selects, $sort);
@@ -187,7 +187,7 @@ class assign_override_form extends moodleform {
$userchoices = array();
// TODO Does not support custom user profile fields (MDL-70456).
- $canviewemail = in_array('email', \core\user_fields::get_identity_fields($this->context, false));
+ $canviewemail = in_array('email', \core_user\fields::get_identity_fields($this->context, false));
foreach ($users as $id => $user) {
if (empty($invalidusers[$id]) || (!empty($override) &&
$id == $override->userid)) {
diff --git a/mod/assign/overridedelete.php b/mod/assign/overridedelete.php
index 60630337920..1003219e67c 100644
--- a/mod/assign/overridedelete.php
+++ b/mod/assign/overridedelete.php
@@ -90,7 +90,7 @@ if ($override->groupid) {
$group = $DB->get_record('groups', array('id' => $override->groupid), 'id, name');
$confirmstr = get_string("overridedeletegroupsure", "assign", $group->name);
} else {
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$namefields = $userfieldsapi->get_sql('', false, '', '', false)->selects;
$user = $DB->get_record('user', array('id' => $override->userid),
'id, ' . $namefields);
diff --git a/mod/assign/overrides.php b/mod/assign/overrides.php
index aa07023ec7f..936cf3b00db 100644
--- a/mod/assign/overrides.php
+++ b/mod/assign/overrides.php
@@ -121,7 +121,7 @@ if ($groupmode) {
list($sort, $params) = users_order_by_sql('u');
$params['assignid'] = $assign->id;
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
if ($accessallgroups) {
$sql = 'SELECT o.*, ' . $userfieldsapi->get_sql('u', false, '', '', false)->selects . '
FROM {assign_overrides} o
diff --git a/mod/chat/lib.php b/mod/chat/lib.php
index ee019d6088e..f7431cad047 100644
--- a/mod/chat/lib.php
+++ b/mod/chat/lib.php
@@ -372,7 +372,7 @@ function chat_print_recent_activity($course, $viewfullnames, $timestart) {
$groupselect = "";
}
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
if (!$users = $DB->get_records_sql("SELECT $userfields
FROM {course_modules} cm
@@ -514,7 +514,7 @@ function chat_get_users($chatid, $groupid=0, $groupingid=0) {
$groupingjoin = '';
}
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$ufields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
return $DB->get_records_sql("SELECT DISTINCT $ufields, c.lastmessageping, c.firstping
FROM {chat_users} c
@@ -907,7 +907,7 @@ function chat_format_message($message, $courseid, $currentuser, $chatlastrow=nul
if (isset($users[$message->userid])) {
$user = $users[$message->userid];
- } else if ($user = $DB->get_record('user', ['id' => $message->userid], implode(',', \core\user_fields::get_picture_fields()))) {
+ } else if ($user = $DB->get_record('user', ['id' => $message->userid], implode(',', \core_user\fields::get_picture_fields()))) {
$users[$message->userid] = $user;
} else {
return null;
@@ -939,7 +939,7 @@ function chat_format_message_theme ($message, $chatuser, $currentuser, $grouping
if (isset($users[$message->userid])) {
$sender = $users[$message->userid];
} else if ($sender = $DB->get_record('user', array('id' => $message->userid),
- implode(',', \core\user_fields::get_picture_fields()))) {
+ implode(',', \core_user\fields::get_picture_fields()))) {
$users[$message->userid] = $sender;
} else {
return null;
diff --git a/mod/choice/lib.php b/mod/choice/lib.php
index f4b9585547f..b67ca1c0120 100644
--- a/mod/choice/lib.php
+++ b/mod/choice/lib.php
@@ -799,7 +799,7 @@ function choice_get_response_data($choice, $cm, $groupmode, $onlyactive) {
/// First get all the users who have access here
/// To start with we assume they are all "unanswered" then move them later
// TODO Does not support custom user profile fields (MDL-70456).
- $userfieldsapi = \core\user_fields::for_identity($context, false)->with_userpic();
+ $userfieldsapi = \core_user\fields::for_identity($context, false)->with_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$allresponses[0] = get_enrolled_users($context, 'mod/choice:choose', $currentgroup,
$userfields, null, 0, 0, $onlyactive);
diff --git a/mod/choice/report.php b/mod/choice/report.php
index b78a93d2c04..664a0e28da0 100644
--- a/mod/choice/report.php
+++ b/mod/choice/report.php
@@ -96,7 +96,7 @@
$users = choice_get_response_data($choice, $cm, $groupmode, $onlyactive);
// TODO Does not support custom user profile fields (MDL-70456).
- $extrafields = \core\user_fields::get_identity_fields($context, false);
+ $extrafields = \core_user\fields::get_identity_fields($context, false);
if ($download == "ods" && has_capability('mod/choice:downloadresponses', $context)) {
require_once("$CFG->libdir/odslib.class.php");
@@ -119,7 +119,7 @@
// Add headers for extra user fields.
foreach ($extrafields as $field) {
- $myxls->write_string(0, $i++, \core\user_fields::get_display_name($field));
+ $myxls->write_string(0, $i++, \core_user\fields::get_display_name($field));
}
$myxls->write_string(0, $i++, get_string("group"));
@@ -180,7 +180,7 @@
// Add headers for extra user fields.
foreach ($extrafields as $field) {
- $myxls->write_string(0, $i++, \core\user_fields::get_display_name($field));
+ $myxls->write_string(0, $i++, \core_user\fields::get_display_name($field));
}
$myxls->write_string(0, $i++, get_string("group"));
@@ -236,7 +236,7 @@
// Add headers for extra user fields.
foreach ($extrafields as $field) {
- echo \core\user_fields::get_display_name($field) . "\t";
+ echo \core_user\fields::get_display_name($field) . "\t";
}
echo get_string("group"). "\t";
diff --git a/mod/data/lib.php b/mod/data/lib.php
index 18c706399b5..f0ce0372baa 100644
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -4118,7 +4118,7 @@ function data_get_recordids($alias, $searcharray, $dataid, $recordids) {
function data_get_advanced_search_sql($sort, $data, $recordids, $selectdata, $sortorder) {
global $DB;
- $userfieldsapi = \core\user_fields::for_userpic()->excluding('id');
+ $userfieldsapi = \core_user\fields::for_userpic()->excluding('id');
$namefields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
if ($sort == 0) {
diff --git a/mod/data/locallib.php b/mod/data/locallib.php
index 9e99e42c953..2cb5020de80 100644
--- a/mod/data/locallib.php
+++ b/mod/data/locallib.php
@@ -1112,7 +1112,7 @@ function data_search_entries($data, $cm, $context, $mode, $currentgroup, $search
$advparams = array();
// This is used for the initial reduction of advanced search results with required entries.
$entrysql = '';
- $userfieldsapi = \core\user_fields::for_userpic()->excluding('id');
+ $userfieldsapi = \core_user\fields::for_userpic()->excluding('id');
$namefields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
// Find the field we are sorting on.
diff --git a/mod/data/preset.php b/mod/data/preset.php
index df23f319bcf..82007c9f3c5 100644
--- a/mod/data/preset.php
+++ b/mod/data/preset.php
@@ -62,7 +62,7 @@ $presets = data_get_available_presets($context);
$strdelete = get_string('deleted', 'data');
foreach ($presets as &$preset) {
if (!empty($preset->userid)) {
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$namefields = $userfieldsapi->get_sql('', false, '', '', false)->selects;
$presetuser = $DB->get_record('user', array('id' => $preset->userid), 'id, ' . $namefields, MUST_EXIST);
$preset->description = $preset->name.' ('.fullname($presetuser, true).')';
diff --git a/mod/data/view.php b/mod/data/view.php
index bde4875c1f3..9bce3e74cce 100644
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -294,7 +294,7 @@
echo $OUTPUT->notification(get_string('recorddeleted','data'), 'notifysuccess');
}
} else { // Print a confirmation page
- $userfieldsapi = \core\user_fields::for_userpic()->excluding('id');
+ $userfieldsapi = \core_user\fields::for_userpic()->excluding('id');
$allnamefields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$dbparams = array($delete);
if ($deleterecord = $DB->get_record_sql("SELECT dr.*, $allnamefields
@@ -331,7 +331,7 @@
$validrecords = array();
$recordids = array();
foreach ($multidelete as $value) {
- $userfieldsapi = \core\user_fields::for_userpic()->excluding('id');
+ $userfieldsapi = \core_user\fields::for_userpic()->excluding('id');
$allnamefields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$dbparams = array('id' => $value);
if ($deleterecord = $DB->get_record_sql("SELECT dr.*, $allnamefields
diff --git a/mod/feedback/classes/responses_table.php b/mod/feedback/classes/responses_table.php
index 66ab1083141..6b0731033e4 100644
--- a/mod/feedback/classes/responses_table.php
+++ b/mod/feedback/classes/responses_table.php
@@ -121,9 +121,9 @@ class mod_feedback_responses_table extends table_sql {
);
// TODO Does not support custom user profile fields (MDL-70456).
- $userfieldsapi = \core\user_fields::for_identity($this->get_context(), false)->with_userpic();
+ $userfieldsapi = \core_user\fields::for_identity($this->get_context(), false)->with_userpic();
$ufields = $userfieldsapi->get_sql('u', false, '', $this->useridfield, false)->selects;
- $extrafields = $userfieldsapi->get_required_fields([\core\user_fields::PURPOSE_IDENTITY]);
+ $extrafields = $userfieldsapi->get_required_fields([\core_user\fields::PURPOSE_IDENTITY]);
$fields = 'c.id, c.timemodified as completed_timemodified, c.courseid, '.$ufields;
$from = '{feedback_completed} c '
. 'JOIN {user} u ON u.id = c.userid AND u.deleted = :notdeleted';
@@ -143,7 +143,7 @@ class mod_feedback_responses_table extends table_sql {
foreach ($extrafields as $field) {
$fields .= ", u.{$field}";
$tablecolumns[] = $field;
- $tableheaders[] = \core\user_fields::get_display_name($field);
+ $tableheaders[] = \core_user\fields::get_display_name($field);
}
}
diff --git a/mod/feedback/lib.php b/mod/feedback/lib.php
index 2d0d52c7f33..bbaebafbf3f 100644
--- a/mod/feedback/lib.php
+++ b/mod/feedback/lib.php
@@ -388,7 +388,7 @@ function feedback_get_recent_mod_activity(&$activities, &$index,
$sqlargs = array();
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', 'useridagain', false)->selects;
$sql = " SELECT fk . * , fc . * , $userfields
FROM {feedback_completed} fc
@@ -986,7 +986,7 @@ function feedback_get_incomplete_users(cm_info $cm,
//first get all user who can complete this feedback
$cap = 'mod/feedback:complete';
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allnames = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$fields = 'u.id, ' . $allnames . ', u.picture, u.email, u.imagealt';
if (!$allusers = get_users_by_capability($context,
@@ -1124,7 +1124,7 @@ function feedback_get_complete_users($cm,
$sortsql = '';
}
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$ufields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$sql = 'SELECT DISTINCT '.$ufields.', c.timemodified as completed_timemodified
FROM {user} u, {feedback_completed} c '.$fromgroup.'
diff --git a/mod/forum/classes/form/export_form.php b/mod/forum/classes/form/export_form.php
index 93647c699d6..f589e9f4af0 100644
--- a/mod/forum/classes/form/export_form.php
+++ b/mod/forum/classes/form/export_form.php
@@ -57,7 +57,7 @@ class export_form extends \moodleform {
'valuehtmlcallback' => function($value) {
global $OUTPUT;
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allusernames = $userfieldsapi->get_sql('', false, '', '', false)->selects;
$fields = 'id, ' . $allusernames;
$user = \core_user::get_user($value, $fields);
diff --git a/mod/forum/classes/local/vaults/discussion_list.php b/mod/forum/classes/local/vaults/discussion_list.php
index ac8cd0307e5..41866143d3c 100644
--- a/mod/forum/classes/local/vaults/discussion_list.php
+++ b/mod/forum/classes/local/vaults/discussion_list.php
@@ -131,7 +131,7 @@ class discussion_list extends db_table_vault {
// - Most recent editor.
$thistable = new dml_table(self::TABLE, $alias, $alias);
$posttable = new dml_table('forum_posts', 'fp', 'p_');
- $userfieldsapi = \core\user_fields::for_userpic()->including('deleted');
+ $userfieldsapi = \core_user\fields::for_userpic()->including('deleted');
$firstauthorfields = $userfieldsapi->get_sql('fa', false,
self::FIRST_AUTHOR_ALIAS, self::FIRST_AUTHOR_ID_ALIAS, false)->selects;
$latestuserfields = $userfieldsapi->get_sql('la', false,
@@ -274,7 +274,7 @@ class discussion_list extends db_table_vault {
$nameformat = get_string('fullnamedisplay', '', (object)['firstname' => 'firstname', 'lastname' => 'lastname']);
}
// Fetch all the available user name fields.
- $availablefields = order_in_string(\core\user_fields::get_name_fields(), $nameformat);
+ $availablefields = order_in_string(\core_user\fields::get_name_fields(), $nameformat);
// We'll default to the first name if there's no available name field.
$returnfield = 'firstname';
if (!empty($availablefields)) {
diff --git a/mod/forum/classes/subscriptions.php b/mod/forum/classes/subscriptions.php
index 7982357ef7e..3c9e9df004e 100644
--- a/mod/forum/classes/subscriptions.php
+++ b/mod/forum/classes/subscriptions.php
@@ -393,7 +393,7 @@ class subscriptions {
global $CFG, $DB;
if (empty($fields)) {
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allnames = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$fields ="u.id,
u.username,
diff --git a/mod/forum/deprecatedlib.php b/mod/forum/deprecatedlib.php
index 5a4e6aad02a..29f2dc35be6 100644
--- a/mod/forum/deprecatedlib.php
+++ b/mod/forum/deprecatedlib.php
@@ -839,7 +839,7 @@ function forum_print_post($post, $discussion, $forum, &$cm, $course, $ownpost=fa
// Build an object that represents the posting user
$postuser = new stdClass;
- $postuserfields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $postuserfields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
$postuser = username_load_fields_from_object($postuser, $post, null, $postuserfields);
$postuser->id = $post->userid;
$postuser->fullname = fullname($postuser, $cm->cache->caps['moodle/site:viewfullnames']);
diff --git a/mod/forum/externallib.php b/mod/forum/externallib.php
index 1f6f62db489..407dc7096c6 100644
--- a/mod/forum/externallib.php
+++ b/mod/forum/externallib.php
@@ -674,7 +674,7 @@ class mod_forum_external extends external_api {
$discussion->usermodifiedfullname = null;
$discussion->usermodifiedpictureurl = null;
} else {
- $picturefields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $picturefields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
// Load user objects from the results of the query.
$user = new stdclass();
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index f3c2001fedf..c619c5a4e4d 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -644,7 +644,7 @@ function forum_print_recent_activity($course, $viewfullnames, $timestart) {
// do not use log table if possible, it may be huge and is expensive to join with other tables
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$allnamefields = $userfieldsapi->get_sql('u', false, '', 'duserid', false)->selects;
if (!$posts = $DB->get_records_sql("SELECT p.*,
f.course, f.type AS forumtype, f.name AS forumname, f.intro, f.introformat, f.duedate,
@@ -972,7 +972,7 @@ function forum_scale_used_anywhere(int $scaleid): bool {
function forum_get_post_full($postid) {
global $CFG, $DB;
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allnames = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
return $DB->get_record_sql("SELECT p.*, d.forum, $allnames, u.email, u.picture, u.imagealt
FROM {forum_posts} p
@@ -1002,7 +1002,7 @@ function forum_get_all_discussion_posts($discussionid, $sort, $tracking = false)
$params[] = $USER->id;
}
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allnames = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$params[] = $discussionid;
if (!$posts = $DB->get_records_sql("SELECT p.*, $allnames, u.email, u.picture, u.imagealt $tr_sel
@@ -1301,7 +1301,7 @@ function forum_search_posts($searchterms, $courseid, $limitfrom, $limitnum,
FROM $fromsql
WHERE $selectsql";
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allnames = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$searchsql = "SELECT p.*,
d.forum,
@@ -1342,7 +1342,7 @@ function forum_get_user_posts($forumid, $userid) {
}
}
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allnames = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
return $DB->get_records_sql("SELECT p.*, d.forum, $allnames, u.email, u.picture, u.imagealt
FROM {forum} f
@@ -1434,7 +1434,7 @@ function forum_count_user_posts($forumid, $userid) {
function forum_get_post_from_log($log) {
global $CFG, $DB;
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allnames = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
if ($log->action == "add post") {
@@ -1763,7 +1763,7 @@ function forum_get_discussions($cm, $forumsort="", $fullpost=true, $unused=-1, $
$postdata = "p.*";
}
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
if (empty($userlastmodified)) { // We don't need to know this
$umfields = "";
@@ -2439,7 +2439,7 @@ function forum_print_discussion_header(&$post, $forum, $group = -1, $datestring
// Picture
$postuser = new stdClass();
- $postuserfields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $postuserfields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
$postuser = username_load_fields_from_object($postuser, $post, null, $postuserfields);
$postuser->id = $post->userid;
echo '| ';
@@ -4114,7 +4114,7 @@ function forum_get_recent_mod_activity(&$activities, &$index, $timestart, $cours
$groupselect = "";
}
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allnames = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
if (!$posts = $DB->get_records_sql("SELECT p.*, f.type AS forumtype, d.forum, d.groupid,
d.timestart, d.timeend, d.userid AS duserid,
@@ -4187,7 +4187,7 @@ function forum_get_recent_mod_activity(&$activities, &$index, $timestart, $cours
$tmpactivity->user = new stdClass();
$additionalfields = array('id' => 'userid', 'picture', 'imagealt', 'email');
- $additionalfields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $additionalfields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
$tmpactivity->user = username_load_fields_from_object($tmpactivity->user, $post, null, $additionalfields);
$tmpactivity->user->id = $post->userid;
@@ -6024,7 +6024,7 @@ function forum_get_posts_by_user($user, array $courses, $musthaveaccess = false,
// Prepare SQL to both count and search.
// We alias user.id to useridx because we forum_posts already has a userid field and not aliasing this would break
// oracle and mssql.
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', 'useridx', false)->selects;
$countsql = 'SELECT COUNT(*) ';
$selectsql = 'SELECT p.*, d.forum, d.name AS discussionname, '.$userfields.' ';
diff --git a/mod/forum/renderer.php b/mod/forum/renderer.php
index c3cc7b9db90..ff5f9948405 100644
--- a/mod/forum/renderer.php
+++ b/mod/forum/renderer.php
@@ -126,7 +126,7 @@ class mod_forum_renderer extends plugin_renderer_base {
} else {
$cm = $modinfo->instances['forum'][$forum->id];
// TODO Does not support custom user profile fields (MDL-70456).
- $canviewemail = in_array('email', \core\user_fields::get_identity_fields(context_module::instance($cm->id), false));
+ $canviewemail = in_array('email', \core_user\fields::get_identity_fields(context_module::instance($cm->id), false));
$strparams = new stdclass();
$strparams->name = format_string($forum->name);
$strparams->count = count($users);
diff --git a/mod/forum/report/summary/classes/summary_table.php b/mod/forum/report/summary/classes/summary_table.php
index 2333c594777..0cbd404b2e0 100644
--- a/mod/forum/report/summary/classes/summary_table.php
+++ b/mod/forum/report/summary/classes/summary_table.php
@@ -544,7 +544,7 @@ class summary_table extends table_sql {
global $USER;
// TODO Does not support custom user profile fields (MDL-70456).
- $userfieldsapi = \core\user_fields::for_identity($this->userfieldscontext, false)->with_userpic();
+ $userfieldsapi = \core_user\fields::for_identity($this->userfieldscontext, false)->with_userpic();
$userfieldssql = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
// Define base SQL query format.
diff --git a/mod/forum/rsslib.php b/mod/forum/rsslib.php
index 2c8e4af28f4..b99e1d36fad 100644
--- a/mod/forum/rsslib.php
+++ b/mod/forum/rsslib.php
@@ -182,7 +182,7 @@ function forum_rss_feed_discussions_sql($forum, $cm, $newsince=0) {
$forumsort = "d.timemodified DESC";
$postdata = "p.id AS postid, p.subject, p.created as postcreated, p.modified, p.discussion, p.userid, p.message as postmessage, p.messageformat AS postformat, p.messagetrust AS posttrust";
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$userpicturefields = $userfieldsapi->get_sql('u', false, '', 'userid', false)->selects;
$sql = "SELECT $postdata, d.id as discussionid, d.name as discussionname, d.timemodified, d.usermodified, d.groupid,
@@ -236,7 +236,7 @@ function forum_rss_feed_posts_sql($forum, $cm, $newsince=0) {
$privatewhere = '';
}
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$usernamefields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$sql = "SELECT p.id AS postid,
d.id AS discussionid,
diff --git a/mod/glossary/classes/entry_query_builder.php b/mod/glossary/classes/entry_query_builder.php
index b1870649660..1e548b79c2d 100644
--- a/mod/glossary/classes/entry_query_builder.php
+++ b/mod/glossary/classes/entry_query_builder.php
@@ -117,7 +117,7 @@ class mod_glossary_entry_query_builder {
* @return void
*/
public function add_user_fields() {
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$fields = $userfieldsapi->get_sql('u', false, 'userdata', '', false)->selects;
$this->fields[] = $fields;
}
diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index bb049369240..078e80cd162 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -403,7 +403,7 @@ function glossary_get_recent_mod_activity(&$activities, &$index, $timestart, $co
$params['timestart'] = $timestart;
$params['glossaryid'] = $cm->instance;
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$ufields = $userfieldsapi->get_sql('u', false, '', 'userid', false)->selects;
$entries = $DB->get_records_sql("
SELECT ge.id AS entryid, ge.glossaryid, ge.concept, ge.definition, ge.approved,
@@ -565,7 +565,7 @@ function glossary_print_recent_activity($course, $viewfullnames, $timestart) {
if (count($approvals) == 0) {
return false;
}
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', 'userid', false)->selects;
$selectsql = 'SELECT ge.id, ge.concept, ge.approved, ge.timemodified, ge.glossaryid,
' . $userfields;
@@ -3674,7 +3674,7 @@ function glossary_get_authors($glossary, $context, $limit, $from, $options = arr
global $DB, $USER;
$params = array();
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$approvedsql = '(ge.approved <> 0 OR ge.userid = :myid)';
@@ -3828,7 +3828,7 @@ function glossary_get_entries_by_search($glossary, $context, $query, $fullsearch
list($searchcond, $params) = glossary_get_search_terms_sql($terms, $fullsearch, $glossary->id);
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$userfields = $userfieldsapi->get_sql('u', false, 'userdata', 'userdataid', false)->selects;
// Need one inner view here to avoid distinct + text.
diff --git a/mod/glossary/rsslib.php b/mod/glossary/rsslib.php
index 1d27b2f5e09..eaeec384590 100644
--- a/mod/glossary/rsslib.php
+++ b/mod/glossary/rsslib.php
@@ -145,7 +145,7 @@
}
if ($glossary->rsstype == 1) {//With author
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allnamefields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$sql = "SELECT e.id AS entryid,
e.concept AS entryconcept,
diff --git a/mod/lesson/essay.php b/mod/lesson/essay.php
index 9d0c799442d..186d1965fbc 100644
--- a/mod/lesson/essay.php
+++ b/mod/lesson/essay.php
@@ -325,7 +325,7 @@ switch ($mode) {
JOIN ($esql) ue ON a.userid = ue.id
WHERE pageid $usql";
if ($essayattempts = $DB->get_records_sql($sql, $parameters)) {
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$ufields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
// Get all the users who have taken this lesson.
list($sort, $sortparams) = users_order_by_sql('u');
diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index f4b0ad56edf..d5dc3be6e34 100644
--- a/mod/lesson/locallib.php
+++ b/mod/lesson/locallib.php
@@ -706,9 +706,9 @@ function lesson_get_overview_report_table_and_data(lesson $lesson, $currentgroup
list($sort, $sortparams) = users_order_by_sql('u');
// TODO Does not support custom user profile fields (MDL-70456).
- $userfieldsapi = \core\user_fields::for_identity($context, false)->with_userpic();
+ $userfieldsapi = \core_user\fields::for_identity($context, false)->with_userpic();
$ufields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
- $extrafields = $userfieldsapi->get_required_fields([\core\user_fields::PURPOSE_IDENTITY]);
+ $extrafields = $userfieldsapi->get_required_fields([\core_user\fields::PURPOSE_IDENTITY]);
$params['a1lessonid'] = $lesson->id;
$params['b1lessonid'] = $lesson->id;
@@ -903,7 +903,7 @@ function lesson_get_overview_report_table_and_data(lesson $lesson, $currentgroup
$headers = [get_string('name')];
foreach ($extrafields as $field) {
- $headers[] = \core\user_fields::get_display_name($field);
+ $headers[] = \core_user\fields::get_display_name($field);
}
$caneditlesson = has_capability('mod/lesson:edit', $context);
diff --git a/mod/lesson/override_form.php b/mod/lesson/override_form.php
index 7e7e9a2bcda..8bc99865b7d 100644
--- a/mod/lesson/override_form.php
+++ b/mod/lesson/override_form.php
@@ -140,7 +140,7 @@ class lesson_override_form extends moodleform {
list($sort) = users_order_by_sql('u');
// Get the list of appropriate users, depending on whether and how groups are used.
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
if ($accessallgroups) {
$users = get_enrolled_users($this->context, '', 0,
'u.id, u.email, ' . $userfieldsapi->get_sql('u', false, '', '', false)->selects, $sort);
@@ -171,7 +171,7 @@ class lesson_override_form extends moodleform {
$userchoices = array();
// TODO Does not support custom user profile fields (MDL-70456).
- $canviewemail = in_array('email', \core\user_fields::get_identity_fields($this->context, false));
+ $canviewemail = in_array('email', \core_user\fields::get_identity_fields($this->context, false));
foreach ($users as $id => $user) {
if (empty($invalidusers[$id]) || (!empty($override) &&
$id == $override->userid)) {
diff --git a/mod/lesson/overridedelete.php b/mod/lesson/overridedelete.php
index 3dacfd8f06d..a133b4974d7 100644
--- a/mod/lesson/overridedelete.php
+++ b/mod/lesson/overridedelete.php
@@ -93,7 +93,7 @@ if ($override->groupid) {
$group = $DB->get_record('groups', array('id' => $override->groupid), 'id, name');
$confirmstr = get_string("overridedeletegroupsure", "lesson", $group->name);
} else {
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$namefields = $userfieldsapi->get_sql('', false, '', '', false)->selects;
$user = $DB->get_record('user', array('id' => $override->userid),
'id, ' . $namefields);
diff --git a/mod/lesson/overrides.php b/mod/lesson/overrides.php
index 3a988169fbb..e48c9569c02 100644
--- a/mod/lesson/overrides.php
+++ b/mod/lesson/overrides.php
@@ -106,7 +106,7 @@ if ($groupmode) {
list($sort, $params) = users_order_by_sql('u');
$params['lessonid'] = $lesson->id;
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
if ($accessallgroups) {
$sql = 'SELECT o.*, ' . $userfieldsapi->get_sql('u', false, '', '', false)->selects . '
FROM {lesson_overrides} o
diff --git a/mod/quiz/lib.php b/mod/quiz/lib.php
index be87ab21c26..2d9877ab9da 100644
--- a/mod/quiz/lib.php
+++ b/mod/quiz/lib.php
@@ -921,7 +921,7 @@ function quiz_get_recent_mod_activity(&$activities, &$index, $timestart,
$params['timestart'] = $timestart;
$params['quizid'] = $quiz->id;
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$ufields = $userfieldsapi->get_sql('u', false, '', 'useridagain', false)->selects;
if (!$attempts = $DB->get_records_sql("
SELECT qa.*,
diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php
index 2327332b245..65fe141387c 100644
--- a/mod/quiz/locallib.php
+++ b/mod/quiz/locallib.php
@@ -1699,7 +1699,7 @@ function quiz_send_notification_messages($course, $quiz, $attempt, $context, $cm
// Check for notifications required.
$notifyfields = 'u.id, u.username, u.idnumber, u.email, u.emailstop, u.lang,
u.timezone, u.mailformat, u.maildisplay, u.auth, u.suspended, u.deleted, ';
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$notifyfields .= $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$groups = groups_get_all_groups($course->id, $submitter->id, $cm->groupingid);
if (is_array($groups) && count($groups) > 0) {
diff --git a/mod/quiz/override_form.php b/mod/quiz/override_form.php
index 7ddecba5b68..3f8edcdb65a 100644
--- a/mod/quiz/override_form.php
+++ b/mod/quiz/override_form.php
@@ -124,8 +124,8 @@ class quiz_override_form extends moodleform {
} else {
// User override.
// TODO Does not support custom user profile fields (MDL-70456).
- $userfieldsapi = \core\user_fields::for_identity($this->context, false)->with_userpic()->with_name();
- $extrauserfields = $userfieldsapi->get_required_fields([\core\user_fields::PURPOSE_IDENTITY]);
+ $userfieldsapi = \core_user\fields::for_identity($this->context, false)->with_userpic()->with_name();
+ $extrauserfields = $userfieldsapi->get_required_fields([\core_user\fields::PURPOSE_IDENTITY]);
if ($this->userid) {
// There is already a userid, so freeze the selector.
$user = $DB->get_record('user', ['id' => $this->userid]);
diff --git a/mod/quiz/overridedelete.php b/mod/quiz/overridedelete.php
index a9d9ab94ed0..2f0c0143983 100644
--- a/mod/quiz/overridedelete.php
+++ b/mod/quiz/overridedelete.php
@@ -101,7 +101,7 @@ if ($override->groupid) {
$namefields = [];
// TODO Does not support custom user profile fields (MDL-70456).
- foreach (\core\user_fields::for_identity($context, false)->get_required_fields() as $field) {
+ foreach (\core_user\fields::for_identity($context, false)->get_required_fields() as $field) {
if (isset($user->$field) && $user->$field !== '') {
$namefields[] = $user->$field;
}
diff --git a/mod/quiz/overrides.php b/mod/quiz/overrides.php
index 172daeb2709..95a216bb1b8 100644
--- a/mod/quiz/overrides.php
+++ b/mod/quiz/overrides.php
@@ -109,11 +109,11 @@ if ($groupmode) {
$colclasses[] = 'colname';
$headers[] = get_string('user');
// TODO Does not support custom user profile fields (MDL-70456).
- $userfieldsapi = \core\user_fields::for_identity($context, false)->with_name()->with_userpic();
- $extrauserfields = $userfieldsapi->get_required_fields([\core\user_fields::PURPOSE_IDENTITY]);
+ $userfieldsapi = \core_user\fields::for_identity($context, false)->with_name()->with_userpic();
+ $extrauserfields = $userfieldsapi->get_required_fields([\core_user\fields::PURPOSE_IDENTITY]);
foreach ($extrauserfields as $field) {
$colclasses[] = 'col' . $field;
- $headers[] = \core\user_fields::get_display_name($field);
+ $headers[] = \core_user\fields::get_display_name($field);
}
list($sort, $params) = users_order_by_sql('u');
diff --git a/mod/quiz/report/attemptsreport.php b/mod/quiz/report/attemptsreport.php
index c4d7e4ecc9a..c54f2efa091 100644
--- a/mod/quiz/report/attemptsreport.php
+++ b/mod/quiz/report/attemptsreport.php
@@ -204,10 +204,10 @@ abstract class quiz_attempts_report extends quiz_default_report {
}
// TODO Does not support custom user profile fields (MDL-70456).
- $extrafields = \core\user_fields::get_identity_fields($this->context, false);
+ $extrafields = \core_user\fields::get_identity_fields($this->context, false);
foreach ($extrafields as $field) {
$columns[] = $field;
- $headers[] = \core\user_fields::get_display_name($field);
+ $headers[] = \core_user\fields::get_display_name($field);
}
}
@@ -219,7 +219,7 @@ abstract class quiz_attempts_report extends quiz_default_report {
$table->column_suppress('picture');
$table->column_suppress('fullname');
// TODO Does not support custom user profile fields (MDL-70456).
- $extrafields = \core\user_fields::get_identity_fields($this->context, false);
+ $extrafields = \core_user\fields::get_identity_fields($this->context, false);
foreach ($extrafields as $field) {
$table->column_suppress($field);
}
diff --git a/mod/quiz/report/attemptsreport_table.php b/mod/quiz/report/attemptsreport_table.php
index 9f681b718e8..92cf4362668 100644
--- a/mod/quiz/report/attemptsreport_table.php
+++ b/mod/quiz/report/attemptsreport_table.php
@@ -135,7 +135,7 @@ abstract class quiz_attempts_report_table extends table_sql {
public function col_picture($attempt) {
global $OUTPUT;
$user = new stdClass();
- $additionalfields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $additionalfields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
$user = username_load_fields_from_object($user, $attempt, null, $additionalfields);
$user->id = $attempt->userid;
return $OUTPUT->user_picture($user);
@@ -414,7 +414,7 @@ abstract class quiz_attempts_report_table extends table_sql {
}
// TODO Does not support custom user profile fields (MDL-70456).
- $userfields = \core\user_fields::for_identity($this->context, false)->with_name()
+ $userfields = \core_user\fields::for_identity($this->context, false)->with_name()
->excluding('id', 'idnumber', 'picture', 'imagealt', 'institution', 'department', 'email');
$extrafields = $userfields->get_sql('u')->selects;
$fields .= '
diff --git a/mod/quiz/report/grading/report.php b/mod/quiz/report/grading/report.php
index 6f66a8e678c..9c9abbb752b 100644
--- a/mod/quiz/report/grading/report.php
+++ b/mod/quiz/report/grading/report.php
@@ -224,7 +224,7 @@ class quiz_grading_report extends quiz_default_report {
$params[] = $this->quiz->id;
$fields = 'quiza.*, u.idnumber, ';
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$fields .= $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$attemptsbyid = $DB->get_records_sql("
SELECT $fields
diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php
index 360d5c0d109..9ca2158fc9b 100644
--- a/mod/quiz/report/overview/report.php
+++ b/mod/quiz/report/overview/report.php
@@ -393,7 +393,7 @@ class quiz_overview_report extends quiz_attempts_report {
global $DB;
$this->unlock_session();
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$sql = "SELECT quiza.*, " . $userfieldsapi->get_sql('u', false, '', '', false)->selects . "
FROM {quiz_attempts} quiza
JOIN {user} u ON u.id = quiza.userid";
@@ -461,7 +461,7 @@ class quiz_overview_report extends quiz_attempts_report {
}
list($uniqueidcondition, $params) = $DB->get_in_or_equal(array_keys($attemptquestions));
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$attempts = $DB->get_records_sql("
SELECT quiza.*, " . $userfieldsapi->get_sql('u', false, '', '', false)->selects . "
FROM {quiz_attempts} quiza
diff --git a/mod/scorm/report/basic/classes/report.php b/mod/scorm/report/basic/classes/report.php
index b7f09a65f7b..d315929da83 100644
--- a/mod/scorm/report/basic/classes/report.php
+++ b/mod/scorm/report/basic/classes/report.php
@@ -118,10 +118,10 @@ class report extends \mod_scorm\report {
$columns[] = 'fullname';
$headers[] = get_string('name');
// TODO Does not support custom user profile fields (MDL-70456).
- $extrafields = \core\user_fields::get_identity_fields($coursecontext, false);
+ $extrafields = \core_user\fields::get_identity_fields($coursecontext, false);
foreach ($extrafields as $field) {
$columns[] = $field;
- $headers[] = \core\user_fields::get_display_name($field);
+ $headers[] = \core_user\fields::get_display_name($field);
}
$columns[] = 'attempt';
@@ -269,7 +269,7 @@ class report extends \mod_scorm\report {
// Construct the SQL.
$select = 'SELECT DISTINCT '.$DB->sql_concat('u.id', '\'#\'', 'COALESCE(st.attempt, 0)').' AS uniqueid, ';
// TODO Does not support custom user profile fields (MDL-70456).
- $userfields = \core\user_fields::for_identity($coursecontext, false)->with_userpic()->including('idnumber');
+ $userfields = \core_user\fields::for_identity($coursecontext, false)->with_userpic()->including('idnumber');
$selectfields = $userfields->get_sql('u', false, '', 'userid')->selects;
$select .= 'st.scormid AS scormid, st.attempt AS attempt ' . $selectfields . ' ';
@@ -379,7 +379,7 @@ class report extends \mod_scorm\report {
}
if (in_array('picture', $columns)) {
$user = new \stdClass();
- $additionalfields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $additionalfields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
$user = username_load_fields_from_object($user, $scouser, null, $additionalfields);
$user->id = $scouser->userid;
$row[] = $OUTPUT->user_picture($user, array('courseid' => $course->id));
diff --git a/mod/scorm/report/interactions/classes/report.php b/mod/scorm/report/interactions/classes/report.php
index 61644dea9fc..43fd42b5c1b 100644
--- a/mod/scorm/report/interactions/classes/report.php
+++ b/mod/scorm/report/interactions/classes/report.php
@@ -134,10 +134,10 @@ class report extends \mod_scorm\report {
$headers[] = get_string('name');
// TODO Does not support custom user profile fields (MDL-70456).
- $extrafields = \core\user_fields::get_identity_fields($coursecontext, false);
+ $extrafields = \core_user\fields::get_identity_fields($coursecontext, false);
foreach ($extrafields as $field) {
$columns[] = $field;
- $headers[] = \core\user_fields::get_display_name($field);
+ $headers[] = \core_user\fields::get_display_name($field);
}
$columns[] = 'attempt';
$headers[] = get_string('attempt', 'scorm');
@@ -158,7 +158,7 @@ class report extends \mod_scorm\report {
// Construct the SQL.
$select = 'SELECT DISTINCT '.$DB->sql_concat('u.id', '\'#\'', 'COALESCE(st.attempt, 0)').' AS uniqueid, ';
// TODO Does not support custom user profile fields (MDL-70456).
- $userfields = \core\user_fields::for_identity($coursecontext, false)->with_userpic()->including('idnumber');
+ $userfields = \core_user\fields::for_identity($coursecontext, false)->with_userpic()->including('idnumber');
$selectfields = $userfields->get_sql('u', false, '', 'userid')->selects;
$select .= 'st.scormid AS scormid, st.attempt AS attempt ' . $selectfields . ' ';
@@ -424,7 +424,7 @@ class report extends \mod_scorm\report {
}
if (in_array('picture', $columns)) {
$user = new \stdClass();
- $additionalfields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $additionalfields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
$user = username_load_fields_from_object($user, $scouser, null, $additionalfields);
$user->id = $scouser->userid;
$row[] = $OUTPUT->user_picture($user, array('courseid' => $course->id));
diff --git a/mod/scorm/report/objectives/classes/report.php b/mod/scorm/report/objectives/classes/report.php
index f8af595852c..f901d951764 100644
--- a/mod/scorm/report/objectives/classes/report.php
+++ b/mod/scorm/report/objectives/classes/report.php
@@ -128,10 +128,10 @@ class report extends \mod_scorm\report {
$headers[] = get_string('name');
// TODO Does not support custom user profile fields (MDL-70456).
- $extrafields = \core\user_fields::get_identity_fields($coursecontext, false);
+ $extrafields = \core_user\fields::get_identity_fields($coursecontext, false);
foreach ($extrafields as $field) {
$columns[] = $field;
- $headers[] = \core\user_fields::get_display_name($field);
+ $headers[] = \core_user\fields::get_display_name($field);
}
$columns[] = 'attempt';
$headers[] = get_string('attempt', 'scorm');
@@ -152,7 +152,7 @@ class report extends \mod_scorm\report {
// Construct the SQL.
$select = 'SELECT DISTINCT '.$DB->sql_concat('u.id', '\'#\'', 'COALESCE(st.attempt, 0)').' AS uniqueid, ';
// TODO Does not support custom user profile fields (MDL-70456).
- $userfields = \core\user_fields::for_identity($coursecontext, false)->with_userpic()->including('idnumber');
+ $userfields = \core_user\fields::for_identity($coursecontext, false)->with_userpic()->including('idnumber');
$selectfields = $userfields->get_sql('u', false, '', 'userid')->selects;
$select .= 'st.scormid AS scormid, st.attempt AS attempt ' . $selectfields . ' ';
@@ -414,7 +414,7 @@ class report extends \mod_scorm\report {
}
if (in_array('picture', $columns)) {
$user = new \stdClass();
- $additionalfields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $additionalfields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
$user = username_load_fields_from_object($user, $scouser, null, $additionalfields);
$user->id = $scouser->userid;
$row[] = $OUTPUT->user_picture($user, array('courseid' => $course->id));
diff --git a/mod/scorm/report/userreport.php b/mod/scorm/report/userreport.php
index 32f0ca9e689..ec91a483be5 100644
--- a/mod/scorm/report/userreport.php
+++ b/mod/scorm/report/userreport.php
@@ -39,7 +39,7 @@ $tracksurl = new moodle_url('/mod/scorm/report/userreporttracks.php', array('id'
$cm = get_coursemodule_from_id('scorm', $id, 0, false, MUST_EXIST);
$course = get_course($cm->course);
$scorm = $DB->get_record('scorm', array('id' => $cm->instance), '*', MUST_EXIST);
-$user = $DB->get_record('user', array('id' => $userid), implode(',', \core\user_fields::get_picture_fields()), MUST_EXIST);
+$user = $DB->get_record('user', array('id' => $userid), implode(',', \core_user\fields::get_picture_fields()), MUST_EXIST);
// Get list of attempts this user has made.
$attemptids = scorm_get_all_attempts($scorm->id, $userid);
diff --git a/mod/scorm/report/userreportinteractions.php b/mod/scorm/report/userreportinteractions.php
index 92983c13ea0..501bf7e710d 100644
--- a/mod/scorm/report/userreportinteractions.php
+++ b/mod/scorm/report/userreportinteractions.php
@@ -40,7 +40,7 @@ $url = new moodle_url('/mod/scorm/report/userreportinteractions.php', array('id'
$cm = get_coursemodule_from_id('scorm', $id, 0, false, MUST_EXIST);
$course = get_course($cm->course);
$scorm = $DB->get_record('scorm', array('id' => $cm->instance), '*', MUST_EXIST);
-$user = $DB->get_record('user', array('id' => $userid), implode(',', \core\user_fields::get_picture_fields()), MUST_EXIST);
+$user = $DB->get_record('user', array('id' => $userid), implode(',', \core_user\fields::get_picture_fields()), MUST_EXIST);
// Get list of attempts this user has made.
$attemptids = scorm_get_all_attempts($scorm->id, $userid);
diff --git a/mod/scorm/report/userreporttracks.php b/mod/scorm/report/userreporttracks.php
index a0e702cc145..3856fd423b5 100644
--- a/mod/scorm/report/userreporttracks.php
+++ b/mod/scorm/report/userreporttracks.php
@@ -40,7 +40,7 @@ $url = new moodle_url('/mod/scorm/report/userreporttracks.php', array('id' => $i
$cm = get_coursemodule_from_id('scorm', $id, 0, false, MUST_EXIST);
$course = get_course($cm->course);
$scorm = $DB->get_record('scorm', array('id' => $cm->instance), '*', MUST_EXIST);
-$user = $DB->get_record('user', array('id' => $userid), implode(',', \core\user_fields::get_picture_fields()), MUST_EXIST);
+$user = $DB->get_record('user', array('id' => $userid), implode(',', \core_user\fields::get_picture_fields()), MUST_EXIST);
$selsco = $DB->get_record('scorm_scoes', array('id' => $scoid), '*', MUST_EXIST);
$PAGE->set_url($url);
diff --git a/mod/survey/lib.php b/mod/survey/lib.php
index c5b4f1972c5..24637f5cbd4 100644
--- a/mod/survey/lib.php
+++ b/mod/survey/lib.php
@@ -243,7 +243,7 @@ function survey_print_recent_activity($course, $viewfullnames, $timestart) {
$slist = implode(',', $ids); // there should not be hundreds of glossaries in one course, right?
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$allusernames = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$rs = $DB->get_recordset_sql("SELECT sa.userid, sa.survey, MAX(sa.time) AS time,
$allusernames
@@ -316,7 +316,7 @@ function survey_get_responses($surveyid, $groupid, $groupingid) {
$groupsjoin = "";
}
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
return $DB->get_records_sql("SELECT $userfields, MAX(a.time) as time
FROM {survey_answers} a
@@ -377,7 +377,7 @@ function survey_get_user_answers($surveyid, $questionid, $groupid, $sort="sa.ans
$groupsql = '';
}
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
return $DB->get_records_sql("SELECT sa.*, $userfields
FROM {survey_answers} sa, {user} u $groupfrom
diff --git a/mod/workshop/allocation/manual/lib.php b/mod/workshop/allocation/manual/lib.php
index ba73dd51dab..77aea70fde5 100644
--- a/mod/workshop/allocation/manual/lib.php
+++ b/mod/workshop/allocation/manual/lib.php
@@ -224,7 +224,7 @@ class workshop_manual_allocator implements workshop_allocator {
// load the participants' submissions
$submissions = $this->workshop->get_submissions(array_keys($participants));
- $allnames = \core\user_fields::get_name_fields();
+ $allnames = \core_user\fields::get_name_fields();
foreach ($submissions as $submission) {
if (!isset($userinfo[$submission->authorid])) {
$userinfo[$submission->authorid] = new stdclass();
@@ -243,7 +243,7 @@ class workshop_manual_allocator implements workshop_allocator {
$reviewers = array();
if ($submissions) {
list($submissionids, $params) = $DB->get_in_or_equal(array_keys($submissions), SQL_PARAMS_NAMED);
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$picturefields = $userfieldsapi->get_sql('r', false, '', 'reviewerid', false)->selects;
$sql = "SELECT a.id AS assessmentid, a.submissionid, $picturefields,
s.id AS submissionid, s.authorid
@@ -270,7 +270,7 @@ class workshop_manual_allocator implements workshop_allocator {
$reviewees = array();
if ($participants) {
list($participantids, $params) = $DB->get_in_or_equal(array_keys($participants), SQL_PARAMS_NAMED);
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$namefields = $userfieldsapi->get_sql('e', false, '', '', false)->selects;
$params['workshopid'] = $this->workshop->id;
$sql = "SELECT a.id AS assessmentid, a.submissionid,
diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index cba46ce7071..8140dcfa1e4 100644
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -523,7 +523,7 @@ function workshop_user_complete($course, $user, $mod, $workshop) {
function workshop_print_recent_activity($course, $viewfullnames, $timestart) {
global $CFG, $USER, $DB, $OUTPUT;
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$authoramefields = $userfieldsapi->get_sql('author', false, 'author', '', false)->selects;
$reviewerfields = $userfieldsapi->get_sql('reviewer', false, 'reviewer', '', false)->selects;
@@ -769,7 +769,7 @@ function workshop_get_recent_mod_activity(&$activities, &$index, $timestart, $co
$params['submissionmodified'] = $timestart;
$params['assessmentmodified'] = $timestart;
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$authornamefields = $userfieldsapi->get_sql('author', false, 'author', '', false)->selects;
$reviewerfields = $userfieldsapi->get_sql('reviewer', false, 'reviewer', '', false)->selects;
@@ -808,13 +808,13 @@ function workshop_get_recent_mod_activity(&$activities, &$index, $timestart, $co
// remember all user names we can use later
if (empty($users[$activity->authorid])) {
$u = new stdclass();
- $additionalfields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $additionalfields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
$u = username_load_fields_from_object($u, $activity, 'author', $additionalfields);
$users[$activity->authorid] = $u;
}
if ($activity->reviewerid and empty($users[$activity->reviewerid])) {
$u = new stdclass();
- $additionalfields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $additionalfields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
$u = username_load_fields_from_object($u, $activity, 'reviewer', $additionalfields);
$users[$activity->reviewerid] = $u;
}
@@ -1492,7 +1492,7 @@ function workshop_get_file_info($browser, $areas, $course, $cm, $context, $filea
} else {
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$sql = "SELECT s.id, $userfields
FROM {workshop_submissions} s
diff --git a/mod/workshop/locallib.php b/mod/workshop/locallib.php
index 5cbe1f4cab7..15d7a65ade9 100644
--- a/mod/workshop/locallib.php
+++ b/mod/workshop/locallib.php
@@ -861,7 +861,7 @@ class workshop {
public function get_submissions($authorid='all', $groupid=0, $limitfrom=0, $limitnum=0) {
global $DB;
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$authorfields = $userfieldsapi->get_sql('u', false, 'author', 'authoridx', false)->selects;
$gradeoverbyfields = $userfieldsapi->get_sql('t', false, 'over', 'gradeoverbyx', false)->selects;
$params = array('workshopid' => $this->id);
@@ -967,7 +967,7 @@ class workshop {
// we intentionally check the workshopid here, too, so the workshop can't touch submissions
// from other instances
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$authorfields = $userfieldsapi->get_sql('u', false, 'author', 'authoridx', false)->selects;
$gradeoverbyfields = $userfieldsapi->get_sql('g', false, 'gradeoverby', 'gradeoverbyx', false)->selects;
$sql = "SELECT s.*, $authorfields, $gradeoverbyfields
@@ -991,7 +991,7 @@ class workshop {
if (empty($authorid)) {
return false;
}
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$authorfields = $userfieldsapi->get_sql('u', false, 'author', 'authoridx', false)->selects;
$gradeoverbyfields = $userfieldsapi->get_sql('g', false, 'gradeoverby', 'gradeoverbyx', false)->selects;
$sql = "SELECT s.*, $authorfields, $gradeoverbyfields
@@ -1011,7 +1011,7 @@ class workshop {
public function get_published_submissions($orderby='finalgrade DESC') {
global $DB;
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$authorfields = $userfieldsapi->get_sql('u', false, 'author', 'authoridx', false)->selects;
$sql = "SELECT s.id, s.authorid, s.timecreated, s.timemodified,
s.title, s.grade, s.gradeover, COALESCE(s.gradeover,s.grade) AS finalgrade,
@@ -1305,7 +1305,7 @@ class workshop {
public function get_all_assessments() {
global $DB;
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$reviewerfields = $userfieldsapi->get_sql('reviewer', false, '', 'revieweridx', false)->selects;
$authorfields = $userfieldsapi->get_sql('author', false, 'author', 'authorid', false)->selects;
$overbyfields = $userfieldsapi->get_sql('overby', false, 'overby', 'gradinggradeoverbyx', false)->selects;
@@ -1335,7 +1335,7 @@ class workshop {
public function get_assessment_by_id($id) {
global $DB;
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$reviewerfields = $userfieldsapi->get_sql('reviewer', false, 'reviewer', 'revieweridx', false)->selects;
$authorfields = $userfieldsapi->get_sql('author', false, 'author', 'authorid', false)->selects;
$overbyfields = $userfieldsapi->get_sql('overby', false, 'overby', 'gradinggradeoverbyx', false)->selects;
@@ -1361,7 +1361,7 @@ class workshop {
public function get_assessment_of_submission_by_user($submissionid, $reviewerid) {
global $DB;
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$reviewerfields = $userfieldsapi->get_sql('reviewer', false, 'reviewer', 'revieweridx', false)->selects;
$authorfields = $userfieldsapi->get_sql('author', false, 'author', 'authorid', false)->selects;
$overbyfields = $userfieldsapi->get_sql('overby', false, 'overby', 'gradinggradeoverbyx', false)->selects;
@@ -1386,7 +1386,7 @@ class workshop {
public function get_assessments_of_submission($submissionid) {
global $DB;
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$reviewerfields = $userfieldsapi->get_sql('reviewer', false, 'reviewer', 'revieweridx', false)->selects;
$overbyfields = $userfieldsapi->get_sql('overby', false, 'overby', 'gradinggradeoverbyx', false)->selects;
list($sort, $params) = users_order_by_sql('reviewer');
@@ -1412,7 +1412,7 @@ class workshop {
public function get_assessments_by_reviewer($reviewerid) {
global $DB;
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$reviewerfields = $userfieldsapi->get_sql('reviewer', false, 'reviewer', 'revieweridx', false)->selects;
$authorfields = $userfieldsapi->get_sql('author', false, 'author', 'authorid', false)->selects;
$overbyfields = $userfieldsapi->get_sql('overby', false, 'overby', 'gradinggradeoverbyx', false)->selects;
@@ -2043,7 +2043,7 @@ class workshop {
$sqlsort[] = $sqlsortfieldname . ' ' . $sqlsortfieldhow;
}
$sqlsort = implode(',', $sqlsort);
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$picturefields = $userfieldsapi->get_sql('u', false, '', 'userid', false)->selects;
$sql = "SELECT $picturefields, s.title AS submissiontitle, s.timemodified AS submissionmodified,
s.grade AS submissiongrade, ag.gradinggrade
@@ -2061,7 +2061,7 @@ class workshop {
$userinfo = array();
// get the user details for all participants to display
- $additionalnames = \core\user_fields::get_name_fields();
+ $additionalnames = \core_user\fields::get_name_fields();
foreach ($participants as $participant) {
if (!isset($userinfo[$participant->userid])) {
$userinfo[$participant->userid] = new stdclass();
@@ -2099,7 +2099,7 @@ class workshop {
if ($submissions) {
list($submissionids, $params) = $DB->get_in_or_equal(array_keys($submissions), SQL_PARAMS_NAMED);
list($sort, $sortparams) = users_order_by_sql('r');
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$picturefields = $userfieldsapi->get_sql('r', false, '', 'reviewerid', false)->selects;
$sql = "SELECT a.id AS assessmentid, a.submissionid, a.grade, a.gradinggrade, a.gradinggradeover, a.weight,
$picturefields, s.id AS submissionid, s.authorid
@@ -2129,7 +2129,7 @@ class workshop {
list($participantids, $params) = $DB->get_in_or_equal(array_keys($participants), SQL_PARAMS_NAMED);
list($sort, $sortparams) = users_order_by_sql('e');
$params['workshopid'] = $this->id;
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$picturefields = $userfieldsapi->get_sql('e', false, '', 'authorid', false)->selects;
$sql = "SELECT a.id AS assessmentid, a.submissionid, a.grade, a.gradinggrade, a.gradinggradeover, a.reviewerid, a.weight,
s.id AS submissionid, $picturefields
@@ -3405,7 +3405,7 @@ class workshop {
list($esql, $params) = get_enrolled_sql($this->context, $capability, $groupid, true);
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$sql = "SELECT $userfields
@@ -4055,7 +4055,7 @@ abstract class workshop_submission_base {
* Usually this is called by the contructor but can be called explicitely, too.
*/
public function anonymize() {
- $authorfields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $authorfields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
foreach ($authorfields as $field) {
$prefixedusernamefield = 'author' . $field;
unset($this->{$prefixedusernamefield});
diff --git a/mod/workshop/renderer.php b/mod/workshop/renderer.php
index 4b1576ca73a..03c5eb716e1 100644
--- a/mod/workshop/renderer.php
+++ b/mod/workshop/renderer.php
@@ -102,7 +102,7 @@ class mod_workshop_renderer extends plugin_renderer_base {
if (!$anonymous) {
$author = new stdclass();
- $additionalfields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $additionalfields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
$author = username_load_fields_from_object($author, $submission, 'author', $additionalfields);
$userpic = $this->output->user_picture($author, array('courseid' => $this->page->course->id, 'size' => 64));
$userurl = new moodle_url('/user/view.php',
@@ -180,7 +180,7 @@ class mod_workshop_renderer extends plugin_renderer_base {
if (!$anonymous) {
$author = new stdClass();
- $additionalfields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $additionalfields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
$author = username_load_fields_from_object($author, $summary, 'author', $additionalfields);
$userpic = $this->output->user_picture($author, array('courseid' => $this->page->course->id, 'size' => 35));
$userurl = new moodle_url('/user/view.php',
diff --git a/mod/workshop/view.php b/mod/workshop/view.php
index ecdef78d0bc..78b464dadfe 100644
--- a/mod/workshop/view.php
+++ b/mod/workshop/view.php
@@ -405,7 +405,7 @@ case workshop::PHASE_ASSESSMENT:
$submission->title = $assessment->submissiontitle;
$submission->timecreated = $assessment->submissioncreated;
$submission->timemodified = $assessment->submissionmodified;
- $userpicturefields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $userpicturefields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
foreach ($userpicturefields as $userpicturefield) {
$prefixedusernamefield = 'author' . $userpicturefield;
$submission->$prefixedusernamefield = $assessment->$prefixedusernamefield;
@@ -533,7 +533,7 @@ case workshop::PHASE_EVALUATION:
$submission->title = $assessment->submissiontitle;
$submission->timecreated = $assessment->submissioncreated;
$submission->timemodified = $assessment->submissionmodified;
- $userpicturefields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $userpicturefields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
foreach ($userpicturefields as $userpicturefield) {
$prefixedusernamefield = 'author' . $userpicturefield;
$submission->$prefixedusernamefield = $assessment->$prefixedusernamefield;
@@ -647,7 +647,7 @@ case workshop::PHASE_CLOSED:
$submission->title = $assessment->submissiontitle;
$submission->timecreated = $assessment->submissioncreated;
$submission->timemodified = $assessment->submissionmodified;
- $userpicturefields = explode(',', implode(',', \core\user_fields::get_picture_fields()));
+ $userpicturefields = explode(',', implode(',', \core_user\fields::get_picture_fields()));
foreach ($userpicturefields as $userpicturefield) {
$prefixedusernamefield = 'author' . $userpicturefield;
$submission->$prefixedusernamefield = $assessment->$prefixedusernamefield;
diff --git a/question/classes/bank/creator_name_column.php b/question/classes/bank/creator_name_column.php
index 835bef07d61..c6d5b263ba1 100644
--- a/question/classes/bank/creator_name_column.php
+++ b/question/classes/bank/creator_name_column.php
@@ -55,7 +55,7 @@ class creator_name_column extends column_base {
}
public function get_required_fields() {
- $allnames = \core\user_fields::get_name_fields();
+ $allnames = \core_user\fields::get_name_fields();
$requiredfields = array();
foreach ($allnames as $allname) {
$requiredfields[] = 'uc.' . $allname . ' AS creator' . $allname;
diff --git a/question/classes/bank/modifier_name_column.php b/question/classes/bank/modifier_name_column.php
index db0a5c26509..35d8617c120 100644
--- a/question/classes/bank/modifier_name_column.php
+++ b/question/classes/bank/modifier_name_column.php
@@ -55,7 +55,7 @@ class modifier_name_column extends column_base {
}
public function get_required_fields() {
- $allnames = \core\user_fields::get_name_fields();
+ $allnames = \core_user\fields::get_name_fields();
$requiredfields = array();
foreach ($allnames as $allname) {
$requiredfields[] = 'um.' . $allname . ' AS modifier' . $allname;
diff --git a/rating/classes/external.php b/rating/classes/external.php
index 4fac9d67cf6..06e6580895c 100644
--- a/rating/classes/external.php
+++ b/rating/classes/external.php
@@ -154,7 +154,7 @@ class core_rating_external extends external_api {
$result['timemodified'] = $rating->timemodified;
// The rating object has all the required fields for generating the picture url.
- // Undo the aliasing of the user id column from user_fields::get_sql.
+ // Undo the aliasing of the user id column from fields::get_sql.
$rating->id = $rating->userid;
$userpicture = new user_picture($rating);
$userpicture->size = 1; // Size f1.
diff --git a/rating/index.php b/rating/index.php
index aa8e3179687..0851dde45db 100644
--- a/rating/index.php
+++ b/rating/index.php
@@ -126,7 +126,7 @@ if (!$ratings) {
continue;
}
- // Undo the aliasing of the user id column from user_fields::get_sql().
+ // Undo the aliasing of the user id column from fields::get_sql().
// We could clone the rating object or preserve the rating id if we needed it again
// but we don't.
$rating->id = $rating->userid;
diff --git a/rating/lib.php b/rating/lib.php
index eef1d4dc19c..a7339d25d15 100644
--- a/rating/lib.php
+++ b/rating/lib.php
@@ -455,7 +455,7 @@ class rating_manager {
'component' => $options->component,
'ratingarea' => $options->ratingarea,
);
- $userfieldsapi = \core\user_fields::for_userpic();
+ $userfieldsapi = \core_user\fields::for_userpic();
$userfields = $userfieldsapi->get_sql('u', false, '', 'userid', false)->selects;
$sql = "SELECT r.id, r.rating, r.itemid, r.userid, r.timemodified, r.component, r.ratingarea, $userfields
FROM {rating} r
diff --git a/report/completion/index.php b/report/completion/index.php
index dd862a8fdee..eaa47c2c668 100644
--- a/report/completion/index.php
+++ b/report/completion/index.php
@@ -67,7 +67,7 @@ $silast = optional_param('silast', 'all', PARAM_NOTAGS);
// Whether to show extra user identity information
// TODO Does not support custom user profile fields (MDL-70456).
-$extrafields = \core\user_fields::get_identity_fields($context, false);
+$extrafields = \core_user\fields::get_identity_fields($context, false);
$leftcols = 1 + count($extrafields);
// Check permissions
@@ -441,7 +441,7 @@ if (!$csv) {
// Print user identity columns
foreach ($extrafields as $field) {
echo ' | ' .
- \core\user_fields::get_display_name($field) . ' | ';
+ \core_user\fields::get_display_name($field) . '';
}
///
@@ -512,7 +512,7 @@ if (!$csv) {
$row[] = get_string('id', 'report_completion');
$row[] = get_string('name', 'report_completion');
foreach ($extrafields as $field) {
- $row[] = \core\user_fields::get_display_name($field);
+ $row[] = \core_user\fields::get_display_name($field);
}
// Add activity headers
diff --git a/report/configlog/classes/output/report_table.php b/report/configlog/classes/output/report_table.php
index 952b0cb3e5a..d334fc5c11d 100644
--- a/report/configlog/classes/output/report_table.php
+++ b/report/configlog/classes/output/report_table.php
@@ -86,7 +86,7 @@ class report_table extends \table_sql implements \renderable {
protected function init_sql() {
global $DB;
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$userfields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$fields = 'cl.id, cl.timemodified, cl.plugin, cl.name, cl.value, cl.oldvalue, cl.userid, ' . $userfields;
diff --git a/report/log/classes/renderable.php b/report/log/classes/renderable.php
index 3da88e962a1..5500d7a460c 100644
--- a/report/log/classes/renderable.php
+++ b/report/log/classes/renderable.php
@@ -377,7 +377,7 @@ class report_log_renderable implements renderable {
$context = context_course::instance($courseid);
$limitfrom = empty($this->showusers) ? 0 : '';
$limitnum = empty($this->showusers) ? COURSE_MAX_USERS_PER_DROPDOWN + 1 : '';
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$courseusers = get_enrolled_users($context, '', $this->groupid, 'u.id, ' .
$userfieldsapi->get_sql('u', false, '', '', false)->selects,
null, $limitfrom, $limitnum);
diff --git a/report/log/classes/table_log.php b/report/log/classes/table_log.php
index 782dc351f79..c53bcedf704 100644
--- a/report/log/classes/table_log.php
+++ b/report/log/classes/table_log.php
@@ -125,7 +125,7 @@ class report_log_table_log extends table_sql {
// If we reach that point new users logs have been generated since the last users db query.
list($usql, $uparams) = $DB->get_in_or_equal($userid);
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$sql = "SELECT id," . $userfieldsapi->get_sql('', false, '', '', false)->selects .
" FROM {user} WHERE id " . $usql;
if (!$user = $DB->get_records_sql($sql, $uparams)) {
@@ -591,7 +591,7 @@ class report_log_table_log extends table_sql {
// Get user fullname and put that in return list.
if (!empty($userids)) {
list($usql, $uparams) = $DB->get_in_or_equal($userids);
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$users = $DB->get_records_sql("SELECT id," . $userfieldsapi->get_sql('', false, '', '', false)->selects .
" FROM {user} WHERE id " . $usql,
$uparams);
diff --git a/report/log/locallib.php b/report/log/locallib.php
index 4b6c70bf5a8..24847dafa15 100644
--- a/report/log/locallib.php
+++ b/report/log/locallib.php
@@ -289,13 +289,13 @@ function report_log_print_mnet_selector_form($hostid, $course, $selecteduser=0,
// If looking at a different host, we're interested in all our site users
if ($hostid == $CFG->mnet_localhost_id && $course->id != SITEID) {
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$courseusers = get_enrolled_users($context, '', $selectedgroup, 'u.id, ' .
$userfieldsapi->get_sql('u', false, '', '', false)->selects,
null, $limitfrom, $limitnum);
} else {
// this may be a lot of users :-(
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$courseusers = $DB->get_records('user', array('deleted' => 0), 'lastaccess DESC', 'id, ' .
$userfieldsapi->get_sql('', false, '', '', false)->selects,
$limitfrom, $limitnum);
diff --git a/report/loglive/classes/table_log.php b/report/loglive/classes/table_log.php
index 21e997baf43..fdc7ed63279 100644
--- a/report/loglive/classes/table_log.php
+++ b/report/loglive/classes/table_log.php
@@ -374,7 +374,7 @@ class report_loglive_table_log extends table_sql {
// Get user fullname and put that in return list.
if (!empty($userids)) {
list($usql, $uparams) = $DB->get_in_or_equal($userids);
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$users = $DB->get_records_sql("SELECT id," .
$userfieldsapi->get_sql('', false, '', '', false)->selects . " FROM {user} WHERE id " . $usql,
$uparams);
diff --git a/report/participation/index.php b/report/participation/index.php
index f6ef6c21301..44248613d91 100644
--- a/report/participation/index.php
+++ b/report/participation/index.php
@@ -225,7 +225,7 @@ if (!empty($instanceid) && !empty($roleid)) {
$params = array_merge($params, $crudparams);
}
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$usernamefields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$users = array();
// If using legacy log then get users from old table.
diff --git a/report/progress/index.php b/report/progress/index.php
index 704e030c929..d69a873571a 100644
--- a/report/progress/index.php
+++ b/report/progress/index.php
@@ -53,7 +53,7 @@ $start = optional_param('start', 0, PARAM_INT);
// Whether to show extra user identity information
// TODO Does not support custom user profile fields (MDL-70456).
-$extrafields = \core\user_fields::get_identity_fields($context, false);
+$extrafields = \core_user\fields::get_identity_fields($context, false);
$leftcols = 1 + count($extrafields);
function csv_quote($value) {
@@ -301,11 +301,11 @@ if (!$csv) {
// Print user identity columns
foreach ($extrafields as $field) {
echo '' .
- \core\user_fields::get_display_name($field) . ' | ';
+ \core_user\fields::get_display_name($field) . '';
}
} else {
foreach ($extrafields as $field) {
- echo $sep . csv_quote(\core\user_fields::get_display_name($field));
+ echo $sep . csv_quote(\core_user\fields::get_display_name($field));
}
}
diff --git a/report/stats/locallib.php b/report/stats/locallib.php
index 0569ba1c401..97af40e21da 100644
--- a/report/stats/locallib.php
+++ b/report/stats/locallib.php
@@ -131,7 +131,7 @@ function report_stats_report($course, $report, $mode, $user, $roleid, $time) {
list($sort, $moreparams) = users_order_by_sql('u');
$moreparams['courseid'] = $course->id;
- $userfieldsapi = \core\user_fields::for_userpic()->including('idnumber');
+ $userfieldsapi = \core_user\fields::for_userpic()->including('idnumber');
$fields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$sql = "SELECT DISTINCT $fields
FROM {stats_user_{$param->table}} s
diff --git a/search/classes/engine.php b/search/classes/engine.php
index 442a6341fba..367879ecd34 100644
--- a/search/classes/engine.php
+++ b/search/classes/engine.php
@@ -150,7 +150,7 @@ abstract class engine {
global $DB;
if (empty(self::$cachedusers[$userid])) {
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$fields = $userfieldsapi->get_sql('', false, '', '', false)->selects;
self::$cachedusers[$userid] = $DB->get_record('user', array('id' => $userid), 'id, ' . $fields);
}
diff --git a/tag/classes/manage_table.php b/tag/classes/manage_table.php
index 2072784a970..d4120f79acc 100644
--- a/tag/classes/manage_table.php
+++ b/tag/classes/manage_table.php
@@ -155,7 +155,7 @@ class core_tag_manage_table extends table_sql {
$sort = "tg.name";
}
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$allusernames = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$sql = "
SELECT tg.id, tg.name, tg.rawname, tg.isstandard, tg.flag, tg.timemodified,
diff --git a/user/action_redir.php b/user/action_redir.php
index 4c0bf0ebb26..7459d4be9d8 100644
--- a/user/action_redir.php
+++ b/user/action_redir.php
@@ -94,7 +94,7 @@ if ($formaction == 'bulkchange.php') {
);
// TODO Does not support custom user profile fields (MDL-70456).
- $identityfields = \core\user_fields::get_identity_fields($context, false);
+ $identityfields = \core_user\fields::get_identity_fields($context, false);
$identityfieldsselect = '';
foreach ($identityfields as $field) {
diff --git a/user/classes/external/search_identity.php b/user/classes/external/search_identity.php
index 694f3920594..c92f1464913 100644
--- a/user/classes/external/search_identity.php
+++ b/user/classes/external/search_identity.php
@@ -59,8 +59,8 @@ class search_identity extends \external_api {
$hasviewfullnames = has_capability('moodle/site:viewfullnames', $context);
- $fields = \core\user_fields::for_name()->with_identity($context, false);
- $extrafields = $fields->get_required_fields([\core\user_fields::PURPOSE_IDENTITY]);
+ $fields = \core_user\fields::for_name()->with_identity($context, false);
+ $extrafields = $fields->get_required_fields([\core_user\fields::PURPOSE_IDENTITY]);
list($searchsql, $searchparams) = users_search_sql($query, '', true, $extrafields);
list($sortsql, $sortparams) = users_order_by_sql('', $query, $context);
diff --git a/user/classes/external/user_summary_exporter.php b/user/classes/external/user_summary_exporter.php
index 1b0658166af..7b753eec298 100644
--- a/user/classes/external/user_summary_exporter.php
+++ b/user/classes/external/user_summary_exporter.php
@@ -49,7 +49,7 @@ class user_summary_exporter extends \core\external\exporter {
$profileurl = (new moodle_url('/user/profile.php', array('id' => $this->data->id)))->out(false);
// TODO Does not support custom user profile fields (MDL-70456).
- $identityfields = array_flip(\core\user_fields::get_identity_fields(null, false));
+ $identityfields = array_flip(\core_user\fields::get_identity_fields(null, false));
$data = $this->data;
foreach ($identityfields as $field => $index) {
if (!empty($data->$field)) {
diff --git a/lib/classes/user_fields.php b/user/classes/fields.php
similarity index 93%
rename from lib/classes/user_fields.php
rename to user/classes/fields.php
index d7fd9eb6c60..d5621957d02 100644
--- a/lib/classes/user_fields.php
+++ b/user/classes/fields.php
@@ -14,14 +14,14 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-namespace core;
+namespace core_user;
/**
* Class for retrieving information about user fields that are needed for displaying user identity.
*
- * @package core
+ * @package core_user
*/
-class user_fields {
+class fields {
/** @var string Prefix used to identify custom profile fields */
const PROFILE_FIELD_PREFIX = 'profile_field_';
/** @var string Regular expression used to match a field name against the prefix */
@@ -82,10 +82,10 @@ class user_fields {
*
* You can add fields to retrieve with the including() function.
*
- * @return user_fields User fields object ready for use
+ * @return fields User fields object ready for use
*/
- public static function empty(): user_fields {
- return new user_fields();
+ public static function empty(): fields {
+ return new fields();
}
/**
@@ -101,14 +101,14 @@ class user_fields {
* Note: After constructing the object you can use the ->with_xx, ->including, and ->excluding
* functions to control the required fields in more detail. For example:
*
- * $fields = user_fields::for_identity($context)->with_userpic()->excluding('email');
+ * $fields = fields::for_identity($context)->with_userpic()->excluding('email');
*
* @param \context|null $context Context; if supplied, includes only fields the current user should see
* @param bool $allowcustom If true, custom profile fields may be included
- * @return user_fields User fields object ready for use
+ * @return fields User fields object ready for use
*/
- public static function for_identity(?\context $context, bool $allowcustom = true): user_fields {
- $fields = new user_fields(self::PURPOSE_IDENTITY);
+ public static function for_identity(?\context $context, bool $allowcustom = true): fields {
+ $fields = new fields(self::PURPOSE_IDENTITY);
$fields->context = $context;
$fields->allowcustom = $allowcustom;
return $fields;
@@ -120,12 +120,12 @@ class user_fields {
* Note: After constructing the object you can use the ->with_xx, ->including, and ->excluding
* functions to control the required fields in more detail. For example:
*
- * $fields = user_fields::for_userpic()->with_name()->excluding('email');
+ * $fields = fields::for_userpic()->with_name()->excluding('email');
*
- * @return user_fields User fields object ready for use
+ * @return fields User fields object ready for use
*/
- public static function for_userpic(): user_fields {
- return new user_fields(self::PURPOSE_USERPIC);
+ public static function for_userpic(): fields {
+ return new fields(self::PURPOSE_USERPIC);
}
/**
@@ -134,36 +134,36 @@ class user_fields {
* Note: After constructing the object you can use the ->with_xx, ->including, and ->excluding
* functions to control the required fields in more detail. For example:
*
- * $fields = user_fields::for_name()->with_userpic()->excluding('email');
+ * $fields = fields::for_name()->with_userpic()->excluding('email');
*
- * @return user_fields User fields object ready for use
+ * @return fields User fields object ready for use
*/
- public static function for_name(): user_fields {
- return new user_fields(self::PURPOSE_NAME);
+ public static function for_name(): fields {
+ return new fields(self::PURPOSE_NAME);
}
/**
- * On an existing user_fields object, adds the fields required for displaying user pictures.
+ * On an existing fields object, adds the fields required for displaying user pictures.
*
* @return $this Same object for chaining function calls
*/
- public function with_userpic(): user_fields {
+ public function with_userpic(): fields {
$this->purposes[self::PURPOSE_USERPIC] = true;
return $this;
}
/**
- * On an existing user_fields object, adds the fields required for displaying user full names.
+ * On an existing fields object, adds the fields required for displaying user full names.
*
* @return $this Same object for chaining function calls
*/
- public function with_name(): user_fields {
+ public function with_name(): fields {
$this->purposes[self::PURPOSE_NAME] = true;
return $this;
}
/**
- * On an existing user_fields object, adds the fields required for displaying user identity.
+ * On an existing fields object, adds the fields required for displaying user identity.
*
* The function does all the required capability checks to see if the current user is allowed
* to see them in the specified context. You can pass context null to get all the fields without
@@ -176,7 +176,7 @@ class user_fields {
* @param bool $allowcustom If true, custom profile fields may be included
* @return $this Same object for chaining function calls
*/
- public function with_identity(?\context $context, bool $allowcustom = true): user_fields {
+ public function with_identity(?\context $context, bool $allowcustom = true): fields {
$this->context = $context;
$this->allowcustom = $allowcustom;
$this->purposes[self::PURPOSE_IDENTITY] = true;
@@ -184,19 +184,19 @@ class user_fields {
}
/**
- * On an existing user_fields object, adds extra fields to be retrieved. You can specify either
+ * On an existing fields object, adds extra fields to be retrieved. You can specify either
* fields from the user table e.g. 'email', or profile fields e.g. 'profile_field_height'.
*
* @param string ...$include One or more fields to add
* @return $this Same object for chaining function calls
*/
- public function including(string ...$include): user_fields {
+ public function including(string ...$include): fields {
$this->include = array_merge($this->include, $include);
return $this;
}
/**
- * On an existing user_fields object, excludes fields from retrieval. You can specify either
+ * On an existing fields object, excludes fields from retrieval. You can specify either
* fields from the user table e.g. 'email', or profile fields e.g. 'profile_field_height'.
*
* This is useful when constructing queries where your query already explicitly references
@@ -205,7 +205,7 @@ class user_fields {
* @param string ...$exclude One or more fields to exclude
* @return $this Same object for chaining function calls
*/
- public function excluding(...$exclude): user_fields {
+ public function excluding(...$exclude): fields {
$this->exclude = array_merge($this->exclude, $exclude);
return $this;
}
@@ -445,7 +445,7 @@ class user_fields {
* refer to the aliases used in the SELECT list there.
*
* The leading comma is included because this makes it work in the pattern above even if there
- * are no fields from the user_fields data (which can happen if doing identity fields and none
+ * are no fields from the get_sql() data (which can happen if doing identity fields and none
* are selected). If you want the result without a leading comma, set $leadingcomma to false.
*
* If the 'id' field is included then it will always be first in the list. Otherwise, you
diff --git a/user/classes/output/participants_filter.php b/user/classes/output/participants_filter.php
index 895f095e338..25b76b13fc0 100644
--- a/user/classes/output/participants_filter.php
+++ b/user/classes/output/participants_filter.php
@@ -24,7 +24,7 @@
namespace core_user\output;
use context_course;
-use core\user_fields;
+use core_user\fields;
use renderable;
use renderer_base;
use stdClass;
@@ -333,7 +333,7 @@ class participants_filter implements renderable, templatable {
* @return stdClass|null
*/
protected function get_country_filter(): ?stdClass {
- $extrauserfields = user_fields::get_identity_fields($this->context, false);
+ $extrauserfields = fields::get_identity_fields($this->context, false);
if (array_search('country', $extrauserfields) === false) {
return null;
}
diff --git a/user/classes/search/user.php b/user/classes/search/user.php
index 7882fb7f63c..34e547bf467 100644
--- a/user/classes/search/user.php
+++ b/user/classes/search/user.php
@@ -94,7 +94,7 @@ class user extends \core_search\base {
$doc = \core_search\document_factory::instance($record->id, $this->componentname, $this->areaname);
// Include all alternate names in title.
$array = [];
- foreach (\core\user_fields::get_name_fields(true) as $field) {
+ foreach (\core_user\fields::get_name_fields(true) as $field) {
$array[$field] = $record->$field;
}
$fullusername = join(' ', $array);
diff --git a/user/classes/table/participants.php b/user/classes/table/participants.php
index 09823d73a59..521c071f8df 100644
--- a/user/classes/table/participants.php
+++ b/user/classes/table/participants.php
@@ -141,9 +141,9 @@ class participants extends \table_sql implements dynamic_table {
$headers[] = get_string('fullname');
$columns[] = 'fullname';
- $extrafields = \core\user_fields::get_identity_fields($this->context);
+ $extrafields = \core_user\fields::get_identity_fields($this->context);
foreach ($extrafields as $field) {
- $headers[] = \core\user_fields::get_display_name($field);
+ $headers[] = \core_user\fields::get_display_name($field);
$columns[] = $field;
}
diff --git a/user/classes/table/participants_search.php b/user/classes/table/participants_search.php
index e931d89290e..552e54d6849 100644
--- a/user/classes/table/participants_search.php
+++ b/user/classes/table/participants_search.php
@@ -30,7 +30,7 @@ use core_table\local\filter\filterset;
use core_user;
use moodle_recordset;
use stdClass;
-use core\user_fields;
+use core_user\fields;
defined('MOODLE_INTERNAL') || die;
@@ -77,7 +77,7 @@ class participants_search {
$this->context = $context;
$this->filterset = $filterset;
- $this->userfields = user_fields::get_identity_fields($this->context);
+ $this->userfields = fields::get_identity_fields($this->context);
}
/**
@@ -194,7 +194,7 @@ class participants_search {
// Get the fields for all contexts because there is a special case later where it allows
// matches of fields you can't access if they are on your own account.
- $userfields = user_fields::for_identity(null)->with_userpic();
+ $userfields = fields::for_identity(null)->with_userpic();
['selects' => $userfieldssql, 'joins' => $userfieldsjoin, 'params' => $userfieldsparams, 'mappings' => $mappings] =
(array)$userfields->get_sql('u', true);
if ($userfieldsjoin) {
@@ -1014,7 +1014,7 @@ class participants_search {
$conditions[] = $idnumber;
// Search all user identify fields.
- $extrasearchfields = user_fields::get_identity_fields(null);
+ $extrasearchfields = fields::get_identity_fields(null);
foreach ($extrasearchfields as $fieldindex => $extrasearchfield) {
if (in_array($extrasearchfield, ['email', 'idnumber', 'country'])) {
// Already covered above.
diff --git a/user/editlib.php b/user/editlib.php
index 99c3410b4ee..8d407d5859b 100644
--- a/user/editlib.php
+++ b/user/editlib.php
@@ -480,7 +480,7 @@ function useredit_get_enabled_name_fields() {
global $CFG;
// Get all of the other name fields which are not ranked as necessary.
- $additionalusernamefields = array_diff(\core\user_fields::get_name_fields(), array('firstname', 'lastname'));
+ $additionalusernamefields = array_diff(\core_user\fields::get_name_fields(), array('firstname', 'lastname'));
// Find out which additional name fields are actually being used from the fullnamedisplay setting.
$enabledadditionalusernames = array();
foreach ($additionalusernamefields as $enabledname) {
@@ -507,7 +507,7 @@ function useredit_get_disabled_name_fields($enabledadditionalusernames = null) {
}
// These are the additional fields that are not currently enabled.
- $nonusednamefields = array_diff(\core\user_fields::get_name_fields(),
+ $nonusednamefields = array_diff(\core_user\fields::get_name_fields(),
array_merge(array('firstname', 'lastname'), $enabledadditionalusernames));
// It may not be significant anywhere, but for compatibility, this used to return an array
diff --git a/user/lib.php b/user/lib.php
index 65ffbcebd95..3809b8170a3 100644
--- a/user/lib.php
+++ b/user/lib.php
@@ -304,7 +304,7 @@ function user_get_user_details($user, $course = null, array $userfields = array(
// This does not need to include custom profile fields as it is only used to check specific
// fields below.
- $showuseridentityfields = \core\user_fields::get_identity_fields($context, false);
+ $showuseridentityfields = \core_user\fields::get_identity_fields($context, false);
if (!empty($course)) {
$canviewhiddenuserfields = has_capability('moodle/course:viewhiddenuserfields', $context);
diff --git a/user/selector/lib.php b/user/selector/lib.php
index a1ba079f2ab..d075622ceb2 100644
--- a/user/selector/lib.php
+++ b/user/selector/lib.php
@@ -115,7 +115,7 @@ abstract class user_selector_base {
// Populate the list of additional user identifiers to display.
// TODO Does not support custom user profile fields (MDL-70456).
- $this->extrafields = \core\user_fields::get_identity_fields($this->accesscontext, false);
+ $this->extrafields = \core_user\fields::get_identity_fields($this->accesscontext, false);
if (isset($options['exclude']) && is_array($options['exclude'])) {
$this->exclude = $options['exclude'];
@@ -439,7 +439,7 @@ abstract class user_selector_base {
// Raw list of fields.
$fields = array('id');
// Add additional name fields.
- $fields = array_merge($fields, \core\user_fields::get_name_fields(), $this->extrafields);
+ $fields = array_merge($fields, \core_user\fields::get_name_fields(), $this->extrafields);
// Prepend the table alias.
if ($u) {
diff --git a/lib/tests/user_fields_test.php b/user/tests/fields_test.php
similarity index 84%
rename from lib/tests/user_fields_test.php
rename to user/tests/fields_test.php
index c022e2a2253..a4a1db2020b 100644
--- a/lib/tests/user_fields_test.php
+++ b/user/tests/fields_test.php
@@ -14,16 +14,16 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see .
-namespace core;
+namespace core_user;
/**
- * Unit tests for \core\user_fields
+ * Unit tests for \core_user\fields
*
* @package core
* @copyright 2014 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
-class user_fields_testcase extends \advanced_testcase {
+class fields_testcase extends \advanced_testcase {
/**
* Tests getting the user picture fields.
@@ -31,7 +31,7 @@ class user_fields_testcase extends \advanced_testcase {
public function test_get_picture_fields() {
$this->assertEquals(['id', 'picture', 'firstname', 'lastname', 'firstnamephonetic',
'lastnamephonetic', 'middlename', 'alternatename', 'imagealt', 'email'],
- user_fields::get_picture_fields());
+ fields::get_picture_fields());
}
/**
@@ -40,11 +40,11 @@ class user_fields_testcase extends \advanced_testcase {
public function test_get_name_fields() {
$this->assertEquals(['firstnamephonetic', 'lastnamephonetic', 'middlename', 'alternatename',
'firstname', 'lastname'],
- user_fields::get_name_fields());
+ fields::get_name_fields());
$this->assertEquals(['firstname', 'lastname',
'firstnamephonetic', 'lastnamephonetic', 'middlename', 'alternatename'],
- user_fields::get_name_fields(true));
+ fields::get_name_fields(true));
}
/**
@@ -75,69 +75,69 @@ class user_fields_testcase extends \advanced_testcase {
// When no context is provided, it does no access checks and should return all specified.
$this->assertEquals(['email', 'department', 'profile_field_a', 'profile_field_b'],
- user_fields::get_identity_fields(null));
+ fields::get_identity_fields(null));
// If you turn off custom profile fields, you don't get those.
- $this->assertEquals(['email', 'department'], user_fields::get_identity_fields(null, false));
+ $this->assertEquals(['email', 'department'], fields::get_identity_fields(null, false));
// Request in context as an administator.
$this->setAdminUser();
$this->assertEquals(['email', 'department', 'profile_field_a', 'profile_field_b'],
- user_fields::get_identity_fields($coursecontext));
+ fields::get_identity_fields($coursecontext));
$this->assertEquals(['email', 'department'],
- user_fields::get_identity_fields($coursecontext, false));
+ fields::get_identity_fields($coursecontext, false));
// Request in context as a student - they don't have any of the capabilities to see identity
// fields or profile fields.
$this->setUser($user);
- $this->assertEquals([], user_fields::get_identity_fields($coursecontext));
+ $this->assertEquals([], fields::get_identity_fields($coursecontext));
// Give the student the basic identity fields permission.
$roleid = $DB->get_field('role', 'id', ['shortname' => 'student']);
role_change_permission($roleid, $coursecontext, 'moodle/site:viewuseridentity', CAP_ALLOW);
$this->assertEquals(['department', 'profile_field_a'],
- user_fields::get_identity_fields($coursecontext));
+ fields::get_identity_fields($coursecontext));
$this->assertEquals(['department'],
- user_fields::get_identity_fields($coursecontext, false));
+ fields::get_identity_fields($coursecontext, false));
// Give them permission to view hidden user fields.
role_change_permission($roleid, $coursecontext, 'moodle/course:viewhiddenuserfields', CAP_ALLOW);
$this->assertEquals(['email', 'department', 'profile_field_a'],
- user_fields::get_identity_fields($coursecontext));
+ fields::get_identity_fields($coursecontext));
$this->assertEquals(['email', 'department'],
- user_fields::get_identity_fields($coursecontext, false));
+ fields::get_identity_fields($coursecontext, false));
// Also give them permission to view all profile fields.
role_change_permission($roleid, $coursecontext, 'moodle/user:viewalldetails', CAP_ALLOW);
$this->assertEquals(['email', 'department', 'profile_field_a', 'profile_field_b'],
- user_fields::get_identity_fields($coursecontext));
+ fields::get_identity_fields($coursecontext));
$this->assertEquals(['email', 'department'],
- user_fields::get_identity_fields($coursecontext, false));
+ fields::get_identity_fields($coursecontext, false));
// Even if we give them student role in the user context they can't view anything...
$generator->role_assign($roleid, $user->id, $usercontext->id);
- $this->assertEquals([], user_fields::get_identity_fields($usercontext));
+ $this->assertEquals([], fields::get_identity_fields($usercontext));
// Give them basic permission.
role_change_permission($roleid, $usercontext, 'moodle/site:viewuseridentity', CAP_ALLOW);
$this->assertEquals(['department', 'profile_field_a'],
- user_fields::get_identity_fields($usercontext));
+ fields::get_identity_fields($usercontext));
$this->assertEquals(['department'],
- user_fields::get_identity_fields($usercontext, false));
+ fields::get_identity_fields($usercontext, false));
// Give them the hidden user fields permission (it's a different one).
role_change_permission($roleid, $usercontext, 'moodle/user:viewhiddendetails', CAP_ALLOW);
$this->assertEquals(['email', 'department', 'profile_field_a'],
- user_fields::get_identity_fields($usercontext));
+ fields::get_identity_fields($usercontext));
$this->assertEquals(['email', 'department'],
- user_fields::get_identity_fields($usercontext, false));
+ fields::get_identity_fields($usercontext, false));
// Also give them permission to view all profile fields.
role_change_permission($roleid, $usercontext, 'moodle/user:viewalldetails', CAP_ALLOW);
$this->assertEquals(['email', 'department', 'profile_field_a', 'profile_field_b'],
- user_fields::get_identity_fields($usercontext));
+ fields::get_identity_fields($usercontext));
$this->assertEquals(['email', 'department'],
- user_fields::get_identity_fields($usercontext, false));
+ fields::get_identity_fields($usercontext, false));
}
/**
@@ -157,40 +157,40 @@ class user_fields_testcase extends \advanced_testcase {
set_config('showuseridentity', 'email,department,profile_field_a');
// What happens if you don't ask for anything?
- $fields = user_fields::empty();
+ $fields = fields::empty();
$this->assertEquals([], $fields->get_required_fields());
// Try each invidual purpose.
- $fields = user_fields::for_identity(null);
+ $fields = fields::for_identity(null);
$this->assertEquals(['email', 'department', 'profile_field_a'], $fields->get_required_fields());
- $fields = user_fields::for_userpic();
- $this->assertEquals(user_fields::get_picture_fields(), $fields->get_required_fields());
- $fields = user_fields::for_name();
- $this->assertEquals(user_fields::get_name_fields(), $fields->get_required_fields());
+ $fields = fields::for_userpic();
+ $this->assertEquals(fields::get_picture_fields(), $fields->get_required_fields());
+ $fields = fields::for_name();
+ $this->assertEquals(fields::get_name_fields(), $fields->get_required_fields());
// Try combining them all. There should be no duplicates (e.g. email), and the 'id' field
// should be moved to the start.
- $fields = user_fields::for_identity(null)->with_name()->with_userpic();
+ $fields = fields::for_identity(null)->with_name()->with_userpic();
$this->assertEquals(['id', 'email', 'department', 'profile_field_a', 'picture',
'firstname', 'lastname', 'firstnamephonetic', 'lastnamephonetic', 'middlename',
'alternatename', 'imagealt'], $fields->get_required_fields());
// Add some specified fields to a default result.
- $fields = user_fields::for_identity(null, true)->including('city', 'profile_field_b');
+ $fields = fields::for_identity(null, true)->including('city', 'profile_field_b');
$this->assertEquals(['email', 'department', 'profile_field_a', 'city', 'profile_field_b'],
$fields->get_required_fields());
// Remove some fields, one of which actually is in the list.
- $fields = user_fields::for_identity(null, true)->excluding('email', 'city');
+ $fields = fields::for_identity(null, true)->excluding('email', 'city');
$this->assertEquals(['department', 'profile_field_a'], $fields->get_required_fields());
// Add and remove fields.
- $fields = user_fields::for_identity(null, true)->including('city', 'profile_field_b')->excluding('city', 'department');
+ $fields = fields::for_identity(null, true)->including('city', 'profile_field_b')->excluding('city', 'department');
$this->assertEquals(['email', 'profile_field_a', 'profile_field_b'],
$fields->get_required_fields());
// Request the list without profile fields, check that still works with both sources.
- $fields = user_fields::for_identity(null, false)->including('city', 'profile_field_b')->excluding('city', 'department');
+ $fields = fields::for_identity(null, false)->including('city', 'profile_field_b')->excluding('city', 'department');
$this->assertEquals(['email'], $fields->get_required_fields());
}
@@ -206,41 +206,41 @@ class user_fields_testcase extends \advanced_testcase {
$generator->create_custom_profile_field(['datatype' => 'text', 'shortname' => 'b', 'name' => 'B']);
set_config('showuseridentity', 'email,department,profile_field_a');
- // Create a user_fields object with all three purposes, plus included and excluded fields.
- $fields = user_fields::for_identity(null, true)->with_name()->with_userpic()
+ // Create a fields object with all three purposes, plus included and excluded fields.
+ $fields = fields::for_identity(null, true)->with_name()->with_userpic()
->including('city', 'profile_field_b')->excluding('firstnamephonetic', 'middlename', 'alternatename');
// Check the result with all purposes.
$this->assertEquals(['id', 'email', 'department', 'profile_field_a', 'picture',
'firstname', 'lastname', 'lastnamephonetic', 'imagealt', 'city',
'profile_field_b'],
- $fields->get_required_fields([user_fields::PURPOSE_IDENTITY, user_fields::PURPOSE_NAME,
- user_fields::PURPOSE_USERPIC, user_fields::CUSTOM_INCLUDE]));
+ $fields->get_required_fields([fields::PURPOSE_IDENTITY, fields::PURPOSE_NAME,
+ fields::PURPOSE_USERPIC, fields::CUSTOM_INCLUDE]));
// Limit to identity and custom includes.
$this->assertEquals(['email', 'department', 'profile_field_a', 'city', 'profile_field_b'],
- $fields->get_required_fields([user_fields::PURPOSE_IDENTITY, user_fields::CUSTOM_INCLUDE]));
+ $fields->get_required_fields([fields::PURPOSE_IDENTITY, fields::CUSTOM_INCLUDE]));
// Limit to name fields.
$this->assertEquals(['firstname', 'lastname', 'lastnamephonetic'],
- $fields->get_required_fields([user_fields::PURPOSE_NAME]));
+ $fields->get_required_fields([fields::PURPOSE_NAME]));
}
/**
* There should be an exception if you try to 'limit' purposes to one that wasn't even included.
*/
public function test_get_required_fields_limitpurposes_not_in_constructor() {
- $fields = user_fields::for_identity(null);
+ $fields = fields::for_identity(null);
$this->expectExceptionMessage('$limitpurposes can only include purposes defined in object');
- $fields->get_required_fields([user_fields::PURPOSE_USERPIC]);
+ $fields->get_required_fields([fields::PURPOSE_USERPIC]);
}
/**
- * Sets up data and a user_fields object for all the get_sql tests.
+ * Sets up data and a fields object for all the get_sql tests.
*
- * @return user_fields Constructed user_fields for testing
+ * @return fields Constructed fields object for testing
*/
- protected function init_for_sql_tests(): user_fields {
+ protected function init_for_sql_tests(): fields {
$generator = self::getDataGenerator();
$generator->create_custom_profile_field(['datatype' => 'text', 'shortname' => 'a', 'name' => 'A']);
$generator->create_custom_profile_field(['datatype' => 'text', 'shortname' => 'b', 'name' => 'B']);
@@ -255,7 +255,7 @@ class user_fields_testcase extends \advanced_testcase {
// It doesn't matter how we construct it (we already tested get_required_fields which is
// where all those values are actually used) so let's just list the fields we want manually.
- return user_fields::empty()->including('department', 'city', 'profile_field_a', 'profile_field_b');
+ return fields::empty()->including('department', 'city', 'profile_field_a', 'profile_field_b');
}
/**
@@ -266,7 +266,7 @@ class user_fields_testcase extends \advanced_testcase {
$this->resetAfterTest();
$fields = $this->init_for_sql_tests();
- user_fields::reset_unique_identifier();
+ fields::reset_unique_identifier();
// Basic SQL.
['selects' => $selects, 'joins' => $joins, 'params' => $joinparams, 'mappings' => $mappings] =
@@ -343,7 +343,7 @@ class user_fields_testcase extends \advanced_testcase {
// Renaming the id field. We need to use a different set of fields so it actually has the
// id field.
- $fields = user_fields::for_userpic();
+ $fields = fields::for_userpic();
['selects' => $selects, 'joins' => $joins, 'params' => $joinparams] =
(array)$fields->get_sql('', false, '', 'userid');
$sql = "SELECT idnumber
@@ -421,7 +421,7 @@ class user_fields_testcase extends \advanced_testcase {
['selects' => $selects1, 'joins' => $joins1, 'params' => $joinparams1] =
(array)$fields->get_sql('u1', true);
// Outer SQL.
- $fields2 = user_fields::empty()->including('profile_field_a', 'email');
+ $fields2 = fields::empty()->including('profile_field_a', 'email');
['selects' => $selects2, 'joins' => $joins2, 'params' => $joinparams2] =
(array)$fields2->get_sql('u2', true);
@@ -452,7 +452,7 @@ class user_fields_testcase extends \advanced_testcase {
* Tests the get_sql function when there are no fields to retrieve.
*/
public function test_get_sql_nothing() {
- $fields = user_fields::empty();
+ $fields = fields::empty();
['selects' => $selects, 'joins' => $joins, 'params' => $joinparams] = (array)$fields->get_sql();
$this->assertEquals('', $selects);
$this->assertEquals('', $joins);
@@ -464,7 +464,7 @@ class user_fields_testcase extends \advanced_testcase {
* are always blank.
*/
public function test_get_sql_no_custom_fields() {
- $fields = user_fields::empty()->including('city', 'country');
+ $fields = fields::empty()->including('city', 'country');
['selects' => $selects, 'joins' => $joins, 'params' => $joinparams, 'mappings' => $mappings] =
(array)$fields->get_sql('u');
$this->assertEquals(', u.city, u.country', $selects);
@@ -481,13 +481,13 @@ class user_fields_testcase extends \advanced_testcase {
global $DB;
$this->resetAfterTest();
- user_fields::reset_unique_identifier();
+ fields::reset_unique_identifier();
$generator = self::getDataGenerator();
$generator->create_custom_profile_field(['datatype' => 'text', 'shortname' => 'a', 'name' => 'A']);
// When we list fields that include custom profile fields...
- $fields = user_fields::empty()->including('id', 'profile_field_a');
+ $fields = fields::empty()->including('id', 'profile_field_a');
// Supplying an alias: all fields have alias.
$selects = $fields->get_sql('u')->selects;
@@ -498,7 +498,7 @@ class user_fields_testcase extends \advanced_testcase {
$this->assertEquals(', {user}.id, ' . $DB->sql_compare_text('uf2d_1.data', 255) . ' AS profile_field_a', $selects);
// When the list doesn't include custom profile fields...
- $fields = user_fields::empty()->including('id', 'city');
+ $fields = fields::empty()->including('id', 'city');
// Supplying an alias: all fields have alias.
$selects = $fields->get_sql('u')->selects;
diff --git a/userpix/index.php b/userpix/index.php
index f3d035cb01b..455e19d9bde 100644
--- a/userpix/index.php
+++ b/userpix/index.php
@@ -24,7 +24,7 @@ $PAGE->set_heading($title);
echo $OUTPUT->header();
$rs = $DB->get_recordset_select("user", "deleted = 0 AND picture > 0", array(), "lastaccess DESC",
- implode(',', \core\user_fields::get_picture_fields()));
+ implode(',', \core_user\fields::get_picture_fields()));
foreach ($rs as $user) {
$fullname = s(fullname($user));
echo "wwwroot/user/view.php?id=$user->id&course=1\" ".
diff --git a/webservice/classes/token_filter.php b/webservice/classes/token_filter.php
index 8144fe62843..16c6d1a4204 100644
--- a/webservice/classes/token_filter.php
+++ b/webservice/classes/token_filter.php
@@ -63,7 +63,7 @@ class token_filter extends moodleform {
global $DB, $OUTPUT;
$context = \context_system::instance();
- $fields = \core\user_fields::for_name()->with_identity($context, false);
+ $fields = \core_user\fields::for_name()->with_identity($context, false);
$record = \core_user::get_user($userid, 'id' . $fields->get_sql()->selects, MUST_EXIST);
$user = (object)[
@@ -72,7 +72,7 @@ class token_filter extends moodleform {
'extrafields' => [],
];
- foreach ($fields->get_required_fields([\core\user_fields::PURPOSE_IDENTITY]) as $extrafield) {
+ foreach ($fields->get_required_fields([\core_user\fields::PURPOSE_IDENTITY]) as $extrafield) {
$user->extrafields[] = (object)[
'name' => $extrafield,
'value' => s($record->$extrafield)
diff --git a/webservice/classes/token_form.php b/webservice/classes/token_form.php
index 5331e96db05..a51f3cbba6d 100644
--- a/webservice/classes/token_form.php
+++ b/webservice/classes/token_form.php
@@ -55,7 +55,7 @@ class token_form extends \moodleform {
global $DB, $OUTPUT;
$context = \context_system::instance();
- $fields = \core\user_fields::for_name()->with_identity($context, false);
+ $fields = \core_user\fields::for_name()->with_identity($context, false);
$record = $DB->get_record('user', ['id' => $userid], $fields, MUST_EXIST);
$user = (object)[
@@ -64,7 +64,7 @@ class token_form extends \moodleform {
'extrafields' => [],
];
- foreach ($fields->get_required_fields([\core\user_fields::PURPOSE_IDENTITY]) as $extrafield) {
+ foreach ($fields->get_required_fields([\core_user\fields::PURPOSE_IDENTITY]) as $extrafield) {
$user->extrafields[] = (object)[
'name' => $extrafield,
'value' => s($record->$extrafield)
diff --git a/webservice/classes/token_table.php b/webservice/classes/token_table.php
index deb8a7a816f..9c91c64db54 100644
--- a/webservice/classes/token_table.php
+++ b/webservice/classes/token_table.php
@@ -70,7 +70,7 @@ class token_table extends \table_sql {
$this->hasviewfullnames = has_capability('moodle/site:viewfullnames', $context);
// List of user identity fields.
- $this->userextrafields = \core\user_fields::get_identity_fields(\context_system::instance(), false);
+ $this->userextrafields = \core_user\fields::get_identity_fields(\context_system::instance(), false);
// Filter form values.
$this->filterdata = $filterdata;
@@ -258,7 +258,7 @@ class token_table extends \table_sql {
debugging('Initial bar not implemented yet. Call out($pagesize, false)');
}
- $userfieldsapi = \core\user_fields::for_name();
+ $userfieldsapi = \core_user\fields::for_name();
$usernamefields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
$creatorfields = $userfieldsapi->get_sql('c', false, 'creator', '', false)->selects;