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

Merge branch 'MDL-35034-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2012-09-06 01:18:40 +02:00
parent 3f4e07ef3c c128731d19
commit e02955dd79
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/googleapi.php
+11 -13
View File
@@ -109,23 +109,21 @@ class google_docs {
$source = 'https://spreadsheets.google.com/feeds/download/spreadsheets/Export?key='.$docid.'&exportFormat=xls';
break;
case 'pdf':
$title = (string)$gdoc->title;
$source = (string)$gdoc->content[0]->attributes()->src;
break;
case 'file':
$title = (string)$gdoc->title;
$source = (string)$gdoc->content[0]->attributes()->src;
$title = (string)$gdoc->title;
// Some files don't have a content probably because the download has been restricted.
if (isset($gdoc->content)) {
$source = (string)$gdoc->content[0]->attributes()->src;
}
break;
}
if (!empty($source)) {
$files[] = array( 'title' => $title,
'url' => "{$gdoc->link[0]->attributes()->href}",
'source' => $source,
'date' => usertime(strtotime($gdoc->updated)),
'thumbnail' => (string) $OUTPUT->pix_url(file_extension_icon($title, 32))
);
}
$files[] = array( 'title' => $title,
'url' => "{$gdoc->link[0]->attributes()->href}",
'source' => $source,
'date' => usertime(strtotime($gdoc->updated)),
'thumbnail' => (string) $OUTPUT->pix_url(file_extension_icon($title, 32))
);
}
return $files;
repository/googledocs/lib.php
+3 -1
View File
@@ -92,8 +92,10 @@ class repository_googledocs extends repository {
}
public function get_file($url, $file = '') {
if (empty($url)) {
throw new repository_exception('cannotdownload', 'repository');
}
$gdocs = new google_docs($this->googleoauth);
$path = $this->prepare_file($file);
return $gdocs->download_file($url, $path, self::GETFILE_TIMEOUT);
}