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

MDL-49819 profile: Move email to top and interests to lower location

Browse source
This commit is contained in:
Frederic Massart 2015-04-10 16:33:59 +08:00 • committed by Adrian Greeve
parent 87223ef792
commit 08cb34a5a6
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lib/myprofilelib.php
View file

@ -144,12 +144,13 @@ function core_myprofile_navigation(core_user\output\myprofile\tree $tree, $user,
$tree->add_node($node); $tree->add_node($node);
} }
// Printing tagged interests. We want this only for full profile. if (isset($identityfields['email']) and ($iscurrentuser
if (!empty($CFG->usetags) && empty($course)) { or $user->maildisplay == 1
if ($interests = tag_get_tags_csv('user', $user->id) ) { or has_capability('moodle/course:useremail', $usercontext)
$node = new core_user\output\myprofile\node('contact', 'interests', get_string('interests'), null, null, $interests); or ($user->maildisplay == 2 and enrol_sharing_course($user, $USER)))) {
$tree->add_node($node); $node = new core_user\output\myprofile\node('contact', 'email', get_string('email'), null, null,
} obfuscate_mailto($user->email, ''));
$tree->add_node($node);
} }
if (!isset($hiddenfields['country']) && $user->country) { if (!isset($hiddenfields['country']) && $user->country) {
@ -196,15 +197,6 @@ function core_myprofile_navigation(core_user\output\myprofile\tree $tree, $user,
$tree->add_node($node); $tree->add_node($node);
} }
if (isset($identityfields['email']) and ($iscurrentuser
or $user->maildisplay == 1
or has_capability('moodle/course:useremail', $usercontext)
or ($user->maildisplay == 2 and enrol_sharing_course($user, $USER)))) {
$node = new core_user\output\myprofile\node('contact', 'email', get_string('email'), null, null,
obfuscate_mailto($user->email, ''));
$tree->add_node($node);
}
if ($user->url && !isset($hiddenfields['webpage'])) { if ($user->url && !isset($hiddenfields['webpage'])) {
$url = $user->url; $url = $user->url;
if (strpos($user->url, '://') === false) { if (strpos($user->url, '://') === false) {
@ -215,6 +207,14 @@ function core_myprofile_navigation(core_user\output\myprofile\tree $tree, $user,
$tree->add_node($node); $tree->add_node($node);
} }
// Printing tagged interests. We want this only for full profile.
if (!empty($CFG->usetags) && empty($course)) {
if ($interests = tag_get_tags_csv('user', $user->id) ) {
$node = new core_user\output\myprofile\node('contact', 'interests', get_string('interests'), null, null, $interests);
$tree->add_node($node);
}
}
if (!isset($hiddenfields['mycourses'])) { if (!isset($hiddenfields['mycourses'])) {
$showallcourses = optional_param('showallcourses', 0, PARAM_INT); $showallcourses = optional_param('showallcourses', 0, PARAM_INT);
if ($mycourses = enrol_get_all_users_courses($user->id, true, null, 'visible DESC, sortorder ASC')) { if ($mycourses = enrol_get_all_users_courses($user->id, true, null, 'visible DESC, sortorder ASC')) {