Merge branch 'master' into update/m40

Laur0r · web-flow · commit 6ea153c6b992 · 2022-04-21T14:30:46.000+02:00
diff --git a/backup/moodle2/backup_groupmembers_stepslib.php b/backup/moodle2/backup_groupmembers_stepslib.php
@@ -22,8 +22,6 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Define the complete groupmembers structure for backup, with file and id annotations
  */
diff --git a/classes/event/course_module_instance_list_viewed.php b/classes/event/course_module_instance_list_viewed.php
@@ -24,7 +24,6 @@
  */
 
 namespace mod_groupmembers\event;
-defined('MOODLE_INTERNAL') || die();
 
 /**
  * The mod_groupmembers course module viewed event class.
diff --git a/classes/event/course_module_viewed.php b/classes/event/course_module_viewed.php
@@ -24,7 +24,6 @@
  */
 
 namespace mod_groupmembers\event;
-defined('MOODLE_INTERNAL') || die();
 
 /**
  * The mod_groupmembers course module viewed event class.
diff --git a/classes/groups.php b/classes/groups.php
@@ -24,7 +24,6 @@
  */
 
 namespace mod_groupmembers;
-defined('MOODLE_INTERNAL') || die();
 
 /**
  * Static methods for collecting relevant groups and members
diff --git a/classes/privacy/provider.php b/classes/privacy/provider.php
@@ -24,8 +24,6 @@
 
 namespace mod_groupmembers\privacy;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Privacy Subsystem for mod_groupmembers implementing null_provider.
  *
diff --git a/db/install.xml b/db/install.xml
@@ -14,6 +14,9 @@
         <FIELD NAME="listgroupingid" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
         <FIELD NAME="showgroups" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
         <FIELD NAME="showemail" TYPE="int" LENGTH="1" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
+        <FIELD NAME="showphone" TYPE="int" LENGTH="1" NOTNULL="false" DEFAULT="0" SEQUENCE="false"/>
+        <FIELD NAME="showdeptinst" TYPE="int" LENGTH="1" NOTNULL="false" DEFAULT="0" SEQUENCE="false"/>
+        <FIELD NAME="showdesc" TYPE="int" LENGTH="1" NOTNULL="false" DEFAULT="0" SEQUENCE="false"/>
         <FIELD NAME="timemodified" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
       </FIELDS>
       <KEYS>
diff --git a/db/upgrade.php b/db/upgrade.php
@@ -31,5 +31,38 @@
  * @return bool
  */
 function xmldb_groupmembers_upgrade($oldversion) {
+    global $DB;
+
+    $dbman = $DB->get_manager(); // Loads ddl manager and xmldb classes.
+    $table = new xmldb_table('groupmembers');
+
+    if ($oldversion < 2022042100) {
+        // Define field showphone to be added to groupmembers.
+        $field = new xmldb_field('showphone', XMLDB_TYPE_INTEGER, '1', null, null, null, '0', 'showemail');
+
+        // Conditionally launch add field option_mute_upon_entry.
+        if (!$dbman->field_exists($table, $field)) {
+            $dbman->add_field($table, $field);
+        }
+
+        // Define field showdeptinst to be added to groupmembers.
+        $field = new xmldb_field('showdeptinst', XMLDB_TYPE_INTEGER, '1', null, null, null, '0', 'showphone');
+
+        // Conditionally launch add field option_mute_upon_entry.
+        if (!$dbman->field_exists($table, $field)) {
+            $dbman->add_field($table, $field);
+        }
+
+        // Define field showdesc to be added to groupmembers.
+        $field = new xmldb_field('showdesc', XMLDB_TYPE_INTEGER, '1', null, null, null, '0', 'showdeptinst');
+
+        // Conditionally launch add field option_mute_upon_entry.
+        if (!$dbman->field_exists($table, $field)) {
+            $dbman->add_field($table, $field);
+        }
+        upgrade_mod_savepoint(true, 2022042100, 'groupmembers');
+
+    }
+
     return true;
 }
diff --git a/lang/de/groupmembers.php b/lang/de/groupmembers.php
@@ -35,21 +35,43 @@
 $string['listgrouping'] = 'Gruppierung';
 $string['setting_adminsettingsheading'] = 'Einstellungen';
 $string['setting_defaultsheading'] = 'Standardmäßige Voreinstellungen';
