Commit adf9b66b authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Show institutional admins on admin notifications page

parent f9bfc075
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
*/ */
define('INTERNAL', 1); define('INTERNAL', 1);
define('ADMIN', 1); define('INSTITUTIONALADMIN', 1);
define('MENUITEM', 'configusers/adminnotifications'); define('MENUITEM', 'configusers/adminnotifications');
require(dirname(dirname(dirname(__FILE__))) . '/init.php'); require(dirname(dirname(dirname(__FILE__))) . '/init.php');
define('TITLE', get_string('adminnotifications', 'admin')); define('TITLE', get_string('adminnotifications', 'admin'));
...@@ -35,12 +35,23 @@ define('SECTION_PAGE', 'notifications'); ...@@ -35,12 +35,23 @@ define('SECTION_PAGE', 'notifications');
require_once('pieforms/pieform.php'); require_once('pieforms/pieform.php');
$sql = 'SELECT u.*, a.activity, a.method global $USER;
$sql = '
SELECT
u.id, u.username, u.firstname, u.lastname, u.preferredname, u.admin, u.staff,
a.activity, a.method
FROM {usr} u FROM {usr} u
LEFT JOIN {usr_activity_preference} a ON a.usr = u.id LEFT JOIN {usr_activity_preference} a ON a.usr = u.id
WHERE u.admin = ?'; LEFT OUTER JOIN {usr_institution} ui
ON (ui.usr = u.id' . ($USER->get('admin') ? '' : ' AND ui.institution IN ('
. join(',',array_map('db_quote', array_keys($USER->get('institutions')))) . ')') . ')
GROUP BY
u.id, u.username, u.firstname, u.lastname, u.preferredname, u.admin, u.staff,
a.activity, a.method
HAVING (' . ($USER->get('admin') ? 'u.admin = 1 OR ' : '') . 'SUM(ui.admin) > 0)';
$admins = get_records_sql_array($sql, array(1)); $admins = get_records_sql_array($sql, null);
$types = get_column('activity_type', 'name', 'admin', 1); $types = get_column('activity_type', 'name', 'admin', 1);
$types = array_flip($types); $types = array_flip($types);
foreach (array_keys($types) as $k) { foreach (array_keys($types) as $k) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment