Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
e2de1055
Commit
e2de1055
authored
Dec 12, 2007
by
Richard Mansfield
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show studentids on institution admins/staff pages
parent
e2e4b64b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
18 deletions
+23
-18
htdocs/admin/users/edit.php
htdocs/admin/users/edit.php
+2
-9
htdocs/admin/users/institutionadmins.php
htdocs/admin/users/institutionadmins.php
+2
-2
htdocs/admin/users/institutionstaff.php
htdocs/admin/users/institutionstaff.php
+2
-2
htdocs/auth/user.php
htdocs/auth/user.php
+12
-0
htdocs/lib/searchlib.php
htdocs/lib/searchlib.php
+4
-4
htdocs/lib/user.php
htdocs/lib/user.php
+1
-1
No files found.
htdocs/admin/users/edit.php
View file @
e2de1055
...
...
@@ -38,15 +38,8 @@ $user = new User;
$user
->
find_by_id
(
$id
);
global
$USER
;
if
(
!
$USER
->
get
(
'admin'
))
{
// Institutional admins must share an institution with the displayed user
$shared
=
false
;
foreach
(
$user
->
get
(
'institutions'
)
as
$i
)
{
$shared
=
$shared
||
$USER
->
is_institutional_admin
(
$i
->
institution
);
}
if
(
!
$shared
)
{
redirect
(
get_config
(
'wwwroot'
)
.
'user/view.php?id='
.
$id
);
}
if
(
!
$USER
->
is_admin_for_user
(
$user
))
{
redirect
(
get_config
(
'wwwroot'
)
.
'user/view.php?id='
.
$id
);
}
$suspended
=
$user
->
get
(
'suspendedcusr'
);
...
...
htdocs/admin/users/institutionadmins.php
View file @
e2de1055
...
...
@@ -55,9 +55,9 @@ $form = array(
'filter'
=>
false
,
'lefttitle'
=>
get_string
(
'institutionmembers'
,
'admin'
),
'righttitle'
=>
get_string
(
'currentadmins'
,
'admin'
),
'searchparams'
=>
array
(
'limit'
=>
100
,
'query'
=>
''
,
'
raw'
=>
true
,
'action'
=>
'search'
,
'searchparams'
=>
array
(
'limit'
=>
100
,
'query'
=>
''
,
'
member'
=>
1
,
'institution'
=>
$institution
),
'searchscript'
=>
'admin/users/search.json.php'
,
'searchscript'
=>
'admin/users/
userinstitution
search.json.php'
,
),
'institution'
=>
array
(
'type'
=>
'hidden'
,
...
...
htdocs/admin/users/institutionstaff.php
View file @
e2de1055
...
...
@@ -55,9 +55,9 @@ $form = array(
'filter'
=>
false
,
'lefttitle'
=>
get_string
(
'institutionmembers'
,
'admin'
),
'righttitle'
=>
get_string
(
'institutionstaff'
,
'admin'
),
'searchparams'
=>
array
(
'limit'
=>
100
,
'query'
=>
''
,
'
raw'
=>
true
,
'action'
=>
'search'
,
'searchparams'
=>
array
(
'limit'
=>
100
,
'query'
=>
''
,
'
member'
=>
1
,
'institution'
=>
$institution
),
'searchscript'
=>
'admin/users/search.json.php'
,
'searchscript'
=>
'admin/users/
userinstitution
search.json.php'
,
),
'institution'
=>
array
(
'type'
=>
'hidden'
,
...
...
htdocs/auth/user.php
View file @
e2de1055
...
...
@@ -383,6 +383,18 @@ class User {
return
$this
->
get
(
'admin'
)
||
$this
->
is_institutional_admin
(
$institution
);
}
public
function
is_admin_for_user
(
$user
)
{
if
(
$this
->
get
(
'admin'
))
{
return
true
;
}
foreach
(
$user
->
get
(
'institutions'
)
as
$i
)
{
if
(
$this
->
is_institutional_admin
(
$i
->
institution
))
{
return
true
;
}
}
return
false
;
}
public
function
set_admin_institutions
(
$institutions
)
{
$this
->
set
(
'admininstitutions'
,
array_combine
(
$institutions
,
$institutions
));
}
...
...
htdocs/lib/searchlib.php
View file @
e2de1055
...
...
@@ -135,10 +135,10 @@ function get_institutional_admin_search_results($search, $limit) {
}
$results
=
institutional_admin_user_search
(
$search
->
query
,
$institution
,
$limit
);
if
(
$results
[
'count'
])
{
foreach
(
$results
[
'data'
]
as
&
$r
esult
)
{
$r
esult
[
'name'
]
=
display_name
(
$result
)
;
if
(
!
empty
(
$r
esult
[
'studentid'
]))
{
$r
esult
[
'name'
]
.
=
' ('
.
$r
esult
[
'studentid'
]
.
')'
;
foreach
(
$results
[
'data'
]
as
&
$r
)
{
$r
[
'name'
]
=
$r
[
'firstname'
]
.
' '
.
$r
[
'lastname'
]
.
' ('
.
$r
[
'username'
]
.
')'
;
if
(
!
empty
(
$r
[
'studentid'
]))
{
$r
[
'name'
]
.
=
' ('
.
$r
[
'studentid'
]
.
')'
;
}
}
}
...
...
htdocs/lib/user.php
View file @
e2de1055
...
...
@@ -312,7 +312,7 @@ function display_name($user, $userto=null) {
$userto
->
preferredname
=
$USER
->
get
(
'preferredname'
);
$userto
->
firstname
=
$USER
->
get
(
'firstname'
);
$userto
->
lastname
=
$USER
->
get
(
'lastname'
);
$userto
->
admin
=
$USER
->
get
(
'admin'
);
$userto
->
admin
=
$USER
->
get
(
'admin'
)
||
$USER
->
is_institutional_admin
()
;
$userto
->
staff
=
$USER
->
get
(
'staff'
);
}
if
(
is_array
(
$user
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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