From 539b3d13d5740366bc658fb2d4e2f5491d207208 Mon Sep 17 00:00:00 2001 From: dongsheng Date: Fri, 12 Sep 2008 03:32:31 +0000 Subject: [PATCH] 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. --- lang/en_utf8/repository_flickr_public.php | 14 ++ .../flickr/phpFlickr.php => lib/flickrlib.php | 0 portfolio/type/flickr/lib.php | 2 +- repository/flickr/repository.class.php | 29 +-- repository/flickr_public/icon.png | Bin 0 -> 862 bytes repository/flickr_public/repository.class.php | 199 ++++++++++++++++++ 6 files changed, 220 insertions(+), 24 deletions(-) create mode 100644 lang/en_utf8/repository_flickr_public.php rename repository/flickr/phpFlickr.php => lib/flickrlib.php (100%) create mode 100644 repository/flickr_public/icon.png create mode 100644 repository/flickr_public/repository.class.php diff --git a/lang/en_utf8/repository_flickr_public.php b/lang/en_utf8/repository_flickr_public.php new file mode 100644 index 0000000000..be97c779d7 --- /dev/null +++ b/lang/en_utf8/repository_flickr_public.php @@ -0,0 +1,14 @@ +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 { diff --git a/repository/flickr/repository.class.php b/repository/flickr/repository.class.php index 82f91b0a0c..a3ff5303fb 100755 --- a/repository/flickr/repository.class.php +++ b/repository/flickr/repository.class.php @@ -1,14 +1,14 @@ + * @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; @@ -161,27 +161,10 @@ class repository_flickr extends repository{ } } public function print_listing(){ - if(empty($this->photos)){ - $this->get_listing(); - } - $str = ''; - $str .= '

Account: '.$this->photos['a'].'

'; - foreach ((array)$this->photos['photo'] as $photo) { - $str .= ""; - $str .= "$photo[title]"; - $str .= ""; - $i++; - - if ($i % 4 == 0) { - $str .= "
"; - } - } - echo $str; + return false; } public function print_search(){ - echo ''; - return true; + return false; } public function get_file($photo_id, $file = ''){ global $CFG; diff --git a/repository/flickr_public/icon.png b/repository/flickr_public/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..835b935ab7b2bd4ae7c1f1aad79eb664f61c2329 GIT binary patch literal 862 zcmV-k1EKthP)LFtrQg(7y! z!%z&CSQKbN6CxTwcE*)4;6_MX5mv1H1#C3#3^9>JC4q&JL{}!p6$T8Cg;*5Iqbjxy z(9%vHGqg;no?B2^d6JXd$NA3v&OP7ZMn^|cQc?nw$%K494`#f;*V#_lE=!Um7sxbC z3#U@4&xT=ySX?fb1JCotSP{oYam<}AmutAWx%sv%%NNXMGso^Ife{Xe1Ix?HQ`_6y zV-&ad2PbrQcNen}3r}Zf=S$k(t*EH5)1D&(b9$At+wGNZx4VmC+d`qxEMfQA9nUDy zp|hi->KGdVKA^G2&av_PihnsIRXdYHMrzFZiUj``T|fW#@hNXCl$4 z^>{pY7@eJzj+u28YPNtbw}jeqQxRaS?*nfF;6(bk>va%X9Ux2}l`<|`t=8sRr|eR) z2F5=ou^7x@Yfs0M4+>rk$#AFAK>sv&N{WUvDEv$URx{+f>c%olS(8XV?U1Y%;q77u zQ?nU_<2n+Q%uwT zx3?EGBx*b!|CCH7U6N#JWW&XAJWkF@E_aBXon6e&&%fH*+8QC<>=N$ZFwtf+7z_?X zqtSb^?Cc}$Uo@K~8|#p&9wdn6w@4&3naN}(C{|%$CO+|`L|IJ~@Hh}yWA!x>MF%_A obv;6*tg&htZB`ZoGy5&T00Dh$2e=b*kpKVy07*qoM6N<$f)kI9y#N3J literal 0 HcmV?d00001 diff --git a/repository/flickr_public/repository.class.php b/repository/flickr_public/repository.class.php new file mode 100644 index 0000000000..e684868615 --- /dev/null +++ b/repository/flickr_public/repository.class.php @@ -0,0 +1,199 @@ + + * @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'); + } + +} + -- 2.39.5