diff --git a/backend/TE/AppDB.php b/backend/TE/AppDB.php index a86eb87e880c237a3b0bc19b570f90094d3e5208..10be2b77fa46fac399d82c450f9188a0881cbe32 100644 --- a/backend/TE/AppDB.php +++ b/backend/TE/AppDB.php @@ -1940,31 +1940,32 @@ class AppDB_TE extends AppDB /* * Admin view */ - public function getUserList() + public function getUserList( $only_users = 0 ) { if( ! $_SESSION[ 'user' ][ 'isadmin' ] ) { throw new Exception( "Access denied" ); } else { - $res = $this->query( " - SELECT - (CASE WHEN pgroup.tutors THEN 'Tutor' ELSE 'User' END) as tutors, - person.id, - person.username, - person.name - FROM - public.pgroup, - public.person, - public.membership - WHERE - person.id = membership.person AND - membership.pgroup = pgroup.id AND - person.active = true - - ORDER BY person.name ASC; - " - ); - + $sql = " + SELECT + (CASE WHEN pgroup.tutors THEN 'Tutor' ELSE 'User' END) as tutors, + person.id, + person.username, + person.name + FROM + public.pgroup, + public.person, + public.membership + WHERE + person.id = membership.person AND + membership.pgroup = pgroup.id AND + person.active = true + "; + if( $only_users == 1 ) + $sql .= " AND tutors = false"; + + $sql .= " ORDER BY person.name ASC;"; + $res = $this->query( $sql ); return $res; } }