Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
MDL-15488
1. Move flickr lib to lib/flickrlib.php
2. Create a new flickr plugin for public access, the original one will be
a personal repository, user need to login to access his/her own photos.
  • Loading branch information
dongsheng committed Sep 12, 2008
1 parent 2b376ab commit 539b3d1
Show file tree
Hide file tree
Showing 6 changed files with 220 additions and 24 deletions.
14 changes: 14 additions & 0 deletions lang/en_utf8/repository_flickr_public.php
@@ -0,0 +1,14 @@
<?php // $Id$
$string['apikey'] = 'API Key';
$string['callbackurl'] = 'Callback URL';
$string['configplugin'] = 'Flickr Public configuration';
$string['emailaddress'] = 'Email address';
$string['invalidemail'] = 'Invalid email address for flickr';
$string['notitle'] = 'notitle';
$string['nullphotolist'] = 'There are no photos in this account';
$string['remember'] = 'Remember me';
$string['repositoryname'] = 'Flickr Public';
$string['repositorydesc'] = 'Repository on flickr.com';
$string['secret'] = 'Secret';
$string['username'] = 'Flickr account email';

File renamed without changes.
2 changes: 1 addition & 1 deletion portfolio/type/flickr/lib.php
@@ -1,6 +1,6 @@
<?php
require_once($CFG->libdir.'/filelib.php');
require_once($CFG->dirroot.'/repository/flickr/phpFlickr.php');
require_once($CFG->libdir.'/flickrlib.php');

