Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
00a344a3
Commit
00a344a3
authored
Dec 21, 2007
by
Richard Mansfield
Browse files
Allow username to be turned off in display_name
parent
c92a34be
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/lib/user.php
View file @
00a344a3
...
...
@@ -302,7 +302,7 @@ function email_user($userto, $userfrom, $subject, $messagetext, $messagehtml='')
*
* @returns string name to display
*/
function
display_name
(
$user
,
$userto
=
null
)
{
function
display_name
(
$user
,
$userto
=
null
,
$nameonly
=
false
)
{
global
$USER
;
if
(
empty
(
$userto
))
{
...
...
@@ -339,13 +339,13 @@ function display_name($user, $userto=null) {
// if they don't have a preferred name set, just return here
if
(
empty
(
$user
->
preferredname
))
{
if
(
$userto
->
admin
||
$userto
->
staff
)
{
if
(
(
$userto
->
admin
||
$userto
->
staff
)
&&
!
$nameonly
)
{
return
$user
->
firstname
.
' '
.
$user
->
lastname
.
' ('
.
$user
->
username
.
')'
;
}
return
$user
->
firstname
.
' '
.
$user
->
lastname
;
}
if
(
$userto
->
admin
||
$userto
->
staff
)
{
if
(
(
$userto
->
admin
||
$userto
->
staff
)
&&
!
$nameonly
)
{
return
$user
->
preferredname
.
' ('
.
$user
->
firstname
.
' '
.
$user
->
lastname
.
' - '
.
$user
->
username
.
')'
;
}
...
...
@@ -355,7 +355,7 @@ function display_name($user, $userto=null) {
ON g1.group = g2.group
WHERE g1.member = ? AND g2.member = ? AND g2.tutor = ?'
;
if
(
record_exists_sql
(
$sql
,
array
(
$user
->
id
,
$userto
->
id
,
1
)))
{
return
$user
->
preferredname
.
' ('
.
$user
->
firstname
.
' '
.
$user
->
lastname
.
')'
;
return
$user
->
preferredname
.
(
$nameonly
?
''
:
' ('
.
$user
->
firstname
.
' '
.
$user
->
lastname
.
')'
)
;
}
return
$user
->
preferredname
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment