Menu
▾
▴
[phpws-comm-commits] modules/featuredphoto/class block.php, 1.23, 1.24 manager.php, 1.37, 1.38
|
From: Greg M. <bli...@us...> - 2008-01-27 18:04:02
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25150/class Modified Files: block.php manager.php Log Message: Added More Photos link. Added Flickr Random in Set block mode. Index: manager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/manager.php,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** manager.php 27 Jan 2008 02:41:30 -0000 1.37 --- manager.php 27 Jan 2008 18:03:31 -0000 1.38 *************** *** 466,469 **** --- 466,470 ---- $form->addSelect('flickr_set', $flickr_sets); $form->setMatch('flickr_set', $block->flickr_set); + $form->setLabel('flickr_set', dgettext('featuredphoto', 'Flickr set to use')); } *************** *** 519,523 **** $errors['mode'] = dgettext('featuredphoto', 'Cannot choose Fixed mode with no image selected.'); } ! if (($_POST['mode'] == FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET) && ($_POST['flickr_set'] == 0)) { $errors['mode'] = dgettext('featuredphoto', 'Cannot choose Flickr Set mode with no set selected.'); --- 520,526 ---- $errors['mode'] = dgettext('featuredphoto', 'Cannot choose Fixed mode with no image selected.'); } ! if ((($_POST['mode'] == FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET) || ! ($_POST['mode'] == FEATUREDPHOTO_BLOCK_MODE_FLICKR_RANDOM_SET)) && ! ($_POST['flickr_set'] == 0)) { $errors['mode'] = dgettext('featuredphoto', 'Cannot choose Flickr Set mode with no set selected.'); *************** *** 742,746 **** } ! /* If Flickr disabled, verify no blocks modes are set to Flickr. */ if (!PHPWS_Settings::get('featuredphoto', 'flickr_support')) { --- 745,749 ---- } ! /* If Flickr disabled, verify no block modes are set to Flickr. */ if (!PHPWS_Settings::get('featuredphoto', 'flickr_support')) { Index: block.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/block.php,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** block.php 27 Jan 2008 01:43:08 -0000 1.23 --- block.php 27 Jan 2008 18:03:31 -0000 1.24 *************** *** 28,31 **** --- 28,32 ---- define('FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST', 3); define('FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET', 4); + define('FEATUREDPHOTO_BLOCK_MODE_FLICKR_RANDOM_SET', 5); class FeaturedPhoto_Block *************** *** 184,187 **** --- 185,190 ---- $modes[FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET] = dgettext('featuredphoto', 'Flickr: Latest public photo in set'); + $modes[FEATUREDPHOTO_BLOCK_MODE_FLICKR_RANDOM_SET] = dgettext('featuredphoto', + 'Flickr: Random public photo in set'); } *************** *** 189,192 **** --- 192,207 ---- } + function isModeFlickr() + { + if (($this->mode == FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST) || + ($this->mode == FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET) || + ($this->mode == FEATUREDPHOTO_BLOCK_MODE_FLICKR_RANDOM_SET)) + { + return true; + } + + return false; + } + function save($save_key=TRUE) { *************** *** 344,348 **** // 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); --- 359,363 ---- // Get the friendly URL of the user's photos $photos_url = $f->urls_getUserPhotos($person['id']); ! // Get the user's latest public photo $photos = $f->people_getPublicPhotos($person['id'], NULL, 1); *************** *** 358,362 **** $template['IMAGE_ALT'] = $photo['title']; $template['NAME'] = $photo['title']; ! $template['CAPTION'] = $info['description']; return PHPWS_Template::process($template, 'featuredphoto', 'photo/flickr_view.tpl'); } --- 373,379 ---- $template['IMAGE_ALT'] = $photo['title']; $template['NAME'] = $photo['title']; ! $template['CAPTION'] = !empty($info['description']) ? $info['description'] : NULL; ! $template['MORE_URL'] = $photos_url; ! $template['MORE'] = dgettext('featuredphoto', 'More Photos'); return PHPWS_Template::process($template, 'featuredphoto', 'photo/flickr_view.tpl'); } *************** *** 368,371 **** --- 385,389 ---- case FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET: + case FEATUREDPHOTO_BLOCK_MODE_FLICKR_RANDOM_SET: { if (PHPWS_Settings::get('featuredphoto', 'flickr_support') && ($this->flickr_set > 0)) *************** *** 376,385 **** $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)) --- 394,407 ---- $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) && ! ($photoset['photos'] > 0)) { // Get the friendly URL of the user's photos $photos_url = $f->urls_getUserPhotos($person['id']); ! ! // Get the user's photo ! $page = (($this->mode == FEATUREDPHOTO_BLOCK_MODE_FLICKR_RANDOM_SET) ? ! rand(1, $photoset['photos']) : $photoset['photos']); ! $photos = $f->photosets_getPhotos($this->flickr_set, NULL, 1, 1, $page); if (!PHPWS_Error::logIfError($photos_url) && !PHPWS_Error::logIfError($photos)) *************** *** 394,398 **** $template['IMAGE_ALT'] = $photo['title']; $template['NAME'] = $photo['title']; ! $template['CAPTION'] = $info['description']; return PHPWS_Template::process($template, 'featuredphoto', 'photo/flickr_view.tpl'); } --- 416,422 ---- $template['IMAGE_ALT'] = $photo['title']; $template['NAME'] = $photo['title']; ! $template['CAPTION'] = !empty($info['description']) ? $info['description'] : NULL; ! $template['MORE_URL'] = $photos_url . 'sets/' . $this->flickr_set; ! $template['MORE'] = dgettext('featuredphoto', 'More Photos'); return PHPWS_Template::process($template, 'featuredphoto', 'photo/flickr_view.tpl'); } *************** *** 455,460 **** $link['block_id'] = $this->getId(); ! if (($this->getMode(false) != FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST) && ! ($this->getMode(false) != FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET)) { $link['action'] = 'managePhotos'; --- 479,483 ---- $link['block_id'] = $this->getId(); ! if (!$this->isModeFlickr()) { $link['action'] = 'managePhotos'; *************** *** 542,547 **** $vars['block_id'] = $this->getId(); ! if (($this->getMode(false) != FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST) && ! ($this->getMode(false) != FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET)) { $vars['action'] = 'managePhotos'; --- 565,569 ---- $vars['block_id'] = $this->getId(); ! if (!$this->isModeFlickr()) { $vars['action'] = 'managePhotos'; |
