';
- $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.');
+ // Special handling for single value fields
+ if (!$field['multiple'] && count($element['#files'])) {
+ $element['replace'] = array(
+ '#type' => 'markup',
+ '#value' => t('If a new image is chosen, the current image will be replaced upon submitting the form.'),
+ );
+ }
+
+ $max_images = $field['multiple'];
+ if ($field['multiple'] && $max_images && $max_images <= count($element['#files'])) {
+ $element['new']['#type'] = 'markup';
+ $element['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
+ // 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(
+ $element['new'][$fieldname .'_upload'] = array(
'#type' => 'file',
+ '#title' => $field['widget']['label'],
'#description' => $field['widget']['description'],
'#tree' => FALSE,
'#weight' => 9,
);
- $form[$fieldname]['new']['upload'] = array(
+ $element['new']['upload'] = array(
'#type' => 'button',
'#value' => t('Upload'),
- '#name' => 'cck_imagefield_'.$fieldname.'_op',
- '#id' => form_clean_id($fieldname .'-attach-button'),
- '#tree' => FALSE,
+ '#ahah' => array(
+ 'wrapper' => $element['#id'] .'-wrapper',
+ 'path' => 'imagefield/js/'. $field['type_name'] .'/'. $field['field_name'],
+ 'progress' => array('type' => 'bar', 'message' => t('Uploading image...')),
+ ),
'#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'));
}
+ return $element;
+}
- // @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',
- );
+/**
+ * Validate the widget.
+ */
+function _imagefield_widget_validate($element, &$form_state) {
+ $field = $element['#field'];
+ $fieldname = $field['field_name'];
+ $items =& $form_state['values'][$fieldname];
+ unset($items['new']);
- $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'],
- );
+ // Allow tokenized paths.
+ if (function_exists('token_replace')) {
+ global $user;
+ $widget_image_path = file_directory_path() .'/'. token_replace($field['widget']['image_path'], 'user', $user);
+ }
+ else {
+ $widget_image_path = file_directory_path() .'/'. $field['widget']['image_path'];
+ }
- $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
+ $validators = array(
+ 'file_validate_extensions' => array($field['widget']['file_extensions']),
+ 'file_validate_size' => array($field['widget']['max_filesize']),
+ );
+
+ // Attach new files.
+ if (imagefield_check_directory($widget_image_path, $fieldname .'_upload') && $file = file_save_upload($fieldname .'_upload', $validators, $widget_image_path)) {
+ // If a single field, mark any other images for deletion.
+ if (count($items)) {
+ foreach ($items as $delta => $item_file) {
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.'),
- );
+ $items[$delta]['flags']['hidden'] = TRUE;
+ $items[$delta]['flags']['delete'] = TRUE;
+ }
+ if (empty($items[$delta]['fid'])) {
+ unset($items[$delta]);
}
}
- 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']);
}
- }
-
+ $file = (array)$file;
+ $file = _imagefield_scale_image($file, $field['widget']['max_resolution']);
+ $items[$file['fid']] = $file;
+ }
- // 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;
-}
-
-/**
- * Validate the widget.
- */
-function _imagefield_widget_validate($node, $field, $items) {
-
- if ($field['required']) {
+ if ($element['#image_required']) {
// Sum all the items marked for deletion, so we can make sure the end user
// isn't deleting all of the images.
$deleted = 0;
- foreach($items as $item) {
- if ($item['flags']['delete']) {
+ foreach ($items as $delta => $item) {
+ if (is_numeric($delta) && $item['flags']['delete']) {
$deleted++;
}
}
- if (!count($items)) {
- form_set_error($field['field_name'], $field['widget']['label'] .' is required. Please upload an image.');
+ if (!count($items)) {
+ form_set_error($field['field_name'] .'_upload', t('@field is required. Please upload an image.', array('@field' => $field['widget']['label'])));
}
else if (count($items) == $deleted ) {
- form_set_error($field['field_name'], $field['widget']['label'] .' is required. Please uncheck at least one delete checkbox or upload another image.');
+ form_set_error($field['field_name'] .'_upload', t('@field is required. Please uncheck at least one delete checkbox or upload another image.', array('@field' => $field['widget']['label'])));
}
}
-}
-function _imagefield_widget_upload_validate($node, $field, $items, $file) {
- // initialize our validation state, innocent until proven guilty.
- $valid = TRUE;
-
- // do we even need to test file extensions?
- if (!empty($field['widget']['file_extensions'])) {
- // pop out the extensions and turn file_extensions into an array.
- $ext = strtolower(array_pop(explode('.', $file['filename'])));
- $allowed_extensions = array_unique(explode(' ', strtolower(trim($field['widget']['file_extensions']))));
- // is it the file extension in the allowed_extensions array?
- if (!in_array($ext, $allowed_extensions)) {
- // sorry no..
- form_set_error($field['field_name'], t('Files with the extension %ext are not allowed. Please upload a file with an extension from the following list: %allowed_extensions', array('%ext' => $ext, '%allowed_extensions' => $field['widget']['file_extensions'])));
- $valid = FALSE;
- }
+ // Prevent more than the maximum limit.
+ if ($field['multiple'] > 0 && count($items) > $field['multiple']) {
+ form_set_error($field['field_name']['new'], t('You are only allowed to upload up to %maximages images.', array('%maximages' => $field['widget']['max_number_images'])));
}
-
- // If max filesize is set
- if (!empty($field['widget']['max_filesize'])) {
- if ($file['filesize'] > ($field['widget']['max_filesize'] * 1024)) {
- form_set_error($field['field_name'], t('The file you uploaded has a filesize greater than the maximum allowed filesize of %sizekb.', array('%size' => $field['widget']['max_filesize'])));
- $valid = FALSE;
- }
- }
-
- // is the mime type a match for image.
- if (strpos($file['filemime'], 'image/') !== 0) {
- // sorry no it isn't. do not pass go, do not collect $200.
- form_set_error($field['field_name'], t('Mime Type mismatch. Only image files may be upload. You uploaded a file with mime type: %mime', array('%mime' => $file['filemime'])));
- $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;
}
-
/**
* Implementation of hook_field_formatter_info().
*/
function imagefield_field_formatter_info() {
$formatters = array(
'default' => array(
- 'label' => 'Default',
+ 'label' => t('Default'),
'field types' => array('image'),
),
);
return $formatters;
}
-/**
- * Implementation of hook_field_formatter().
- *
- */
-function imagefield_field_formatter($field, $item, $formatter, $node = NULL) {
- if (empty($item['fid']) && $field['use_default_image']) {
- $item = $field['default_image'];
- }
- // If there is no image on the database, use default.
- if (empty($item['filepath'])) {
- $item = array_merge($item, _imagefield_file_load($item['fid']));
- }
- if (!empty($item['filepath'])) {
- return theme('imagefield_image', $item, $item['alt'], $item['title']);
- }
-}
-
-
function _imagefield_file_load($fid = NULL) {
// Don't bother if we weren't passed and fid.
- if (!empty($fid) && is_numeric($fid)) {
+ if (!empty($fid) && is_numeric($fid)) {
$result = db_query('SELECT * FROM {files} WHERE fid = %d', $fid);
$file = db_fetch_array($result);
if ($file) {
@@ -888,13 +669,96 @@
return array();
}
-function theme_imagefield_view_image($file, $alt = '', $title = '', $attributes = NULL, $getsize = TRUE) {
- return theme('imagefield_image', $file, $alt, $title, $attributes , $getsize);
+/**
+ * Implementation of hook_theme().
+ */
+function imagefield_theme() {
+ return array(
+ 'imagefield_image' => array(
+ 'arguments' => array('file' => NULL, 'alt' => '', 'title' => '', 'attributes' => NULL, 'getsize' => TRUE),
+ ),
+ 'imagefield' => array(
+ 'arguments' => array('element' => NULL),
+ ),
+ 'imagefield_row' => array(
+ 'arguments' => array('element' => NULL),
+ ),
+ 'imagefield_formatter_default' => array(
+ 'arguments' => array('element' => NULL),
+ ),
+ );
}
+/**
+ * Theme function for 'default' text field formatter.
+ */
+function theme_imagefield_formatter_default($element) {
+ $item = $element['#item'];
+
+ if (!empty($item['filepath'])) {
+ return theme('imagefield_image', $item, $item['alt'], $item['title']);
+ }
+}
+
+/**
+ * FormAPI theme function. Theme the output of an image field.
+ */
+function theme_imagefield(&$element) {
+ $output = '';
+
+ // Always add tabledrag in case a table is created after uploads.
+ if ($element['#multiple']) {
+ drupal_add_tabledrag($element['#id'] .'-table', 'order', 'sibling', $element['#id'] .'-weight');
+ }
+ // Print out the existing images.
+ if ($element['#multiple'] && !empty($element['#files'])) {
+ $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';
-function theme_imagefield_edit_image_row($element) {
+ $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');
+ }
+
+ $existing_items = theme('table', array(), $rows, array('id' => $element['#id'] .'-table'));
+ }
+ elseif (!empty($element['#files'])) {
+ foreach ($element['#files'] as $file) {
+ if ($file['fid'] && !$file['flags']['hidden']) {
+ $existing_items = '
';
- //$output .= ''. theme('imagefield_row', $element[$file['fid']]) .'
';
+ break;
+ }
+ }
+ }
+
+ if (isset($existing_items)) {
+ $existing_element = array(
+ '#type' => 'element',
+ '#title' => $element['#title'],
+ '#required' => $element['#image_required'],
+ );
+ $output .= theme('form_element', $existing_element, $existing_items);
+ unset($element['new'][$element['#field']['field_name'] .'_upload']['#title']);
+ }
+ else {
+ $element['new'][$element['#field']['field_name'] .'_upload']['#required'] = $element['#image_required'];
+ }
+
+ // Additional image information and upload controls.
+ if (isset($element['replace'])) {
+ $output .= ''. drupal_render($element['replace']) .'
';
+ }
+ $output .= drupal_render($element['new']);
+ $output = ''. $output .'
';
+
+ return $output;
+}
+
+function theme_imagefield_row($element) {
$output = ''. drupal_render($element['admin_preview']) .'
';
$output .= '';
$output .= '
';
$output .= drupal_render($element['alt']);
$output .= drupal_render($element['title']);
+ $output .= drupal_render($element['fid']);
$output .= ''. drupal_render($element['flags']) .'
';
@@ -902,47 +766,34 @@
$output .= ''. $element['fid']['#value'] .'
';
- $output = ''. $output .'
';
if (isset($element['replace'])) {
$output .= ''. drupal_render($element['replace']) .'
';
}
- return $output;
+ return $output;
}
function theme_imagefield_image($file, $alt = '', $title = '', $attributes = NULL, $getsize = TRUE) {
$file = (array)$file;
- if (!is_file($file['filepath'])) {
+ if (!is_file($file['filepath'])) {
return;
}
if (!$getsize || (list($width, $height, $type, $image_attributes) = @getimagesize($file['filepath']))) {
$attributes = drupal_attributes($attributes);
- $path = ($file['fid'] == 'upload') ? $file['preview'] : $file['filepath'];
$alt = empty($alt) ? $file['alt'] : $alt;
$title = empty($title) ? $file['title'] : $title;
- $url = file_create_url($path);
+ $url = file_create_url($file['filepath']);
return '