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

Merge branch 's10_MDL-27330_dropbox_authorization_url_20' of github.com:dongsheng/moodle into MOODLE_20_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2011-05-04 13:56:59 +08:00
parent 0baa1eee59 64a17788aa
commit c44a5d5946
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/en/repository.php
+1
View File
@@ -156,6 +156,7 @@ $string['renameto'] = 'Rename to';
$string['repositories'] = 'Repositories';
$string['repository'] = 'Repository';
$string['repositorycourse'] = 'Course repositories';
$string['repositoryerror'] = 'Remote repository returned error: {$a}';
$string['save'] = 'Save';
$string['saveas'] = 'Save as';
$string['saved'] = 'Saved';
repository/dropbox/lib.php
+9 -3
View File
@@ -66,7 +66,7 @@ class repository_dropbox extends repository {
'oauth_consumer_key'=>$this->dropbox_key,
'oauth_consumer_secret'=>$this->dropbox_secret,
'oauth_callback' => $this->callback->out(false),
'api_root' => 'http://api.dropbox.com/0/oauth',
'api_root' => 'http://www.dropbox.com/0/oauth',
);
$this->dropbox = new dropbox($args);
@@ -163,10 +163,16 @@ class repository_dropbox extends repository {
}
}
$files = $result->contents;
if (!is_array($files) || empty($files)) {
if (!empty($result->error)) {
// reset access key
set_user_preference($this->setting.'_access_key', '');
set_user_preference($this->setting.'_access_secret', '');
throw new repository_exception('repositoryerror', 'repository', '', $result->error);
}
if (empty($result->contents) or !is_array($result->contents)) {
return $list;
}
$files = $result->contents;
foreach ($files as $file) {
if ($file->is_dir) {
$list['list'][] = array(