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

Merge branch 'wip-MDL-32417-master' of git://github.com/marinaglancy/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2012-04-25 03:40:53 +02:00
commit 9c51f675fa
1 changed files with 9 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

27
repository/flickr/lib.php
View file

@ -154,12 +154,12 @@ class repository_flickr extends repository {
} }
/** /**
* Converts result received from phpFlickr::photo_search to Filepicker/repository format
* *
* @param mixed $photos * @param mixed $photos
* @param int $page
* @return array * @return array
*/ */
private function build_list($photos, $page = 1) { private function build_list($photos) {
$photos_url = $this->flickr->urls_getUserPhotos($this->nsid); $photos_url = $this->flickr->urls_getUserPhotos($this->nsid);
$ret = array(); $ret = array();
$ret['manage'] = $photos_url; $ret['manage'] = $photos_url;
@ -167,11 +167,7 @@ class repository_flickr extends repository {
$ret['pages'] = $photos['pages']; $ret['pages'] = $photos['pages'];
$ret['total'] = $photos['total']; $ret['total'] = $photos['total'];
$ret['perpage'] = $photos['perpage']; $ret['perpage'] = $photos['perpage'];
if($page <= $ret['pages']) { $ret['page'] = $photos['page'];
$ret['page'] = $page;
} else {
$ret['page'] = 1;
}
if (!empty($photos['photo'])) { if (!empty($photos['photo'])) {
foreach ($photos['photo'] as $p) { foreach ($photos['photo'] as $p) {
if(empty($p['title'])) { if(empty($p['title'])) {
@ -189,6 +185,7 @@ class repository_flickr extends repository {
} }
$ret['list'][] = array('title'=>$p['title'],'source'=>$p['id'], $ret['list'][] = array('title'=>$p['title'],'source'=>$p['id'],
'id'=>$p['id'],'thumbnail'=>$this->flickr->buildPhotoURL($p, 'Square'), 'id'=>$p['id'],'thumbnail'=>$this->flickr->buildPhotoURL($p, 'Square'),
'thumbnail_width'=>75, 'thumbnail_height'=>75,
'date'=>'', 'size'=>'unknown', 'url'=>$photos_url.$p['id']); 'date'=>'', 'size'=>'unknown', 'url'=>$photos_url.$p['id']);
} }
} }
@ -198,6 +195,7 @@ class repository_flickr extends repository {
/** /**
* *
* @param string $search_text * @param string $search_text
* @param int $page
* @return array * @return array
*/ */
public function search($search_text, $page = 0) { public function search($search_text, $page = 0) {
@ -205,10 +203,11 @@ class repository_flickr extends repository {
'user_id'=>$this->nsid, 'user_id'=>$this->nsid,
'per_page'=>24, 'per_page'=>24,
'extras'=>'original_format', 'extras'=>'original_format',
'page'=>$page,
'text'=>$search_text 'text'=>$search_text
)); ));
$ret = $this->build_list($photos); $ret = $this->build_list($photos);
$ret['list'] = array_filter($ret['list'], array($this, 'filter')); $ret['list'] = array_filter($ret['list'], array($this, 'filter')); // TODO this breaks pagination
return $ret; return $ret;
} }
@ -218,16 +217,8 @@ class repository_flickr extends repository {
* @param int $page * @param int $page
* @return array * @return array
*/ */
public function get_listing($path = '', $page = '1') { public function get_listing($path = '', $page = '') {
$photos_url = $this->flickr->urls_getUserPhotos($this->nsid); return $this->search('', $page);
$photos = $this->flickr->photos_search(array(
'user_id'=>$this->nsid,
'per_page'=>24,
'page'=>$page,
'extras'=>'original_format'
));
return $this->build_list($photos, $page);
} }
public function get_link($photo_id) { public function get_link($photo_id) {