',
@@ -640,7 +646,7 @@
$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
+ // 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',
@@ -652,7 +658,7 @@
$form[$fieldname]['new']['upload'] = array(
'#type' => 'button',
'#value' => t('Upload'),
- '#name' => 'cck_imagefield_'.$fieldname.'_op',
+ '#name' => 'cck_imagefield_'. $fieldname .'_op',
'#id' => form_clean_id($fieldname .'-attach-button'),
'#tree' => FALSE,
'#weight' => 10,
@@ -661,13 +667,12 @@
$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) {
+ foreach ($items as $delta => $file) {
if ($file['filepath'] && !$file['flags']['hidden']) {
- $form[$fieldname][$delta] = array (
+ $form[$fieldname][$delta] = array(
'#theme' => 'imagefield_edit_image_row',
);
@@ -676,22 +681,23 @@
'#title' => t('Delete'),
'#default_value' => isset($file['flags']['delete']) ? $file['flags']['delete'] : 0,
);
-
- if (function_exists('token_replace')) {
+
+ 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 {
+ }
+ 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'],
+ '#value' => '
'. t('Filename: ') .''. $file['filename'],
);
$form[$fieldname][$delta]['alt'] = array(
@@ -709,7 +715,7 @@
'#size' => 10,
);
}
-
+
$form[$fieldname][$delta]['title'] = array(
'#type' => 'hidden',
'#value' => $file['filename'],
@@ -725,7 +731,7 @@
'#size' => 10,
);
}
-
+
// Special handling for single value fields
if (!$field['multiple']) {
$form[$fieldname][$delta]['replace'] = array(
@@ -753,8 +759,6 @@
}
}
-
-
// Some useful info for our js callback.
$form['vid'] = array(
'#type' => 'hidden',
@@ -771,7 +775,7 @@
'#value' => $node->type,
'#tree' => FALSE,
);
-
+
return $form;
}
@@ -779,44 +783,44 @@
* Validate the widget.
*/
function _imagefield_widget_validate($node, $field, $items) {
-
+
if ($field['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) {
+ foreach ($items as $item) {
if ($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'], 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'], 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?
+ // 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.
+ // 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?
+ // Is it the file extension in the allowed_extensions array?
if (!in_array($ext, $allowed_extensions)) {
- // sorry no..
+ // 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;
}
}
- // If max filesize is set
+ // 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'])));
@@ -824,7 +828,7 @@
}
}
- // is the mime type a match for image.
+ // 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'])));
@@ -859,7 +863,6 @@
/**
* Implementation of hook_field_formatter().
- *
*/
function imagefield_field_formatter($field, $item, $formatter, $node = NULL) {
if (empty($item['fid']) && $field['use_default_image']) {
@@ -874,10 +877,9 @@
}
}
-
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) {
@@ -892,8 +894,6 @@
return theme('imagefield_image', $file, $alt, $title, $attributes , $getsize);
}
-
-
function theme_imagefield_edit_image_row($element) {
$output = '
'. drupal_render($element['admin_preview']) .'
';
$output .= '
';
@@ -903,17 +903,16 @@
$output .= drupal_render($element['alt']);
$output .= drupal_render($element['title']);
$output .= '
';
- //$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']))) {
@@ -928,21 +927,22 @@
}
/**
- * formats an array of images.
+ * Formats an array of images.
+ *
* @param images
* array of individually themed images
- * @return
+ * @return
* html string
*/
function theme_imagefield_multiple($images) {
return implode("\n", $images);
}
-/**
- * implementation of hook_filedownload
- * replicated from upload.module.
+/**
+ * Implementation of hook_file_download().
+ * Replicated from upload.module.
*
- * conditionally included since we're just replicating the
+ * Conditionally included since we're just replicating the
* work of upload.module for now.
*/
@@ -991,18 +991,16 @@
function imagefield_js() {
// Parse fieldname from submit button.
$matches = array();
- foreach(array_keys($_POST) as $key) {
+ foreach (array_keys($_POST) as $key) {
if (preg_match('/cck_imagefield_(.*)_op/', $key, $matches)) {
break;
}
}
- $fieldname = $matches[1];
-
-
+ $fieldname = $matches[1];
+
$node = (object)$_POST;
// Load field data.
$field = content_fields($fieldname, $node->type);
-
// Load fid's stored by content.module
$items = array();
@@ -1015,9 +1013,9 @@
// Handle uploads and validation.
_imagefield_widget_prepare_form_values($node, $field, $items);
_imagefield_widget_validate($node, $field, $items);
-
- if(is_array($node->{$fieldname}) && count($node->{$fieldname}) > 0) {
- foreach($node->{$fieldname} as $key => $image) {
+
+ if (is_array($node->{$fieldname}) && count($node->{$fieldname}) > 0) {
+ foreach ($node->{$fieldname} as $key => $image) {
// Set the alt and title from POST
$items[$key]['alt'] = $image['alt'];
$items[$key]['title'] = $image['title'];