diff --git a/field/flickrfield.info b/field/flickrfield.info
index 4ab5ea0..357213e 100644
--- a/field/flickrfield.info
+++ b/field/flickrfield.info
@@ -1,6 +1,9 @@
name = Flickrfield
description = Flickr CCK field to insert Flickr images into content.
+core = 7.x
+
+dependencies[] = field
dependencies[] = flickr
-dependencies[] = content
-package = CCK
-core = 6.x
+
+files[] = flickrfield.install
+files[] = flickrfield.module
\ No newline at end of file
diff --git a/field/flickrfield.install b/field/flickrfield.install
deleted file mode 100644
index 69a94a8..0000000
--- a/field/flickrfield.install
+++ /dev/null
@@ -1,36 +0,0 @@
- array(
'label' => 'Flickr Photo',
'description' => t('Store Flickr Photo or Photoset ids and display the photos in nodes and views.'),
+ 'default_widget' => 'flickrfield',
+ 'default_formatter' => $sizes[0],
),
'flickrfield_photoset' => array(
'label' => 'Flickr photo set',
'description' => t('Field for storing a reference to a Flickr photo set.'),
- )
+ 'default_widget' => 'flickrfield_flickrid',
+ 'default_formatter' => 'photoset_primaryphoto_size' . $sizes[0] . '_nolink',
+ ),
);
}
/**
- * Implementation of hook_field_settings().
+ * Implements hook_field_schema().
*/
-function flickrfield_field_settings($op, $field) {
- switch ($op) {
- case 'database columns':
- if ($field['type'] == 'flickrfield') {
- $columns = array(
- 'id' => array('type' => 'varchar', 'length' => 64, 'not null' => FALSE, 'sortable' => TRUE),
- 'type' => array('type' => 'varchar', 'length' => 10, 'not null' => FALSE, 'sortable' => TRUE),
- 'nsid' => array('type' => 'varchar', 'length' => 64, 'not null' => FALSE, 'sortable' => TRUE),
- );
- }
- else if ($field['type'] == 'flickrfield_photoset') {
- $columns = array(
- 'flickrid' => array('type' => 'varchar', 'length' => 64, 'not null' => FALSE, 'sortable' => TRUE),
- );
- }
- return $columns;
+function flickrfield_field_schema($field) {
+ if ($field['type'] == 'flickrfield') {
+ $columns = array(
+ 'id' => array('type' => 'varchar', 'length' => 64, 'not null' => FALSE, 'sortable' => TRUE),
+ 'type' => array('type' => 'varchar', 'length' => 10, 'not null' => FALSE, 'sortable' => TRUE),
+ 'nsid' => array('type' => 'varchar', 'length' => 64, 'not null' => FALSE, 'sortable' => TRUE),
+ );
}
+ else if ($field['type'] == 'flickrfield_photoset') {
+ $columns = array(
+ 'flickrid' => array('type' => 'varchar', 'length' => 64, 'not null' => FALSE, 'sortable' => TRUE),
+ );
+ }
+ return array('columns' => $columns);
}
/**
- * Implementation of hook_widget_info().
+ * Implements hook_widget_info().
*/
-function flickrfield_widget_info() {
+function flickrfield_field_widget_info() {
return array(
'flickrfield' => array(
'label' => 'Flickr Photo',
'field types' => array('flickrfield'),
- 'multiple values' => CONTENT_HANDLE_CORE,
- 'callbacks' => array(
- 'default value' => CONTENT_CALLBACK_DEFAULT,
- ),
+ 'behaviors' => array(
+ 'multiple values' => FIELD_BEHAVIOR_DEFAULT,
+ 'default value' => FIELD_BEHAVIOR_DEFAULT,
+ ),
),
'flickrfield_flickrid' => array(
'label' => 'Flickr Id',
'field types' => array('flickrfield_photoset'),
- 'multiple values' => CONTENT_HANDLE_CORE,
- 'callbacks' => array(
- 'default value' => CONTENT_CALLBACK_DEFAULT,
- ),
- )
+ 'behaviors' => array(
+ 'multiple values' => FIELD_BEHAVIOR_DEFAULT,
+ 'default value' => FIELD_BEHAVIOR_DEFAULT,
+ ),
+ ),
);
}
-function flickrfield_elements() {
+/**
+ * Implements hook_elements_info().
+ */
+function flickrfield_element_info() {
return array(
'flickrfield' => array(
'#input' => TRUE,
'#columns' => array('type', 'id', 'uid'),
- '#process' => array('flickrfield_process'),
+ '#process' => array('flickrfield_form_process_flickrfield'),
+ //'#theme' => array('theme_flickrfield'),
),
'flickrfield_flickrid' => array(
'#input' => TRUE,
'#columns' => array('flickrid'),
- '#process' => array('flickrfield_flickrid_process'),
- )
+ '#process' => array('flickrfield_form_process_flickrfield_flickrid'),
+ //'#theme' => array('theme_flickrfield_flickrid'),
+ ),
);
}
-function flickrfield_widget(&$form, &$form_state, $field, $items, $delta = 0) {
- $element = array(
- '#type' => $field['widget']['type'],
+/**
+ * Implements hook_field_widget_form().
+ */
+function flickrfield_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) {
+ $element = array(
+ '#type' => $instance['widget']['type'],
'#default_value' => isset($items[$delta]) ? $items[$delta] : '',
);
return $element;
}
-function flickrfield_process($element, $edit, $form_state, $form) {
+/**
+ * Form process callback for flickr photo fields.
+ */
+function flickrfield_form_process_flickrfield($element, $form_state, $form = array()) {
$options = array();
$options['photo_id'] = t("Photo");
$options['set_id'] = t("Photoset");
@@ -121,7 +134,7 @@ function flickrfield_process($element, $edit, $form_state, $form) {
);
$element['id'] = array(
'#type' => 'textfield',
- '#title' => t('Id'),
+ '#title' => t('Item id'),
'#default_value' => !empty($element['#value']['id']) ? $element['#value']['id'] : '',
);
$element['nsid'] = array(
@@ -134,56 +147,61 @@ function flickrfield_process($element, $edit, $form_state, $form) {
return $element;
}
-function flickrfield_flickrid_process($element, $edit, $form_state, $form) {
+/**
+ * Form process callback for flickr photoset fields.
+ */
+function flickrfield_form_process_flickrfield_flickrid($element, $form_state, $form) {
$element['flickrid'] = array(
'#type' => 'textfield',
- '#title' => $element['#title'],
- '#description' => $element['#description'],
- '#required' => $element['#required'],
+ '#title' => !empty($element['#title']) ? $element['#title'] : '',
+ '#description' => !empty($element['#description']) ? $element['#description'] : '',
+ '#required' => FALSE || $element['#required'],
'#field_prefix' => t('Flickr ID: '),
'#default_value' => !empty($element['#value']['flickrid']) ? $element['#value']['flickrid'] : '',
'#size' => 20,
'#maxlength' => 20,
- '#attributes' => array('class' => 'flickrfield_flickrid'),
+ '#attributes' => array('class' => array('flickrfield_flickrid')),
);
return $element;
}
/**
- * Implementation of hook_content_is_empty().
+ * Implements hook_content_is_empty().
*/
-function flickrfield_content_is_empty($item, $field) {
+function flickrfield_field_is_empty($item, $field) {
if ($field['type'] == 'flickrfield') {
- return empty($item['id']);
- } else if ($field['type'] == 'flickrfield_photoset') {
+ return empty($item['id']);
+ }
+ else if ($field['type'] == 'flickrfield_photoset') {
return empty($item['flickrid']);
}
}
/**
- * Implementation of hook_field_formatter_info().
+ * Implements hook_field_formatter_info().
*/
function flickrfield_field_formatter_info() {
- require_once(drupal_get_path('module', 'flickr') .'/flickr.inc');
+ require_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'flickr') . '/flickr.inc';
$sizes = flickr_photo_sizes();
// Formatters for general Flickr CCK field.
foreach ($sizes as $size => $info) {
$formatters[$size] = array(
'label' => $info['label'],
'field types' => array('flickrfield'),
- );
+ );
}
- // Formatters for Flickr photoset CCK field.
+
+ // Formatters for Flickr photoset field.
foreach ($sizes as $size => $info) {
- $formatters['photoset_primaryphoto_size'. $size .'_nolink'] = array(
+ $formatters['photoset_primaryphoto_size' . $size . '_nolink'] = array(
'label' => t('Primary set photo at size "@size"', array('@size' => $info['label'])),
'field types' => array('flickrfield_photoset'),
);
- $formatters['photoset_primaryphoto_size'. $size .'_linknode'] = array(
+ $formatters['photoset_primaryphoto_size' . $size . '_linknode'] = array(
'label' => t('Primary set photo at size "@size" with link to node', array('@size' => $info['label'])),
'field types' => array('flickrfield_photoset'),
);
- $formatters['photoset_primaryphoto_size'. $size .'_linkflickrcomset'] = array(
+ $formatters['photoset_primaryphoto_size' . $size . '_linkflickrcomset'] = array(
'label' => t('Primary set photo at size "@size" with link to set on Flickr.com', array('@size' => $info['label'])),
'field types' => array('flickrfield_photoset'),
);
@@ -200,51 +218,73 @@ function flickrfield_field_formatter_info() {
}
/**
- * Implementation of hook_theme().
+ * Implements hook_field_formatter_view().
+ * @todo: the theme definitions for our field-formatters should be removed from flickrfield_theme() and implemented here
+ * @see http://drupal.org/node/728792 (section "Changed! Hook Formatter")
+ */
+function flickrfield_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
+ $element = array();
+ $sizes = array_keys(flickr_photo_sizes());
+ foreach ($items as $delta => $item) {
+ $variables = array(
+ '#node' => $entity,
+ '#item' => $item,
+ '#formatter' => $display['type'],
+ '#field_name' => $field['field_name'],
+ );
+ $element[$delta]['#markup'] = theme('flickrfield_formatter_' . $display['type'], $variables);
+ }
+ return $element;
+}
+
+/**
+ * Implements hook_theme().
+ * @todo: the theme definitions for our field-formatters should go in flickrfield_field_formatter_view()
+ * @see http://drupal.org/node/728792 (section "Changed! Hook Formatter")
*/
function flickrfield_theme() {
- require_once(drupal_get_path('module', 'flickr') .'/flickr.inc');
+ require_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'flickr') . '/flickr.inc';
$themes = array();
foreach (flickr_photo_sizes() as $size => $info) {
- $themes['flickrfield_formatter_'. $size] = array(
- 'arguments' => array('element'),
+ $themes['flickrfield_formatter_' . $size] = array(
+ 'variables' => array('element'),
'function' => 'theme_flickrfield_field_formatter',
- );
+ );
// Theme function for the primary photo formatters of a Flickr photo set.
- $themes['flickrfield_formatter_photoset_primaryphoto_size'. $size .'_nolink'] = array(
- 'arguments' => array('element'),
+ $themes['flickrfield_formatter_photoset_primaryphoto_size' . $size . '_nolink'] = array(
+ 'variables' => array('element'),
'function' => 'theme_flickrfield_formatter_photoset_primaryphoto',
);
- $themes['flickrfield_formatter_photoset_primaryphoto_size'. $size .'_linknode'] = array(
- 'arguments' => array('element'),
+ $themes['flickrfield_formatter_photoset_primaryphoto_size' . $size . '_linknode'] = array(
+ 'variables' => array('element'),
'function' => 'theme_flickrfield_formatter_photoset_primaryphoto',
);
- $themes['flickrfield_formatter_photoset_primaryphoto_size'. $size .'_linkflickrcomset'] = array(
- 'arguments' => array('element'),
+ $themes['flickrfield_formatter_photoset_primaryphoto_size' . $size . '_linkflickrcomset'] = array(
+ 'variables' => array('element'),
'function' => 'theme_flickrfield_formatter_photoset_primaryphoto',
);
}
return $themes + array(
'flickrfield_photo' => array(
- 'arguments' => array('img', 'photo_url', 'formatter', 'photo_data', 'node'),
+ 'variables' => array('img', 'photo_url', 'formatter', 'photo_data', 'node'),
),
'flickrfield_photoset' => array(
- 'arguments' => array('img', 'photo_url', 'formatter', 'photo_data', 'node'),
+ 'variables' => array('img', 'photo_url', 'formatter', 'photo_data', 'node'),
),
'flickrfield' => array(
- 'arguments' => array('element'),
+ 'variables' => array('element'),
),
'flickrfield_flickrid' => array(
- 'arguments' => array('element'),
+ 'variables' => array('element'),
),
'flickrfield_photoset_primaryphoto' => array(
- 'arguments' => array('element'),
+ 'variables' => array('element'),
),
'flickrfield_formatter_photoset_flickrcomslideshow' => array(
- 'arguments' => array('element'),
+ 'variables' => array('element'),
),
'flickrfield_formatter_photoset_flickrcomsetlink' => array(
- 'arguments' => array('element'),
+ 'variables' => array('element'),
),
);
}
@@ -253,7 +293,7 @@ function flickrfield_theme() {
* Basic flickrfield formatter.
*/
function theme_flickrfield_field_formatter($element) {
- require_once(drupal_get_path('module', 'flickr') .'/flickr.inc');
+ require_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'flickr') . '/flickr.inc';
$item = $element['#item'];
if (empty($item['id'])) {
return;
@@ -266,12 +306,12 @@ function theme_flickrfield_field_formatter($element) {
$photo_data = flickr_photo_get_info($item['id']);
$img = flickr_img($photo_data, $formatter);
$photo_url = flickr_photo_page_url($photo_data['owner'], $photo_data['id']);
- return theme('flickrfield_photo', $img, $photo_url, $formatter, $photo_data, $node);
+ return theme('flickrfield_photo', array('0' => $img, '1' => $photo_url, '2' => $formatter, '3' => $photo_data, '4' => $node));
case 'set_id':
$photo_data = flickr_photoset_get_info($item['id']);
$img = flickr_img($photo_data, $formatter);
$photo_url = flickr_photoset_page_url($photo_data['owner'], $photo_data['id']);
- return theme('flickrfield_photoset', $img, $photo_url, $formatter, $photo_data, $node);
+ return theme('flickrfield_photoset', array('0' => $img, '1' => $photo_url, '2' => $formatter, '3' => $photo_data, '4' => $node));
}
}
@@ -279,7 +319,7 @@ function theme_flickrfield_field_formatter($element) {
* Theme a Flickr photo set as the primary photo of that set.
*/
function theme_flickrfield_formatter_photoset_primaryphoto($element) {
- require_once(drupal_get_path('module', 'flickr') .'/flickr.inc');
+ require_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'flickr') . '/flickr.inc';
if (empty($element['#item']['flickrid'])) {
return;
}
@@ -290,7 +330,7 @@ function theme_flickrfield_formatter_photoset_primaryphoto($element) {
$img = flickr_img($set_data, $size);
switch ($formatter_info[3]) {
case 'linknode':
- $link = 'node/'. $element['#node']->nid;
+ $link = 'node/' . $element['#node']->nid;
break;
case 'linkflickrcomset':
$link = $set_url;
@@ -299,31 +339,32 @@ function theme_flickrfield_formatter_photoset_primaryphoto($element) {
$link = NULL;
break;
}
- $title = is_array($photo_data['title']) ? $photo_data['title']['_content'] : $photo_data['title'];
+ $title = is_array($set_data['title']) ? $set_data['title']['_content'] : $set_data['title'];
- return theme('flickrfield_photoset_primaryphoto', $img, $link, $set_url, $size, $title);
+ $vars = array($img, $link, $set_url, $size, $title);
+ return theme('flickrfield_photoset_primaryphoto', $vars);
}
/**
* Theme a Flickr photo set as an embedded Flickr.com flash slideshow.
*/
-function theme_flickrfield_formatter_photoset_flickrcomslideshow($element) {
- require_once(drupal_get_path('module', 'flickr') .'/flickr.inc');
- if (empty($element['#item']['flickrid'])) {
+function theme_flickrfield_formatter_photoset_flickrcomslideshow($variables) {
+ require_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'flickr') . '/flickr.inc';
+ if (empty($variables['#item']['flickrid'])) {
return;
}
- $set_id = $element['#item']['flickrid'];
- $src = 'http://www.flickr.com/slideShow/index.gne?set_id='. $set_id;
+ $set_id = $variables['#item']['flickrid'];
+ $src = 'http://www.flickr.com/slideShow/index.gne?set_id=' . $set_id;
return ''
- .''
- .'
';
+ . ''
+ . '';
}
/**
* Theme a Flickr photo set as a simple link to the photo set page on Flickr.com.
*/
-function theme_flickrfield_formatter_photoset_flickrcomsetlink($element) {
- $set_data = flickr_photoset_get_info($element['#item']['flickrid']);
+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);
}
@@ -335,51 +376,67 @@ function theme_flickrfield_formatter_photoset_flickrcomsetlink($element) {
* otherwise just display the image. To comply with Flickr terms of service
* add a link back to the Flickr page.
*/
-function theme_flickrfield_photo($img, $photo_url, $formatter, $photo_data, $node) {
+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 .'
';
+ $output = '' . $img . '
';
}
else {
- $output = ''. l($img, 'node/'. $node->nid, array('attributes' => array('title' => $title), 'absolute' => TRUE, 'html' => TRUE)) . '
';
+ $output = '' . l($img, 'node/' . $node->nid, array('attributes' => array('title' => $title), 'absolute' => TRUE, 'html' => TRUE)) . '
';
}
- $output .= ''. l(t('Source: Flickr'), $photo_url) .'
';
+ $output .= '' . l(t('Source: Flickr'), $photo_url) . '
';
return $output;
}
-function theme_flickrfield_photoset($img, $photo_url, $formatter, $photo_data, $node) {
+/**
+ * Theme function for showing a photo set.
+ */
+function theme_flickrfield_photoset($variables) {
+ $img = $variables['0'];
+ $photo_url = $variables['1'];
+ $formatter = $variables['2'];
+ $photo_data = $variables['3'];
+ $node = $variables['4'];
$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);
+ //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)) . '
';
+ $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)) . '
';
}
}
- } else {
+ }
+ 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)) . '
';
+ $output .= '
' . $img . '
';
+ }
+ else {
+ $output .= '
' . l($img, 'node/' . $node->nid, array('attributes' => array('title' => $title), 'absolute' => TRUE, 'html' => TRUE)) . '
';
}
}
$output .= '
'. l($img, $link, array('attributes' => array('title' => $title), 'html' => TRUE)) . '
';
+ $output = '' . l($img, $link, array('attributes' => array('title' => $title), 'html' => TRUE)) . '
';
}
else {
- $output = ''. $img .'
';
+ $output = '' . $img . '
';
}
- $output .= ''. l(t('Source: Flickr'), $set_url) .'
';
+ $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($element) {
- $fields = content_fields();
- $field = $fields[$element['#field_name']];
+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) : ''),
+ '#title' => $field['widget']['label'] . ' ' . ($element['#delta'] > 0 ? intval($element['#delta'] + 1) : ''),
'#value' => $element['#children'],
'#collapsible' => FALSE,
'#collapsed' => FALSE,
@@ -431,6 +493,7 @@ function theme_flickrfield($element) {
* The textfield is already rendered by the textfield theme
* and the html output lives in $element['#children'].
*/
-function theme_flickrfield_flickrid($element) {
+function theme_flickrfield_flickrid($variables) {
+ $element = $variables['0'];
return $element['#children'];
}