+$string['setting_showdeptinstdefault'] = 'Abteilungen und Institutionen anzeigen';
+$string['setting_showdeptinstdefault_desc'] = 'Mit dieser Einstellung kontrollieren Sie die Voreinstellung von "Abteilungen und Institutionen anzeigen" innerhalb einer Aktivität.<br />Diese Einstellung wird nur berücksichtigt, wenn die Einstellung "E-Mail-Adressen anzeigen aktivieren" auch aktiviert ist.';
+$string['setting_showdeptinstenable'] = 'Abteilungen und Institutionen anzeigen aktivieren';
+$string['setting_showdeptinstenable_desc'] = 'Mit dieser Einstellung kontrollieren Sie ob die Anzeige von Abteilungen und Institutionen innerhalb einer Aktivität möglich ist oder nicht.';
+$string['setting_showdescdefault'] = 'Beschreibungen anzeigen';
+$string['setting_showdescdefault_desc'] = 'Mit dieser Einstellung kontrollieren Sie die Voreinstellung von "Beschreibungen anzeigen" innerhalb einer Aktivität.<br />Diese Einstellung wird nur berücksichtigt, wenn die Einstellung "E-Mail-Adressen anzeigen aktivieren" auch aktiviert ist.';
+$string['setting_showdescenable'] = 'Beschreibungen anzeigen aktivieren';
+$string['setting_showdescenable_desc'] = 'Mit dieser Einstellung kontrollieren Sie ob die Anzeige von Beschreibungen innerhalb einer Aktivität möglich ist oder nicht.';
 $string['setting_showemaildefault'] = 'E-Mail-Adressen anzeigen';
 $string['setting_showemaildefault_desc'] = 'Mit dieser Einstellung kontrollieren Sie die Voreinstellung von "E-Mail-Adressen anzeigen" innerhalb einer Aktivität.<br />Diese Einstellung wird nur berücksichtigt, wenn die Einstellung "E-Mail-Adressen anzeigen aktivieren" auch aktiviert ist.';
 $string['setting_showemailenable'] = 'E-Mail-Adressen anzeigen aktivieren';
 $string['setting_showemailenable_desc'] = 'Mit dieser Einstellung kontrollieren Sie ob die Anzeige von E-Mail-Adressen innerhalb einer Aktivität möglich ist oder nicht.';
+$string['setting_showphonedefault'] = 'Telefonnummern anzeigen';
+$string['setting_showphonedefault_desc'] = 'Mit dieser Einstellung kontrollieren Sie die Voreinstellung von "Telefonnummern anzeigen" innerhalb einer Aktivität.<br />Diese Einstellung wird nur berücksichtigt, wenn die Einstellung "E-Mail-Adressen anzeigen aktivieren" auch aktiviert ist.';
+$string['setting_showphoneenable'] = 'ETelefonnummern anzeigen aktivieren';
+$string['setting_showphoneenable_desc'] = 'Mit dieser Einstellung kontrollieren Sie ob die Anzeige von Telefonnummern innerhalb einer Aktivität möglich ist oder nicht.';
 $string['setting_showgroupsdefault'] = 'Anzuzeigende Gruppen';
 $string['setting_showgroupsdefault_desc'] = 'Mit dieser Einstellung kontrollieren Sie die Voreinstellung von "Anzuzeigende Gruppen" innerhalb einer Aktivität.';
 $string['showgroups'] = 'Anzuzeigende Gruppen';
 $string['showgroups:all'] = 'Alle Gruppen der Gruppierung';
 $string['showgroups:own'] = 'Nur die eigene Gruppe';
+$string['showdeptinst'] = 'Abteilungen und Institutionen anzeigen';
+$string['showdesc'] = 'Beschreibungen anzeigen';
 $string['showemail'] = 'E-Mail-Adressen anzeigen';
 $string['showemail:no'] = 'Nein, nur interne Nachrichten';
 $string['showemail:owngroup'] = 'Für die eigene Gruppe anzeigen';
 $string['showemail:allgroups'] = 'Für alle Gruppen anzeigen';
