2018081400 beta release code (#137)

db/upgrade.php

@@ -166,7 +166,7 @@ function xmldb_block_panopto_upgrade($oldversion = 0) {
         $existingcoursemappings = $DB->get_records(
             'block_panopto_foldermap',
             null,
-            'moodleid, publisher_mapping, creator_mapping'
+            'id,moodleid,publisher_mapping,creator_mapping'
         );
 
         // Define table table where we will place all of our creator mappings.

lang/en/block_panopto.php

@@ -83,6 +83,8 @@
 $string['block_panopto_async_tasks_desc'] = 'Enable this option to allow the enrolment, unenrolment, and delete user tasks to happen asynchronously (may have a short delay before running)';
 $string['block_panopto_folder_name_style'] = 'Panopto folder name style';
 $string['block_panopto_folder_name_style_desc'] = 'Use this option to select which visual name style you wish to have for your new Panopto folders';
+$string['block_panopto_enforce_https_on_wsdl'] = 'Enforce HTTPS on Panopto API calls';
+$string['block_panopto_enforce_https_on_wsdl_desc'] = 'Enforce HTTPS endpoints are used for Panopto API calls (recommended to everyone)';
 $string['block_panopto_wsdl_proxy_host'] = 'WSDL proxy host';
 $string['block_panopto_wsdl_proxy_host_desc'] = 'The host address used as a proxy for any Panopto service WSDL. (Optional)';
 $string['block_panopto_wsdl_proxy_port'] = 'WSDL proxy port';

lib/AuthManagement/AuthManagementWsdlClass.php

@@ -14,6 +14,9 @@
  * @version 20150429-01
  * @date 2017-05-25
  */
+
+defined('MOODLE_INTERNAL') || die();
+
 class AuthManagementWsdlClass extends stdClass implements ArrayAccess,Iterator,Countable
 {
     /**
@@ -949,3 +952,33 @@ public function __toString()
         return __CLASS__;
     }
 }
+
+/**
+* Class AuthManagementSoapClient
+*/
+class AuthManagementSoapClient extends SoapClient {
+
+    /**
+     * Constructor wrapper
+     */
+    public function __construct ($wsdl, array $options = null) {
+        parent::__construct($wsdl, $options);
+    }
+
+    /**
+     * wrapper around dorequest so we can enforce https on all calls
+     *
+     * @param object $request - the request being made
+     * @param string $location - the location the request will be made to
+     * @param string $action
+     * @param string $version
+     * @param int $one_way
+     */
+    public function __doRequest ($request, $location, $action, $version, $one_way = 0) {
+        if (get_config('block_panopto', 'enforce_https_on_wsdl')) {
+            $location = str_replace('http://', 'https://', $location);
+        }
+
+        return parent::__doRequest($request, $location, $action, $version, $one_way);
+    }
+}

lib/SessionManagement/SessionManagementWsdlClass.php

@@ -14,6 +14,9 @@
  * @version 20150429-01
  * @date 2017-01-19
  */
+
+defined('MOODLE_INTERNAL') || die();
+
 class SessionManagementWsdlClass extends stdClass implements ArrayAccess,Iterator,Countable
 {
     /**
@@ -949,3 +952,33 @@ public function __toString()
         return __CLASS__;
     }
 }
+
+/**
+* Class SessionManagementSoapClient
+*/
+class SessionManagementSoapClient extends SoapClient {
+
+    /**
+     * Constructor wrapper
+     */
+    public function __construct ($wsdl, array $options = null) {
+        parent::__construct($wsdl, $options);
+    }
+
+    /**
+     * wrapper around dorequest so we can enforce https on all calls
+     *
+     * @param object $request - the request being made
+     * @param string $location - the location the request will be made to
+     * @param string $action
+     * @param string $version
+     * @param int $one_way
+     */
+    public function __doRequest ($request, $location, $action, $version, $one_way = 0) {
+        if (get_config('block_panopto', 'enforce_https_on_wsdl')) {
+            $location = str_replace('http://', 'https://', $location);
+        }
+
+        return parent::__doRequest($request, $location, $action, $version, $one_way);
+    }
+}

lib/UserManagement/UserManagementWsdlClass.php

@@ -14,6 +14,9 @@
  * @version 20150429-01
  * @date 2017-01-19
  */
+
+defined('MOODLE_INTERNAL') || die();
+
 class UserManagementWsdlClass extends stdClass implements ArrayAccess,Iterator,Countable
 {
     /**
@@ -944,3 +947,33 @@ public function __toString()
         return __CLASS__;
     }
 }
+
+/**
+* Class UserManagementSoapClient
+*/
+class UserManagementSoapClient extends SoapClient {
+
+    /**
+     * Constructor wrapper
+     */
+    public function __construct ($wsdl, array $options = null) {
+        parent::__construct($wsdl, $options);
+    }
+
+    /**
+     * wrapper around dorequest so we can enforce https on all calls
+     *
+     * @param object $request - the request being made
+     * @param string $location - the location the request will be made to
+     * @param string $action
+     * @param string $version
+     * @param int $one_way
+     */
+    public function __doRequest ($request, $location, $action, $version, $one_way = 0) {
+        if (get_config('block_panopto', 'enforce_https_on_wsdl')) {
+            $location = str_replace('http://', 'https://', $location);
+        }
+
+        return parent::__doRequest($request, $location, $action, $version, $one_way);
+    }
+}

lib/cli/upgrade_all_folders.php

@@ -51,7 +51,7 @@ function upgrade_all_panopto_folders() {
         'block_panopto_foldermap',
         null,
         null,
-        'moodleid'
+        'id,moodleid'
     );
 
     $currindex = 0;

lib/panopto_data.php

@@ -678,7 +678,7 @@ public static function get_import_list($courseid) {
             'block_panopto_importmap',
             array('target_moodle_id' => $courseid),
             null,
-            'import_moodle_id'
+            'id,import_moodle_id'
         );
 
         $retarray = array();
@@ -703,7 +703,7 @@ public static function get_import_target_list($courseid) {
             'block_panopto_importmap',
             array('import_moodle_id' => $courseid),
             null,
-            'target_moodle_id'
+            'id,target_moodle_id'
         );
 
         $retarray = array();
@@ -799,7 +799,7 @@ public static function get_moodle_course_id($sessiongroupid) {
             'block_panopto_foldermap',
             array('panopto_id' => $sessiongroupid),
             null,
-            'moodleid'
+            'id,moodleid'
         );
     }
 
@@ -878,7 +878,7 @@ public static function get_course_role_mappings($moodlecourseid) {
         $creatorrolesraw = $DB->get_records(
             'block_panopto_creatormap',
             array('moodle_id' => $moodlecourseid),
-            'role_id'
+            'id,role_id'
         );
 
         if (isset($creatorrolesraw) && !empty($creatorrolesraw)) {
@@ -891,7 +891,7 @@ public static function get_course_role_mappings($moodlecourseid) {
         $pubrolesraw = $DB->get_records(
             'block_panopto_publishermap',
             array('moodle_id' => $moodlecourseid),
-            'role_id'
+            'id,role_id'
         );
 
         if (isset($pubrolesraw) && !empty($pubrolesraw)) {

lib/panopto_user_soap_client.php

@@ -77,6 +77,7 @@ public function __construct($servername, $apiuseruserkey, $apiuserauthcode) {
             $apiuseruserkey);
 
         $this->serviceparams = generate_wsdl_service_params('https://'. $servername . '/Panopto/PublicAPI/4.6/UserManagement.svc?singlewsdl');
+
     }
 
     /**

reinitialize_imports.php

@@ -62,8 +62,7 @@ function reinitialize_all_imports() {
     $courseimports = $DB->get_records(
         'block_panopto_importmap',
         null,
-        null,
-        'import_moodle_id,target_moodle_id'
+        null
     );
 
     $coursepanoptoarray = array();

settings.php

@@ -202,6 +202,15 @@
         )
     );
 
+    $settings->add(
+        new admin_setting_configcheckbox(
+            'block_panopto/enforce_https_on_wsdl',
+            get_string('block_panopto_enforce_https_on_wsdl', 'block_panopto'),
+            get_string('block_panopto_enforce_https_on_wsdl_desc', 'block_panopto'),
+            1
+        )
+    );
+
     $settings->add(
         new admin_setting_configtext_trimmed(
             'block_panopto/wsdl_proxy_host',

upgrade_all_folders.php

@@ -89,7 +89,7 @@ function upgrade_all_panopto_folders() {
         'block_panopto_foldermap',
         null,
         null,
-        'moodleid'
+        'id,moodleid'
     );
 
     $currindex = 0;

version.php

@@ -29,7 +29,7 @@
 
 // Plugin version should normally be the same as the internal version.
 // If an admin wants to install with an older version number, however, set that here.
-$plugin->version = 2018070900;
+$plugin->version = 2018081400;
 
 // Requires this Moodle version - 2.7.
 $plugin->requires  = 2014051200;