'
- . ''
- . '
';
-}
-
-/**
- * Theme a Flickr photo set as a simple link to the photo set page on Flickr.com.
- */
-function theme_flickrfield_formatter_photoset_flickrcomsetlink($variables) {
- $set_data = flickr_photoset_get_info($variables['#item']['flickrid']);
- $set_url = flickr_photoset_page_url($set_data['owner'], $set_data['id']);
- return l($set_url, $set_url);
-}
-
-/**
- * Flickrfield photo themes.
- *
- * If we are not on the node, make the photo link back to the node,
- * otherwise just display the image. To comply with Flickr terms of service
- * add a link back to the Flickr page.
- */
-function theme_flickrfield_photo($variables) {
- $img = $variables['0'];
- $photo_url = $variables['1'];
- $formatter = $variables['2'];
- $photo_data = $variables['3'];
- $node = $variables['4'];
- $title = is_array($photo_data['title']) ? $photo_data['title']['_content'] : $photo_data['title'];
- if (arg(0) == 'node' && arg(1) == $node->nid) {
- $output = '' . $img . '
';
+
+ if ($link != NULL) {
+ return $options[$link];
}
else {
- $output = '' . l($img, 'node/' . $node->nid, array('attributes' => array('title' => $title), 'absolute' => TRUE, 'html' => TRUE)) . '
';
+ return $options;
}
- $output .= '';
-
- if (module_exists('flickr_sets')) {
- $photos = flickr_set_load($photo_data['id']);
-
- foreach ((array) $photos['photoset']['photo'] as $photo) {
- //insert owner into $photo because theme_flickr_photo needs it
- $photo['owner'] = $photos['photoset']['owner'];
- $title = is_array($photo['title']) ? $photo['title']['_content'] : $photo['title'];
- $img = flickr_img($photo, $formatter);
- $original = flickr_photo_img($photo);
-
- if (arg(0) == 'node' && arg(1) == $node->nid) {
- $output .= '
' . l($img, $original, array('attributes' => array('title' => $title), 'absolute' => TRUE, 'html' => TRUE)) . '
';
- }
- else {
- $output .= '
' . l($img, 'node/' . $node->nid, array('attributes' => array('title' => $title), 'absolute' => TRUE, 'html' => TRUE)) . '
';
- }
- }
+function flickrfield_field_formatter_settings_form($field, $instance, $view_mode, $form, &$form_state) {
+ $display = $instance['display'][$view_mode];
+ $settings = $display['settings'];
+
+ $form = array();
+
+ if($display['type'] == 'flickrfield_photo' || $display['type'] == 'flickrfield_photoset') {
+ $form['size'] = array(
+ '#title' => t('Size'),
+ '#type' => 'select',
+ '#options' => flickrfield_size_options(),
+ '#default_value' => $settings['size'],
+ );
+
+ $form['link'] = array(
+ '#title' => t('Link'),
+ '#type' => 'select',
+ '#options' => flickrfield_link_options(),
+ '#default_value' => $settings['link'],
+ );
}
- else {
- $title = is_array($photo_data['title']) ? $photo_data['title']['_content'] : $photo_data['title'];
-
- if (arg(0) == 'node' && arg(1) == $node->nid) {
- $output .= '
' . $img . '
';
- }
- else {
- $output .= '
' . l($img, 'node/' . $node->nid, array('attributes' => array('title' => $title), 'absolute' => TRUE, 'html' => TRUE)) . '
';
- }
-
+
+ if($display['type'] == 'flickrfield_photoset') {
+ $form['photos'] = array(
+ '#title' => t('Photos'),
+ '#type' => 'textfield',
+ '#maxlength' => 2,
+ '#size' => 2,
+ '#default_value' => $settings['photos'],
+ );
}
- $output .= '
' . l($img, $link, array('attributes' => array('title' => $title), 'html' => TRUE)) . '
';
+function flickrfield_field_formatter_settings_summary($field, $instance, $view_mode) {
+ $display = $instance['display'][$view_mode];
+ $settings = $display['settings'];
+
+ require_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'flickr') . '/flickr.inc';
+ $sizes = flickr_photo_sizes();
+
+ if ($display['type'] == 'flickrfield_photo') {
+ $summary = t('!size Photo linked to !link', array('!size' => flickrfield_size_options($settings['size']), '!link' => flickrfield_link_options($settings['link'])));
+ }
+ else if ($display['type'] == 'flickrfield_photoset') {
+ $summary = t('!size Photoset with !num photos linked to !link', array('!size' => flickrfield_size_options($settings['size']), '!num' => $settings['photos'], '!link' => flickrfield_link_options($settings['link'])));
}
else {
- $output = '' . $img . '
';
+ $summar = NULL;
}
- $output .= '' . l(t('Source: Flickr'), $set_url) . '
';
- return $output;
-}
-
-/**
- * Theme for the form element.
- *
- * The form is already rendered by the child elements by the time it comes back here,
- * just group each delta grouping into its own fieldset.
- */
-function theme_flickrfield($variables) {
- $element = $variables['0'];
- $field = field_info_field($element['#field_name']);
- $fieldset = array(
- '#title' => $field['widget']['label'] . ' ' . ($element['#delta'] > 0 ? intval($element['#delta'] + 1) : ''),
- '#value' => $element['#children'],
- '#collapsible' => FALSE,
- '#collapsed' => FALSE,
- '#description' => $element['#description'],
- '#attributes' => array(),
- );
- return theme('fieldset', $fieldset);
+
+ return $summary;
}
/**
- * Theme function for the Flickr ID form element.
- *
- * The textfield is already rendered by the textfield theme
- * and the html output lives in $element['#children'].
+ * Implements hook_field_formatter_view().
*/
-function theme_flickrfield_flickrid($variables) {
- $element = $variables['0'];
- return $element['#children'];
-}
+function flickrfield_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
+ $element = array();
+ $settings = $display['settings'];
+ $formatter = $display['type'];
+
+ require_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'flickr') . '/flickr.inc';
+ $sizes = flickr_photo_sizes();
+
+ switch ($formatter) {
+ case 'flickrfield_photo':
+ foreach ($items as $delta => $item) {
+ $photo = flickr_photo_get_info($item['id']);
+ $img = flickr_img($photo, $settings['size'], NULL);
+ $photo_url = flickr_photo_page_url($photo['owner'], $photo['id']);
+
+ switch($settings['link']) {
+ case 'flickr':
+ $element[$delta] = array('#markup' => l($img, $photo_url, array('absolute' => TRUE, 'html' => TRUE)));
+ break;
+ case 'node':
+ $element[$delta] = array('#markup' => l($img, 'node/' . $entity->nid, array('html' => TRUE)));
+ break;
+ case 'none':
+ $element[$delta] = array('#markup' => $img);
+ break;
+ default:
+ $linked_photo_url = flickr_photo_img($photo, $settings['link']);
+ $element[$delta] = array('#markup' => l($img, $linked_photo_url, array('absolute' => TRUE, 'html' => TRUE)));
+ break;
+ }
+ }
+ break;
+ case 'flickrfield_photoset':
+ foreach ($items as $delta => $item) {
+ $photoset = flickr_photoset_get_photos($item['id'], array('extras' => NULL, 'privacy_filter' => 1, 'per_page' => $settings['photos'], 'page' => 1, 'media' => 'photos'));
+
+ $photos = array();
+
+ foreach($photoset['photo'] as $photo) {
+ $img = flickr_img($photo, $settings['size'], NULL);
+ $photo_url = flickr_photoset_page_url($photoset['owner'], $photo['id']);
+
+ switch($settings['link']) {
+ case 'flickr':
+ $photos[] = l($img, $photo_url, array('absolute' => TRUE, 'html' => TRUE));
+ break;
+ case 'node':
+ $photos[] = l($img, 'node/' . $entity->nid, array('html' => TRUE));
+ break;
+ case 'none':
+ $photos[] = $img;
+ break;
+ default:
+ $linked_photo_url = flickr_photo_img($photo, $settings['link']);
+ $photos[] = l($img, $linked_photo_url, array('absolute' => TRUE, 'html' => TRUE));
+ break;
+ }
+ }
+
+ $element[$delta] = array('#markup' => theme('item_list', array('items' => $photos, 'attributes' => array('class' => 'flickr-photoset'))));
+ }
+ break;
+ }
+
+ return $element;
+}
\ No newline at end of file
diff --git a/flickr.inc b/flickr.inc
index 93b9eeb..c50cf90 100644
--- a/flickr.inc
+++ b/flickr.inc
@@ -224,8 +224,12 @@ function flickr_photo_img($photo, $size = NULL, $format = NULL) {
// photoset's use primary instead of id to specify the image.
$id = isset($photo['primary']) ? $photo['primary'] : $photo['id'];
$secret = $photo['secret'];
-
- return "http://farm{$farm}.static.flickr.com/{$server}/{$id}_{$secret}" . ($size ? "_$size." : '.') . ($size == 'o' ? $format : 'jpg');
+
+ if ($size == '-') {
+ $size = NULL;
+ }
+
+ return "http://farm{$farm}.static.flickr.com/{$server}/{$id}_{$secret}" . ($size ? "_$size." : '.') . ($size == 'o' ? $photo['originalformat'] : 'jpg');
}
/**
@@ -343,6 +347,32 @@ function flickr_photoset_get_list($nsid) {
}
/**
+ * @param $photoset_id
+ * id of the photoset to get information about
+ *
+ * @return
+ * response from the flickr method flickr.photosets.getPhotos
+ * (http://www.flickr.com/services/api/flickr.photosets.getPhotos.html)
+ */
+function flickr_photoset_get_photos($photoset_id, $vars = array('extras' => NULL, 'privacy_filter' => 1, 'per_page' => 10, 'page' => 1, 'media' => 'all')) {
+ $response = flickr_request(
+ 'flickr.photosets.getPhotos',
+ array(
+ 'photoset_id' => $photoset_id,
+ 'extras' => $vars['extras'],
+ 'privacy_filter' => $vars['privacy_filter'],
+ 'per_page' => $vars['per_page'],
+ 'page' => $vars['page'],
+ 'media' => $vars['media']
+ )
+ );
+ if ($response) {
+ return $response['photoset'];
+ }
+ return FALSE;
+}
+
+/**
* @param $nsid The Flickr user's NSID
*
* @return