Skip to content
Browse files

MDL-35034 Repository: Google Docs does not fail when download is rest…

…ricted

Conflicts:

	lib/googleapi.php
	repository/googledocs/lib.php
  • Loading branch information...
1 parent 8f3c8e7 commit 1e12baddde828b0aa941f44621ef000cd3cbebd2 @FMCorz FMCorz committed Aug 27, 2012
Showing with 14 additions and 10 deletions.
  1. +11 −9 lib/googleapi.php
  2. +3 −1 repository/googledocs/lib.php
View
20 lib/googleapi.php
@@ -316,19 +316,21 @@ public function get_file_list($search = ''){
$source = 'https://spreadsheets.google.com/feeds/download/spreadsheets/Export?key='.$docid.'&exportFormat=xls';
break;
case 'pdf':
+ case 'file':
$title = (string)$gdoc->title;
- $source = (string)$gdoc->content[0]->attributes()->src;
+ // 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;
View
4 repository/googledocs/lib.php
@@ -109,7 +109,9 @@ public function logout(){
}
public function get_file($url, $file) {
- global $CFG;
+ if (empty($url)) {
+ throw new repository_exception('cannotdownload', 'repository');
+ }
$path = $this->prepare_file($file);
$fp = fopen($path, 'w');

0 comments on commit 1e12bad

Please sign in to comment.
Something went wrong with that request. Please try again.