Merge pull request #65 from integral-learning/dev

Release v1.6.2
integral-learning · Nov 9, 2023 · d4b8bdf · d4b8bdf
2 parents 154057b + 279b206
commit d4b8bdf
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,11 @@
 # MumieTask - Changelog
 
 All important changes to this plugin will be documented in this file.
+## [v1.6.2] - 2023-11-09
+### Fixed
+- Grade synchronisation bug fixed
+- Support php:7.4
+
 ## [v1.6.1] - 2023-10-31
 ### Added
 - The language is sent with the worksheet during the note synchronization request.

diff --git a/classes/grades/synchronization/context/context_provider.php b/classes/grades/synchronization/context/context_provider.php
@@ -57,7 +57,7 @@ public static function get_context(array $mumietasks, array $users): context {
      * @return bool
      */
     public static function requires_context(stdClass $mumie): bool {
-        return str_starts_with($mumie->taskurl, "worksheet_")
+        return (substr( $mumie->taskurl, 0, 10 ) === "worksheet_")
             && $mumie->duedate > 0;
     }
 

diff --git a/classes/grades/synchronization/xapi_request.php b/classes/grades/synchronization/xapi_request.php
@@ -75,16 +75,18 @@ private function has_error(array $response): bool {
      * @return mixed curl handle for json payload
      */
     public function create_post_curl_request() {
+        $postfields = json_encode($this->payload);
         $ch = curl_init($this->server->get_grade_sync_url());
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
-        curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($this->payload));
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $postfields);
+        curl_setopt($ch, CURLOPT_USERAGENT, "My User Agent Name");
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt(
             $ch,
             CURLOPT_HTTPHEADER,
             array(
                 'Content-Type: application/json',
-                'Content-Length: ' . strlen(json_encode($this->payload)),
+                'Content-Length: ' . strlen($postfields),
                 "X-API-Key: " . get_config('auth_mumie', 'mumie_api_key'),
             )
         );

diff --git a/gradesync.php b/gradesync.php
@@ -189,7 +189,8 @@ public static function get_all_grades_for_user(stdClass $mumie, int $userid) : ?
      */
     private static function xapi_to_moodle_grade($xapigrade) : stdClass {
         $grade = new stdClass();
-        $grade->userid = self::get_mumie_user_from_sync_id($xapigrade->actor->account->name)->get_moodle_id();
+        $syncid = self::get_mumie_user_from_sync_id($xapigrade->actor->account->name);
+        $grade->userid = $syncid->get_moodle_id();
         $grade->rawgrade = 100 * $xapigrade->result->score->raw;
         $grade->timecreated = strtotime($xapigrade->timestamp);
         return $grade;

diff --git a/version.php b/version.php
@@ -25,11 +25,11 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version = 2023103100; // The current module version (Date: YYYYMMDDXX).
+$plugin->version = 2023110900; // The current module version (Date: YYYYMMDDXX).
 $plugin->component = 'mod_mumie'; // Full name of the plugin (used for diagnostics).
 $plugin->requires = 2022041900;
-$plugin->release = "v1.6.1";
+$plugin->release = "v1.6.2";
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'auth_mumie' => 2023103100,
+    'auth_mumie' => 2023110900,
 );