Index: image.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/image.admin.inc,v retrieving revision 1.9.2.1 diff -u -p -r1.9.2.1 image.admin.inc --- image.admin.inc 30 Jun 2010 16:57:17 -0000 1.9.2.1 +++ image.admin.inc 29 Jul 2010 11:11:20 -0000 @@ -12,7 +12,7 @@ function image_admin_settings() { $form['files'] = array( '#type' => 'fieldset', - '#title' => t('Image file settings') + '#title' => t('Image file settings'), ); $form['files']['image_default_path'] = array( '#type' => 'textfield', @@ -50,7 +50,7 @@ function image_admin_settings() { // Add some empty rows for user defined sizes. $num_sizes = count($sizes); for ($i = $num_sizes; $i < ($num_sizes + 3); $i++) { - $sizes['new'. $i] = array( + $sizes['new' . $i] = array( 'label' => '', 'operation' => 'scale', 'width' => '', @@ -67,7 +67,7 @@ function image_admin_settings() { '#size' => 25, '#maxlength' => 32, ); - + // For required sizes, set the value and disable the field. if (_image_is_required_size($key)) { $form['image_sizes'][$key]['label']['#disabled'] = TRUE; @@ -109,7 +109,7 @@ function image_admin_settings() { * Form validation handler for image admin settings form. */ function image_admin_settings_validate($form, &$form_state) { - // Check that the sizes provided have the required amount of information. + // Check that the sizes provided have the required amount of information. $image_sizes = $form_state['values']['image_sizes']; foreach (element_children($image_sizes) as $key) { // If there's a label they must provide at either a height or width. @@ -119,18 +119,18 @@ function image_admin_settings_validate($ } } } - + // Try to create directories and warn the user of errors. $image_default_path = $form_state['values']['image_default_path']; $image_path = file_create_path(file_directory_path() . '/' . $image_default_path); - $temp_path = $image_path .'/temp'; + $temp_path = $image_path . '/temp'; if (!file_check_directory($image_path, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS, 'image_default_path')) { form_set_error('image_default_path', t('You have specified an invalid directory.')); } if (!file_check_directory($temp_path, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS, 'image_default_path')) { - form_set_error('image_default_path', t('You have specified an invalid directory.')); - } + form_set_error('image_default_path', t('You have specified an invalid directory.')); + } } /** Index: image.imagemagick.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/image.imagemagick.inc,v retrieving revision 1.24 diff -u -p -r1.24 image.imagemagick.inc --- image.imagemagick.inc 6 Mar 2009 01:40:09 -0000 1.24 +++ image.imagemagick.inc 29 Jul 2010 11:12:31 -0000 @@ -37,14 +37,14 @@ function image_imagemagick_settings() { } function _image_imagemagick_build_version($form, $form_element) { - // Don't check the path when another toolkit is being selected. + // Don't check the path when another toolkit is being selected. if (!isset($form['#post']['image_toolkit']) || $form['#post']['image_toolkit'] == 'imagemagick') { $valid = _image_imagemagick_check_path($form_element['values']['image_imagemagick_convert'], 'image_imagemagick_convert'); if ($valid) { _image_imagemagick_convert_exec('-version', $output, $errors); $form['imagemagick_binary']['version'] = array( '#type' => 'item', - '#value' => '
'. check_plain(trim($output)) .'
', + '#value' => '
' . check_plain(trim($output)) . '
', ); } } @@ -78,12 +78,13 @@ function _image_imagemagick_check_path($ * String containing the path to the image that is being processed. * @param $args * Array containing ImageMagick options. + * * @return * Array of modified arguments. */ function _image_imagemagick_alter_invoke($op, $filepath, $args) { foreach (module_implements('imagemagick_alter') as $module) { - $function = $module .'_imagemagick_alter'; + $function = $module . '_imagemagick_alter'; $function($op, $filepath, $args); } return $args; @@ -93,7 +94,7 @@ function _image_imagemagick_alter_invoke * Resize an image to the given width and height. */ function image_imagemagick_resize($source, $dest, $width, $height) { - $args = array('resize' => '-resize '. (int) $width .'x'. (int) $height .'!'); + $args = array('resize' => '-resize ' . (int) $width . 'x' . (int) $height . '!'); $args = _image_imagemagick_alter_invoke('resize', $source, $args); return _image_imagemagick_convert($source, $dest, $args); } @@ -103,8 +104,8 @@ function image_imagemagick_resize($sourc */ function image_imagemagick_rotate($source, $dest, $degrees, $bg_color = 0x000000) { $args = array( - 'rotate' => '-rotate '. (float) $degrees, - 'background' => '-background #'. str_pad(dechex($bg_color), 6, 0), + 'rotate' => '-rotate ' . (float) $degrees, + 'background' => '-background #' . str_pad(dechex($bg_color), 6, 0), ); $args = _image_imagemagick_alter_invoke('rotate', $source, $args); return _image_imagemagick_convert($source, $dest, $args); @@ -114,7 +115,7 @@ function image_imagemagick_rotate($sourc * Crop an image to the specified dimensions. */ function image_imagemagick_crop($source, $dest, $x, $y, $width, $height) { - $args = array('crop' => '-crop '. (int) $width .'x'. (int) $height .'+'. (int) $x .'+'. (int) $y .'!'); + $args = array('crop' => '-crop ' . (int) $width . 'x' . (int) $height . '+' . (int) $x . '+' . (int) $y . '!'); $args = _image_imagemagick_alter_invoke('crop', $source, $args); return _image_imagemagick_convert($source, $dest, $args); } @@ -147,15 +148,15 @@ function _image_imagemagick_convert_exec // http://us3.php.net/manual/en/function.exec.php#56599 // Use /D to run the command from PHP's current working directory so the // file paths don't have to be absolute. - $convert_path = 'start "window title" /D'. escapeshellarg(getcwd()) .' /B '. escapeshellarg($convert_path); + $convert_path = 'start "window title" /D' . escapeshellarg(getcwd()) . ' /B ' . escapeshellarg($convert_path); } $descriptors = array( 0 => array('pipe', 'r'), // stdin 1 => array('pipe', 'w'), // stdout - 2 => array('pipe', 'w') // stderr + 2 => array('pipe', 'w'), // stderr ); - if ($h = proc_open($convert_path .' '. $command_args, $descriptors, $pipes)) { + if ($h = proc_open($convert_path . ' ' . $command_args, $descriptors, $pipes)) { $output = ''; while (!feof($pipes[1])) { $output .= fgets($pipes[1]); @@ -168,7 +169,7 @@ function _image_imagemagick_convert_exec // Display debugging information to authorized users. if (variable_get('image_imagemagick_debugging', FALSE) && user_access('administer site configuration')) { - drupal_set_message(t('ImageMagick command: @command', array('@command' => $convert_path .' '. $command_args))); + drupal_set_message(t('ImageMagick command: @command', array('@command' => $convert_path . ' ' . $command_args))); drupal_set_message(t('ImageMagick output: @output', array('@output' => $output))); } Index: image.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/image.install,v retrieving revision 1.33.2.1 diff -u -p -r1.33.2.1 image.install --- image.install 11 Jul 2010 14:06:59 -0000 1.33.2.1 +++ image.install 31 Jul 2010 15:38:35 -0000 @@ -73,7 +73,7 @@ function image_requirements($phase) { $requirements['image_toolkit'] = array( 'value' => t('The %toolkit_name toolkit is installed.', array('%toolkit_name' => $toolkit)), 'severity' => REQUIREMENT_OK, - ); + ); } else { $requirements['image_toolkit'] = array( @@ -86,7 +86,7 @@ function image_requirements($phase) { // File paths - $image_path = file_create_path(file_directory_path() .'/'. variable_get('image_default_path', 'images')); + $image_path = file_create_path(file_directory_path() . '/' . variable_get('image_default_path', 'images')); $temp_path = $image_path . '/temp'; if (!file_check_directory($image_path, FILE_CREATE_DIRECTORY)) { $requirements['image_dirs'] = array( @@ -114,7 +114,6 @@ function image_requirements($phase) { return $requirements; } - /** * Upgrade to the new image_sizes variable format. */ @@ -155,33 +154,33 @@ function image_update_4() { $ret = array(); // Locate image files that aren't stored in the files directory. - $files_path = rtrim(file_directory_path(), '\\/'); + $files_path = rtrim(file_directory_path(), '\\/'); $result = db_query("SELECT f.nid, f.fid, f.filename, f.filepath FROM {files} f INNER JOIN {node} n ON f.nid = n.nid WHERE n.type = 'image' AND f.filename = '_original' AND NOT f.filepath LIKE '%s/%%'", $files_path); while ($file = db_fetch_object($result)) { $file->filepath = file_create_path($file->filepath); if (file_exists($file->filepath)) { // File exists, make sure there's not a duplicate record. if (db_result(db_query("SELECT COUNT(*) FROM {files} f INNER JOIN {node} n ON f.nid = n.nid WHERE n.type = 'image' AND filepath = '%s' AND fid <> %d", $file->filepath, $file->fid))) { - $ret[] = update_sql("DELETE FROM {files} WHERE fid = ". (int)$file->fid); - $ret[] = update_sql("DELETE FROM {file_revisions} WHERE fid = ". (int)$file->fid); + $ret[] = update_sql("DELETE FROM {files} WHERE fid = " . (int) $file->fid); + $ret[] = update_sql("DELETE FROM {file_revisions} WHERE fid = " . (int) $file->fid); } else { - $ret[] = update_sql("UPDATE {files} SET filepath = '". db_escape_string($file->filepath) ."' WHERE fid = ". (int)$file->fid); + $ret[] = update_sql("UPDATE {files} SET filepath = '" . db_escape_string($file->filepath) . "' WHERE fid = " . (int) $file->fid); } } else { - $ret[] = update_sql("DELETE FROM {files} WHERE fid = ". (int)$file->fid); - $ret[] = update_sql("DELETE FROM {file_revisions} WHERE fid = ". (int)$file->fid); + $ret[] = update_sql("DELETE FROM {files} WHERE fid = " . (int) $file->fid); + $ret[] = update_sql("DELETE FROM {file_revisions} WHERE fid = " . (int) $file->fid); } } // Check for and remove {files} with duplicate filenames. $result = db_query("SELECT f1.fid, f1.nid, f1.filepath FROM {files} f1 INNER JOIN {node} n ON f1.nid = n.nid WHERE n.type = 'image' AND EXISTS ( SELECT * FROM {files} f2 WHERE f2.filepath = f1.filepath AND f1.fid <> f2.fid AND f1.fid < f2.fid )"); while ($file = db_fetch_object($result)) { - $ret[] = update_sql("DELETE FROM {files} WHERE fid = ". (int)$file->fid); + $ret[] = update_sql("DELETE FROM {files} WHERE fid = " . (int) $file->fid); } - // Delete rows from {file_revisions} that don't have matching {files}. + // Delete rows from {file_revisions} that don't have matching {files}. $ret[] = update_sql("DELETE FROM {file_revisions} WHERE NOT EXISTS (SELECT * FROM {files} WHERE {files}.fid = {file_revisions}.fid)"); return $ret; @@ -215,7 +214,7 @@ function image_update_5() { $new_key = drupal_strtolower(drupal_substr($old_key, 0, 32)); // Update the files. if ($new_key != $old_key) { - $ret[] = update_sql("UPDATE {files} f INNER JOIN {node} n ON f.nid = n.nid SET f.filename = '". db_escape_string($new_key) ."' WHERE n.type = 'image' AND filename = '". db_escape_string($old_key) ."'"); + $ret[] = update_sql("UPDATE {files} f INNER JOIN {node} n ON f.nid = n.nid SET f.filename = '" . db_escape_string($new_key) . "' WHERE n.type = 'image' AND filename = '" . db_escape_string($old_key) . "'"); } $new_sizes[$new_key] = $size; } @@ -228,20 +227,20 @@ function image_update_5() { /** * Move image files into their own table. - * + * * First update for the 5.2 branch, using the update naming convention layed * out in: http://drupal.org/node/114774#update-n */ function image_update_5200() { $ret = array(); - + // Versions prior to 5 had an {image} table which is no longer used on 5.1 // but not removed. if (db_table_exists('image')) { - db_rename_table($ret, 'image', 'image_old'); - // Notify the user that their table has been moved. + db_rename_table($ret, 'image', 'image_old'); + // Notify the user that their table has been moved. drupal_set_message('Your existing {image} table has been renamed {image_old}.'); - } + } switch ($GLOBALS['db_type']) { case 'mysql': @@ -254,6 +253,7 @@ function image_update_5200() { INDEX image_fid(`fid`) ) /*!40100 DEFAULT CHARACTER SET utf8 */;"); break; + case 'pgsql': $ret[] = update_sql("CREATE TABLE {image} ( nid int_unsigned NOT NULL, @@ -267,7 +267,7 @@ function image_update_5200() { // Copy image files records into the new table. drupal_load('module', 'image'); $args = array_map('db_escape_string', array_keys(image_get_sizes())); - $cond = " IN ('". implode("', '", $args) ."')"; + $cond = " IN ('" . implode("', '", $args) . "')"; // Upgrade from 5.x-1.x to 5.x-2.x. // Group by clause prevents duplicate insertions from bad data: @@ -295,7 +295,7 @@ function image_update_5201() { $sizes[$key]['operation'] = 'scale'; } variable_set('image_sizes', $sizes); - + return array(); } @@ -316,19 +316,19 @@ function image_update_6100() { 'not null' => TRUE, 'default' => 0, )); - + /** * We remove and re-add primary keys and indexes because the column types * are changed. - * Sometimes however these don't exist in the first place (@see - * ; the @ takes care of suppressing the + * Sometimes however these don't exist in the first place (@see + * ; the @ takes care of suppressing the * error message this causes. - */ + */ @db_drop_primary_key($ret, 'image'); db_add_primary_key($ret, 'image', array('nid', 'image_size')); @db_drop_index($ret, 'image', 'image_fid'); db_add_index($ret, 'image', 'fid', array('fid')); - + // Notify the user that they may get harmless fail messages here. $ret[] = array('success' => TRUE, 'query' => t('If you see a message of the form "Failed: ALTER TABLE {image} DROP PRIMARY KEY" or "DROP INDEX image_fid" here it is harmless.')); return $ret; @@ -386,3 +386,4 @@ function image_update_6104() { $ret[] = update_sql($query); return $ret; } + Index: image.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/Attic/image.module,v retrieving revision 1.322.2.2 diff -u -p -r1.322.2.2 image.module --- image.module 13 Jul 2010 17:03:10 -0000 1.322.2.2 +++ image.module 29 Jul 2010 11:16:50 -0000 @@ -73,7 +73,7 @@ function image_node_info() { 'name' => t('Image'), 'module' => 'image', 'description' => t('An image (with thumbnail). This is ideal for publishing photographs or screenshots.'), - ) + ), ); } @@ -145,10 +145,10 @@ function image_menu() { * Implements hook_cron. (deletes old temp images) */ function image_cron() { - $path = file_directory_path() .'/'. variable_get('image_default_path', 'images') .'/temp'; + $path = file_directory_path() . '/' . variable_get('image_default_path', 'images') . '/temp'; $files = file_scan_directory(file_create_path($path), '.*'); foreach ($files as $file => $info) { - if (time() - filemtime($file) > 60*60*6) { + if (time() - filemtime($file) > 60 * 60 * 6) { file_delete($file); } } @@ -201,8 +201,8 @@ function image_file_download($filename) unset($images[IMAGE_ORIGINAL]); if (user_access('view original images') || in_array($filepath, $images)) { return array( - 'Content-Type: '. mime_header_encode($file->filemime), - 'Content-Length: '. (int) $file->filesize, + 'Content-Type: ' . mime_header_encode($file->filemime), + 'Content-Length: ' . (int) $file->filesize, ); } } @@ -225,24 +225,24 @@ function image_link($type, $node, $main // but other sizes will not be set. if (isset($node->images[$key]) && $node->images[$key] != $node->images[$request]) { if ($size['link'] == IMAGE_LINK_NEW) { - $links['image_size_'. $key] = array( + $links['image_size_' . $key] = array( 'title' => t($size['label']), 'href' => "image/view/{$node->nid}/$key", 'attributes' => array('target' => '_blank'), ); } else { - $links['image_size_'. $key] = array( + $links['image_size_' . $key] = array( 'title' => t($size['label']), - 'href' => 'node/'. $node->nid, - 'query' => 'size='. urlencode($key) + 'href' => 'node/' . $node->nid, + 'query' => 'size=' . urlencode($key), ); } } } } if (!user_access('view original images')) { - unset($links['image_size_'. IMAGE_ORIGINAL]); + unset($links['image_size_' . IMAGE_ORIGINAL]); } } @@ -263,7 +263,7 @@ function image_block($op = 'list', $delt case 'configure': $form['number_images'] = array( - '#type' => 'select', + '#type' => 'select', '#title' => t('Number of images to display'), '#options' => drupal_map_assoc(range(1, 99)), '#default_value' => variable_get("image_block_{$delta}_number_images", 1), @@ -324,7 +324,7 @@ function image_form(&$node, $form_state) '#size' => 60, '#maxlength' => 128, '#required' => TRUE, - '#default_value' => $node->title + '#default_value' => $node->title, ); $form['images']['#tree'] = TRUE; @@ -384,7 +384,7 @@ function image_form_validate($form, &$fo // New image uploads need to be saved in images/temp in order to be viewable // during node preview. - $temporary_file_path = file_create_path(file_directory_path() . '/' . variable_get('image_default_path', 'images') .'/temp'); + $temporary_file_path = file_create_path(file_directory_path() . '/' . variable_get('image_default_path', 'images') . '/temp'); if ($file = file_save_upload('image', $validators, $temporary_file_path)) { // Resize the original. @@ -476,14 +476,14 @@ function image_load(&$node) { // There's no original image, we're in trouble... return; } - + if ((arg(0) != 'batch') && (strpos($_GET['q'], 'admin/content/node') === FALSE)) { _image_build_derivatives_if_needed($node); } } - + /** - * Rebuild derivatives if needed. Helper function for image_load(). + * Rebuild derivatives if needed. Helper function for image_load(). */ function _image_build_derivatives_if_needed(&$node) { $node->rebuild_images = FALSE; @@ -523,9 +523,9 @@ function _image_build_derivatives_if_nee // Correct any problems with the derivative images. if ($node->rebuild_images) { // Possibly TODO: calling a hook implementation here isn't very elegant. - // but the code there is tangled and it works, so maybe leave it ;) + // but the code there is tangled and it works, so maybe leave it ;) image_update($node); - watchdog('image', 'Derivative images were regenerated for %title.', array('%title' => $node->title), WATCHDOG_INFO, l(t('view'), 'node/'. $node->nid)); + watchdog('image', 'Derivative images were regenerated for %title.', array('%title' => $node->title), WATCHDOG_INFO, l(t('view'), 'node/' . $node->nid)); } } @@ -538,7 +538,7 @@ function image_insert($node) { if (empty($node->new_file) && !empty($node->translation_source)) { db_query("INSERT INTO {image} (nid, fid, image_size) SELECT %d, fid, image_size FROM {image} WHERE nid = %d", $node->nid, $node->translation_source->nid); return; - } + } // Derivative images that aren't needed are set to the original file. Make // note of the current path before calling _image_insert() because if it's @@ -623,9 +623,9 @@ function image_update(&$node) { function image_delete($node) { $result = db_query('SELECT i.fid, f.filepath FROM {image} i INNER JOIN {files} f ON i.fid = f.fid WHERE i.nid = %d', $node->nid); while ($file = db_fetch_object($result)) { - db_query("DELETE FROM {image} WHERE nid = %d AND fid = %d", $node->nid, $file->fid); + db_query("DELETE FROM {image} WHERE nid = %d AND fid = %d", $node->nid, $file->fid); _image_file_remove($file); - } + } } /** @@ -637,7 +637,7 @@ function image_display(&$node, $label = } $image_info = image_get_info(file_create_path($node->images[$label])); - $attributes['class'] = "image image-$label ". (isset($attributes['class']) ? $attributes['class'] : ""); + $attributes['class'] = "image image-$label " . (isset($attributes['class']) ? $attributes['class'] : ""); // Only output width/height attributes if image_get_info() was able to detect // the image dimensions, since certain browsers interpret an empty attribute // value as zero. @@ -685,7 +685,7 @@ function image_fetch($nid = 0, $size = I * Theme a teaser */ function theme_image_teaser($node, $size) { - return l(image_display($node, IMAGE_THUMBNAIL), 'node/'. $node->nid, array('html' => TRUE)); + return l(image_display($node, IMAGE_THUMBNAIL), 'node/' . $node->nid, array('html' => TRUE)); } /** @@ -713,7 +713,7 @@ function theme_image_display($node, $lab function theme_image_block_random($images, $size) { $output = ''; foreach ($images as $image) { - $output .= l(image_display($image, $size), 'node/'. $image->nid, array('html' => TRUE)); + $output .= l(image_display($image, $size), 'node/' . $image->nid, array('html' => TRUE)); } return $output; } @@ -724,7 +724,7 @@ function theme_image_block_random($image function theme_image_block_latest($images, $size) { $output = ''; foreach ($images as $image) { - $output .= l(image_display($image, $size), 'node/'. $image->nid, array('html' => TRUE)); + $output .= l(image_display($image, $size), 'node/' . $image->nid, array('html' => TRUE)); } return $output; } @@ -768,22 +768,22 @@ function image_get_latest($count = 1, $t */ function _image_check_settings() { // File paths - $image_path = file_create_path(file_directory_path() .'/'. variable_get('image_default_path', 'images')); - $temp_path = $image_path .'/temp'; + $image_path = file_create_path(file_directory_path() . '/' . variable_get('image_default_path', 'images')); + $temp_path = $image_path . '/temp'; if (!file_check_directory($image_path, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS, 'image_default_path')) { - return false; + return FALSE; } if (!file_check_directory($temp_path, FILE_CREATE_DIRECTORY | FILE_MODIFY_PERMISSIONS, 'image_default_path')) { - return false; + return FALSE; } // Sanity check : make sure we've got a working toolkit if (!image_get_toolkit()) { drupal_set_message(t('No image toolkit is currently enabled. Without one the image module will not be able to resize your images. You can select one from the image toolkit settings page.', array('@link' => url('admin/settings/image-toolkit'))), 'error'); - return false; + return FALSE; } - return true; + return TRUE; } /** @@ -791,6 +791,7 @@ function _image_check_settings() { * * @param $image_path * String file path to the image. + * * @return * Returns a subset of image_get_sizes()'s results depending on what * derivative images are needed. @@ -828,6 +829,7 @@ function image_get_derivative_sizes($ima * @param $temp * Boolean indicating if the derivatives should be saved to the temp * directory. + * * @return * New array of images for the node. */ @@ -835,8 +837,8 @@ function _image_build_derivatives($node, $original_path = file_create_path($node->images[IMAGE_ORIGINAL]); // Figure out which sizes we need to generate. - $all_sizes = image_get_sizes(); - $needed_sizes = image_get_derivative_sizes($original_path); + $all_sizes = image_get_sizes(); + $needed_sizes = image_get_derivative_sizes($original_path); $unneeded_sizes = array_diff(array_keys($all_sizes), array_keys($needed_sizes)); // Images that don't need a derivative image get set to the original. @@ -858,7 +860,7 @@ function _image_build_derivatives($node, break; case 'scale_crop': - $status = image_scale_and_crop($original_path, $destination, $size['width'], $size['height']); + $status = image_scale_and_crop($original_path, $destination, $size['width'], $size['height']); break; } @@ -882,12 +884,13 @@ function _image_build_derivatives($node, * @param $filepath * The full path and filename of the original image file,relative to Drupal * root, eg 'sites/default/files/images/myimage.jpg'. + * * @return * A full path and filename with derivative image label inserted if required. */ function _image_filename($filepath, $label = IMAGE_ORIGINAL, $temp = FALSE) { // Get default path for a new file. - $path = file_directory_path() .'/'. variable_get('image_default_path', 'images'); + $path = file_directory_path() . '/' . variable_get('image_default_path', 'images'); if ($temp) { $path .= '/temp'; } @@ -903,18 +906,18 @@ function _image_filename($filepath, $lab } // Insert the resized name in non-original images. $pos = strrpos($filename, '.'); - if ($pos === false) { + if ($pos === FALSE) { // The file had no extension - which happens in really old image.module // versions, so figure out the extension. - $image_info = image_get_info(file_create_path($path .'/'. $filename)); - $filename = $filename .'.'. $label .'.'. $image_info['extension']; + $image_info = image_get_info(file_create_path($path . '/' . $filename)); + $filename = $filename . '.' . $label . '.' . $image_info['extension']; } else { - $filename = substr($filename, 0, $pos) .'.'. $label . substr($filename, $pos); + $filename = substr($filename, 0, $pos) . '.' . $label . substr($filename, $pos); } } - return file_create_path($path .'/'. $filename); + return file_create_path($path . '/' . $filename); } /** @@ -922,9 +925,10 @@ function _image_filename($filepath, $lab * * @param $size * An optional string to return only the image size with the specified key. - * @param $aspect_ratio + * @param $aspect_ratio * Float value with the ratio of image height / width. If a size has only one * dimension provided this will be used to compute the other. + * * @return * An associative array with width, height, and label fields for the size. * If a $size parameter was specified and it cannot be found FALSE will be @@ -934,7 +938,7 @@ function image_get_sizes($size = NULL, $ $defaults = array( IMAGE_ORIGINAL => array('width' => '', 'height' => '', 'label' => t('Original'), 'operation' => 'scale', 'link' => IMAGE_LINK_SHOWN), IMAGE_THUMBNAIL => array('width' => 100, 'height' => 100, 'label' => t('Thumbnail'), 'operation' => 'scale', 'link' => IMAGE_LINK_SHOWN), - IMAGE_PREVIEW => array('width' => 640, 'height' => 640, 'label' => t('Preview'), 'operation' => 'scale', 'link' => IMAGE_LINK_SHOWN), + IMAGE_PREVIEW => array('width' => 640, 'height' => 640, 'label' => t('Preview'), 'operation' => 'scale', 'link' => IMAGE_LINK_SHOWN), ); $sizes = array(); @@ -974,11 +978,12 @@ function _image_get_sizes($size = NULL, return image_get_sizes($size, $aspect_ratio); } - /** * Is a given size a built-in, required size? + * * @param $size * One of the keys in the array returned by image_get_sizes(). + * * @return boolean */ function _image_is_required_size($size) { @@ -1044,6 +1049,7 @@ function _image_file_remove($file) { * Taxonomy terms to assign to the node if the taxonomy.module is installed. * @param $keep_original * Boolean to indicate whether the original file should be deleted + * * @return * A node object if the node is created successfully or FALSE on error. */ @@ -1118,7 +1124,7 @@ function image_create_node_from($filepat function image_views_api() { return array( 'api' => 2, - 'path' => drupal_get_path('module', 'image') .'/views', + 'path' => drupal_get_path('module', 'image') . '/views', ); } @@ -1137,3 +1143,4 @@ function image_content_extra_fields($typ return $extra; } } + Index: contrib/image_attach/image_attach.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_attach/image_attach.install,v retrieving revision 1.22 diff -u -p -r1.22 image_attach.install --- contrib/image_attach/image_attach.install 7 Sep 2009 13:09:33 -0000 1.22 +++ contrib/image_attach/image_attach.install 29 Jul 2010 11:17:18 -0000 @@ -106,19 +106,19 @@ function image_attach_update_6100() { 'not null' => TRUE, 'default' => 0, )); - + /** * We remove and re-add primary keys and indexes because the column types * are changed. - * Sometimes however these don't exist in the first place (@see - * ; the @ takes care of suppressing the + * Sometimes however these don't exist in the first place (@see + * ; the @ takes care of suppressing the * error message this causes. - */ + */ @db_drop_primary_key($ret, 'image_attach'); db_add_primary_key($ret, 'image_attach', array('nid')); @db_drop_index($ret, 'image_attach', 'iid'); db_add_index($ret, 'image_attach', 'iid', array('iid')); - + // Notify the user that they may get harmless fail messages here. $ret[] = array('success' => TRUE, 'query' => t('If you see a message of the form "Failed: ALTER TABLE {image_attach} DROP PRIMARY KEY" or "DROP INDEX iid" here it is harmless.')); return $ret; @@ -133,7 +133,7 @@ function image_attach_update_6101() { $ret = array(); $ret[] = update_sql("DELETE FROM {blocks} WHERE module = 'image_attach' AND delta = '0'"); - return $ret; + return $ret; } /** Index: contrib/image_attach/image_attach.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_attach/image_attach.module,v retrieving revision 1.76.2.4 diff -u -p -r1.76.2.4 image_attach.module --- contrib/image_attach/image_attach.module 1 Jul 2010 08:06:36 -0000 1.76.2.4 +++ contrib/image_attach/image_attach.module 29 Jul 2010 11:19:54 -0000 @@ -8,19 +8,9 @@ define('IMAGE_ATTACH_HIDDEN', 'hidden'); /** - * Implementation of hook_help(). - */ -function image_attach_help($path, $arg) { - switch ($path) { - } -} - -/** * Implementation of hook_menu() */ function image_attach_menu() { - $items = array(); - $items['image_attach'] = array( 'title' => 'Image attachment view', 'page callback' => 'image_attach_view_image', @@ -45,19 +35,16 @@ function image_attach_perm() { return array('attach images'); } - function image_attach_admin_settings() { - $form = array(); - $form['image_attach_existing'] = array( '#type' => 'radios', '#title' => t('Attach existing images'), '#default_value' => variable_get('image_attach_existing', 1), '#options' => array( 0 => t('Disabled'), - 1 => t('Enabled') + 1 => t('Enabled'), ), - '#description' => t('When enabled, will allow existing image nodes to be attached instead of uploading new images.') + '#description' => t('When enabled, will allow existing image nodes to be attached instead of uploading new images.'), ); return system_settings_form($form); @@ -70,10 +57,10 @@ function image_attach_block($op = 'list' switch ($op) { case 'list': $blocks[0] = array( - 'info' => t('Attached images'), - 'weight' => 0, + 'info' => t('Attached images'), + 'weight' => 0, 'visibility' => 1, - 'pages' => 'node/*', + 'pages' => 'node/*', ); return $blocks; @@ -127,7 +114,7 @@ function image_attach_block($op = 'list' * Add settings to the content type settings form. */ function image_attach_form_node_type_form_alter(&$form, $form_state) { - if($form['#node_type']->type != 'image') { + if ($form['#node_type']->type != 'image') { _image_check_settings(); $image_sizes = array(IMAGE_ATTACH_HIDDEN => t('')); @@ -144,7 +131,7 @@ function image_attach_form_node_type_for $form['image_attach']['image_attach'] = array( '#type' => 'radios', '#title' => t('Attach images'), - '#default_value' => variable_get('image_attach_'. $form['#node_type']->type, 0), + '#default_value' => variable_get('image_attach_' . $form['#node_type']->type, 0), '#options' => array(0 => t('Disabled'), 1 => t('Enabled')), '#description' => t('Should this node allows users to upload an image?'), ); @@ -158,36 +145,36 @@ function image_attach_form_node_type_for $form['image_attach']['image_attach_size_teaser'] = array( '#type' => 'select', '#title' => t('Teaser image size'), - '#default_value' => variable_get('image_attach_size_teaser_'. $form['#node_type']->type, IMAGE_THUMBNAIL), + '#default_value' => variable_get('image_attach_size_teaser_' . $form['#node_type']->type, IMAGE_THUMBNAIL), '#options' => $image_sizes, - '#description' => t("This determines the size of the image that appears when the node is displayed as a teaser. 'Hidden' will not show the image.") + '#description' => t("This determines the size of the image that appears when the node is displayed as a teaser. 'Hidden' will not show the image."), ); // Hide the weight if CCK is doing the weight for us. if (!module_exists('content')) { $form['image_attach']['image_attach_weight_teaser'] = array( '#type' => 'weight', '#title' => t('Teaser image weight'), - '#default_value' => variable_get('image_attach_weight_teaser_'. $form['#node_type']->type, 0), + '#default_value' => variable_get('image_attach_weight_teaser_' . $form['#node_type']->type, 0), '#description' => t('This value determines the order of the image when displayed in the teaser.'), ); } $form['image_attach']['image_attach_size_body'] = array( '#type' => 'select', '#title' => t('Full node image size'), - '#default_value' => variable_get('image_attach_size_body_'. $form['#node_type']->type, IMAGE_THUMBNAIL), + '#default_value' => variable_get('image_attach_size_body_' . $form['#node_type']->type, IMAGE_THUMBNAIL), '#options' => $image_sizes, - '#description' => t("This determines the size of the image that appears when the full node is displayed. 'Hidden' will not show the image.") + '#description' => t("This determines the size of the image that appears when the full node is displayed. 'Hidden' will not show the image."), ); if (!module_exists('content')) { $form['image_attach']['image_attach_weight_body'] = array( '#type' => 'weight', '#title' => t('Full node image weight'), - '#default_value' => variable_get('image_attach_weight_body_'. $form['#node_type']->type, 0), + '#default_value' => variable_get('image_attach_weight_body_' . $form['#node_type']->type, 0), '#description' => t('This value determines the order of the image when displayed in the body.'), ); } if (module_exists('content')) { - $link = l(t('Manage fields'), $_GET['q'] .'/fields'); + $link = l(t('Manage fields'), $_GET['q'] . '/fields'); $form['image_attach']['#description'] = t('Since you installed CCK module, you can change the image weight in the !link page.', array('!link' => $link)); } } @@ -201,7 +188,7 @@ function image_attach_form_alter(&$form, if (isset($form['type']['#value']) && $form['type']['#value'] != 'image') { $type = $form['type']['#value']; // If enabled adjust the form. - if ($form_id == $type .'_node_form' && variable_get('image_attach_'. $type, 0)) { + if ($form_id == $type . '_node_form' && variable_get('image_attach_' . $type, 0)) { $node = $form['#node']; _image_check_settings(); $value = !empty($node->new_image) ? '#value' : '#default_value'; @@ -212,11 +199,11 @@ function image_attach_form_alter(&$form, $form['#submit'][] = 'image_attach_node_form_submit'; // Check permissions and settings - $may_attach = user_access('attach images'); - $may_attach_existing = variable_get('image_attach_existing', 1); - $may_upload = user_access('create images'); - $has_existing_images = !empty($node->iids); - $maximum_images = variable_get('image_attach_maximum_' . $type, 0); + $may_attach = user_access('attach images'); + $may_attach_existing = variable_get('image_attach_existing', 1); + $may_upload = user_access('create images'); + $has_existing_images = !empty($node->iids); + $maximum_images = variable_get('image_attach_maximum_' . $type, 0); // Display the image attach form only if user can attach images, AND // it is allowed to attach existing images or the user is allowed to create new images @@ -271,9 +258,9 @@ function image_attach_form_alter(&$form, } // User may only upload new images: show a selection box containing only attached images. else { - $form['image_attach']['iids']['#title'] = t('Attached images'); - $form['image_attach']['iids']['#options'] = _image_attach_get_image_nodes($node->iids); - $form['image_attach']['iids']['#description'] = t('You can remove a previously attached image by unselecting it.'); + $form['image_attach']['iids']['#title'] = t('Attached images'); + $form['image_attach']['iids']['#options'] = _image_attach_get_image_nodes($node->iids); + $form['image_attach']['iids']['#description'] = t('You can remove a previously attached image by unselecting it.'); } } @@ -282,13 +269,13 @@ function image_attach_form_alter(&$form, $form['image_attach']['image'] = array( '#type' => 'file', '#size' => 40, - '#title' => t('Upload image') + '#title' => t('Upload image'), ); $form['image_attach']['image_title'] = array( '#type' => 'textfield', '#title' => t('Image title'), $value => '', - '#description' => t('The title the image will be shown with. Leave blank to use the filename.') + '#description' => t('The title the image will be shown with. Leave blank to use the filename.'), ); // Provide an additional submit button, which adds an image and redirects // the user to the node edit form. @@ -380,7 +367,7 @@ function image_attach_validate(&$form, & // Initialize an image properly. $image = image_create_node_from($file->filepath, $image_title, ''); if ($image && !form_get_errors()) { - drupal_set_message(t("Created new image to attach to this node. !image_link", array('!image_link' => l($image_title, 'node/'. $image->nid) ))); + drupal_set_message(t("Created new image to attach to this node. !image_link", array('!image_link' => l($image_title, 'node/' . $image->nid)))); // Append image nid to array of images. $form_state['values']['iids'][$image->nid] = $image->nid; } @@ -415,7 +402,7 @@ function image_attach_nodeapi(&$node, $o } return; } - else if (variable_get('image_attach_'. $node->type, 0) == 0) { + else if (variable_get('image_attach_' . $node->type, 0) == 0) { return; } switch ($op) { @@ -448,7 +435,7 @@ function image_attach_nodeapi(&$node, $o if (!empty($node->iids)) { $node->image_attach = _image_attach_node_load_attached($node->iids, $teaser); $teaser_or_body = $teaser ? 'teaser' : 'body'; - $img_size = variable_get('image_attach_size_' . $teaser_or_body . '_'. $node->type, IMAGE_THUMBNAIL); + $img_size = variable_get('image_attach_size_' . $teaser_or_body . '_' . $node->type, IMAGE_THUMBNAIL); // Don't show anything if the attached images are set to hidden. if ($img_size == IMAGE_ATTACH_HIDDEN) { @@ -470,7 +457,7 @@ function image_attach_nodeapi(&$node, $o } $node->content['image_attach'] = array( '#weight' => $weight, - '#value' => theme('image_attach_attached_images_node', $node->nid, $node->image_attach, $img_size, $teaser), + '#value' => theme('image_attach_attached_images_node', $node->nid, $node->image_attach, $img_size, $teaser), ); } break; @@ -482,23 +469,23 @@ function image_attach_nodeapi(&$node, $o $ret[] = array( 'key' => 'enclosure', 'attributes' => array( - 'url' => url("image/view/{$node->iids[0]}/". IMAGE_PREVIEW, array('absolute' => TRUE)), + 'url' => url("image/view/{$node->iids[0]}/" . IMAGE_PREVIEW, array('absolute' => TRUE)), 'length' => $info['file_size'], 'type' => $info['mime_type'], - ) + ), ); } return $ret; } } - /** * Helper function for hook_nodeapi: view op. * Loads all the required attached image nodes. * * @param $nids: an array of node ids. * @param $teaser: if true, only load the first of the node ids. + * * @return: An numerical array of node objects. */ function _image_attach_node_load_attached($attached_nids, $teaser = FALSE) { @@ -524,12 +511,12 @@ function _image_attach_get_image_nodes($ $placeholder = ''; // If $nids was passed, build placeholders to put in the query if (count($nids)) { - $placeholder = 'AND n.nid IN ('. implode(', ', array_fill(0, sizeof($nids), '%d')) .') '; + $placeholder = 'AND n.nid IN (' . implode(', ', array_fill(0, sizeof($nids), '%d')) . ') '; } $rows = array(0 => t('- None -')); - $result = db_query(db_rewrite_sql("SELECT n.nid, n.title, n.sticky FROM {node} n WHERE n.status = 1 AND n.type = 'image' ". $placeholder ."ORDER BY n.sticky DESC, n.title ASC"), $nids); + $result = db_query(db_rewrite_sql("SELECT n.nid, n.title, n.sticky FROM {node} n WHERE n.status = 1 AND n.type = 'image' " . $placeholder . "ORDER BY n.sticky DESC, n.title ASC"), $nids); while ($node = db_fetch_object($result)) { $rows[$node->nid] = $node->title; } @@ -537,43 +524,40 @@ function _image_attach_get_image_nodes($ return $rows; } - /** * Views 2 API handler - * */ - function image_attach_views_api() { -return array( - 'api' => 2, - 'path' => drupal_get_path('module', 'image_attach'), -); + return array( + 'api' => 2, + 'path' => drupal_get_path('module', 'image_attach'), + ); } /** * Implementation of hook_theme() registry. - **/ + */ function image_attach_theme() { return array( 'image_attach_attached_images' => array( 'arguments' => array( - 'nid' => 0, - 'image_nodes' => array(), - 'options' => array(), + 'nid' => 0, + 'image_nodes' => array(), + 'options' => array(), ), ), 'image_attach_attached_images_node' => array( 'arguments' => array( - 'node' => new stdClass(), - 'image_nodes' => array(), - 'img_size' => IMAGE_THUMBNAIL, - 'teaser' => FALSE, + 'node' => new stdClass(), + 'image_nodes' => array(), + 'img_size' => IMAGE_THUMBNAIL, + 'teaser' => FALSE, ), ), 'image_attach_attached_images_block' => array( 'arguments' => array( - 'nid' => 0, - 'image_nodes' => array(), + 'nid' => 0, + 'image_nodes' => array(), ), ), ); @@ -604,7 +588,7 @@ function theme_image_attach_attached_ima 'class' => 'image-attach-' . ($teaser ? 'teaser' : 'body'), ), ); - + // We take the images in reverse order because they are floated to the right, // and we want the apparent left to right order to be correct. $output = theme('image_attach_attached_images', $nid, array_reverse($image_nodes), $options); @@ -632,7 +616,7 @@ function theme_image_attach_attached_ima 'size' => variable_get('image_attach_block_0_size', IMAGE_THUMBNAIL), 'link' => 'image', ); - + $output = theme('image_attach_attached_images', $nid, $image_nodes, $options); $output = '
' . $output . '
'; @@ -646,7 +630,7 @@ function theme_image_attach_attached_ima * @param $nid * The id of the attaching node. * @param $image_nodes - * The fully loaded image nodes to theme. These do not need to be checked for + * The fully loaded image nodes to theme. These do not need to be checked for * access: that happens in this function. * @param $options * An associative array of options, with the following keys: @@ -664,17 +648,17 @@ function theme_image_attach_attached_ima function theme_image_attach_attached_images($nid, $image_nodes = array(), $options = array()) { // Merge in defaults. $options += array( - 'size' => IMAGE_THUMBNAIL, - 'link' => 'image', + 'size' => IMAGE_THUMBNAIL, + 'link' => 'image', ); - $img_size = $options['size']; + $img_size = $options['size']; $link_destination = $options['link']; // Link images to the attaching node. if ($link_destination == 'node') { $link_path = "node/$nid"; - } + } $output = ''; foreach ($image_nodes as $image) { @@ -686,7 +670,7 @@ function theme_image_attach_attached_ima // Link images to the image node. if ($link_destination == 'image') { $link_path = "node/$image->nid"; - } + } // Get a fresh copy of the attributes for each image node. $div_attributes = $options['attributes']; @@ -694,9 +678,10 @@ function theme_image_attach_attached_ima // Create CSS classes. $classes = array(); if (isset($div_attributes['class'])) { - $classes[] = $div_attributes['class']; // incoming classes. + $classes[] = $div_attributes['class']; } - //$classes[] = 'image-attach-' . $teaser_or_body; // replace with base class in DIV + // replace with base class in DIV + //$classes[] = 'image-attach-' . $teaser_or_body; $classes[] = 'image-attach-node-' . $image->nid; if (!$image->status) { $classes[] = 'image-unpublished'; Index: contrib/image_attach/image_attach.views.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_attach/image_attach.views.inc,v retrieving revision 1.6 diff -u -p -r1.6 image_attach.views.inc --- contrib/image_attach/image_attach.views.inc 9 Sep 2009 19:51:51 -0000 1.6 +++ contrib/image_attach/image_attach.views.inc 29 Jul 2010 11:20:34 -0000 @@ -10,7 +10,7 @@ function image_attach_views_data() { // Define the base group of this table. Fields that don't // have a group defined will go into this field by default. - $data['image_attach']['table']['group'] = t('Image attach'); + $data['image_attach']['table']['group'] = t('Image attach'); // For other base tables, explain how we join // LEFT is the default, but let's be explicit @@ -26,7 +26,8 @@ function image_attach_views_data() { // {node} --> {image_attach} --> {node}. // In other words, given the node, what attached images does it have? $data['image_attach']['iid'] = array( - 'title' => t('Attached images'), // The item it appears as on the UI, + // The item it appears as on the UI, + 'title' => t('Attached images'), 'help' => t('The images attached to a node.'), 'relationship' => array( 'title' => t('Attached image nodes'), @@ -44,18 +45,18 @@ function image_attach_views_data() { // This goes from attached image nodes to image attach and thence to nodes, // but joining first on iid, and only then on nid. // In other words, given the image, what node(s) have it as an attached image? - $data['image_attach_reverse']['table']['group'] = t('Image attach'); + $data['image_attach_reverse']['table']['group'] = t('Image attach'); $data['image_attach_reverse']['table']['join'] = array( 'node' => array( - 'table' => 'image_attach', // real table name + 'table' => 'image_attach', 'left_field' => 'nid', 'field' => 'iid', 'type' => 'LEFT', ), ); $data['image_attach_reverse']['nid'] = array( - 'title' => t('Attaching nodes'), // The item it appears as on the UI, + 'title' => t('Attaching nodes'), 'help' => t('The nodes that have attached images.'), 'relationship' => array( 'title' => t('Attaching nodes'), @@ -95,7 +96,7 @@ function image_attach_views_handlers() { return array( 'info' => array( 'path' => drupal_get_path('module', 'image_attach'), - ), + ), 'handlers' => array( 'image_attach_views_handler_field_attached_images' => array( 'parent' => 'image_handler_field_image_node_image', @@ -103,3 +104,4 @@ function image_attach_views_handlers() { ), ); } + Index: contrib/image_attach/image_attach_views_handler_field_attached_images.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_attach/image_attach_views_handler_field_attached_images.inc,v retrieving revision 1.4.2.1 diff -u -p -r1.4.2.1 image_attach_views_handler_field_attached_images.inc --- contrib/image_attach/image_attach_views_handler_field_attached_images.inc 11 Jul 2010 13:51:34 -0000 1.4.2.1 +++ contrib/image_attach/image_attach_views_handler_field_attached_images.inc 29 Jul 2010 11:21:06 -0000 @@ -10,8 +10,7 @@ * * Inherit from image_handler_field_image_node_image so we get image sizes. */ -class image_attach_views_handler_field_attached_images - extends image_handler_field_image_node_image { +class image_attach_views_handler_field_attached_images extends image_handler_field_image_node_image { /** * Constructor to provide additional fields to add. @@ -26,10 +25,10 @@ class image_attach_views_handler_field_a 'field' => 'nid', ); } - + /** * Define default values for options. - * + * * We inherit the image size option. */ function option_definition() { @@ -55,10 +54,10 @@ class image_attach_views_handler_field_a '#default_value' => $this->options['as_link'], ); } - + /** * We don't add to the query (see the parent class). - * Instead, run our own query on pre-render. This is the same approach as CCK + * Instead, run our own query on pre-render. This is the same approach as CCK * multiple fields. */ function pre_render(&$values) { @@ -71,7 +70,7 @@ class image_attach_views_handler_field_a $nids[$nid] = $nid; } } - + if (count($nids)) { $nids_string = implode(',', $nids); $result = db_query("SELECT nid, iid FROM {image_attach} WHERE nid IN (" . $nids_string . ") ORDER BY weight"); @@ -79,7 +78,7 @@ class image_attach_views_handler_field_a // Store all the attached image nids (iid) keyed by attaching nid. $attached_images[$data->nid][] = $data->iid; } - + // Place the data into the $values array for each result. foreach ($values as $id => $v) { if (isset($attached_images[$v->{$this->aliases['image_attach_nid']}])) { @@ -110,3 +109,4 @@ class image_attach_views_handler_field_a } } } + Index: contrib/image_gallery/image_gallery.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_gallery/image_gallery.admin.inc,v retrieving revision 1.2 diff -u -p -r1.2 image_gallery.admin.inc --- contrib/image_gallery/image_gallery.admin.inc 13 Sep 2009 07:53:58 -0000 1.2 +++ contrib/image_gallery/image_gallery.admin.inc 29 Jul 2010 11:21:49 -0000 @@ -11,7 +11,7 @@ */ function image_gallery_admin_settings() { _image_check_settings(); - + // Show various messages if Views module is enabled. if (module_exists('views')) { // Test the status of the view: @@ -20,7 +20,7 @@ function image_gallery_admin_settings() // - FALSE: view enabled // - TRUE: view disabled // @see views_get_all_views(). - $status = variable_get('views_defaults', array()); + $status = variable_get('views_defaults', array()); if (isset($status['image_gallery']) && $status['image_gallery']) { // The view is disabled: tell the user that more interesting things can be done. $form['info']['#value'] = t('Enabling the image_gallery view will give you many more ways to customize your galleries.', array('!views-link' => url('admin/build/views'))); @@ -36,7 +36,7 @@ function image_gallery_admin_settings() } else { $form['info']['#value'] = t('To change the way galleries are displayed, enable the Views UI module on the Modules administration page, then override the default image_gallery view.', array('!modules-link' => url('admin/build/modules'))); - } + } return $form; } } @@ -83,7 +83,7 @@ function image_gallery_admin() { if ($tree) { $header = array(t('Name'), t('Operations')); foreach ($tree as $term) { - $rows[] = array(str_repeat(' -- ', $term->depth) .' '. l($term->name, "image/tid/$term->tid"), l(t('edit gallery'), "admin/content/image/edit/$term->tid")); + $rows[] = array(str_repeat(' -- ', $term->depth) . ' ' . l($term->name, "image/tid/$term->tid"), l(t('edit gallery'), "admin/content/image/edit/$term->tid")); } return theme('table', $header, $rows); } @@ -108,7 +108,7 @@ function image_gallery_admin_edit($tid = 'name' => '', 'description' => '', 'vid' => _image_gallery_get_vid(), - 'tid' => null, + 'tid' => NULL, 'weight' => 0, ); } @@ -124,7 +124,7 @@ function image_gallery_admin_form(&$form '#title' => t('Gallery name'), '#default_value' => $edit['name'], '#size' => 60, - '#maxlength' => 64, + '#maxlength' => 64, '#description' => t('The name is used to identify the gallery.'), '#required' => TRUE, ); @@ -149,7 +149,7 @@ function image_gallery_admin_form(&$form '#type' => 'hidden', '#value' => _image_gallery_get_vid(), ); - $form['submit' ] = array( + $form['submit'] = array( '#type' => 'submit', '#value' => t('Save'), ); @@ -187,11 +187,11 @@ function _image_gallery_parent_select($t $exclude[] = $tid; $tree = taxonomy_get_tree(_image_gallery_get_vid()); - $options[0] = '<'. t('root') .'>'; + $options[0] = '<' . t('root') . '>'; if ($tree) { foreach ($tree as $term) { if (!in_array($term->tid, $exclude)) { - $options[$term->tid] = str_repeat(' -- ', $term->depth) .' '. $term->name; + $options[$term->tid] = str_repeat(' -- ', $term->depth) . ' ' . $term->name; } } } @@ -202,7 +202,7 @@ function _image_gallery_parent_select($t '#default_value' => $parent, '#options' => $options, '#description' => t('Image galleries may be nested below other galleries.'), - '#required' => TRUE + '#required' => TRUE, ); } @@ -215,9 +215,11 @@ function image_gallery_admin_submit($for case SAVED_NEW: drupal_set_message(t('Created new gallery %term.', array('%term' => $form_state['values']['name']))); break; + case SAVED_UPDATED: drupal_set_message(t('The gallery %term has been updated.', array('%term' => $form_state['values']['name']))); break; + case SAVED_DELETED: drupal_set_message(t('The gallery %term has been deleted.', array('%term' => $form_state['values']['name']))); break; @@ -245,3 +247,4 @@ function image_gallery_confirm_delete_fo drupal_set_message(t('The image gallery %term and all sub-galleries have been deleted.', array('%term' => $form_state['values']['name']))); $form_state['redirect'] = 'admin/content/image'; } + Index: contrib/image_gallery/image_gallery.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_gallery/image_gallery.install,v retrieving revision 1.20 diff -u -p -r1.20 image_gallery.install --- contrib/image_gallery/image_gallery.install 7 Sep 2009 13:01:41 -0000 1.20 +++ contrib/image_gallery/image_gallery.install 29 Jul 2010 11:22:04 -0000 @@ -25,8 +25,8 @@ function image_gallery_enable() { // Create the image gallery vocabulary if it does not exist. $vocabulary = array( 'name' => t('Image Galleries'), - 'multiple' => 0, - 'required' => 0, + 'multiple' => 0, + 'required' => 0, 'hierarchy' => 1, 'relations' => 0, 'module' => 'image_gallery', @@ -92,9 +92,10 @@ function image_gallery_update_6100() { * Clear the Views cache so our new default views are picked up. */ function image_gallery_update_6101() { - $ret = array(); + $ret = array(); if (drupal_load('module', 'views')) { views_invalidate_cache(); } - return $ret; + return $ret; } + Index: contrib/image_gallery/image_gallery.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_gallery/image_gallery.module,v retrieving revision 1.46 diff -u -p -r1.46 image_gallery.module --- contrib/image_gallery/image_gallery.module 4 Sep 2009 13:24:41 -0000 1.46 +++ contrib/image_gallery/image_gallery.module 29 Jul 2010 11:22:19 -0000 @@ -21,6 +21,7 @@ function image_gallery_help($path, $arg) $output .= ''; $output .= '

' . t('For more information, see the online handbook entry for Image module and its related submodules.', array('@image-url' => 'http://drupal.org/handbook/modules/image')) . '

'; return $output; + case 'admin/content/image': $output = '

' . t('Image galleries can be used to organize and present groups of images. Galleries may be nested. To add a new gallery click the "add gallery" tab.', array('@image-gallery-url' => url('image'))) . '

'; return $output; @@ -106,7 +107,7 @@ function image_gallery_taxonomy($op, $ty * Implementation of hook_term_path(). */ function image_gallery_term_path($term) { - return 'image/tid/'. $term->tid; + return 'image/tid/' . $term->tid; } /** @@ -116,19 +117,19 @@ function image_gallery_nodeapi(&$node, $ switch ($op) { case 'view': if ($page && !$teaser && $node->type == 'image') { - $vid = _image_gallery_get_vid(); + $vid = _image_gallery_get_vid(); $terms = taxonomy_node_get_terms_by_vocabulary($node, $vid); - $term = array_pop($terms); + $term = array_pop($terms); if ($term) { $vocabulary = taxonomy_vocabulary_load($vid); // Breadcrumb navigation - $breadcrumb = array(); + $breadcrumb = array(); $breadcrumb[] = l(t('Home'), NULL); $breadcrumb[] = l($vocabulary->name, 'image'); if ($parents = taxonomy_get_parents_all($term->tid)) { $parents = array_reverse($parents); foreach ($parents as $parent) { - $breadcrumb[] = l($parent->name, 'image/tid/'. $parent->tid); + $breadcrumb[] = l($parent->name, 'image/tid/' . $parent->tid); } } drupal_set_breadcrumb($breadcrumb); @@ -163,8 +164,8 @@ function image_gallery_theme() { */ function theme_image_gallery_count($count) { return format_plural( - $count, - 'There is 1 image in this gallery', + $count, + 'There is 1 image in this gallery', 'There are @count images in this gallery' ); } @@ -223,6 +224,7 @@ function _image_gallery_get_vid() { function image_gallery_views_api() { return array( 'api' => 2, - 'path' => drupal_get_path('module', 'image_gallery') .'/views', + 'path' => drupal_get_path('module', 'image_gallery') . '/views', ); } + Index: contrib/image_gallery/image_gallery.pages.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_gallery/image_gallery.pages.inc,v retrieving revision 1.1 diff -u -p -r1.1 image_gallery.pages.inc --- contrib/image_gallery/image_gallery.pages.inc 4 Sep 2009 13:24:41 -0000 1.1 +++ contrib/image_gallery/image_gallery.pages.inc 29 Jul 2010 11:23:22 -0000 @@ -3,7 +3,7 @@ /** * @file - * Contains menu callbacks for image_gallery pages, + * Contains menu callbacks for image_gallery pages, * ie galleries not made with views module. * This file is not loaded when Views is creating the gallery. */ @@ -38,13 +38,13 @@ function image_gallery_page($type = NULL $vid = _image_gallery_get_vid(); $galleries = taxonomy_get_tree($vid, $tid, -1, 1); - for ($i=0; $i < count($galleries); $i++) { + for ($i = 0; $i < count($galleries); $i++) { $galleries[$i]->count = taxonomy_term_count_nodes($galleries[$i]->tid, 'image'); $tree = taxonomy_get_tree($vid, $galleries[$i]->tid, -1); $descendant_tids = array_merge(array($galleries[$i]->tid), array_map('_taxonomy_get_tid_from_term', $tree)); // The values of $descendant_tids should be safe for raw inclusion in the // SQL since they're all loaded from integer fields in the database. - $sql = "SELECT n.nid FROM {node} n INNER JOIN {term_node} tn ON n.nid = tn.nid $join WHERE tn.tid IN (". implode(',', $descendant_tids) .") AND n.type = 'image' AND n.status = 1 $where $order"; + $sql = "SELECT n.nid FROM {node} n INNER JOIN {term_node} tn ON n.nid = tn.nid $join WHERE tn.tid IN (" . implode(',', $descendant_tids) . ") AND n.type = 'image' AND n.status = 1 $where $order"; if ($nid = db_result(db_query(db_rewrite_sql($sql), $args))) { $galleries[$i]->latest = node_load(array('nid' => $nid)); } @@ -69,7 +69,7 @@ function image_gallery_page($type = NULL $breadcrumb[] = l(t('Image galleries'), 'image'); foreach ($parents as $parent) { // Add parents to breadcrumb navigation - $breadcrumb[] = l($parent->name, 'image/tid/'. $parent->tid); + $breadcrumb[] = l($parent->name, 'image/tid/' . $parent->tid); } drupal_set_breadcrumb($breadcrumb); drupal_set_title($gallery->name); @@ -82,7 +82,7 @@ function image_gallery_page($type = NULL * Theme a gallery page */ function theme_image_gallery($galleries, $images) { - drupal_add_css(drupal_get_path('module', 'image_gallery') .'/image_gallery.css'); + drupal_add_css(drupal_get_path('module', 'image_gallery') . '/image_gallery.css'); $size = image_get_sizes(IMAGE_THUMBNAIL); @@ -92,13 +92,13 @@ function theme_image_gallery($galleries, foreach ($galleries as $gallery) { $content .= '
  • '; if ($gallery->count) { - $content .= l(image_display($gallery->latest, IMAGE_THUMBNAIL), 'image/tid/'. $gallery->tid, array('html' => TRUE)); + $content .= l(image_display($gallery->latest, IMAGE_THUMBNAIL), 'image/tid/' . $gallery->tid, array('html' => TRUE)); } - $content .= "

    ". l($gallery->name, 'image/tid/'. $gallery->tid) ."

    \n"; - $content .= '
    '. check_markup($gallery->description) ."
    \n"; - $content .= '

    '. format_plural($gallery->count, 'There is 1 image in this gallery.', 'There are @count images in this gallery.') ."

    \n"; + $content .= "

    " . l($gallery->name, 'image/tid/' . $gallery->tid) . "

    \n"; + $content .= '
    ' . check_markup($gallery->description) . "
    \n"; + $content .= '

    ' . format_plural($gallery->count, 'There is 1 image in this gallery.', 'There are @count images in this gallery.') . "

    \n"; if (isset($gallery->latest) && $gallery->latest->changed) { - $content .= '

    '. t('Last updated: %date', array('%date' => format_date($gallery->latest->changed))) ."

    \n"; + $content .= '

    ' . t('Last updated: %date', array('%date' => format_date($gallery->latest->changed))) . "

    \n"; } $content .= "
    • \n"; } @@ -118,7 +118,7 @@ function theme_image_gallery($galleries, } if (count($images) + count($galleries) == 0) { - $content .= '

    '. format_plural(0, 'There is 1 image in this gallery.', 'There are @count images in this gallery.') ."

    \n"; + $content .= '

    ' . format_plural(0, 'There is 1 image in this gallery.', 'There are @count images in this gallery.') . "

    \n"; } return $content; @@ -137,15 +137,16 @@ function theme_image_gallery_img($image, $content .= ' class="sticky"'; } $content .= " style='height : {$height}px; width : {$width}px;'>\n"; - $content .= l(image_display($image, IMAGE_THUMBNAIL), 'node/'. $image->nid, array('html' => TRUE)); - $content .= '

    '. l($image->title, 'node/'. $image->nid) .'

    '; + $content .= l(image_display($image, IMAGE_THUMBNAIL), 'node/' . $image->nid, array('html' => TRUE)); + $content .= '

    ' . l($image->title, 'node/' . $image->nid) . '

    '; if (variable_get('image_gallery_node_info', 0)) { - $content .= '
    '. t('Posted by: !name', array('!name' => theme('username', $image))) ."
    \n"; + $content .= '
    ' . t('Posted by: !name', array('!name' => theme('username', $image))) . "
    \n"; if ($image->created > 0) { - $content .= '
    '. format_date($image->created) ."
    \n"; + $content .= '
    ' . format_date($image->created) . "
    \n"; } } $content .= "\n"; return $content; } + Index: contrib/image_gallery/views/image_gallery.views.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_gallery/views/image_gallery.views.inc,v retrieving revision 1.3 diff -u -p -r1.3 image_gallery.views.inc --- contrib/image_gallery/views/image_gallery.views.inc 5 Sep 2009 14:50:31 -0000 1.3 +++ contrib/image_gallery/views/image_gallery.views.inc 29 Jul 2010 11:28:08 -0000 @@ -15,9 +15,9 @@ * The default views are: * - image_gallery * - image_gallery_terms - + * * There are two ways of getting the image gallery cover image: - * - a plain field. This allows complex code like recursion (check the gallery itself, + * - a plain field. This allows complex code like recursion (check the gallery itself, * if empty, check the child galleries, etc) * Plain field also allows us to grab the sort order set on the gallery images * and get the first image from that order as the front. @@ -50,14 +50,14 @@ function image_gallery_views_data_alter( // Note that a bug in Views -- http://drupal.org/node/380560 -- will cause // an error message when adding node fields on these relationships. $data['term_data']['image_gallery_cover_latest'] = array( - 'group' => t('Image gallery'), + 'group' => t('Image gallery'), 'relationship' => array( 'title' => t('Latest image'), - 'label' => t('Cover image, latest'), + 'label' => t('Cover image, latest'), 'help' => t('Relate an image gallery to its most recently updated node (does not consider child galleries).'), 'handler' => 'image_gallery_handler_relationship_gallery_cover', - 'base' => 'node', - 'field' => 'nid', + 'base' => 'node', + 'field' => 'nid', 'correlated field' => 'tid', 'subquery order' => ' gallery_cover_node.created DESC ', ), @@ -66,11 +66,11 @@ function image_gallery_views_data_alter( 'group' => t('Image gallery'), 'relationship' => array( 'title' => t('Oldest image'), - 'label' => t('Cover image, oldest'), + 'label' => t('Cover image, oldest'), 'help' => t('Relate an image gallery to its oldest node (does not consider child galleries).'), 'handler' => 'image_gallery_handler_relationship_gallery_cover', - 'base' => 'node', - 'field' => 'nid', + 'base' => 'node', + 'field' => 'nid', 'correlated field' => 'tid', 'subquery order' => ' gallery_cover_node.created ASC ', ), @@ -79,11 +79,11 @@ function image_gallery_views_data_alter( 'group' => t('Image gallery'), 'relationship' => array( 'title' => t('First image by title'), - 'label' => t('Cover image, first by title'), + 'label' => t('Cover image, first by title'), 'help' => t('Relate an image gallery to its first node when sorted by title (does not consider child galleries).'), 'handler' => 'image_gallery_handler_relationship_gallery_cover', - 'base' => 'node', - 'field' => 'nid', + 'base' => 'node', + 'field' => 'nid', 'correlated field' => 'tid', 'subquery order' => ' gallery_cover_node.title ASC ', ), @@ -101,7 +101,7 @@ function image_gallery_views_data_alter( 'handler' => 'image_gallery_handler_field_gallery_count', ), ); - + // ---------------------------------------------------------------------- // Fields for cover image. // @@ -116,7 +116,7 @@ function image_gallery_views_data_alter( // To add more fields, define them on term_data and optionally add handlers. // See image_gallery_handler_field_gallery_cover for more information. $data['term_data']['image_gallery_latest_thumbnail'] = array( - 'group' => t('Image gallery'), + 'group' => t('Image gallery'), 'field' => array( 'title' => t('Latest image'), 'help' => t('The most recently posted image in the gallery or its child galleries.'), @@ -125,7 +125,7 @@ function image_gallery_views_data_alter( ), ); $data['term_data']['image_gallery_latest_time'] = array( - 'group' => t('Image gallery'), + 'group' => t('Image gallery'), 'field' => array( 'title' => t('Last updated time'), 'help' => t('The time of the most recently posted image in the gallery or its child galleries.'), @@ -167,10 +167,10 @@ function image_gallery_views_handlers() ), 'image_gallery_handler_field_gallery_cover' => array( 'parent' => 'views_handler_field_taxonomy', - ), + ), 'image_gallery_handler_field_gallery_cover_thumbnail' => array( 'parent' => 'image_gallery_handler_field_gallery_cover', - ), + ), 'image_gallery_handler_field_gallery_cover_latest_time' => array( 'parent' => 'image_gallery_handler_field_gallery_cover', ), @@ -178,7 +178,7 @@ function image_gallery_views_handlers() 'parent' => 'views_handler_relationship', ), 'image_gallery_plugin_display_image_gallery' => array( - 'parent' => 'views_plugin_display_page', + 'parent' => 'views_plugin_display_page', ), ), ); @@ -206,7 +206,8 @@ function image_gallery_views_plugins() { 'use pager' => TRUE, 'accept attachments' => TRUE, 'admin' => t('Page'), - 'help topic' => 'display-page', // TODO ?? + // @todo ? + 'help topic' => 'display-page', 'path' => drupal_get_path('module', 'image_gallery') . '/views', ), ), @@ -215,7 +216,7 @@ function image_gallery_views_plugins() { * A list style for term lists. */ 'image_gallery_terms' => array( - 'title' => 'Subgallery list', + 'title' => 'Subgallery list', 'help' => t('Displays subgalleries in a formatted list.'), 'parent' => 'list', 'handler' => 'views_plugin_style_list', @@ -311,5 +312,5 @@ class image_gallery_join_subquery extend } return $output; } -} // class image_gallery_join_subquery +} Index: contrib/image_gallery/views/image_gallery_handler_field_gallery_count.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_gallery/views/image_gallery_handler_field_gallery_count.inc,v retrieving revision 1.1 diff -u -p -r1.1 image_gallery_handler_field_gallery_count.inc --- contrib/image_gallery/views/image_gallery_handler_field_gallery_count.inc 27 Aug 2009 12:10:57 -0000 1.1 +++ contrib/image_gallery/views/image_gallery_handler_field_gallery_count.inc 29 Jul 2010 11:28:58 -0000 @@ -6,7 +6,8 @@ * the gallery, including descendant galleries, using taxonomy.module's * taxonomy_term_count_nodes. */ -class image_gallery_handler_field_gallery_count extends views_handler_field_taxonomy { +class image_gallery_handler_field_gallery_count extends views_handler_field_taxonomy { + /** * Override query() so we don't query: fake field. */ @@ -14,7 +15,7 @@ class image_gallery_handler_field_galler $this->ensure_my_table(); $this->add_additional_fields(); } - + /** * Return field html. */ Index: contrib/image_gallery/views/image_gallery_handler_field_gallery_cover.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_gallery/views/image_gallery_handler_field_gallery_cover.inc,v retrieving revision 1.1 diff -u -p -r1.1 image_gallery_handler_field_gallery_cover.inc --- contrib/image_gallery/views/image_gallery_handler_field_gallery_cover.inc 27 Aug 2009 12:10:57 -0000 1.1 +++ contrib/image_gallery/views/image_gallery_handler_field_gallery_cover.inc 29 Jul 2010 11:29:40 -0000 @@ -16,6 +16,7 @@ * grabbing the query from another view. */ class image_gallery_handler_field_gallery_cover extends views_handler_field_taxonomy { + /** * Constructor to provide additional fields to add. */ @@ -68,10 +69,10 @@ class image_gallery_handler_field_galler // Child handlers should replace this text with something more relevant // to what they do. '#description' => theme('advanced_help_topic', 'image_gallery', 'descendants') . - t('How to get data from subgalleries: either only select from this gallery itself, or consider subgalleries all together, or recurse into subgalleries if the gallery itself is empty.'), + t('How to get data from subgalleries: either only select from this gallery itself, or consider subgalleries all together, or recurse into subgalleries if the gallery itself is empty.'), '#options' => array( - 'single' => t('Only select from this gallery'), - 'flat' => t('Consider subgalleries, flattened.'), + 'single' => t('Only select from this gallery'), + 'flat' => t('Consider subgalleries, flattened.'), 'recurse' => t('Consider subgalleries, recursively. (Warning: this can produce many queries per row if your parent galleries are empty!).'), ), '#default_value' => $this->options['descendants'], @@ -113,7 +114,7 @@ class image_gallery_handler_field_galler $this->basic_query = $this->get_cover_node_nid_query(); } } - + // If we don't have a query, return NULL now to prevent SQL errors. if (is_null($this->basic_query)) { return NULL; @@ -142,6 +143,7 @@ class image_gallery_handler_field_galler $where_clause = "tn.tid = $tid "; $query = str_replace('***WHERE_CLAUSE***', $where_clause, $this->basic_query); break; + // Flat: all descendant galleries considered for the cover query. case 'flat': if ($depth == 'all') { @@ -231,3 +233,4 @@ class image_gallery_handler_field_galler return $nid; } } + Index: contrib/image_gallery/views/image_gallery_handler_field_gallery_cover_latest_time.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_gallery/views/image_gallery_handler_field_gallery_cover_latest_time.inc,v retrieving revision 1.4 diff -u -p -r1.4 image_gallery_handler_field_gallery_cover_latest_time.inc --- contrib/image_gallery/views/image_gallery_handler_field_gallery_cover_latest_time.inc 9 Sep 2009 19:31:55 -0000 1.4 +++ contrib/image_gallery/views/image_gallery_handler_field_gallery_cover_latest_time.inc 29 Jul 2010 11:29:58 -0000 @@ -12,18 +12,18 @@ class image_gallery_handler_field_galler $form['descendants']['#description'] = theme('advanced_help_topic', 'image_gallery', 'descendants') . t('Whether to only consider this gallery itself, or consider subgalleries all together, or recurse into subgalleries if the gallery itself is empty.'); $form['descendants']['#options'] = array( - 'single' => t('Only get latest time from this gallery'), - 'flat' => t('Consider subgalleries, flattened.'), + 'single' => t('Only get latest time from this gallery'), + 'flat' => t('Consider subgalleries, flattened.'), 'recurse' => t('Consider subgalleries, recursively. (Warning: this can produce many queries per row if your parent galleries are empty!).'), ); } - + /** * Returns field html. */ function render($values) { $nid = $this->get_cover_node_nid($values); - + // If there is no node (ie gallery empty), suppress the label. // Because this is called for each row, but $this->options['label'] applies // to everything, we have to muck about and stash the original, user-set @@ -33,7 +33,7 @@ class image_gallery_handler_field_galler if (!isset($original_label)) { $original_label = $this->options['label']; } - + if (isset($nid)) { $this->options['label'] = $original_label; $latest_node = node_load($nid); @@ -42,6 +42,7 @@ class image_gallery_handler_field_galler } else { $this->options['label'] = ''; - } + } } } + Index: contrib/image_gallery/views/image_gallery_handler_field_gallery_cover_thumbnail.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_gallery/views/image_gallery_handler_field_gallery_cover_thumbnail.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 image_gallery_handler_field_gallery_cover_thumbnail.inc --- contrib/image_gallery/views/image_gallery_handler_field_gallery_cover_thumbnail.inc 11 Jul 2010 13:55:47 -0000 1.1.2.1 +++ contrib/image_gallery/views/image_gallery_handler_field_gallery_cover_thumbnail.inc 29 Jul 2010 11:30:20 -0000 @@ -9,6 +9,7 @@ * and the order to get the cover node. */ class image_gallery_handler_field_gallery_cover_thumbnail extends image_gallery_handler_field_gallery_cover { + /** * Defines default values for options. */ @@ -30,8 +31,8 @@ class image_gallery_handler_field_galler $form['descendants']['#description'] = theme('advanced_help_topic', 'image_gallery', 'descendants') . t('Whether to go into subgalleries when getting a cover image. Either: consider only this gallery itself, consider subgalleries all together, or recurse into subgalleries one by one if the gallery itself is empty.'); $form['descendants']['#options'] = array( - 'single' => t('Only get cover image from this gallery'), - 'flat' => t('Consider subgalleries, flattened.'), + 'single' => t('Only get cover image from this gallery'), + 'flat' => t('Consider subgalleries, flattened.'), 'recurse' => t('Consider subgalleries, recursively. (Warning: this can produce many queries per row if your parent galleries are empty!).'), ); @@ -43,7 +44,7 @@ class image_gallery_handler_field_galler '#title' => t('Image size to show'), '#options' => $sizes, '#default_value' => $this->options['image_derivative'], - '#description' => t('Pick an image derivative to display.') + '#description' => t('Pick an image derivative to display.'), ); } Index: contrib/image_gallery/views/image_gallery_handler_relationship_gallery_cover.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_gallery/views/image_gallery_handler_relationship_gallery_cover.inc,v retrieving revision 1.1 diff -u -p -r1.1 image_gallery_handler_relationship_gallery_cover.inc --- contrib/image_gallery/views/image_gallery_handler_relationship_gallery_cover.inc 27 Aug 2009 12:10:57 -0000 1.1 +++ contrib/image_gallery/views/image_gallery_handler_relationship_gallery_cover.inc 29 Jul 2010 11:31:10 -0000 @@ -1,5 +1,6 @@ array( * 'title' => t('Latest image'), @@ -48,6 +49,7 @@ * left_query() method to return your own subquery on which to join. */ class image_gallery_handler_relationship_gallery_cover extends views_handler_relationship { + /** * Defines default values for options. */ @@ -71,15 +73,15 @@ class image_gallery_handler_relationship '#title' => t('Depth'), '#default_value' => $this->options['depth'], '#description' => t('The depth will determine how deep to look into descendant galleries to cover nodes.' . - 'There is no recursion: so setting the depth to 1 will choose the best fitting node out of the pool of images in the gallery and its children taken all together.' . - 'Setting this to 0 will only consider the gallery itself.' - ), + 'There is no recursion: so setting the depth to 1 will choose the best fitting node out of the pool of images in the gallery and its children taken all together.' . + 'Setting this to 0 will only consider the gallery itself.' + ), ); } /** * Return the subquery to use for the left side of the relationship join clause. - * + * */ function left_query() { $order = $this->definition['subquery order']; @@ -178,3 +180,4 @@ class image_gallery_handler_relationship return $sub_query; } */ + Index: contrib/image_gallery/views/image_gallery_plugin_display_image_gallery.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_gallery/views/image_gallery_plugin_display_image_gallery.inc,v retrieving revision 1.1 diff -u -p -r1.1 image_gallery_plugin_display_image_gallery.inc --- contrib/image_gallery/views/image_gallery_plugin_display_image_gallery.inc 27 Aug 2009 12:10:57 -0000 1.1 +++ contrib/image_gallery/views/image_gallery_plugin_display_image_gallery.inc 29 Jul 2010 11:31:22 -0000 @@ -16,7 +16,6 @@ * @ingroup views_display_plugins */ class image_gallery_plugin_display_image_gallery extends views_plugin_display_page { - function options_summary(&$categories, &$options) { // It is very important to call the parent function here: parent::options_summary($categories, $options); @@ -48,7 +47,7 @@ class image_gallery_plugin_display_image // Tack THIS view onto the gallery terms view. We don't do anything with // this yet, but other handlers might need it. - $this->gallery_terms_view->embedding_view =& $this->view; + $this->gallery_terms_view->embedding_view = &$this->view; $output = $this->gallery_terms_view->preview('default', $args); } @@ -73,3 +72,4 @@ class image_gallery_plugin_display_image } } } + Index: contrib/image_im_advanced/image_im_advanced.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_im_advanced/image_im_advanced.install,v retrieving revision 1.4 diff -u -p -r1.4 image_im_advanced.install --- contrib/image_im_advanced/image_im_advanced.install 6 Mar 2009 01:40:10 -0000 1.4 +++ contrib/image_im_advanced/image_im_advanced.install 29 Jul 2010 11:23:35 -0000 @@ -12,9 +12,8 @@ function image_im_advanced_requirements( $toolkits = image_get_available_toolkits(); $requirements['imagemagick'] = array('title' => t('ImageMagick advanced options')); if (!isset($toolkits['imagemagick'])) { - $requirements['imagemagick']['value'] = - t('ImageMagick image toolkit is not properly installed'); - $requirements['imagemagick']['description'] = t('The %toolkit_inc file must be copied to %inc_dir in order for the ImageMagick image toolkit to function.', array('%toolkit_inc' => drupal_get_path('module', 'image') .'/image.imagemagick.inc', '%inc_dir' => 'includes')); + $requirements['imagemagick']['value'] = t('ImageMagick image toolkit is not properly installed'); + $requirements['imagemagick']['description'] = t('The %toolkit_inc file must be copied to %inc_dir in order for the ImageMagick image toolkit to function.', array('%toolkit_inc' => drupal_get_path('module', 'image') . '/image.imagemagick.inc', '%inc_dir' => 'includes')); $requirements['imagemagick']['severity'] = REQUIREMENT_ERROR; return $requirements; } @@ -39,3 +38,4 @@ function image_im_advanced_requirements( } return $requirements; } + Index: contrib/image_im_advanced/image_im_advanced.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_im_advanced/image_im_advanced.module,v retrieving revision 1.7 diff -u -p -r1.7 image_im_advanced.module --- contrib/image_im_advanced/image_im_advanced.module 6 Mar 2009 01:40:10 -0000 1.7 +++ contrib/image_im_advanced/image_im_advanced.module 29 Jul 2010 11:23:53 -0000 @@ -13,7 +13,7 @@ function image_im_advanced_options() { 'unsharp' => array( 'radius' => 0.9, 'amount' => 0, - ), + ), 'profile' => array('path' => ''), ); return variable_get('image_im_advanced_options', $defaults); @@ -105,17 +105,16 @@ function image_im_advanced_form_alter(&$ ); // Move the buttons below our additions. - $form['buttons']['#weight'] = 10; - } + $form['buttons']['#weight'] = 10; + } } - /** * Validate settings form. */ function image_im_advanced_settings_validate($element, &$form_state) { $options = $form_state['values']['image_im_advanced_options']; - + // Check that the JPEG quality is a valid number. if (!is_numeric($options['jpeg_quality']) || $options['jpeg_quality'] < 1 || $options['jpeg_quality'] > 100) { form_set_error('image_im_advanced_options][jpeg_quality', t('The JPEG quality must be a positive number between 1 and 100.')); @@ -135,7 +134,7 @@ function image_im_advanced_settings_vali form_set_error('image_im_advanced_options][unsharp][radius', t('The sharpness radius must be specified as a positive value.')); } } - + // Check that if the color profile is provided that it's a readable file. if (!empty($options['profile']['path']) && (!file_exists($options['profile']['path']) || !is_readable($options['profile']['path']))) { form_set_error('image_im_advanced_options][profile][path', t('The ICC profile could not be read.')); @@ -158,7 +157,7 @@ function image_im_advanced_imagemagick_a // Add sharpening filter. if ($options['unsharp']['amount'] && $options['unsharp']['radius']) { // 0.7 and 0.02 are reasonable values for Sigma and Threshold. - $args['unsharp'] = '-unsharp '. $options['unsharp']['radius'] .'x0.7+'. round($options['unsharp']['amount'] / 100, 2) .'+0.02'; + $args['unsharp'] = '-unsharp ' . $options['unsharp']['radius'] . 'x0.7+' . round($options['unsharp']['amount'] / 100, 2) . '+0.02'; } break; @@ -167,7 +166,7 @@ function image_im_advanced_imagemagick_a $size = preg_replace('/[^\d]*(\d+x\d+)[^\d]*/', '$1', $args['crop']); list($width, $height) = explode('x', $size); break; - + case 'rotate': // For lack of a better guess, use the current image size. $width = $image['width']; @@ -177,13 +176,13 @@ function image_im_advanced_imagemagick_a // Convert to specified color profile. if (!empty($options['profile']['path']) && is_readable($options['profile']['path'])) { - $args['profile'] = '-profile '. $options['profile']['path']; + $args['profile'] = '-profile ' . $options['profile']['path']; } // Assign a color space. Skip this if a color profile has been provided, // as it will be more accurate. if ($options['colorspace'] && !isset($args['profile'])) { - $args['colorspace'] = ' -colorspace '. $options['colorspace']; + $args['colorspace'] = ' -colorspace ' . $options['colorspace']; } // Determine if the -strip parameter should be used. @@ -195,7 +194,7 @@ function image_im_advanced_imagemagick_a // Set JPEG quality. if ($image['mime_type'] == 'image/jpeg') { if (empty($args['quality']) && $options['jpeg_quality']) { - $args['quality'] = '-quality '. $options['jpeg_quality']; + $args['quality'] = '-quality ' . $options['jpeg_quality']; } } Index: contrib/image_import/image_import.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_import/image_import.admin.inc,v retrieving revision 1.3 diff -u -p -r1.3 image_import.admin.inc --- contrib/image_import/image_import.admin.inc 9 Mar 2009 02:57:25 -0000 1.3 +++ contrib/image_import/image_import.admin.inc 29 Jul 2010 11:24:17 -0000 @@ -8,7 +8,7 @@ function image_import_admin_settings() { $form['image_import_path'] = array( '#type' => 'textfield', '#title' => t('Import path'), - '#default_value' => variable_get('image_import_path', file_directory_temp() .'/image'), + '#default_value' => variable_get('image_import_path', file_directory_temp() . '/image'), '#description' => t("The directory to import image nodes from. Drupal will need to have write access to this directory so we can move the file.") .'
    ' . t("Note: a path begining with a / indicates the path is relative to the server's root, one starting without specifies a path relative to Drupal's root. I.e. /tmp/image would be the temp directory off the root while tmp/image would be inside Drupal's directory."), '#required' => TRUE, @@ -31,7 +31,7 @@ function image_import_admin_settings() { function image_import_admin_settings_submit_validate($form, &$form_state) { $import_dir = $form_state['values']['image_import_path']; file_check_directory($import_dir, 0, 'image_import_path'); - $image_dir = variable_get('image_file_path', file_directory_path() .'/image'); + $image_dir = variable_get('image_file_path', file_directory_path() . '/image'); if (realpath($import_dir) == realpath($image_dir)) { form_set_error('image_import_path', t("You can't import from the image module's directory. The import deletes the original files so you would just be asking for trouble.")); } Index: contrib/image_import/image_import.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_import/image_import.install,v retrieving revision 1.7 diff -u -p -r1.7 image_import.install --- contrib/image_import/image_import.install 15 Jan 2009 02:10:52 -0000 1.7 +++ contrib/image_import/image_import.install 29 Jul 2010 11:24:26 -0000 @@ -18,7 +18,7 @@ function image_import_requirements($phas elseif (!file_check_directory($dirpath)) { // The import directory does not exist, indicate an error. $requirements['image_import_dir']['value'] = t('Import directory %dirpath does not exist or is not writable.', array('%dirpath' => $dirpath)); - $requirements['image_import_dir']['description'] = t('The import directory %dirpath either does not exist or does not grant the web container write permission. Either choose a different directory or create the %dirpath directory and grant write permissions. The Image import module will not function until this is corrected.', array('%dirpath' => $dirpath, '@choose'=> url('admin/settings/image/image_import'))); + $requirements['image_import_dir']['description'] = t('The import directory %dirpath either does not exist or does not grant the web container write permission. Either choose a different directory or create the %dirpath directory and grant write permissions. The Image import module will not function until this is corrected.', array('%dirpath' => $dirpath, '@choose' => url('admin/settings/image/image_import'))); $requirements['image_import_dir']['severity'] = REQUIREMENT_ERROR; } else { @@ -37,3 +37,4 @@ function image_import_update_1() { variable_del('image_import_extensions'); return array(); } + Index: contrib/image_import/image_import.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_import/image_import.module,v retrieving revision 1.21 diff -u -p -r1.21 image_import.module --- contrib/image_import/image_import.module 9 Mar 2009 02:57:25 -0000 1.21 +++ contrib/image_import/image_import.module 31 Jul 2010 15:54:34 -0000 @@ -7,7 +7,12 @@ function image_import_help($path, $arg) { switch ($path) { case 'admin/content/image_import': - return '

    '. t("Import multiple image files and save them as image nodes. The files will be moved from their location into the image module's files directory. Searching for image files in %dirpath.", array('%dirpath' => realpath(variable_get('image_import_path', '')))) .'

    '; + $output = '

    '; + $output .= t("Import multiple image files and save them as image nodes. The files will be moved from their location into the image module's files directory. Searching for image files in %dirpath.", array( + '%dirpath' => realpath(variable_get('image_import_path', '')), + )); + $output .= '

    '; + return $output; } } Index: contrib/image_import/image_import.pages.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_import/image_import.pages.inc,v retrieving revision 1.7.2.1 diff -u -p -r1.7.2.1 image_import.pages.inc --- contrib/image_import/image_import.pages.inc 21 Mar 2010 10:58:30 -0000 1.7.2.1 +++ contrib/image_import/image_import.pages.inc 31 Jul 2010 15:56:53 -0000 @@ -62,7 +62,7 @@ function image_import_form() { $form['type'] = array('#type' => 'value', '#value' => $form['#node_type']); $form['#node'] = new stdClass(); $form['#node']->type = $form['#node_type']; - taxonomy_form_alter($form, array(), $form['#node_type'] .'_node_form'); + taxonomy_form_alter($form, array(), $form['#node_type'] . '_node_form'); unset($form['type']); unset($form['#node']); } @@ -109,7 +109,7 @@ function image_import_form() { ); $form['files']['dimensions'][$index] = array( '#type' => 'item', - '#value' => $file->width .'x'. $file->height, + '#value' => $file->width . 'x' . $file->height, ); $form['files']['title'][$index] = array( '#type' => 'textfield', @@ -127,7 +127,7 @@ function image_import_form() { $form['files']['import'][$index]['#type'] = 'item'; $form['files']['errors'][$index] = array( '#type' => 'markup', - '#value' => ''. implode(' ', $problems) .'', + '#value' => '' . implode(' ', $problems) . '', ); unset($form['files']['title'][$index]); unset($form['files']['body'][$index]); @@ -179,7 +179,7 @@ function theme_image_import_form($form) unset($form['files']['import'][$key]['#title']); $row = array( array('data' => drupal_render($form['files']['import'][$key])), - array('data' => ''), + array('data' => ''), array('data' => $filename), array('data' => drupal_render($form['files']['filesize'][$key])), array('data' => drupal_render($form['files']['dimensions'][$key])), @@ -208,12 +208,12 @@ function image_import_form_submit($form, 'progress_message' => 'Importing @current of @total.', 'operations' => array(), 'finished' => '_image_import_batch_finished', - 'file' => drupal_get_path('module', 'image_import') .'/image_import.pages.inc', + 'file' => drupal_get_path('module', 'image_import') . '/image_import.pages.inc', ); foreach (array_filter($form_state['values']['import']) as $index => $true) { $origname = $form_state['values']['file_list'][$index]; - if ($filepath = file_check_location($form['#dirpath'] .'/'. $origname, $form['#dirpath'])) { + if ($filepath = file_check_location($form['#dirpath'] . '/' . $origname, $form['#dirpath'])) { $args = array( 'node_type' => $form['#node_type'], 'title' => isset($form_state['values']['title'][$index]) ? $form_state['values']['title'][$index] : NULL, @@ -263,9 +263,9 @@ function _image_import_batch_op($args, & $context['results']['good'][] = t('Imported %origname as !link @status [!edit-link].', array( '%origname' => $args['origname'], - '!link' => l($node->title, 'node/'. $node->nid), + '!link' => l($node->title, 'node/' . $node->nid), '@status' => $node->status ? '' : t('(Unpublished)'), - '!edit-link' => l(t('edit'), 'node/'. $node->nid .'/edit'), + '!edit-link' => l(t('edit'), 'node/' . $node->nid . '/edit'), )); } else { @@ -296,6 +296,7 @@ function _image_import_batch_finished($s /** * Creates subgalleries. + * * @param $origname * The original name (with its path) of the image which subcategory has to be created. * @param $image_galleries_vid @@ -306,26 +307,31 @@ function _image_import_batch_finished($s * An array of the tids of each subgallery already created, indexed by subgallery path. * @param $context * The execution log. + * * @return * The tid of the subgallery in which the image goes to. */ function _image_import_create_subgalleries($origname, $image_galleries_vid, $subgalleries_parent_tid, &$subgalleries, &$context) { - // get a term id from its parent (if any), its vocabulary, and its name + // Get a term id from its parent (if any), its vocabulary, and its name. $tid_query = 'SELECT td.tid FROM {term_data} td, {term_hierarchy} th WHERE td.tid = th.tid AND vid = %d AND name = \'%s\' AND parent = %d'; - $requested_subgalleries = explode('/', $origname); // explode path to image - array_pop($requested_subgalleries); // remove the filename at the end - $parent_tid = (int) $subgalleries_parent_tid; // parent gallery - $subgallery_tid = (int) $subgalleries_parent_tid; // current image's gallery - // create each gallery in the path, if necessary + // Explode path to image. + $requested_subgalleries = explode('/', $origname); + // Remove the filename at the end. + array_pop($requested_subgalleries); + // Parent gallery. + $parent_tid = (int) $subgalleries_parent_tid; + // Current image's gallery. + $subgallery_tid = (int) $subgalleries_parent_tid; + // Create each gallery in the path, if necessary. foreach ($requested_subgalleries as $key => $subgallery_name) { - // the current subgallery's relative path - $subgallery_path = implode('/', array_slice($requested_subgalleries, 0, $key+1)); - // was this subgallery already created by the current batch ? + // The current subgallery's relative path. + $subgallery_path = implode('/', array_slice($requested_subgalleries, 0, $key + 1)); + // Was this subgallery already created by the current batch? $subgallery_tid = $subgalleries[$subgallery_path]; if (!$subgallery_tid) { - // first, look in DB + // First, look in DB. $subgallery_tid = db_result(db_query($tid_query, $image_galleries_vid, $subgallery_name, $parent_tid)); - // didn't find? create it + // Didn't find? Create it. if (!$subgallery_tid) { $subgallery_term = array( 'name' => $subgallery_name, @@ -334,60 +340,61 @@ function _image_import_create_subgalleri ); $status = taxonomy_save_term($subgallery_term); if ($status) { - // get its tid back + // Get its tid back. $subgallery_tid = db_result(db_query($tid_query, $image_galleries_vid, $subgallery_name, $parent_tid)); $term = taxonomy_get_term($subgallery_tid); $context['results']['good'][] = t('Created gallery !link [!edit-link].', array( '!link' => l($subgallery_name, taxonomy_term_path($term)), - '!edit-link' => l(t('edit'), 'admin/content/taxonomy/edit/term/'. $subgallery_tid), + '!edit-link' => l(t('edit'), 'admin/content/taxonomy/edit/term/' . $subgallery_tid), )); } else { watchdog('image_import', 'There was an error that prevented gallery %gallery_path from being created.', array('%gallery_path' => $subgallery_path), WATCHDOG_ERROR); $context['results']['bad'][] = t('Error creating gallery %gallery_path.', array('%gallery_path' => $subgallery_path)); - return 0; // return an error + // Return an error. + return 0; } } $subgalleries[$subgallery_path] = $subgallery_tid; } - // for the next subgallery to be created, last created will be its parent + // For the next subgallery to be created, last created will be its parent. $parent_tid = (int)$subgallery_tid; } return $subgallery_tid; } - /** * Delete recursively all directories inside $basepath. + * * @param $basepath * The base directory where to find empty directories. * @param $dir * A directory inside $basepath, used for recursive purpose. * Should not be used when calling this method. + * * @return * An array of the deleted directories paths, relative to $basepath. */ -function _image_import_recursive_delete_empty_directories($basepath, $dir='') { +function _image_import_recursive_delete_empty_directories($basepath, $dir = '') { $deleted = array(); - // append $basepath to $dir only if $dir is not empty (to avoid trailing slash) + // Append $basepath to $dir only if $dir is not empty (to avoid trailing + // slash). if ($dir != '') { - $crnt_dir = $basepath .'/'. $dir; + $crnt_dir = $basepath . '/' . $dir; } else { $crnt_dir = $basepath; } - // get each file in $crnt_dir, except . , .. and CVS + // Get each file in $crnt_dir. $ls = file_scan_directory($crnt_dir, '.*', array('.', '..', 'CVS'), 0, FALSE); - // for each directory inside + // For each directory inside, recursively delete empty directories inside. foreach ($ls as $file) { if (is_dir($file->filename)) { - $next_dir = $dir ? $dir .'/'. $file->basename : $file->basename; - // delete recursively empty directories inside + $next_dir = $dir ? $dir . '/' . $file->basename : $file->basename; $deleted = array_merge($deleted, _image_import_recursive_delete_empty_directories($basepath, $next_dir)); - // if the directory is empty, delete it if (sizeof(file_scan_directory($file->filename, '.*', array('.', '..'), 0, FALSE)) == 0) { rmdir($file->filename); - $deleted[] = ''. $next_dir .''; + $deleted[] = '' . $next_dir . ''; } } } @@ -409,3 +416,4 @@ function _image_import_recursive_delete_ } $context['finished'] = 1; } + Index: views/image.views.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/views/image.views.inc,v retrieving revision 1.4 diff -u -p -r1.4 image.views.inc --- views/image.views.inc 27 Aug 2009 12:10:57 -0000 1.4 +++ views/image.views.inc 29 Jul 2010 11:32:13 -0000 @@ -167,7 +167,7 @@ function image_views_plugins() { * A fluid grid view style for gallery items. */ 'image_gallery' => array( - 'title' => 'Gallery', + 'title' => 'Gallery', 'help' => t('Displays items in a fluid grid.'), 'parent' => 'list', 'handler' => 'views_plugin_style_list', @@ -192,7 +192,8 @@ function image_views_plugins() { 'title' => t('Image size'), 'handler' => 'image_plugin_argument_default_image_size', 'path' => drupal_get_path('module', 'image') . '/views', - 'parent' => 'fixed', // so that the parent class is included + // Include parent class. + 'parent' => 'fixed', ), ), ); Index: views/image_handler_argument_image_node_image_size.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/views/image_handler_argument_image_node_image_size.inc,v retrieving revision 1.1 diff -u -p -r1.1 image_handler_argument_image_node_image_size.inc --- views/image_handler_argument_image_node_image_size.inc 26 Aug 2009 18:41:44 -0000 1.1 +++ views/image_handler_argument_image_node_image_size.inc 29 Jul 2010 11:33:15 -0000 @@ -9,6 +9,7 @@ * This expects the image_handler_field_image_node_image to be present. */ class image_handler_argument_image_node_image_size extends views_handler_argument_string { + /** * Change the argument's options for more image specific options. */ @@ -31,24 +32,28 @@ class image_handler_argument_image_node_ 'ignore' => array( 'title' => t('Ignore and use the field setting'), 'method' => 'default_ignore', - 'breadcrumb' => TRUE, // generate a breadcrumb to here + // generate a breadcrumb to here + 'breadcrumb' => TRUE, ), 'not found' => array( 'title' => t('Hide view / Page not found (404)'), 'method' => 'default_not_found', - 'hard fail' => TRUE, // This is a hard fail condition + // This is a hard fail condition. + 'hard fail' => TRUE, ), 'empty' => array( 'title' => t('Display empty text'), 'method' => 'default_empty', - 'breadcrumb' => TRUE, // generate a breadcrumb to here + // generate a breadcrumb to here + 'breadcrumb' => TRUE, ), 'default' => array( 'title' => t('Provide default argument'), 'method' => 'default_default', 'form method' => 'default_argument_form', 'has default argument' => TRUE, - 'default only' => TRUE, // this can only be used for missing argument, not validation failure + // this can only be used for missing argument, not validation failure + 'default only' => TRUE, ), ); @@ -105,4 +110,5 @@ class image_handler_argument_image_node_ $this->view->field['image_image']->options['image_derivative'] = $argument; } } -} \ No newline at end of file +} + Index: views/image_plugin_argument_default_image_size.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/views/image_plugin_argument_default_image_size.inc,v retrieving revision 1.1 diff -u -p -r1.1 image_plugin_argument_default_image_size.inc --- views/image_plugin_argument_default_image_size.inc 26 Aug 2009 18:41:44 -0000 1.1 +++ views/image_plugin_argument_default_image_size.inc 29 Jul 2010 11:34:43 -0000 @@ -1,5 +1,6 @@ option_name] = array( '#type' => 'select', '#title' => t('Default argument'), - '#options' => $sizes, + '#options' => $sizes, '#default_value' => $this->get_argument(), '#process' => array('views_process_dependency'), '#dependency' => array( 'radio:options[default_action]' => array('default'), - 'radio:options[default_argument_type]' => array($this->id) + 'radio:options[default_argument_type]' => array($this->id), ), '#dependency_count' => 2, ); Index: views/theme/image-view-image-gallery.tpl.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/views/theme/image-view-image-gallery.tpl.php,v retrieving revision 1.2 diff -u -p -r1.2 image-view-image-gallery.tpl.php --- views/theme/image-view-image-gallery.tpl.php 5 Sep 2009 13:48:50 -0000 1.2 +++ views/theme/image-view-image-gallery.tpl.php 29 Jul 2010 11:10:19 -0000 @@ -1,5 +1,7 @@
    - +

    < class="images"> @@ -19,3 +21,4 @@ >
    + Index: views/theme/theme.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image/views/theme/theme.inc,v retrieving revision 1.2 diff -u -p -r1.2 theme.inc --- views/theme/theme.inc 5 Sep 2009 18:01:14 -0000 1.2 +++ views/theme/theme.inc 29 Jul 2010 11:10:19 -0000 @@ -1,5 +1,7 @@