Merge "Allowing admin users see all activity filter types in inbox/outbox"

htdocs/artefact/multirecipientnotification/inbox.php

@@ -36,9 +36,15 @@ $installedtypes = get_records_assoc(
 );
 
 $options = array();
+// check if user is an admin in at least one group and if so they can see group admin filter options
+$groupadmin = false;
+$grouproles = $USER->get('grouproles');
+if (array_search('admin', $grouproles) !== false) {
+    $groupadmin = true;
+}
 
-foreach ($installedtypes as &$t) {
-    if (!$t->admin) {
+foreach ($installedtypes as $t) {
+    if (!$t->admin || $USER->get('admin') || ($groupadmin && $t->pluginname == 'forum')) {
         $section = $t->pluginname ? "{$t->plugintype}.{$t->pluginname}" : 'activity';
         $options[$t->name] = get_string('type' . $t->name, $section);
     }

htdocs/artefact/multirecipientnotification/outbox.php

@@ -35,10 +35,10 @@ $installedtypes = get_records_assoc(
 );
 
 $options = array();
-foreach ($installedtypes as &$t) {
+foreach ($installedtypes as $t) {
     // ignore activity type newpost, as each recipients notification appears
     // as a single entry for the poster and thus floods his outbox
-    if ((!$t->admin) && ('newpost' !== $t->name)) {
+    if ((!$t->admin || $USER->get('admin')) && ('newpost' !== $t->name)) {
         $section = $t->pluginname ? "{$t->plugintype}.{$t->pluginname}" : 'activity';
         $options[$t->name] = get_string('type' . $t->name, $section);
     }