From 6da1c55ba86947c105a7c86998352fdd0c6ddadb Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Fri, 10 Mar 2017 13:34:21 +0800
Subject: [PATCH] MDL-58219 googledocs: Keep original name on copy

Also - only add writers to files that have been "claimed" (prevent_changes_to_external_files)

Part of MDL-58220
---
 repository/googledocs/lib.php | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/repository/googledocs/lib.php b/repository/googledocs/lib.php
index c62bbdab167..81668d4bb7b 100644
--- a/repository/googledocs/lib.php
+++ b/repository/googledocs/lib.php
@@ -313,7 +313,13 @@ class repository_googledocs extends repository {
                 }
                 if (isset($gfile->fileExtension)) {
                     // The file has an extension, therefore we can download it.
-                    $source = json_encode(['id' => $gfile->id, 'exportformat' => 'download', 'link' => $link]);
+                    $source = json_encode([
+                        'id' => $gfile->id,
+                        'name' => $gfile->name,
+                        'exportformat' => 'download',
+                        'link' => $link,
+                        'claimed' => false
+                    ]);
                     $title = $gfile->name;
                 } else {
                     // The file is probably a Google Doc file, we get the corresponding export link.
@@ -356,7 +362,13 @@ class repository_googledocs extends repository {
                     if (empty($title)) {
                         continue;
                     }
-                    $source = json_encode(['id' => $gfile->id, 'exportformat' => $exporttype, 'link' => $link]);
+                    $source = json_encode([
+                        'id' => $gfile->id,
+                        'exportformat' => $exporttype,
+                        'link' => $link,
+                        'name' => $gfile->name,
+                        'claimed' => false
+                    ]);
                 }
                 // Adds the file to the file list. Using the itemId along with the name as key
                 // of the array because Google Drive allows files with identical names.
@@ -541,7 +553,7 @@ class repository_googledocs extends repository {
                                    $storedfile->get_filepath(),
                                    $storedfile->get_filename());
 
-        if ($info->is_writable()) {
+        if (!empty($source->claimed) && $info->is_writable()) {
             // Add the current user as an OAuth writer.
             $systemauth = \core\oauth2\api::get_system_oauth_client($this->issuer);
 
@@ -608,7 +620,7 @@ class repository_googledocs extends repository {
         $systemservice = new repository_googledocs\rest($systemauth);
 
         // Copy the file so we get a snapshot file owned by Moodle.
-        $newsource = $this->copy_file($systemservice, $source->id);
+        $newsource = $this->copy_file($systemservice, $source->id, $source->name);
 
         // Set the sharing options.
         $this->set_file_sharing_anyone_with_link_can_read($systemservice, $newsource->id);
@@ -626,6 +638,7 @@ class repository_googledocs extends repository {
         if (empty($source->link)) {
             $source->link = isset($newsource->webContentLink) ? $newsource->webContentLink : '';
         }
+        $source->claimed = true;
         $reference = json_encode($source);
         $file->set_source($reference);
 
@@ -772,16 +785,22 @@ class repository_googledocs extends repository {
      *
      * @param \core\oauth2\client $client Authenticated client.
      * @param string $fileid The file we are copying.
+     * @param string $name The original filename (don't change it).
      *
      * @return stdClass file details.
      */
-    protected function copy_file(\repository_googledocs\rest $client, $fileid) {
+    protected function copy_file(\repository_googledocs\rest $client, $fileid, $name) {
         $fields = "id,name,mimeType,webContentLink,webViewLink,size,thumbnailLink,iconLink";
         $params = [
             'fileid' => $fileid,
-            'fields' => $fields
+            'fields' => $fields,
         ];
-        $fileinfo = $client->call('copy', $params, ' ');
+        // Keep the original name (don't put copy at the end of it).
+        $copyinfo = [];
+        if (!empty($name)) {
+            $copyinfo = [ 'name' => $name ];
+        }
+        $fileinfo = $client->call('copy', $params, json_encode($copyinfo));
         if (empty($fileinfo->id)) {
             $details = 'Cannot copy file:' . $fileid;
             throw new repository_exception('errorwhilecommunicatingwith', 'repository', '', $details);