Merge branch 'MDL-58399-master' of git://github.com/jleyva/moodle

diff --git a/course/externallib.php b/course/externallib.php
index 01deee9..5d9a7d1 100644 (file)
--- a/course/externallib.php
+++ b/course/externallib.php
@@ -363,6 +363,11 @@ class core_course_external extends external_api {
                                                   'timecreated' => new external_value(PARAM_INT, 'Time created'),
                                                   'timemodified' => new external_value(PARAM_INT, 'Time modified'),
                                                   'sortorder' => new external_value(PARAM_INT, 'Content sort order'),
+                                                  'mimetype' => new external_value(PARAM_RAW, 'File mime type.', VALUE_OPTIONAL),
+                                                  'isexternalfile' => new external_value(PARAM_BOOL, 'Whether is an external file.',
+                                                    VALUE_OPTIONAL),
+                                                  'repositorytype' => new external_value(PARAM_PLUGIN, 'The repository type for external files.',
+                                                    VALUE_OPTIONAL),
 
                                                   // copyright related info
                                                   'userid' => new external_value(PARAM_INT, 'User who added this content to moodle'),

diff --git a/lib/externallib.php b/lib/externallib.php
index 896a175..4114ad6 100644 (file)
--- a/lib/externallib.php
+++ b/lib/externallib.php
@@ -1309,6 +1309,10 @@ class external_util {
                 $file['mimetype'] = $areafile->get_mimetype();
                 $file['filesize'] = $areafile->get_filesize();
                 $file['timemodified'] = $areafile->get_timemodified();
+                $file['isexternalfile'] = $areafile->is_external_file();
+                if ($file['isexternalfile']) {
+                    $file['repositorytype'] = $areafile->get_repository_type();
+                }
                 $fileitemid = $useitemidinurl ? $areafile->get_itemid() : null;
                 $file['fileurl'] = moodle_url::make_webservice_pluginfile_url($contextid, $component, $filearea,
                                     $fileitemid, $areafile->get_filepath(), $areafile->get_filename())->out(false);
@@ -1345,6 +1349,8 @@ class external_files extends external_multiple_structure {
                     'fileurl' => new external_value(PARAM_URL, 'Downloadable file url.', VALUE_OPTIONAL),
                     'timemodified' => new external_value(PARAM_INT, 'Time modified.', VALUE_OPTIONAL),
                     'mimetype' => new external_value(PARAM_RAW, 'File mime type.', VALUE_OPTIONAL),
+                    'isexternalfile' => new external_value(PARAM_BOOL, 'Whether is an external file.', VALUE_OPTIONAL),
+                    'repositorytype' => new external_value(PARAM_PLUGIN, 'The repository type for external files.', VALUE_OPTIONAL),
                 ),
                 'File.'
             ),
@@ -1397,6 +1403,18 @@ class external_files extends external_multiple_structure {
                 'optional' => true,
                 'null' => NULL_NOT_ALLOWED,
             ),
+            'isexternalfile' => array(
+                'type' => PARAM_BOOL,
+                'description' => 'Whether is an external file.',
+                'optional' => true,
+                'null' => NULL_NOT_ALLOWED,
+            ),
+            'repositorytype' => array(
+                'type' => PARAM_PLUGIN,
+                'description' => 'The repository type for the external files.',
+                'optional' => true,
+                'null' => NULL_ALLOWED,
+            ),
         ];
     }
 }

diff --git a/lib/filestorage/stored_file.php b/lib/filestorage/stored_file.php
index 92478b6..8eadfbe 100644 (file)
--- a/lib/filestorage/stored_file.php
+++ b/lib/filestorage/stored_file.php
@@ -815,6 +815,22 @@ class stored_file {
         }
     }
 
