';
- $form[$fieldname]['new']['#value'] = format_plural($max_images, 'You can only attach one image to this field. Delete the image if you wish to be able to upload a different one.', 'You can only attach @count images to this field. Delete an image if you wish to be able to upload different images.');
- }
- else {
- // Seperate from tree becase of that silly things won't be
- // displayed if they are a child of '#type' = form issue
- $form[$fieldname]['new'][$fieldname .'_upload'] = array(
- '#type' => 'file',
- '#description' => $field['widget']['description'],
- '#tree' => FALSE,
- '#weight' => 9,
- );
-
- $form[$fieldname]['new']['upload'] = array(
- '#type' => 'button',
- '#value' => t('Upload'),
- '#name' => 'cck_imagefield_'.$fieldname.'_op',
- '#id' => form_clean_id($fieldname .'-attach-button'),
- '#tree' => FALSE,
- '#weight' => 10,
- );
- // The class triggers the js upload behaviour.
- $form[$fieldname .'-attach-url'] = array('#type' => 'hidden', '#value' => url('imagefield/js', NULL, NULL, TRUE), '#attributes' => array('class' => 'upload'));
- }
-
-
- // @todo split following if block into its own function.
- // Store the file data object to be carried on.
- if (is_array($items) && count($items)) {
- foreach($items as $delta => $file) {
- if ($file['filepath'] && !$file['flags']['hidden']) {
- $form[$fieldname][$delta] = array (
- '#theme' => 'imagefield_edit_image_row',
- );
-
- $form[$fieldname][$delta]['flags']['delete'] = array(
- '#type' => 'checkbox',
- '#title' => t('Delete'),
- '#default_value' => isset($file['flags']['delete']) ? $file['flags']['delete'] : 0,
- );
-
- if (function_exists('token_replace')) {
- global $user;
- $filename = $file['fid'] == 'upload' ? file_create_filename($file['filename'], file_create_path(token_replace($field['widget']['image_path'], 'user', $user))) : $file['filepath'];
- } else {
- $filename = $file['fid'] == 'upload' ? file_create_filename($file['filename'], file_create_path($field['widget']['image_path'])) : $file['filepath'];
- }
-
- $form[$fieldname][$delta]['admin_preview'] = array(
- '#type' => 'markup',
- '#value' => theme('imagefield_image', $file, $file['alt'], $file['title'], array('width' => '150'), FALSE),
- );
-
- $form[$fieldname][$delta]['description'] = array(
- '#type' => 'markup',
- '#value' => '
' . t('Filename: ') . '' . $file['filename'],
- );
-
- $form[$fieldname][$delta]['alt'] = array(
- '#type' => 'hidden',
- '#value' => $file['filename'],
- );
- // overwrite with an input field if custom_alt is flagged;
- if ($field['widget']['custom_alt']) {
- $form[$fieldname][$delta]['alt'] = array(
- '#type' => 'textfield',
- '#title' => t('Alternate text'),
- '#default_value' => $file['alt'],
- '#description' => t('Alternate text to be displayed if the image cannot be displayed.'),
- '#maxlength' => 255,
- '#size' => 10,
- );
- }
-
- $form[$fieldname][$delta]['title'] = array(
- '#type' => 'hidden',
- '#value' => $file['filename'],
- );
- // overwrite with an input field if custom_title is flagged;
- if ($field['widget']['custom_title']) {
- $form[$fieldname][$delta]['title'] = array(
- '#type' => 'textfield',
- '#title' => t('Title'),
- '#default_value' => $file['title'],
- '#description' => t('Text to be displayed on mouse overs.'),
- '#maxlength' => 255,
- '#size' => 10,
- );
- }
-
- // Special handling for single value fields
- if (!$field['multiple']) {
- $form[$fieldname][$delta]['replace'] = array(
- '#type' => 'markup',
- '#value' => t('If a new image is chosen, the current image will be replaced upon submitting the form.'),
- );
- }
- }
- elseif ($file['filepath'] && $file['flags']['hidden']) {
- // Render all the form values of this item if it is hidden.
- $form[$fieldname][$delta]['flags']['hidden'] = array('#type' => 'value', '#value' => $file['flags']['hidden']);
- $form[$fieldname][$delta]['flags']['delete'] = array('#type' => 'value', '#value' => $file['flags']['delete']);
- $form[$fieldname][$delta]['title'] = array('#type' => 'value', '#value' => $file['title']);
- $form[$fieldname][$delta]['alt'] = array('#type' => 'value', '#value' => $file['alt']);
- }
- if (isset($file['sessionid'])) {
- $form[$fieldname][$delta]['sessionid'] = array('#type' => 'value', '#value' => $file['sessionid']);
- }
- $form[$fieldname][$delta]['filename'] = array('#type' => 'value', '#value' => $file['filename']);
- $form[$fieldname][$delta]['filepath'] = array('#type' => 'value', '#value' => $file['filepath']);
- $form[$fieldname][$delta]['preview'] = array('#type' => 'value', '#value' => $file['preview']);
- $form[$fieldname][$delta]['filemime'] = array('#type' => 'value', '#value' => $file['filemime']);
- $form[$fieldname][$delta]['filesize'] = array('#type' => 'value', '#value' => $file['filesize']);
- $form[$fieldname][$delta]['fid'] = array('#type' => 'value', '#value' => $file['fid']);
- }
- }
-
-
-
- // Some useful info for our js callback.
- $form['vid'] = array(
- '#type' => 'hidden',
- '#value' => $node->vid,
- '#tree' => FALSE,
- );
- $form['nid'] = array(
- '#type' => 'hidden',
- '#value' => $node->nid,
- '#tree' => FALSE,
- );
- $form['type'] = array(
- '#type' => 'hidden',
- '#value' => $node->type,
- '#tree' => FALSE,
- );
-
- return $form;
}
/**
@@ -831,15 +732,6 @@
$valid = FALSE;
}
- // If max number of images is set
- if ($field['multiple'] && !empty($field['widget']['max_number_images'])) {
- $count = count($items) + count($_SESSION['imagefield'][$field['field_name']]);
- if ($count >= $field['widget']['max_number_images']) {
- form_set_error($field['field_name'], t('You are only allowed to upload up to %maximages images.', array('%maximages' => $field['widget']['max_number_images'])));
- $valid = FALSE;
- }
- }
-
return $valid;
}
@@ -852,16 +744,45 @@
'default' => array(
'label' => 'Default',
'field types' => array('image'),
+ 'multiple values' => CONTENT_HANDLE_CORE,
),
);
return $formatters;
}
+function _imagefield_file_load($fid = NULL) {
+ // Don't bother if we weren't passed and fid.
+ if (!empty($fid) && is_numeric($fid)) {
+ $result = db_query('SELECT * FROM {files} WHERE fid = %d', $fid);
+ $file = db_fetch_array($result);
+ if ($file) {
+ return $file;
+ }
+ }
+ // return an empty array if nothing was found.
+ return array();
+}
+
/**
- * Implementation of hook_field_formatter().
- *
+ * Implementation of hook_theme().
*/
-function imagefield_field_formatter($field, $item, $formatter, $node = NULL) {
+function imagefield_theme() {
+ return array(
+ 'imagefield_view_image' => array('file' => NULL, 'alt' => '', 'title' => '', 'attributes' => NULL, 'getsize' => TRUE),
+ 'imagefield_edit_image_row' => array('element' => NULL),
+ 'imagefield_image' => array('file' => NULL, 'alt' => '', 'title' => '', 'attributes' => NULL, 'getsize' => TRUE),
+ 'imagefield' => array('element' => NULL),
+ 'imagefield_row' => array('element' => NULL),
+ );
+}
+
+/**
+ * Theme function for 'default' text field formatter.
+ */
+function theme_imagefield_formatter_default($element) {
+ $item = $element['#item'];
+ $field = $element['#field'];
+
if (empty($item['fid']) && $field['use_default_image']) {
$item = $field['default_image'];
}
@@ -874,27 +795,42 @@
}
}
-
-function _imagefield_file_load($fid = NULL) {
- // Don't bother if we weren't passed and fid.
- if (!empty($fid) && is_numeric($fid)) {
- $result = db_query('SELECT * FROM {files} WHERE fid = %d', $fid);
- $file = db_fetch_array($result);
- if ($file) {
- return $file;
- }
- }
- // return an empty array if nothing was found.
- return array();
-}
-
function theme_imagefield_view_image($file, $alt = '', $title = '', $attributes = NULL, $getsize = TRUE) {
return theme('imagefield_image', $file, $alt, $title, $attributes , $getsize);
}
+function theme_imagefield(&$element) {
+ $output = '';
+ if ($element['#multiple']) {
+ $rows = array();
+ foreach($element['#files'] as $fid => $file) {
+ $element[$fid]['weight']['#attributes']['class'] = isset($element[$fid]['weight']['#attributes']['class']) ? ($element[$fid]['weight']['#attributes']['class'] .' '. $element['#id'] .'-weight') : $element['#id'] .'-weight';
+
+ $row = array();
+ $row[] = array('data' => '', 'class' => 'content-multiple-drag');
+ $row[] = theme('imagefield_row', $element[$fid]);
+ $row[] = drupal_render($element[$fid]['weight']);
+ $rows[] = array('data' => $row, 'class' => 'draggable');
+ }
+
+ $header = array(array('colspan' => 2, 'data' => $element['#title']), '');
+ drupal_add_tabledrag($element['#id'] .'-table', 'order', 'sibling', $element['#id'] .'-weight');
+ $output .= theme('table', $header, $rows, array('id' => $element['#id'] .'-table'));
+ }
+ elseif (count($element['#files'])) {
+ $fid = array_shift(array_keys($element['#files']));
+ $output .= theme('imagefield_row', $element[$fid]);
+ }
+ if (isset($element['replace'])) {
+ $output .= '
'. drupal_render($element['replace']) .'
';
+ }
+ $output = '
'. $output .'
';
+ $output .= drupal_render($element['new']);
+ return $output;
+}
-function theme_imagefield_edit_image_row($element) {
+function theme_imagefield_row($element) {
$output = '
'. drupal_render($element['admin_preview']) .'
';
$output .= '
';
$output .= '
'. drupal_render($element['flags']) .'
';
@@ -904,7 +840,6 @@
$output .= drupal_render($element['title']);
$output .= '
';
//$output .= '
'. $element['fid']['#value'] .'
';
- $output = '
'. $output .'
';
if (isset($element['replace'])) {
$output .= '
'. drupal_render($element['replace']) .'
';
}
@@ -927,17 +862,6 @@
}
}
-/**
- * formats an array of images.
- * @param images
- * array of individually themed images
- * @return
- * html string
- */
-function theme_imagefield_multiple($images) {
- return implode("\n", $images);
-}
-
/**
* implementation of hook_filedownload
* replicated from upload.module.
@@ -989,6 +913,47 @@
* Menu-callback for JavaScript-based uploads.
*/
function imagefield_js() {
+
+
+ // Load the form from the Form API cache.
+ $cache = cache_get('form_'. $_POST['form_build_id'], 'cache_form');
+
+ // We only do the upload.module part of the node validation process.
+ $node = (object)$_POST;
+ unset($node->files['upload']);
+ $form = $cache->data;
+ $form_state = array('values' => $_POST);
+
+ // Handle new uploads, and merge tmp files into node-files.
+ upload_node_form_submit($form, $form_state);
+ $node_files = upload_load($node);
+ if (!empty($form_state['values']['files'])) {
+ foreach ($form_state['values']['files'] as $fid => $file) {
+ if (is_numeric($fid)) {
+ $node->files[$fid] = $file;
+ if (!isset($file['filepath'])) {
+ $node->files[$fid] = $node_files[$fid];
+ }
+ }
+ }
+ }
+ $form = _upload_form($node);
+
+ // Update the default values changed in the $_POST array.
+ $files = isset($_POST['files']) ? $_POST['files'] : array();
+ foreach ($files as $fid => $file) {
+ if (is_numeric($fid)) {
+ $form['files'][$fid]['description']['#default_value'] = $file['description'];
+ $form['files'][$fid]['list']['#default_value'] = isset($file['list']) ? 1 : 0;
+ $form['files'][$fid]['remove']['#default_value'] = isset($file['remove']) ? 1 : 0;
+ $form['files'][$fid]['weight']['#default_value'] = $file['weight'];
+ }
+ }
+
+ // Add the new element to the stored form state and resave.
+ $cache->data['attachments']['wrapper'] = array_merge($cache->data['attachments']['wrapper'], $form);
+ cache_set('form_'. $_POST['form_build_id'], $cache->data, 'cache_form', $cache->expire);
+
// Parse fieldname from submit button.
$matches = array();
foreach(array_keys($_POST) as $key) {
@@ -1028,13 +993,17 @@
// Get our new form baby, yeah tiger, get em!
$form = _imagefield_widget_form($node, $field, $items);
- foreach (module_implements('form_alter') as $module) {
- $function = $module .'_form_alter';
- $function('imagefield_js', $form);
- }
- $form = form_builder('imagefield_js', $form);
-
- $output = theme('status_messages') . drupal_render($form);
+ // Render the form for output.
+ $form += array(
+ '#post' => $_POST,
+ '#programmed' => FALSE,
+ '#tree' => FALSE,
+ '#parents' => array(),
+ );
+ drupal_alter('form', $form, array(), 'imagefield_js');
+ $form_state = array('submitted' => FALSE);
+ $form = form_builder('imagefield_js', $form, $form_state);
+ $output = theme('status_messages') . drupal_render($form);
// We send the updated file attachments form.
print drupal_to_js(array('status' => TRUE, 'data' => $output));
Index: imagefield.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/imagefield/imagefield.info,v
retrieving revision 1.4.4.2
diff -u -r1.4.4.2 imagefield.info
--- imagefield.info 6 Dec 2007 09:25:39 -0000 1.4.4.2
+++ imagefield.info 11 Apr 2008 12:18:35 -0000
@@ -1,5 +1,6 @@
; $Id: imagefield.info,v 1.4.4.2 2007/12/06 09:25:39 dopry Exp $
name = Image Field
description = Defines an image field type.
-dependencies = content
+core = 6.x
+dependencies[] = content
package = CCK