Remove a debug message about missing name fields in the DB query if teacher...

Remove a debug message about missing name fields in the DB query if teacher names are configured to be displayed according to the fullnamedisplay setting

README.md

@@ -13,6 +13,7 @@ This plugin requires Moodle 3.1+
 Changes
 -------
 
+* 2016-11-07 - Remove a debug message about missing name fields in the DB query if teacher names are configured to be displayed according to the fullnamedisplay setting
 * 2016-07-19 - Check compatibility for Moodle 3.1, no functionality change
 * 2016-06-14 - New Feature: Hide suspended teachers
 * 2016-04-05 - Split the existing long settings page into multiple settings pages

block_course_overview_campus.php

@@ -467,6 +467,9 @@ class block_course_overview_campus extends block_base {
                     // Get course teachers based on global teacher roles
                     if (count($teacherroles) > 0) {
 
+                        // Get all user name fields for SQL query in a proper way
+                        $allnames = get_all_user_name_fields(true, 'u');
+
                         // Check if we have to check for suspended teachers
                         if ($coc_config->teacherroleshidesuspended == 1) {
                             // Build extra where clause for SQL query
@@ -479,35 +482,35 @@ class block_course_overview_campus extends block_base {
                         if ($coc_config->teacherrolesparent == 1) {
                             // If we have to check for suspended teachers
                             if ($coc_config->teacherroleshidesuspended == 1) {
-                                $courseteachers = get_role_users($teacherroles, $context, true, 'ra.id, u.id, u.lastname, u.firstname, r.sortorder', 'u.lastname, u.firstname', false, '', '', '', $extrawhere);
+                                $courseteachers = get_role_users($teacherroles, $context, true, 'ra.id, u.id, '.$allnames.', r.sortorder', 'u.lastname, u.firstname', false, '', '', '', $extrawhere);
                             } 
                             else {
-                                $courseteachers = get_role_users($teacherroles, $context, true, 'ra.id, u.id, u.lastname, u.firstname, r.sortorder', 'u.lastname, u.firstname');
+                                $courseteachers = get_role_users($teacherroles, $context, true, 'ra.id, u.id, '.$allnames.', r.sortorder', 'u.lastname, u.firstname');
                             }
                         }
                         // If no
                         else if ($coc_config->teacherrolesparent == 2) {
                             // If we have to check for suspended teachers
                             if ($coc_config->teacherroleshidesuspended == 1) {
-                                $courseteachers = get_role_users($teacherroles, $context, false, 'ra.id, u.id, u.lastname, u.firstname, r.sortorder', 'u.lastname, u.firstname', false, '', '', '', $extrawhere);
+                                $courseteachers = get_role_users($teacherroles, $context, false, 'ra.id, u.id, '.$allnames.', r.sortorder', 'u.lastname, u.firstname', false, '', '', '', $extrawhere);
                             } 
                             else {
-                                $courseteachers = get_role_users($teacherroles, $context, false, 'ra.id, u.id, u.lastname, u.firstname, r.sortorder', 'u.lastname, u.firstname');
+                                $courseteachers = get_role_users($teacherroles, $context, false, 'ra.id, u.id, '.$allnames.', u.alternatename, r.sortorder', 'u.lastname, u.firstname');
                             }
                         }
                         // If depending on moodle/course:reviewotherusers capability
                         else if ($coc_config->teacherrolesparent == 3) {
                             // If we have to check for suspended teachers
                             if ($coc_config->teacherroleshidesuspended == 1) {
-                                $courseteachers = get_role_users($teacherroles, $context, has_capability('moodle/course:reviewotherusers', $context), 'ra.id, u.id, u.lastname, u.firstname, r.sortorder', 'u.lastname, u.firstname', false, '', '', '', $extrawhere);
+                                $courseteachers = get_role_users($teacherroles, $context, has_capability('moodle/course:reviewotherusers', $context), 'ra.id, u.id, '.$allnames.', r.sortorder', 'u.lastname, u.firstname', false, '', '', '', $extrawhere);
                             } 
                             else {
-                                $courseteachers = get_role_users($teacherroles, $context, has_capability('moodle/course:reviewotherusers', $context), 'ra.id, u.id, u.lastname, u.firstname, r.sortorder', 'u.lastname, u.firstname');
+                                $courseteachers = get_role_users($teacherroles, $context, has_capability('moodle/course:reviewotherusers', $context), 'ra.id, u.id, '.$allnames.', r.sortorder', 'u.lastname, u.firstname');
                             }
                         }
                         // Should not happen
                         else {
-                            $courseteachers = get_role_users($teacherroles, $context, true, 'ra.id, u.id, u.lastname, u.firstname, r.sortorder', 'u.lastname, u.firstname');
+                            $courseteachers = get_role_users($teacherroles, $context, true, 'ra.id, u.id, '.$allnames.', r.sortorder', 'u.lastname, u.firstname');
                         }
                     }
                     else {

version.php

@@ -25,7 +25,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'block_course_overview_campus';
-$plugin->version = 2016071900;
-$plugin->release = 'v3.1-r1';
+$plugin->version = 2016110700;
+$plugin->release = 'v3.1-r2';
 $plugin->requires = 2016052300;
 $plugin->maturity = MATURITY_STABLE;