Index: imagefield.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/imagefield/imagefield.module,v retrieving revision 1.9.2.10 diff -u -r1.9.2.10 imagefield.module --- imagefield.module 15 Nov 2006 17:56:55 -0000 1.9.2.10 +++ imagefield.module 29 Nov 2006 21:00:28 -0000 @@ -24,31 +24,21 @@ function imagefield_menu($maycache) { $items = array(); - if ($maycache) { - - } - else { + if (!$maycache) { // Add handlers for previewing new uploads. if ($_SESSION['imagefield']) { foreach ($_SESSION['imagefield'] as $fieldname => $files) { - foreach($files as $delta => $file) { - $filename = file_create_filename($file['filename'], file_create_path()); - // strip file_directory_path() from private downloads path. @see file_create_url - if (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC) == FILE_DOWNLOADS_PRIVATE) { - if (strpos($filename, file_directory_path()) !== FALSE) { - $filename = trim(substr($filename, strlen(file_directory_path())), '\\/'); + if (is_array($files)) { + foreach($files as $delta => $file) { + if ($file['preview']) { + $items[] = array( + 'path' => $file['preview'], + 'callback' => '_imagefield_preview', + 'access' => TRUE, + 'type' => MENU_CALLBACK, + ); } - $filename = 'system/files/' . $filename; } - $items[] = array( - 'path' => $filename, 'title' => t('file download'), - 'callback' => '_imagefield_preview', - 'access' => TRUE, - 'type' => MENU_CALLBACK - ); - $file['preview'] = $filename; - $_SESSION['imagefield'][$fieldname][$delta] = $file; - //drupal_set_message($filename); } } } @@ -114,7 +104,9 @@ */ function imagefield_file_insert($node, &$file, $field) { $fieldname = $field['field_name']; - if ($file = file_save_upload((object)$file, file_directory_path() . '/'.$file['filename'])) { + $filepath = file_create_path($field['widget']['image_path']) . '/' . $file['filename']; + + if ($file = file_save_upload((object)$file, $filepath)) { $file = (array)$file; $file['fid'] = db_next_id('{files}_fid'); db_query("INSERT into {files} (fid, nid, filename, filepath, filemime, filesize) @@ -175,11 +167,8 @@ case 'view': $images = array(); foreach ($node_field as $delta => $item) { - // do not show images flagged for deletion in preview. - if (!$item['flags']['delete'] == 1) { - $node_field[$delta]['view'] = content_format($field, $item, ($page ? 'default' : 'thumb')); - $images[] = $node_field[$delta]['view']; - } + $node_field[$delta]['view'] = content_format($field, $item, 'default'); + $images[] = $node_field[$delta]['view']; } $view = theme('imagefield_multiple', $images); @@ -237,14 +226,38 @@ '#description' => t('The maximum allowed image size expressed as WIDTHxHEIGHT (e.g. 640x480). Set to 0 for no restriction.') ); + $form['image_path'] = array( + '#type' => 'textfield', + '#title' => t('Image path'), + '#default_value' => $widget['image_path'] ? $widget['image_path'] : '', + '#description' => t('Optional subdirectory within the "%dir" directory where images will be stored. Do not include trailing slash.', array('%dir' => theme('placeholder', variable_get('file_directory_path', 'files')))), + '#after_build' => array('imagefield_check_directory'), + ); return $form; case 'validate': break; case 'save': - return array('max_resolution'); + return array('max_resolution', 'image_path'); } } +/** + * Create the image directory relative to the 'files' dir - if user specified one + * Won't allow form submit unless the directory exists & is writable + * + * @param $form_element + * The form element containing the name of the directory to check. + */ +function imagefield_check_directory($form_element) { + if(!empty($form_element['#value'])) { + // create each directory necessary if it doesn't exist + foreach(explode('/', $form_element['#value']) as $dir) { + $dirs[] = $dir; + file_check_directory(file_create_path(implode($dirs,'/')), FILE_CREATE_DIRECTORY, $form_element['#parents'][0]); + } + } + return $form_element; +} function _imagefield_scale_image($file, $resolution = 0) { $info = image_get_info($file['filepath']); @@ -297,8 +310,9 @@ /** * Implementation of hook_widget(). */ -function imagefield_widget($op, $node, $field, &$node_field) { +function imagefield_widget($op, &$node, $field, &$node_field) { $fieldname = $field['field_name']; + $content_type = $field['type_name']; switch ($op) { case 'prepare form values': // clean up the session if we weren't posted. @@ -310,46 +324,44 @@ if ($file = file_check_upload($fieldname . '_upload')) { $file = (array)$file; if (strpos($file['filemime'],'image') !== FALSE) { - $file = _imagefield_scale_image($file, $field['widget']['max_resolution']); - } - else { - return FALSE; - } - $file['fid'] = 'upload'; - if (!$field['multiple']) { - // Remove old temporary file from session. - imagefield_clear_field_session($fieldname); + $file = _imagefield_scale_image($file, $field['widget']['max_resolution']); + + // Create the filepath for the image preview + $filepath = file_create_filename($file['filename'], file_create_path($field['widget']['image_path'])); + if (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC) == FILE_DOWNLOADS_PRIVATE) { + if (strpos($filepath, file_directory_path()) !== FALSE) { + $filepath = trim(substr($filepath, strlen(file_directory_path())), '\\/'); + } + $filepath = 'system/files/' . $filepath; + } + + $file['fid'] = 'upload'; + $file['preview'] = $filepath; + + // If a single field, mark any other images for deletion and delete files in session + if (!$field['multiple']) { + if (is_array($node_field)) { + foreach ($node_field as $delta => $session_file) { + $node_field[$delta]['flags']['delete'] = TRUE; + } + } + imagefield_clear_field_session($fieldname); + } + // Add the file to the session + $file_id = count($node_field) + count($_SESSION['imagefield'][$fieldname]); + $_SESSION['imagefield'][$fieldname][$file_id] = $file; } - //drupal_set_message('
'. print_r($file, true) .'
'); - $file['sessionid'] = count($_SESSION['imagefield'][$fieldname]); - $_SESSION['imagefield'][$fieldname][$file['sessionid']] = $file; } - // Load files from preview state. before committing actions. - /* Don't do this until we hear whether cck is going to support this... - although it is really needed if anyother module wants to modify imagefields. - - if (is_array($_SESSION['imagefield'][$fieldname]) && count($_SESSION['imagefield'][$fieldname])) { - foreach($_SESSION['imagefield'][$fieldname] as $delta => $file) { + // add all new images saved in the session to the node_field + if (is_array($_SESSION['imagefield'][$fieldname])) { + foreach ($_SESSION['imagefield'][$fieldname] as $delta => $file) { $node_field[] = $file; } } - - */ - //drupal_set_message('imagefield['. $fieldname .'] '. $op .' node field: 
'. print_r($node_field, true) .'
'); break; case 'form': - //drupal_set_message('imagefield['. $fieldname .'] '. $op .' node field: 
'. print_r($node_field, true) .'
'); - /* This is hack since content.module isn't returning data added to node_field in hook_widget op=prepare form values. - its really annoying with new imagefields that don't already have data in them. - */ - if (is_array($_SESSION['imagefield'][$fieldname]) && count($_SESSION['imagefield'][$fieldname])) { - foreach($_SESSION['imagefield'][$fieldname] as $delta => $file) { - $node_field[] = $file; - } - } - $form = _imagefield_widget_form($node, $field, $node_field); return $form; @@ -357,7 +369,6 @@ if ($field['required']) { if (!count($node_field)) { form_set_error($fieldname, $field['widget']['label'] .' is required.'); - } } return; @@ -387,9 +398,9 @@ '#weight' => 9, ); - $form[$fieldname]['Update'] = array( + $form[$fieldname]['upload'] = array( '#type' => 'button', - '#value' => t('Update'), + '#value' => t('Upload'), '#name' => 'cck_imagefield_'.$fieldname.'_op', '#attributes' => array('id' => $fieldname.'-attach-button'), '#tree' => FALSE, @@ -399,7 +410,7 @@ // Store the file data object to be carried on. if (is_array($node_field) && count($node_field)) { foreach($node_field as $delta => $file) { - if ($file['filepath']) { + if ($file['filepath'] && !$file['flags']['delete']) { $form[$fieldname][$delta] = array ( '#theme' => 'imagefield_edit_image_row', ); @@ -410,7 +421,9 @@ '#default_value' => 0, '#attributes' => array('id' => $fieldname .'-'. $delta.'-delete-checkbox'), ); - + + $filename = $file['fid'] == 'upload' ? file_create_filename($file['filename'], file_create_path($field['widget']['image_path'])) : $file['filepath']; + $form[$fieldname][$delta]['preview'] = array( '#type' => 'markup', '#value' => theme('imagefield_image_preview', $file, $file['alt'], $file['title'], array('width' => '150'), FALSE), @@ -436,8 +449,7 @@ '#maxlength' => 255, '#size' => 10, ); - // must set #tree => true, so data structure will be carried - // with node into hook_field.... + $form[$fieldname][$delta]['filename'] = array('#type' => 'value', '#value' => $file['filename']); $form[$fieldname][$delta]['filepath'] = array('#type' => 'value', '#value' => $file['filepath']); $form[$fieldname][$delta]['filemime'] = array('#type' => 'value', '#value' => $file['filemime']); @@ -445,16 +457,18 @@ $form[$fieldname][$delta]['fid'] = array('#type' => 'value', '#value' => $file['fid']); // Special handling for single value fields - if (!$field['multiple'] && $delta == 0) { - // Mark [0] for deletion if there is more than 1 image. - if (count($_SESSION['imagefield'][$fieldname]) > 1) { - $form[$fieldname][$delta]['flags']['delete']['#value'] = 1; - $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.'), - ); - } - } + 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']['delete']) { + $form[$fieldname][$delta]['flags']['delete'] = array( + '#type' => 'hidden', // A value type will not persist here, must be hidden + '#value' => $file['flags']['delete'], + ); } } } @@ -534,14 +548,11 @@ //$output .= '
'. $element['fid']['#value'] .'
'; if (isset($element['replace'])) { $output .= '
'. form_render($element['replace']) .'
'; - } else { - $output .= '
'. form_render($element['flags']) .'
'; } + $output .= '
'. form_render($element['flags']) .'
'; $output .= '
 
'; - if (!isset($element['replace'])) { - $output .= '
'.form_render($element['alt']).'
'; - $output .= '
'.form_render($element['title']).'
'; - } + $output .= '
'.form_render($element['alt']).'
'; + $output .= '
'.form_render($element['title']).'
'; $output = '
'. $output .'
'; return $output; } @@ -551,19 +562,12 @@ $file = (array)$file; if (!$getsize || (is_file($file['filepath']) && (list($width, $height, $type, $image_attributes) = @getimagesize($file['filepath'])))) { $attributes = drupal_attributes($attributes); - if ($file['fid'] == 'upload') { - $path = file_create_filename($file['filename'], file_create_path()); - } - else { - $path = $file['filepath']; - } + + $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); - if ($alt == '') { - $alt = $file['alt']; - } - if ($title == '') { - $title = $file['title']; - } return ''. check_plain($alt) .''; }