+$string['showfield:no'] = 'Nein';
+$string['showfield:owngroup'] = 'Für die eigene Gruppe anzeigen';
+$string['showfield:allgroups'] = 'Für alle Gruppen anzeigen';
+$string['showphone'] = 'Telefonnummern anzeigen';
 $string['user:fullname'] = 'Vorname / Nachname';
 $string['user:contact'] = 'Kontakt';
+$string['user:deptinst'] = 'Abteilung und Institution';
+$string['user:desc'] = 'Beschreibung';
+$string['user:descsummary'] = 'Beschreibung von {$a}';
+$string['user:phone'] = 'Telefon';
 $string['noowngroupsavailable'] = 'Du bist derzeit keiner Gruppe zugewiesen.';
 $string['nogroupsavailable'] = 'Es sind derzeit keine Gruppen zur Anzeige hinterlegt.';
 $string['mailhidden'] = 'E-Mail-Kontakt deaktiviert';
diff --git a/lang/en/groupmembers.php b/lang/en/groupmembers.php
@@ -35,21 +35,43 @@
 $string['listgrouping'] = 'Grouping';
 $string['setting_adminsettingsheading'] = 'Group Members settings';
 $string['setting_defaultsheading'] = 'Group Members default settings';
+$string['setting_showdeptinstdefault'] = 'Show department and institution';
+$string['setting_showdeptinstdefault_desc'] = 'With this setting, you control the default value of the "Show department and institution" module instance setting.<br />This setting will only be processed, if the "Enable showing department and institution" is enabled.';
+$string['setting_showdeptinstenable'] = 'Enable showing department and institution';
+$string['setting_showdeptinstenable_desc'] = 'With this setting, you control if showing department and institution can be enabled within a module instance or not.';
+$string['setting_showdescdefault'] = 'Show description';
+$string['setting_showdescdefault_desc'] = 'With this setting, you control the default value of the "Show description" module instance setting.<br />This setting will only be processed, if the "Enable showing description" is enabled.';
+$string['setting_showdescenable'] = 'Enable showing description';
+$string['setting_showdescenable_desc'] = 'With this setting, you control if showing description can be enabled within a module instance or not.';
 $string['setting_showemaildefault'] = 'Show e-mail addresses';
 $string['setting_showemaildefault_desc'] = 'With this setting, you control the default value of the "Show e-mail addresses" module instance setting.<br />This setting will only be processed, if the "Enable showing e-mail addresses" is enabled.';
 $string['setting_showemailenable'] = 'Enable showing e-mail addresses';
 $string['setting_showemailenable_desc'] = 'With this setting, you control if showing e-mail addresses can be enabled within a module instance or not.';
+$string['setting_showphonedefault'] = 'Show phone numbers';
+$string['setting_showphonedefault_desc'] = 'With this setting, you control the default value of the "Show phone numbers" module instance setting.<br />This setting will only be processed, if the "Enable showing phone numbers" is enabled.';
+$string['setting_showphoneenable'] = 'Enable showing phone numbers';
+$string['setting_showphoneenable_desc'] = 'With this setting, you control if showing phone numbers can be enabled within a module instance or not.';
 $string['setting_showgroupsdefault'] = 'Show groups';
 $string['setting_showgroupsdefault_desc'] = 'With this setting, you control the default value of the "Show groups" module instance setting.';
 $string['showgroups'] = 'Show groups';
 $string['showgroups:all'] = 'All groups of grouping';
 $string['showgroups:own'] = 'Only own group';
+$string['showdeptinst'] = 'Show department and institution';
+$string['showdesc'] = 'Show description';
 $string['showemail'] = 'Show e-mail addresses';
 $string['showemail:no'] = 'No, only internal messages';
 $string['showemail:owngroup'] = 'Only for own group';
 $string['showemail:allgroups'] = 'For all groups';
+$string['showfield:no'] = 'No';
+$string['showfield:owngroup'] = 'Only for own group';
+$string['showfield:allgroups'] = 'For all groups';
+$string['showphone'] = 'Show phone numbers';
 $string['user:fullname'] = 'First name / Surname';
 $string['user:contact'] = 'Contact';
