Menu
▾
▴
[phpws-comm-commits] modules/featuredphoto/class block.php, 1.20, 1.21 manager.php, 1.33, 1.34
|
From: Greg M. <bli...@us...> - 2008-01-26 18:04:20
|
Update of /cvsroot/phpwebsite-comm/modules/featuredphoto/class In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1906/class Modified Files: block.php manager.php Log Message: Can now select a Flickr block mode. Index: manager.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/manager.php,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** manager.php 26 Jan 2008 14:49:11 -0000 1.33 --- manager.php 26 Jan 2008 18:03:53 -0000 1.34 *************** *** 51,55 **** } ! $panel->setContent(FeaturedPhoto_Manager::route($action)); Layout::add(PHPWS_ControlPanel::display($panel->display())); } --- 51,55 ---- } ! $panel->setContent(FeaturedPhoto_Manager::route($action, $panel)); Layout::add(PHPWS_ControlPanel::display($panel->display())); } *************** *** 78,82 **** } ! function route($action) { $title = NULL; --- 78,82 ---- } ! function route($action, &$panel) { $title = NULL; *************** *** 111,114 **** --- 111,116 ---- case 'manageBlocks': + /* Need to set tab in case we got here from another action. */ + $panel->setCurrentTab('manageBlocks'); $title = dgettext('featuredphoto', 'Manage Photo Blocks'); $content = FeaturedPhoto_Manager::listBlocks(); *************** *** 435,438 **** --- 437,464 ---- $form->setMatch('current_photo', $block->current_photo); + if (PHPWS_Settings::get('featuredphoto', 'flickr_support')) + { + PHPWS_Core::initModClass('featuredphoto', 'lib/Flickr.php'); + $flickr_sets[0] = '(' . dgettext('featuredphoto', 'None') . ')'; + + $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)) + { + $photosets = $f->photosets_getList($person['id']); + if (!PHPWS_Error::logIfError($photosets)) + { + $flickr_sets = NULL; + foreach ($photosets as $photoset) + { + $flickr_sets[$photoset['id']] = $photoset['title']; + } + } + } + + $form->addSelect('flickr_set', $flickr_sets); + $form->setMatch('flickr_set', $block->flickr_set); + } + $form->addText('tn_width', $block->getTnWidth()); $form->setSize('tn_width', 4); *************** *** 460,463 **** --- 486,493 ---- $template['TITLE_ERROR'] = $errors['title']; } + if (isset($errors['mode'])) + { + $template['MODE_ERROR'] = $errors['mode']; + } if (isset($errors['resize'])) { *************** *** 478,485 **** --- 508,524 ---- $errors['resize'] = dgettext('featuredphoto', 'Image dimensions must be greater than zero.'); } + if (($_POST['mode'] == FEATUREDPHOTO_BLOCK_MODE_FIXED) && ($_POST['current_photo'] == 0)) + { + $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.'); + } $block->setTitle($_POST['title']); $block->setMode($_POST['mode']); $block->setCurrentPhoto($_POST['current_photo']); + $block->setFlickrSet(isset($_POST['flickr_set']) ? $_POST['flickr_set'] : 0); $block->setTnWidth($_POST['tn_width']); $block->setTnHeight($_POST['tn_height']); Index: block.php =================================================================== RCS file: /cvsroot/phpwebsite-comm/modules/featuredphoto/class/block.php,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** block.php 26 Jan 2008 14:49:11 -0000 1.20 --- block.php 26 Jan 2008 18:03:53 -0000 1.21 *************** *** 25,31 **** PHPWS_Core::initModClass('featuredphoto', 'photo.php'); ! define('FEATUREDPHOTO_BLOCK_MODE_INCREMENT', 0); ! define('FEATUREDPHOTO_BLOCK_MODE_RANDOM', 1); ! define('FEATUREDPHOTO_BLOCK_MODE_FIXED', 2); class FeaturedPhoto_Block --- 25,33 ---- PHPWS_Core::initModClass('featuredphoto', 'photo.php'); ! define('FEATUREDPHOTO_BLOCK_MODE_INCREMENT', 0); ! define('FEATUREDPHOTO_BLOCK_MODE_RANDOM', 1); ! define('FEATUREDPHOTO_BLOCK_MODE_FIXED', 2); ! define('FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST', 3); ! define('FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET', 4); class FeaturedPhoto_Block *************** *** 37,40 **** --- 39,43 ---- var $active = 1; var $current_photo = 0; + var $flickr_set = 0; var $tn_width = FEATUREDPHOTO_DEFAULT_THUMBNAIL_WIDTH; var $tn_height = FEATUREDPHOTO_DEFAULT_THUMBNAIL_HEIGHT; *************** *** 107,111 **** function setCurrentPhoto($current_photo) { ! $this->current_photo = (int)$current_photo; } --- 110,119 ---- function setCurrentPhoto($current_photo) { ! $this->current_photo = (is_numeric($current_photo) ? $current_photo : 0); ! } ! ! function setFlickrSet($flickr_set) ! { ! $this->flickr_set = (is_numeric($flickr_set) ? $flickr_set : 0); } *************** *** 172,175 **** --- 180,191 ---- $modes[FEATUREDPHOTO_BLOCK_MODE_FIXED] = dgettext('featuredphoto', 'Fixed on the image'); + if (PHPWS_Settings::get('featuredphoto', 'flickr_support')) + { + $modes[FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST] = dgettext('featuredphoto', + 'Flickr: Latest public photo'); + $modes[FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET] = dgettext('featuredphoto', + 'Flickr: Latest public photo in set'); + } + return $modes; } *************** *** 288,292 **** $db->setLimit(1); $photos = $db->getObjects('FeaturedPhoto'); ! $photo = &$photos[0]; break; } --- 304,311 ---- $db->setLimit(1); $photos = $db->getObjects('FeaturedPhoto'); ! if (!PHPWS_Error::logIfError($photos) && ($photos != NULL)) ! { ! return $photos[0]->view(); ! } break; } *************** *** 299,303 **** $db->setLimit(1); $photos = $db->getObjects('FeaturedPhoto'); ! $photo = &$photos[0]; } break; --- 318,343 ---- $db->setLimit(1); $photos = $db->getObjects('FeaturedPhoto'); ! if (!PHPWS_Error::logIfError($photos) && ($photos != NULL)) ! { ! return $photos[0]->view(); ! } ! } ! break; ! } ! ! case FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST: ! { ! if (PHPWS_Settings::get('featuredphoto', 'flickr_support')) ! { ! return 'Flickr Latest'; ! } ! break; ! } ! ! case FEATUREDPHOTO_BLOCK_MODE_FLICKR_LATEST_SET: ! { ! if (PHPWS_Settings::get('featuredphoto', 'flickr_support') && ($this->flickr_set > 0)) ! { ! return 'Flickr Latest in Set'; } break; *************** *** 309,320 **** $photos = $db->getObjects('FeaturedPhoto'); ! $newFound = FALSE; ! if ($photos != NULL) { foreach ($photos as $pic) { if (($pic->getId() > $this->current_photo) && (!$newFound)) { ! $newFound = TRUE; $photo = $pic; $this->current_photo = $pic->getId(); --- 349,361 ---- $photos = $db->getObjects('FeaturedPhoto'); ! if (!PHPWS_Error::logIfError($photos) && ($photos != NULL)) { + $newFound = false; + foreach ($photos as $pic) { if (($pic->getId() > $this->current_photo) && (!$newFound)) { ! $newFound = true; $photo = $pic; $this->current_photo = $pic->getId(); *************** *** 324,347 **** if (!$newFound) { ! $newFound = TRUE; $photo = &$photos[0]; $this->current_photo = $photo->getId(); } - } ! if ($newFound) ! { ! $this->save(FALSE); } - break; } } - if (isset($photo)) - { - return $photo->view(); - } - return dgettext('featuredphoto', 'No active photo.'); } --- 365,380 ---- if (!$newFound) { ! $newFound = true; $photo = &$photos[0]; $this->current_photo = $photo->getId(); } ! $this->save(false); ! return $photo->view(); } break; } } return dgettext('featuredphoto', 'No active photo.'); } *************** *** 356,364 **** if (Current_User::allow('featuredphoto')) { ! $link['action'] = 'managePhotos'; ! $link['block_id'] = $this->id; ! $img = sprintf('<img src="./images/mod/featuredphoto/edit.png" alt="%s" title="%s" />', ! dgettext('featuredphoto', 'Manage Photos'), dgettext('featuredphoto', 'Manage Photos')); ! $edit = PHPWS_Text::secureLink($img, 'featuredphoto', $link); if (Current_User::allow('featuredphoto', 'pin_blocks')) --- 389,403 ---- if (Current_User::allow('featuredphoto')) { ! $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'; ! $img = sprintf('<img src="./images/mod/featuredphoto/edit.png" alt="%s" title="%s" />', ! dgettext('featuredphoto', 'Manage Photos'), ! dgettext('featuredphoto', 'Manage Photos')); ! $edit = PHPWS_Text::secureLink($img, 'featuredphoto', $link); ! } if (Current_User::allow('featuredphoto', 'pin_blocks')) *************** *** 408,413 **** $vars['block_id'] = $this->getId(); ! $vars['action'] = 'managePhotos'; ! $links[] = PHPWS_Text::secureLink(dgettext('featuredphoto', 'Photos'), 'featuredphoto', $vars); if (Current_User::allow('featuredphoto', 'edit_blocks', $this->id)) --- 447,456 ---- $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'; ! $links[] = PHPWS_Text::secureLink(dgettext('featuredphoto', 'Photos'), 'featuredphoto', $vars); ! } if (Current_User::allow('featuredphoto', 'edit_blocks', $this->id)) |
