L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-58765-master' of git://github.com/damyon/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2017-05-08 10:31:59 +01:00
parent 3cc5abc163 6a7552fe70
commit e18cd34bbb
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
repository/googledocs/lib.php
+6 -2
View File
@@ -872,6 +872,12 @@ class repository_googledocs extends repository {
// finally update the reference to contain the share link if it was not
// already there (and point to new file id if we copied).
// Get the details from the reference.
$source = json_decode($reference);
if (!empty($source->usesystem)) {
// If we already copied this file to the system account - we are done.
return $reference;
}
// Check this issuer is enabled.
if ($this->disabled) {
@@ -895,8 +901,6 @@ class repository_googledocs extends repository {
throw new repository_exception('errorwhilecommunicatingwith', 'repository', '', $details);
}
// Get the details from the reference.
$source = json_decode($reference);
$userservice = new repository_googledocs\rest($userauth);
$systemservice = new repository_googledocs\rest($systemauth);
repository/onedrive/lib.php
+5 -2
View File
@@ -815,6 +815,11 @@ class repository_onedrive extends repository {
// then set the permissions so anyone with the share link can view,
// finally update the reference to contain the share link if it was not
// already there (and point to new file id if we copied).
$source = json_decode($reference);
if (!empty($source->usesystem)) {
// If we already copied this file to the system account - we are done.
return $reference;
}
// Get a system and a user oauth client.
$systemauth = \core\oauth2\api::get_system_oauth_client($this->issuer);
@@ -824,8 +829,6 @@ class repository_onedrive extends repository {
throw new repository_exception('errorwhilecommunicatingwith', 'repository', '', $details);
}
$source = json_decode($reference);
$userauth = $this->get_user_oauth_client();
if ($userauth === false) {
$details = 'Cannot connect as current user';