fixed issues with php 8 compat

justinhunt · Dec 9, 2021 · 7e9c559 · 7e9c559
1 parent c2d0aac
commit 7e9c559
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,8 @@
 Change List
 =========
+Version 3.1.50 (Build 2021120900)
+- Fixed issues causing errors in php 8 on poodlltools
+
 Version 3.1.49 (Build 2021082700)
 - Fixed issue with mimetype and extension on whiteboard drawings
 

diff --git a/classes/awsremote.php b/classes/awsremote.php
@@ -257,7 +257,7 @@ function s3_put_filedata($mediatype, $key, $filepath) {
     }
 
     //called from poodlltools->getAMDRecordercode. Has matching function in awstools
-    function get_presignedupload_url($mediatype, $minutes = 30, $key, $iosvideo = false) {
+    function get_presignedupload_url($mediatype, $minutes, $key, $iosvideo = false) {
         $params = Array();
         $params['region'] = $this->region;
         $params['mediatype'] = $mediatype;

diff --git a/classes/poodlltools.php b/classes/poodlltools.php
@@ -193,13 +193,13 @@ public static function fetch_placeholder_duration($mediatype) {
     }
 
     //this is just a temporary function, until the PoodLL filter client plugins are upgraded to not use simpleaudioplayer
-    public static function fetchSimpleAudioPlayer($param1 = 'auto', $url, $param3 = 'http', $param4 = 'width', $param5 = 'height') {
+    public static function fetchSimpleAudioPlayer($param1 = 'auto', $url="", $param3 = 'http', $param4 = 'width', $param5 = 'height') {
         $html_snippet = \html_writer::tag('a', 'audiofile.mp3', array('href' => $url));
         return format_text($html_snippet);
     }
 
     //this is just a temporary function, until the PoodLL filter client plugins are upgraded to not use simpleaudioplayer
-    public static function fetchSimpleVideoPlayer($param1 = 'auto', $url, $param3 = 'http', $param4 = 'width', $param5 = 'height') {
+    public static function fetchSimpleVideoPlayer($param1 = 'auto', $url="", $param3 = 'http', $param4 = 'width', $param5 = 'height') {
         $html_snippet = \html_writer::tag('a', 'videofile.mp4', array('href' => $url));
         return format_text($html_snippet);
     }
@@ -1301,29 +1301,29 @@ public static function convert_with_ffmpeg($filerecord, $tempfilename, $convfile
     }//end of convert with FFMPEG
 
     //This a legacy call from client plugins, that ais mapped to amd recorder code
-    public static function fetchAudioRecorderForSubmission($runtime, $assigname, $updatecontrol = "saveflvvoice", $contextid,
+    public static function fetchAudioRecorderForSubmission($runtime, $assigname, $updatecontrol, $contextid,
             $component, $filearea, $itemid, $timelimit = "0", $callbackjs = false, $hints = []) {
         return self::fetchAMDRecorderCode('audio', $updatecontrol, $contextid, $component, $filearea, $itemid, $timelimit,
                 $callbackjs, $hints);
     }
 
     //This a legacy call from client plugins, that ais mapped to amd recorder code
-    public static function fetchVideoRecorderForSubmission($runtime, $assigname, $updatecontrol = "saveflvvoice", $contextid,
+    public static function fetchVideoRecorderForSubmission($runtime, $assigname, $updatecontrol, $contextid,
             $component, $filearea, $itemid, $timelimit = "0", $callbackjs = false, $hints = []) {
         return self::fetchAMDRecorderCode('video', $updatecontrol, $contextid, $component, $filearea, $itemid, $timelimit,
                 $callbackjs, $hints);
     }
 
     //This a legacy call from client plugins, that ais mapped to amd recorder code
-    public static function fetchHTML5SnapshotCamera($updatecontrol = "saveflvvoice", $width, $height, $contextid, $component,
+    public static function fetchHTML5SnapshotCamera($updatecontrol, $width, $height, $contextid, $component,
             $filearea, $itemid, $callbackjs = false, $hints = []) {
         $mediatype = "snapshot";
         return self::fetchAMDRecorderCode($mediatype, $updatecontrol, $contextid, $component, $filearea, $itemid, 0, $callbackjs,
                 $hints);
     }
 
     //This a legacy call from client plugins, that ais mapped to amd recorder code
-    public static function fetch_HTML5RecorderForSubmission($updatecontrol = "saveflvvoice", $contextid, $component, $filearea,
+    public static function fetch_HTML5RecorderForSubmission($updatecontrol, $contextid, $component, $filearea,
             $itemid, $mediatype = "image", $fromrepo = false, $callbackjs = false, $hints = []) {
         return self::fetchAMDRecorderCode($mediatype, $updatecontrol, $contextid, $component, $filearea, $itemid, 0, $callbackjs,
                 $hints);

diff --git a/presets/textblockreader.txt b/presets/textblockreader.txt
diff --git a/version.php b/version.php
@@ -25,9 +25,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2021082700;
+$plugin->version = 2021120900;
 $plugin->requires = 2016052300;//moodle 3.1.0
 $plugin->component = 'filter_poodll';
 $plugin->maturity = MATURITY_STABLE;
-$plugin->release = '3.1.49 (Build 2021082700)';
+$plugin->release = '3.1.50 (Build 2021120900)';