Merge "Sort activities in mailboxes"

htdocs/artefact/multirecipientnotification/inbox.php

@@ -35,9 +35,7 @@ $installedtypes = get_records_assoc(
     'name,admin,plugintype,pluginname'
 );
 
-$options = array(
-    'all' => get_string('alltypes', 'activity'),
-);
+$options = array();
 
 foreach ($installedtypes as &$t) {
     if (!$t->admin) {
@@ -50,6 +48,10 @@ if ($USER->get('admin')) {
     $options['adminmessages'] = get_string('typeadminmessages', 'activity');
 }
 
+// sort activitytypes now, when they have been translated
+uasort($options, 'strcmp');
+// ... and add the element for 'all types' to the beginning
+$options = array_merge(array('all' => get_string('alltypes', 'activity')), $options);
 $type = param_variable('type', 'all');
 if ($type == '') {
     $type = 'all';

htdocs/artefact/multirecipientnotification/outbox.php

@@ -34,10 +34,7 @@ $installedtypes = get_records_assoc(
     'name,admin,plugintype,pluginname'
 );
 
-$options = array(
-    'all' => get_string('alltypes', 'activity'),
-);
-
+$options = array();
 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
@@ -51,6 +48,10 @@ if ($USER->get('admin')) {
     $options['adminmessages'] = get_string('typeadminmessages', 'activity');
 }
 
+// sort activitytypes now, when they have been translated
+uasort($options, 'strcmp');
+// ... and add the element for 'all types' to the beginning
+$options = array_merge(array('all' => get_string('alltypes', 'activity')), $options);
 $type = param_variable('type', 'all');
 if ($type == '') {
     $type = 'all';