moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 09:26:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev_MDL-33513_files_source' of git://github.com/danpoltawski/moodle

Browse source
This commit is contained in:
Dan Poltawski 2012-06-14 11:12:21 +08:00
commit cd925ac79b
13 changed files with 180 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

32
repository/flickr_public/lib.php
View file

@ -396,9 +396,13 @@ class repository_flickr_public extends repository {
return $str;
}
public function get_link($photo_id) {
global $CFG;
$result = $this->flickr->photos_getSizes($photo_id);
/**
* Return photo url by given photo id
* @param string $photoid
* @return string
*/
private function build_photo_url($photoid) {
$result = $this->flickr->photos_getSizes($photoid);
$url = '';
if(!empty($result[4])) {
$url = $result[4]['source'];
@ -410,23 +414,27 @@ class repository_flickr_public extends repository {
return $url;
}
public function get_link($photoid) {
return $this->build_photo_id($photoid);
}
/**
*
* @global object $CFG
* @param string $photo_id
* @param string $photoid
* @param string $file
* @return string
*/
public function get_file($photo_id, $file = '') {
public function get_file($photoid, $file = '') {
global $CFG;
$info = $this->flickr->photos_getInfo($photo_id);
$info = $this->flickr->photos_getInfo($photoid);
if ($info['owner']['realname']) {
$author = $info['owner']['realname'];
} else {
$author = $info['owner']['username'];
}
$copyright = get_string('author', 'repository') . ': ' . $author;
$result = $this->flickr->photos_getSizes($photo_id);
$result = $this->flickr->photos_getSizes($photoid);
// download link
$source = '';
// flickr photo page
@ -517,4 +525,14 @@ class repository_flickr_public extends repository {
public function supported_returntypes() {
return (FILE_INTERNAL | FILE_EXTERNAL);
}
/**
* Return the source information
*
* @param string $photoid photo id
* @return string|null
*/
public function get_file_source_info($photoid) {
return $this->build_photo_url($photoid);
}
}