+    /**
+     * Returns repository type.
+     *
+     * @return mixed str|null the repository type or null if is not an external file
+     * @since  Moodle 3.3
+     */
+    public function get_repository_type() {
+
+        if (!empty($this->repository)) {
+            return $this->repository->get_typename();
+        } else {
+            return null;
+        }
+    }
+
+
     /**
      * get reference file id
      * @return int

diff --git a/lib/tests/externallib_test.php b/lib/tests/externallib_test.php
index d6a922c..088e40a 100644 (file)
--- a/lib/tests/externallib_test.php
+++ b/lib/tests/externallib_test.php
@@ -510,6 +510,7 @@ class core_externallib_testcase extends advanced_testcase {
             'timemodified' => $timemodified,
             'filesize' => $filesize,
             'mimetype' => 'text/plain',
+            'isexternalfile' => false,
         );
         // Get all the files for the area.
         $files = external_util::get_area_files($context, $component, $filearea, false);
@@ -529,7 +530,8 @@ class core_externallib_testcase extends advanced_testcase {
         $description = new external_files();
 
         // First check that the expected default values and keys are returned.
-        $expectedkeys = array_flip(array('filename', 'filepath', 'filesize', 'fileurl', 'timemodified', 'mimetype'));
+        $expectedkeys = array_flip(array('filename', 'filepath', 'filesize', 'fileurl', 'timemodified', 'mimetype',
+            'isexternalfile', 'repositorytype'));
         $returnedkeys = array_flip(array_keys($description->content->keys));
         $this->assertEquals($expectedkeys, $returnedkeys);
         $this->assertEquals('List of files.', $description->desc);

diff --git a/mod/book/lib.php b/mod/book/lib.php
index 04b11c0..860db56 100644 (file)
--- a/mod/book/lib.php
+++ b/mod/book/lib.php
@@ -595,6 +595,11 @@ function book_export_contents($cm, $baseurl) {
             $file['userid']       = $fileinfo->get_userid();
             $file['author']       = $fileinfo->get_author();
             $file['license']      = $fileinfo->get_license();
+            $file['mimetype']     = $fileinfo->get_mimetype();
+            $file['isexternalfile'] = $fileinfo->is_external_file();
+            if ($file['isexternalfile']) {
+                $file['repositorytype'] = $fileinfo->get_repository_type();
+            }
             $contents[] = $file;
         }
     }

diff --git a/mod/folder/lib.php b/mod/folder/lib.php
index 161cd02..8c2b17b 100644 (file)
--- a/mod/folder/lib.php
+++ b/mod/folder/lib.php
@@ -326,6 +326,11 @@ function folder_export_contents($cm, $baseurl) {
         $file['userid']       = $fileinfo->get_userid();
         $file['author']       = $fileinfo->get_author();
         $file['license']      = $fileinfo->get_license();
+        $file['mimetype']     = $fileinfo->get_mimetype();
+        $file['isexternalfile'] = $fileinfo->is_external_file();
+        if ($file['isexternalfile']) {
+            $file['repositorytype'] = $fileinfo->get_repository_type();
+        }
         $contents[] = $file;
     }
 

diff --git a/mod/forum/tests/externallib_test.php b/mod/forum/tests/externallib_test.php
index 3726b34..e3ee2b6 100644 (file)
--- a/mod/forum/tests/externallib_test.php
+++ b/mod/forum/tests/externallib_test.php
@@ -325,6 +325,7 @@ class mod_forum_external_testcase extends externallib_advanced_testcase {
                                     $discussion1reply1->id, '/', $filename),
                     'timemodified' => $timepost,
                     'mimetype' => 'image/jpeg',
+                    'isexternalfile' => false,
                 )
             ),
             'totalscore' => $discussion1reply1->totalscore,

diff --git a/mod/imscp/lib.php b/mod/imscp/lib.php
index cc0dbdc..d3c9e4e 100644 (file)
--- a/mod/imscp/lib.php
+++ b/mod/imscp/lib.php
@@ -420,6 +420,11 @@ function imscp_export_contents($cm, $baseurl) {
         $file['userid']       = $fileinfo->get_userid();
         $file['author']       = $fileinfo->get_author();
         $file['license']      = $fileinfo->get_license();
+        $file['mimetype']     = $fileinfo->get_mimetype();
+        $file['isexternalfile'] = $fileinfo->is_external_file();
+        if ($file['isexternalfile']) {
+            $file['repositorytype'] = $fileinfo->get_repository_type();
+        }
         $contents[] = $file;
     }
 

diff --git a/mod/page/lib.php b/mod/page/lib.php
index b1f5a84..ce8ba80 100644 (file)
--- a/mod/page/lib.php
+++ b/mod/page/lib.php
@@ -424,6 +424,11 @@ function page_export_contents($cm, $baseurl) {
         $file['userid']       = $fileinfo->get_userid();
         $file['author']       = $fileinfo->get_author();
         $file['license']      = $fileinfo->get_license();
+        $file['mimetype']     = $fileinfo->get_mimetype();
+        $file['isexternalfile'] = $fileinfo->is_external_file();
+        if ($file['isexternalfile']) {
+            $file['repositorytype'] = $fileinfo->get_repository_type();
+        }
         $contents[] = $file;
     }
 

diff --git a/mod/resource/lib.php b/mod/resource/lib.php
index da5f0fa..adbd744 100644 (file)
--- a/mod/resource/lib.php
+++ b/mod/resource/lib.php
@@ -460,6 +460,11 @@ function resource_export_contents($cm, $baseurl) {
         $file['userid']       = $fileinfo->get_userid();
         $file['author']       = $fileinfo->get_author();
         $file['license']      = $fileinfo->get_license();
+        $file['mimetype']     = $fileinfo->get_mimetype();
+        $file['isexternalfile'] = $fileinfo->is_external_file();
+        if ($file['isexternalfile']) {
+            $file['repositorytype'] = $fileinfo->get_repository_type();
+        }
         $contents[] = $file;
     }
 

diff --git a/mod/wiki/tests/externallib_test.php b/mod/wiki/tests/externallib_test.php
index cbe4967..3e3c9dc 100644 (file)
--- a/mod/wiki/tests/externallib_test.php
+++ b/mod/wiki/tests/externallib_test.php
@@ -1074,6 +1074,7 @@ class mod_wiki_external_testcase extends externallib_advanced_testcase {
             'filename' => $file['filename'],
             'filepath' => $file['filepath'],
             'mimetype' => 'image/jpeg',
+            'isexternalfile' => false,
             'filesize' => strlen($content),
             'timemodified' => $file['timemodified'],
             'fileurl' => moodle_url::make_webservice_pluginfile_url($file['contextid'], $file['component'],
@@ -1128,6 +1129,7 @@ class mod_wiki_external_testcase extends externallib_advanced_testcase {
             'filename' => $file['filename'],
             'filepath' => $file['filepath'],
             'mimetype' => 'image/jpeg',
+            'isexternalfile' => false,
             'filesize' => strlen($content),
             'timemodified' => $file['timemodified'],
             'fileurl' => moodle_url::make_webservice_pluginfile_url($file['contextid'], $file['component'],