Update #86c3a0wce - Patch 4.5.4

Author: ldesignmedia-jan-choros

group/index.php

@@ -63,6 +63,16 @@
 $PAGE->requires->js('/group/clientlib.js', true);
 $PAGE->requires->js('/group/module.js', true);
 
+// START BSL TWEAK - Handle additional user types
+// Copyright (C) 2024 Springer Media B.V. - All Rights Reserved.
+$isadmin = has_capability('block/dshop:admin', context_system::instance(), $USER);
+$students = [];
+if (!$isadmin) {
+    $duser = Dshop_User::getInstance();
+    $students = $duser->getMyStudents();
+}
+// END BSL TWEAK.
+
 // Check for multiple/no group errors.
 if (!$singlegroup) {
     switch($action) {
@@ -98,6 +108,12 @@
                 $shortroledata->name = html_entity_decode($roledata->name, ENT_QUOTES, 'UTF-8');
                 $shortroledata->users = array();
                 foreach ($roledata->users as $member) {
+                    // START BSL TWEAK - Handle additional user types
+                    // Copyright (C) 2024 Springer Media B.V. - All Rights Reserved.
+                    if (!isset($students[$member->id]) && !$isadmin) {
+                        continue;
+                    }
+                    // END BSL TWEAK.
                     $shortmember = new stdClass();
                     $shortmember->id = $member->id;
                     $shortmember->name = fullname($member, $viewfullnames);

lib/db/install.xml

@@ -912,6 +912,10 @@
         <FIELD NAME="middlename" TYPE="char" LENGTH="255" NOTNULL="false" SEQUENCE="false" COMMENT="Middle name"/>
         <FIELD NAME="alternatename" TYPE="char" LENGTH="255" NOTNULL="false" SEQUENCE="false" COMMENT="Alternate name - Useful for three-name countries."/>
         <FIELD NAME="moodlenetprofile" TYPE="char" LENGTH="255" NOTNULL="false" SEQUENCE="false" COMMENT="Moodle.net profile information"/>
+        <!-- TWEAK START LDESIGN. -->
+        <FIELD NAME="site_id" TYPE="int" LENGTH="10" NOTNULL="false" DEFAULT="0" SEQUENCE="false"/>
+        <FIELD NAME="gdpr" TYPE="text" NOTNULL="false" SEQUENCE="false"/>
+        <!-- TWEAK END LDESIGN. -->
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id"/>

lib/moodlelib.php

@@ -6150,8 +6150,10 @@ function send_password_change_confirmation_email($user, $resetrecord) {
     $subject = get_string('emailresetconfirmationsubject', '', format_string($site->fullname));
 
     // Directly email rather than using the messaging system to ensure its not routed to a popup or jabber.
-    return email_to_user($user, $supportuser, $subject, $message);
-
+    // START BSL TWEAK - Use custom mailer instead. It is impossible to change settings of core one.
+    // Copyright (C) 2024 Springer Media B.V. - All Rights Reserved.
+    return \block_dshop\helper::email_to_user($user, $supportuser, $subject, html_to_text($message), $message);
+    // END BSL TWEAK.
 }
 
 /**

login/signup.php

@@ -25,6 +25,10 @@
  */
 
 require('../config.php');
+// START BSL TWEAK - Custom sing up page handling.
+// Copyright (C) 2024 Springer Media B.V. - All Rights Reserved.
+redirect(new moodle_url('/blocks/dshop/register'));
+// END BSL TWEAK.
 require_once($CFG->dirroot . '/user/editlib.php');
 require_once($CFG->libdir . '/authlib.php');
 require_once('lib.php');

mod/assign/locallib.php

@@ -1489,7 +1489,10 @@ public function update_calendar($coursemoduleid) {
         }
 
         $eventtype = ASSIGN_EVENT_TYPE_GRADINGDUE;
-        if ($instance->gradingduedate) {
+        // START BSL TWEAK - Fix for additional user types.
+        // Copyright (C) 2024 Springer Media B.V. - All Rights Reserved.
+        if (!empty($instance->gradingduedate)) {
+        // END BSL TWEAK.
             $event->name = get_string('calendargradingdue', 'assign', $instance->name);
             $event->eventtype = $eventtype;
             $event->timestart = $instance->gradingduedate;
@@ -6601,23 +6604,22 @@ public static function send_assignment_notification($userfrom,
         $eventdata->notification    = 1;
         $eventdata->contexturl      = $info->url;
         $eventdata->contexturlname  = $info->assignment;
-        $customdata = [
-            'cmid' => $coursemodule->id,
-            'instance' => $coursemodule->instance,
-            'messagetype' => $messagetype,
-            'blindmarking' => $blindmarking,
-            'uniqueidforuser' => $uniqueidforuser,
-        ];
-        // Check if the userfrom is real and visible.
-        if (!empty($userfrom->id) && core_user::is_real_user($userfrom->id)) {
-            $userpicture = new user_picture($userfrom);
-            $userpicture->size = 1; // Use f1 size.
-            $userpicture->includetoken = $userto->id; // Generate an out-of-session token for the user receiving the message.
-            $customdata['notificationiconurl'] = $userpicture->get_url($PAGE)->out(false);
+        // START BSL TWEAK - Dshop email handling.
+        // Copyright (C) 2024 Springer Media B.V. - All Rights Reserved.
+        if (has_capability("mod/assign:receivegradernotifications", $context, $userto)) {
+            // Check if user want to get notifications.
+            $userto->mail_preference = Dshop_Userhelper::getEmailPreference($userto->id, 'assign');
+            \block_dshop\helper::email_to_user($userto, $userfrom, $postsubject, $posttext, $posthtml);
+            return;
         }
-        $eventdata->customdata = $customdata;
 
-        message_send($eventdata);
+        require_once($CFG->dirroot . '/blocks/dshop/class/Helper.php');
+        $customer = Dshop_Helper::getMyCustomer($userfrom->id, $coursemodule->course);
+        if ($customer) {
+            $customer->mail_preference = Dshop_Userhelper::getEmailPreference($customer->id, 'assign');
+            \block_dshop\helper::email_to_user($customer, $userfrom, $postsubject, $posttext, $posthtml);
+        }
+        // END BSL TWEAK.
     }
 
     /**

mod/assign/mod_form.php

@@ -248,6 +248,10 @@ public function definition() {
         $this->apply_admin_defaults();
 
         $this->add_action_buttons();
+        // START BSL TWEAK - Load dentallect defaults
+        // Copyright (C) 2024 Springer Media B.V. - All Rights Reserved.
+        $this->set_dentallect_defaults();
+        // END BSL TWEAK.
     }
 
     /**
@@ -406,4 +410,17 @@ public function apply_admin_defaults($datetimeoffsets = []): void {
             }
         }
     }
+    // START BSL TWEAK - Load dentallect defaults
+    // Copyright (C) 2024 Springer Media B.V. - All Rights Reserved.
+    public function set_dentallect_defaults() {
+        $mform =& $this->_form;
+        $mform->setDefault('requiresubmissionstatement', '1');
+        $mform->setDefault('attemptreopenmethod', 'untilpass');
+        $mform->setDefault('grade[modgrade_type]', 'scale');
+        $mform->setDefault('grade[modgrade_scale]', '4');
+        $mform->setDefault('gradepass', '2');
+        $mform->setDefault('completion', '2');
+        $mform->setDefault('completionusegrade', '1');
+    }
+    // END BSL TWEAK.
 }

mod/assign/submission_form.php

@@ -44,6 +44,31 @@ public function definition() {
         global $USER;
         $mform = $this->_form;
         list($assign, $data) = $this->_customdata;
+        // START BSL TWEAK - Dshop handling of submission forms
+        // Copyright (C) 2024 Springer Media B.V. - All Rights Reserved.
+        global $DB;
+        $currentinstanceid = (int)$assign->get_instance()->id;
+        $sql = "SELECT *
+                FROM {dshop_assign}
+                WHERE :assignid = ANY (string_to_array(assign_ids, ',')::int[])";
+        $params = ['assignid' => $currentinstanceid];
+        $results = $DB->get_records_sql($sql, $params);
+        foreach ($results as $result) {
+            $assigns = explode(',', $result->assign_ids) ?? [];
+            foreach ($assigns as $assignid) {
+                if ($currentinstanceid === $assignid) {
+                    continue;
+                }
+                if (\block_dshop\assign\assign::has_activity_completion($assignid, $USER->id) == false) {
+                    continue;
+                }
+
+                $mform->addElement('static', 'error', '',
+                    html_writer::div('Waarschuwing! Je hebt deze opdracht reeds ingediend. Door deze opnieuw in te dienen wordt je eerder ingediende opdracht, inclusief beoordeling, gewist op alle plaatsen.', 'alert alert-danger'));
+                break;
+            }
+        }
+        // END BSL TWEAK.
         $instance = $assign->get_instance();
         if ($instance->teamsubmission) {
             $submission = $assign->get_group_submission($data->userid, 0, true);

mod/feedback/analysis.php

@@ -64,6 +64,11 @@
 $mygroupid = groups_get_activity_group($cm, true);
 groups_print_activity_menu($cm, $url);
 
+// START BSL TWEAK - Fix for filtering analysis
+// Copyright (C) 2024 Springer Media B.V. - All Rights Reserved.
+$filtering = new \mod_feedback\form\filter_analysis($PAGE->url);
+echo '<hr>' . $filtering->render();
+// END BSL TWEAK.
 // Button "Export to excel".
 if (has_capability('mod/feedback:viewreports', $context) && $feedbackstructure->get_items()) {
     echo $OUTPUT->container_start('form-buttons');
@@ -93,7 +98,10 @@
     foreach ($items as $item) {
         $itemobj = feedback_get_item_class($item->typ);
         $printnr = ($feedback->autonumbering && $item->itemnr) ? ($item->itemnr . '.') : '';
-        $itemobj->print_analysed($item, $printnr, $mygroupid);
+        // START BSL TWEAK - Include additional parameters for analysis
+        // Copyright (C) 2024 Springer Media B.V. - All Rights Reserved.
+        $itemobj->print_analysed($item, $printnr, $mygroupid, false, $filtering->get_data());
+        // END BSL TWEAK.
     }
 } else {
     echo $OUTPUT->heading_with_help(get_string('insufficient_responses_for_this_group', 'feedback'),

mod/feedback/analysis_to_excel.php

@@ -28,7 +28,12 @@
 
 $id = required_param('id', PARAM_INT); // Course module id.
 $courseid = optional_param('courseid', '0', PARAM_INT);
-
+// START BSL TWEAK - Handle additional analysis parameters
+// Copyright (C) 2024 Springer Media B.V. - All Rights Reserved.
+$from = optional_param('from' , 0 , PARAM_INT);
+$till = optional_param('till' , time(), PARAM_INT);
+$formdata = (object)['from' => $from, 'till' => $till];
+// END BSL TWEAK.
 $url = new moodle_url('/mod/feedback/analysis_to_excel.php', array('id' => $id));
 if ($courseid) {
     $url->param('courseid', $courseid);
@@ -79,6 +84,11 @@
 $rowoffset1 = 0;
 $worksheet1->write_string($rowoffset1, 0, userdate(time()), $xlsformats->head1);
 
+// START BSL TWEAK - Handle additional analysis parameters
+// Copyright (C) 2024 Springer Media B.V. - All Rights Reserved.
+$completedscount = $feedbackstructure->count_completed_responses($mygroupid , $formdata);
+// END BSL TWEAK.
+
 // Get the completeds.
 $completedscount = $feedbackstructure->count_completed_responses($mygroupid);
 // Write the count of completeds.
@@ -109,7 +119,11 @@
         $xlsformats,
         $item,
         $mygroupid,
-        $courseid);
+        $courseid,
+        // START BSL TWEAK - Handle additional analysis parameters
+        // Copyright (C) 2024 Springer Media B.V. - All Rights Reserved.
+        $formdata);
+        // END BSL TWEAK.
 }
 
 $workbook->close();

mod/feedback/classes/form/filter_analysis.php

@@ -0,0 +1,57 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ *
+ *
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ *
+ * @package   moodlefreak_dentallect
+ * @copyright 04/08/2021 Mfreak.nl | LdesignMedia.nl - Luuk Verhoeven
+ * @author    Luuk Verhoeven
+ **/
+
+namespace mod_feedback\form;
+
+use moodleform;
+
+defined('MOODLE_INTERNAL') || die;
+
+/**
+ * Filter filter_analysis
+ *
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ *
+ * @package   moodlefreak_dentallect
+ * @copyright 04/08/2021 Mfreak.nl | LdesignMedia.nl - Luuk Verhoeven
+ * @author    Luuk Verhoeven
+ */
+class filter_analysis extends moodleform {
+
+    /**
+     * Form definition. Abstract method - always override!
+     */
+    protected function definition() {
+        $mform = &$this->_form;
+
+        $mform->addElement('date_time_selector', 'from', get_string('form:from', 'feedback'));
+        $mform->setDefault('from', strtotime('-10 years'));
+
+        $mform->addElement('date_time_selector', 'till', get_string('form:till', 'feedback'));
+
+        $this->add_action_buttons(false, get_string('btn:filter', 'feedback'));
+    }
+}