fixed #34 where upgrade from pre 2019 versions to current version wou…

…ld pass through an upgrade step which broke the upgrade

CHANGES.txt

@@ -1,5 +1,8 @@
 Change List
 =========
+Version 3.1.35 (Build 2020062400)
+- Removed references to AWS SDK in old upgrade code. Since its not used in latest version
+
 Version 3.1.34 (Build 2020061400)
 -fixed issue where cloudpoodlltoken not properly fetched when useing widget/players
 

db/upgrade.php

@@ -74,6 +74,8 @@ function xmldb_filter_poodll_upgrade($oldversion) {
             $currentskin = $CFG->filter_poodll_html5recorder_skinstyle_video;
             set_config('skinstylevideo', $currentskin, 'filter_poodll');
         }
+        //  savepoint reached
+        upgrade_plugin_savepoint(true, 2017082601, 'filter', 'poodll');
     }
     if ($oldversion < 2017092402) {
         if (property_exists($CFG, 'filter_poodll_recorderorder_audio')) {
@@ -82,27 +84,8 @@ function xmldb_filter_poodll_upgrade($oldversion) {
             $currentvideo = $CFG->filter_poodll_recorderorder_video;
             set_config('filter_poodll_recorderorder_video', str_replace('mobile,media,', 'media,mobile,', $currentvideo));
         }
-    }
-
-    if ($oldversion < 2018041002 && version_compare(phpversion(), '5.5.0', '>=')) {
-        if (property_exists($CFG, 'filter_poodll_aws_sdk')) {
-            set_config('filter_poodll_aws_sdk', '3.x');
-        }
-    }
-
-    if ($oldversion < 2018120500) {
-        if (property_exists($CFG, 'filter_poodll_aws_sdk')) {
-            $currentvalue = get_config('filter_poodll_aws_sdk');
-            switch ($currentvalue) {
-                case constants::AWS_NONE:
-                case constants::AWS_V2:
-                    //lets just leave it like that.
-                    //they probably had a reason for this
-                    break;
-                default:
-                    set_config('filter_poodll_aws_sdk', constants::AWS_AUTO);
-            }
-        }
+        //  savepoint reached
+        upgrade_plugin_savepoint(true, 2017092402, 'filter', 'poodll');
     }
 
     return true;

thirdpartylibs.xml

@@ -1,19 +1,5 @@
 <?xml version="1.0"?>
 <libraries>
-    <library>
-        <location>3rdparty/aws-v3</location>
-        <name>AWS SDK for PHP</name>
-        <version>Version 3</version>
-        <license>Apache</license>
-        <licenseversion>2.0</licenseversion>
-    </library>
-    <library>
-        <location>3rdparty/aws-v2</location>
-        <name>AWS SDK for PHP</name>
-        <version>Version 2</version>
-        <license>Apache</license>
-        <licenseversion>2.0</licenseversion>
-    </library>
     <library>
         <location>3rdparty/flowplayer-6.0.5</location>
         <name>Flowplayer media player</name>

version.php

@@ -25,9 +25,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2020061400;
+$plugin->version = 2020062400;
 $plugin->requires = 2016052300;//moodle 3.1.0
 $plugin->component = 'filter_poodll';
 $plugin->maturity = MATURITY_STABLE;
-$plugin->release = '3.1.34 (Build 2020061400)';
+$plugin->release = '3.1.35 (Build 2020062400)';