class portfolio_plugin_flickr extends portfolio_plugin_push_base {

Expand Down
29 changes: 6 additions & 23 deletions repository/flickr/repository.class.php
@@ -1,14 +1,14 @@
<?php
/**
* repository_flickr class
* This is a subclass of repository class
* This plugin is used to access user's private flickr repository
*
* @author Dongsheng Cai
* @version 0.1 dev
* @author Dongsheng Cai <dongsheng@moodle.com>
* @version $Id$
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
*/

require_once($CFG->dirroot.'/repository/flickr/'.'phpFlickr.php');
require_once($CFG->libdir.'/flickrlib.php');

class repository_flickr extends repository{
private $flickr;
Expand Down Expand Up @@ -161,27 +161,10 @@ public function get_listing($path = '1', $search = ''){
}
}
public function print_listing(){
if(empty($this->photos)){
$this->get_listing();
}
$str = '';
$str .= '<h2>Account: <span>'.$this->photos['a'].'</span></h2>';
foreach ((array)$this->photos['photo'] as $photo) {
$str .= "<a href='".$this->photos['url'].$photo[id]."'>";
$str .= "<img border='0' alt='$photo[title]' ".
"src=" . $photo['thumbnail'] . ">";
$str .= "</a>";
$i++;

if ($i % 4 == 0) {
$str .= "<br/>";
}
}
echo $str;
return false;
}
public function print_search(){
echo '<input type="text" name="Search" value="search terms..." size="40" class="right"/>';
return true;
return false;
}
public function get_file($photo_id, $file = ''){
global $CFG;
Expand Down
Binary file added repository/flickr_public/icon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
199 changes: 199 additions & 0 deletions repository/flickr_public/repository.class.php
@@ -0,0 +1,199 @@
<?php
/**
* repository_flickr_public class
* This one is used to create public repository
* You can set up a public account in admin page, so everyone can
* access photos in this public account
*
* @author Dongsheng Cai <dongsheng@moodle.com>
* @version $Id$
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
*/

require_once($CFG->libdir.'/flickrlib.php');

class repository_flickr_public extends repository{
private $flickr;
public $photos;

public function set_option($options = array()){
if (!empty($options['api_key'])) {
set_config('api_key', trim($options['api_key']), 'flickr_public');
}
unset($options['api_key']);
$ret = parent::set_option($options);
return $ret;
}

public function get_option($config = ''){
if($config==='api_key'){
return trim(get_config('flickr_public', 'api_key'));
} else {
$options['api_key'] = trim(get_config('flickr_public', 'api_key'));
}
$options = parent::get_option($config);
return $options;
}

public function global_search(){
global $SESSION;
if (empty($this->flickr_account)) {
return false;
} else {
return true;
}
}

public function __construct($repositoryid, $context = SITEID, $options = array()){
global $SESSION, $action, $CFG;
$options['page'] = optional_param('p', 1, PARAM_INT);
parent::__construct($repositoryid, $context, $options);
$this->api_key = $this->get_option('api_key');
$this->flickr = new phpFlickr($this->api_key);

$this->flickr_account = $this->get_option('public_account');

if(!empty($this->flickr_account)) {
$action = 'list';
} else {
$account = optional_param('flickr_account', '', PARAM_RAW);
if(!empty($account)) {
$people = $this->flickr->people_findByEmail($account);
if(!empty($people)) {
$this->flickr_account = $account;
$action = 'list';
} else {
throw new repository_exception('invalidemail', 'repository_flickr_public');
}
} else {
$action = 'login';
}
}
}
public function print_login($ajax = true){
global $SESSION;
if(empty($this->flickr_account)) {
if($ajax){
$ret = array();
$e1->label = get_string('username', 'repository_flickr_public').': ';
$e1->id = 'account';
$e1->type = 'text';
$e1->name = 'flickr_account';

$e2->type = 'hidden';
$e2->name = 'repo_id';
$e2->value = $this->id;
$ret['login'] = array($e1, $e2);
return $ret;
}else{
echo $str;
}
} else {
return $this->get_listing();
}
}
public function get_listing($path = '1', $search = ''){
global $SESSION;
$people = $this->flickr->people_findByEmail($this->flickr_account);
$photos_url = $this->flickr->urls_getUserPhotos($people['nsid']);

if(!empty($search)) {
// do searching, if $path is not empty, ignore it.
$photos = $this->flickr->photos_search(array('user_id'=>$people['nsid'], 'text'=>$search));
} elseif(!empty($path) && empty($search)) {
$photos = $this->flickr->people_getPublicPhotos($people['nsid'], 'original_format', 25, $path);
}

$ret = array();
$ret['manage'] = $photos_url;
$ret['list'] = array();
$ret['nologin'] = true;
$ret['pages'] = $photos['pages'];
if(is_int($path) && $path <= $ret['pages']) {
$ret['page'] = $path;
} else {
$ret['page'] = 1;
}
foreach ($photos['photo'] as $p) {
if(empty($p['title'])) {
$p['title'] = get_string('notitle', 'repository_flickr_public');
}
if (isset($p['originalformat'])) {
$format = $p['originalformat'];
} else {
$format = 'jpg';
}
$ret['list'][] =
array('title'=>$p['title'].'.'.$format,'source'=>$p['id'],'id'=>$p['id'],'thumbnail'=>$this->flickr->buildPhotoURL($p, 'Square'), 'date'=>'', 'size'=>'unknown', 'url'=>$photos_url.$p['id']);
}
if(empty($ret)) {
throw new repository_exception('nullphotolist', 'repository_flickr_public');
} else {
return $ret;
}
}
public function print_listing(){
return false;
}
public function print_search(){
return false;
}
public function get_file($photo_id, $file = ''){
global $CFG;
$result = $this->flickr->photos_getSizes($photo_id);
$url = '';
if(!empty($result[4])) {
$url = $result[4]['source'];
} elseif(!empty($result[3])) {
$url = $result[3]['source'];
} elseif(!empty($result[2])) {
$url = $result[2]['source'];
}
if (!file_exists($CFG->dataroot.'/repository/download')) {
mkdir($CFG->dataroot.'/repository/download/', 0777, true);
}
if(is_dir($CFG->dataroot.'/repository/download')) {
$dir = $CFG->dataroot.'/repository/download/';
}

if(empty($file)) {
$file = $photo_id.'_'.time().'.jpg';
}
if(file_exists($dir.$file)) {
$file = uniqid('m').$file;
}
$fp = fopen($dir.$file, 'w');
$c = new curl;
$c->download(array(
array('url'=>$url, 'file'=>$fp)
));
return $dir.$file;
}
public static function has_admin_config() {
return true;
}

public static function has_multiple_instances() {
return true;
}

public static function has_instance_config() {
return false;
}

public function admin_config_form(&$mform) {
$api_key = get_config('flickr_public', 'api_key');
if (empty($api_key)) {
$api_key = '';
}
$strrequired = get_string('required');
$mform->addElement('text', 'api_key', get_string('apikey', 'repository_flickr_public'), array('value'=>$api_key,'size' => '40'));
$mform->addElement('text', 'public_account', get_string('public_account', 'repository_flickr_public'), array('size' => '40'));
$mform->addRule('api_key', $strrequired, 'required', null, 'client');
}
public static function get_admin_option_names(){
return array('api_key', 'public_account');
}

}

0 comments on commit 539b3d1

Please sign in to comment.