Menu
▾
▴
[phpws-comm-commits] modules/featuredphoto/class block.php, 1.21, 1.22 manager.php, 1.34, 1.35
|
From: Greg M. <bli...@us...> - 2008-01-26 22:33:18
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29746/class Modified Files: block.php manager.php Log Message: Can now display photos from Flickr Index: manager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/manager.php,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** manager.php 26 Jan 2008 18:03:53 -0000 1.34 --- manager.php 26 Jan 2008 22:32:51 -0000 1.35 *************** *** 23,26 **** --- 23,28 ---- */ + PHPWS_Core::initModClass('featuredphoto', 'photo.php'); + class FeaturedPhoto_Manager { *************** *** 371,374 **** --- 373,377 ---- $pager->setSearch('title'); $pager->setDefaultOrder('title', 'asc'); + $pager->setEmptyMessage(dgettext('featuredphoto', 'No photo blocks found.')); return $pager->get(); *************** *** 585,588 **** --- 588,592 ---- $pager->setDefaultOrder('id'); $pager->addWhere('block_id', $block_id); + $pager->setEmptyMessage(dgettext('featuredphoto', 'No photos found.')); return $pager->get(); Index: block.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/block.php,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** block.php 26 Jan 2008 18:03:53 -0000 1.21 --- block.php 26 Jan 2008 22:32:51 -0000 1.22 *************** *** 23,28 **** */ - PHPWS_Core::initModClass('featuredphoto', 'photo.php'); - define('FEATUREDPHOTO_BLOCK_MODE_INCREMENT', 0); define('FEATUREDPHOTO_BLOCK_MODE_RANDOM', 1); --- 23,26 ---- *************** *** 257,260 **** --- 255,260 ---- function clearPhotos() { + PHPWS_Core::initModClass('featuredphoto', 'photo.php'); + $db = new PHPWS_DB('featuredphoto_photos'); $db->addWhere('block_id', $this->id); *************** *** 293,304 **** function getPhoto() { - $db = new PHPWS_DB('featuredphoto_photos'); - $db->addWhere('active', 1); - $db->addWhere('block_id', $this->getId()); - switch ($this->getMode(false)) { case FEATUREDPHOTO_BLOCK_MODE_RANDOM: { $db->addOrder('random'); $db->setLimit(1); --- 293,305 ---- function getPhoto() { switch ($this->getMode(false)) { case FEATUREDPHOTO_BLOCK_MODE_RANDOM: { + PHPWS_Core::initModClass('featuredphoto', 'photo.php'); + + $db = new PHPWS_DB('featuredphoto_photos'); + $db->addWhere('active', 1); + $db->addWhere('block_id', $this->getId()); $db->addOrder('random'); $db->setLimit(1); *************** *** 315,318 **** --- 316,324 ---- if ($this->current_photo > 0) { + PHPWS_Core::initModClass('featuredphoto', 'photo.php'); + + $db = new PHPWS_DB('featuredphoto_photos'); + $db->addWhere('active', 1); + $db->addWhere('block_id', $this->getId()); $db->addWhere('id', $this->current_photo); $db->setLimit(1); *************** *** 330,334 **** if (PHPWS_Settings::get('featuredphoto', 'flickr_support')) { ! return 'Flickr Latest'; } break; --- 336,366 ---- if (PHPWS_Settings::get('featuredphoto', 'flickr_support')) { ! PHPWS_Core::initModClass('featuredphoto', 'lib/Flickr.php'); ! ! $f = new PHPWS_Flickr(PHPWS_Settings::get('featuredphoto', 'flickr_api_key')); ! $person = $f->people_findByUsername(PHPWS_Settings::get('featuredphoto', 'flickr_username')); ! if (!PHPWS_Error::logIfError($person)) ! { ! // Get the friendly URL of the user's photos ! $photos_url = $f->urls_getUserPhotos($person['id']); ! // Get the user's first public photo ! $photos = $f->people_getPublicPhotos($person['id'], NULL, 1); ! ! if (!PHPWS_Error::logIfError($photos_url) && !PHPWS_Error::logIfError($photos)) ! { ! $photo = $photos['photo'][0]; ! $info = $f->photos_getInfo($photo['id'], $photo['secret']); ! if (!PHPWS_Error::logIfError($info)) ! { ! $template['URL'] = $photos_url . $photo['id']; ! $template['IMAGE_SRC'] = $f->build_photo_url($photo, ! $f->best_photo_size($this->tn_width, $this->tn_height)); ! $template['IMAGE_ALT'] = $photo['title']; ! $template['NAME'] = $photo['title']; ! $template['CAPTION'] = $info['description']; ! return PHPWS_Template::process($template, 'featuredphoto', 'photo/flickr_view.tpl'); ! } ! } ! } } break; *************** *** 339,343 **** if (PHPWS_Settings::get('featuredphoto', 'flickr_support') && ($this->flickr_set > 0)) { ! return 'Flickr Latest in Set'; } break; --- 371,402 ---- if (PHPWS_Settings::get('featuredphoto', 'flickr_support') && ($this->flickr_set > 0)) { ! PHPWS_Core::initModClass('featuredphoto', 'lib/Flickr.php'); ! ! $f = new PHPWS_Flickr(PHPWS_Settings::get('featuredphoto', 'flickr_api_key')); ! $person = $f->people_findByUsername(PHPWS_Settings::get('featuredphoto', 'flickr_username')); ! $photoset = $f->photosets_getInfo($this->flickr_set); ! if (!PHPWS_Error::logIfError($person) && !PHPWS_Error::logIfError($photoset)) ! { ! // Get the friendly URL of the user's photos ! $photos_url = $f->urls_getUserPhotos($person['id']); ! // Get the user's first public photo ! $photos = $f->photosets_getPhotos($this->flickr_set, NULL, 1, 1, $photoset['photos']); ! ! if (!PHPWS_Error::logIfError($photos_url) && !PHPWS_Error::logIfError($photos)) ! { ! $photo = $photos['photo'][0]; ! $info = $f->photos_getInfo($photo['id'], $photo['secret']); ! if (!PHPWS_Error::logIfError($info)) ! { ! $template['URL'] = $photos_url . $photo['id']; ! $template['IMAGE_SRC'] = $f->build_photo_url($photo, ! $f->best_photo_size($this->tn_width, $this->tn_height)); ! $template['IMAGE_ALT'] = $photo['title']; ! $template['NAME'] = $photo['title']; ! $template['CAPTION'] = $info['description']; ! return PHPWS_Template::process($template, 'featuredphoto', 'photo/flickr_view.tpl'); ! } ! } ! } } break; *************** *** 346,349 **** --- 405,413 ---- default: { + PHPWS_Core::initModClass('featuredphoto', 'photo.php'); + + $db = new PHPWS_DB('featuredphoto_photos'); + $db->addWhere('active', 1); + $db->addWhere('block_id', $this->getId()); $db->addOrder('id'); $photos = $db->getObjects('FeaturedPhoto'); |