+$string['user:deptinst'] = 'Department & Institution';
+$string['user:desc'] = 'Description';
+$string['user:descsummary'] = '{$a}\'s Description';
+$string['user:phone'] = 'Phone';
 $string['noowngroupsavailable'] = 'You are currently not assigned to any group.';
 $string['nogroupsavailable'] = 'There are currently no groups to be displayed.';
 $string['mailhidden'] = 'Mail contact disabled';
diff --git a/lib.php b/lib.php
@@ -23,8 +23,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-defined('MOODLE_INTERNAL') || die;
-
 /**
  * Define some constants
  */
@@ -33,6 +31,9 @@
 define('GROUPMEMBERS_SHOWEMAIL_NO', 0);
 define('GROUPMEMBERS_SHOWEMAIL_OWNGROUP', 1);
 define('GROUPMEMBERS_SHOWEMAIL_ALLGROUPS', 2);
+define('GROUPMEMBERS_SHOWFIELD_NO', 0);
+define('GROUPMEMBERS_SHOWFIELD_OWNGROUP', 1);
+define('GROUPMEMBERS_SHOWFIELD_ALLGROUPS', 2);
 
 /**
  * List of features supported in groupmembers module
diff --git a/mod_form.php b/mod_form.php
@@ -98,6 +98,42 @@ protected function definition() {
             $mform->setDefault('showemail', $config->showemaildefault);
         }
 
+        // Phone visibility selector - used to decide whether phone numbers should be shown to other users.
+        if ($config->showphoneenable) {
+            $options = array(
+                GROUPMEMBERS_SHOWFIELD_NO => get_string('showfield:no', 'groupmembers'),
+                GROUPMEMBERS_SHOWFIELD_OWNGROUP => get_string('showfield:owngroup', 'groupmembers'),
+                GROUPMEMBERS_SHOWFIELD_ALLGROUPS => get_string('showfield:allgroups', 'groupmembers'),
+            );
+            $mform->addElement('select', 'showphone', get_string('showphone', 'groupmembers'), $options);
+            $mform->addRule('showphone', null, 'required', null, 'client');
+            $mform->setDefault('showphone', $config->showphonedefault);
+        }
+
+        // Department & Institution visibility selector - used to decide whether dept. and inst. should be shown to other users.
+        if ($config->showdeptinstenable) {
+            $options = array(
+                GROUPMEMBERS_SHOWFIELD_NO => get_string('showfield:no', 'groupmembers'),
+                GROUPMEMBERS_SHOWFIELD_OWNGROUP => get_string('showfield:owngroup', 'groupmembers'),
+                GROUPMEMBERS_SHOWFIELD_ALLGROUPS => get_string('showfield:allgroups', 'groupmembers'),
+            );
+            $mform->addElement('select', 'showdeptinst', get_string('showdeptinst', 'groupmembers'), $options);
+            $mform->addRule('showdeptinst', null, 'required', null, 'client');
+            $mform->setDefault('showdeptinst', $config->showdeptinstdefault);
+        }
+
+        // Department & Institution visibility selector - used to decide whether dept. and inst. should be shown to other users.
+        if ($config->showdescenable) {
+            $options = array(
+                GROUPMEMBERS_SHOWFIELD_NO => get_string('showfield:no', 'groupmembers'),
+                GROUPMEMBERS_SHOWFIELD_OWNGROUP => get_string('showfield:owngroup', 'groupmembers'),
+                GROUPMEMBERS_SHOWFIELD_ALLGROUPS => get_string('showfield:allgroups', 'groupmembers'),
+            );
+            $mform->addElement('select', 'showdesc', get_string('showdesc', 'groupmembers'), $options);
+            $mform->addRule('showdesc', null, 'required', null, 'client');
+            $mform->setDefault('showdesc', $config->showdescdefault);
+        }
+
         // -------------------------------------------------------------------------------
         $this->standard_coursemodule_elements();
         // -------------------------------------------------------------------------------
diff --git a/renderer.php b/renderer.php
@@ -44,11 +44,22 @@ class mod_groupmembers_renderer extends plugin_renderer_base {
      * @param bool $showemail Setting whether email addresses should be suppressed
      * @return string Rendered template
      */
-    public function render_allgroups(array $groups, $showemail) {
+    public function render_allgroups(array $groups, $showemail, $showphone, $showdeptinst, $showdesc) {
         global $USER, $COURSE, $CFG;
 
         $config = get_config('mod_groupmembers');
 
+        // If fields have been disabled in admin settings, override local settings.
+        if (!$config->showphoneenable) {
+            $showphone = GROUPMEMBERS_SHOWFIELD_NO;
+        }
+        if (!$config->showdeptinstenable) {
+            $showdeptinst = GROUPMEMBERS_SHOWFIELD_NO;
+        }
+        if (!$config->showdescenable) {
+            $showdesc = GROUPMEMBERS_SHOWFIELD_NO;
+        }
+
         $data = array(
             'groups' => []
         );
@@ -59,6 +70,22 @@ public function render_allgroups(array $groups, $showemail) {
                 $memberemailtext = null;
                 $memberemailhidden = false;
                 $membermessage = null;
+                $memberphone = null;
+                $memberdeptinst = null;
+                $memberdesc = null;
+                $membersummary = null;
+
+                // Hide additional fields if user is not allowed to view this group.
+                if ($showphone == GROUPMEMBERS_SHOWFIELD_OWNGROUP && !$group['ismember']) {
+                    $showphone == GROUPMEMBERS_SHOWFIELD_NO;
+                }
+                if ($showdeptinst == GROUPMEMBERS_SHOWFIELD_OWNGROUP && !$group['ismember']) {
+                    $showdeptinst == GROUPMEMBERS_SHOWFIELD_NO;
+                }
+                if ($showdesc == GROUPMEMBERS_SHOWFIELD_OWNGROUP && !$group['ismember']) {
+                    $showdesc == GROUPMEMBERS_SHOWFIELD_NO;
+                }
+
                 if ($USER->id != $member->id) {
                     if (!$config->showemailenable) {
                         // Admin has decided that e-mail addresses should not be shown in this module.
@@ -78,6 +105,20 @@ public function render_allgroups(array $groups, $showemail) {
                         has_capability('moodle/site:sendmessage', \context_system::instance())) {
                         $membermessage = new moodle_url('/message/index.php', ['id' => $member->id]);
                     }
+
+                    // Get data for additional fields if not hidden.
+                    if ($showphone > 0) {
+                        $memberphone = implode(', ', array_filter(array($member->phone1, $member->phone2)));
+                    }
+                    if ($showdeptinst > 0) {
+                        $memberdeptinst = implode(', ', array_filter(array($member->department, $member->institution)));
+                    }
+                    if ($showdesc > 0 && $member->description) {
+                        $memberdesc = $member->description;
+                        if (count_words($member->description) > 50) {
+                            $membersummary = get_string('user:descsummary', 'mod_groupmembers', $member->firstname);
+                        }
+                    }
                 }
 
                 $members[] = array(
@@ -88,15 +129,22 @@ public function render_allgroups(array $groups, $showemail) {
                     'mailtext' => $memberemailtext,
                     'mailhidden' => $memberemailhidden,
                     'profileurl' => new moodle_url('/user/view.php', ['id' => $member->id, 'course' => $COURSE->id]),
-                    'messageurl' => $membermessage
+                    'messageurl' => $membermessage,
+                    'memberphone' => $memberphone,
+                    'memberdeptinst' => $memberdeptinst,
+                    'memberdesc' => $memberdesc,
+                    'membersummary' => $membersummary
                 );
             }
 
             $data['groups'][] = array(
                 'id' => $group['group']->id,
                 'name' => $group['group']->name,
                 'members' => $members,
-                'ismember' => $group['ismember']
+                'ismember' => $group['ismember'],
+                'showphone' => $showphone,
+                'showdeptinst' => $showdeptinst,
+                'showdesc' => $showdesc
             );
         }
         return $this->render_from_template('mod_groupmembers/allgroups', $data);
diff --git a/settings.php b/settings.php
diff --git a/templates/allgroups.mustache b/templates/allgroups.mustache
diff --git a/version.php b/version.php
diff --git a/view.php b/view.php

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,6 @@`
`24`	`24`
`25`	`25`	`namespace mod_groupmembers\privacy;`
`26`	`26`
`27`		`-defined('MOODLE_INTERNAL') \|\| die();`
`28`		`-`
`29`	`27`	`/**`
`30`	`28`	`* Privacy Subsystem for mod_groupmembers implementing null_provider.`
`31`	`29`	`*`