Index: image_fupload.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image_fupload/image_fupload.install,v retrieving revision 1.9 diff -u -p -r1.9 image_fupload.install --- image_fupload.install 21 Mar 2009 19:10:14 -0000 1.9 +++ image_fupload.install 1 May 2009 01:16:35 -0000 @@ -2,6 +2,10 @@ // $Id: image_fupload.install,v 1.9 2009/03/21 19:10:14 grandcat Exp $ /** + * @file + */ + +/** * Implementation of hook_install(). */ function image_fupload_install() { @@ -17,7 +21,7 @@ function image_fupload_install() { ); variable_set('image_node_types', $image_node_types); } - + // create table for temporary images for image preview list drupal_install_schema('image_fupload'); } @@ -28,15 +32,15 @@ function image_fupload_install() { function image_fupload_uninstall() { // remove all used variables $variables = array( - 'fupload_title_replacements', - 'fupload_previewlist_img_attributes', + 'fupload_title_replacements', + 'fupload_previewlist_img_attributes', 'fupload_previewlist_field_settings', 'image_node_types', ); for ($i = 0; $i < count($variables); $i++) { variable_del($variables[$i]); } - + // drop our image preview table drupal_uninstall_schema('image_fupload'); } @@ -46,26 +50,26 @@ function image_fupload_uninstall() { */ function image_fupload_requirements($phase) { $requirements = array(); - + if ($phase == 'runtime') { // Make sure that swfUpload Files which aren't bundled with this module, are located in swfupload directory $path = drupal_get_path('module', 'image_fupload') .'/swfupload/'; if (!file_exists($path .'swfupload.js') || !file_exists($path .'swfupload.queue.js') || !file_exists($path .'swfupload.swf')) { // One or more needed files are missing; give an error - $requirements['image_fupload'] = array( - 'title' => t('Image FUpload'), - 'value' => t('Missing or wrong files in subdirectory "swfupload"'), - 'description' => t('Some needed files which are not bundled with this module, are missing or out-of-date! This can be either "swfupload.swf", "swfupload.js" or "swfupload.queue.js" which should be located in "%path". These files can be downloaded from !page. Note: Version 2.2.0 or higher is needed.', array('%path' => $path, '!page' => l(t('SWFUploads project page'), 'http://code.google.com/p/swfupload/'))), - 'severity' => REQUIREMENT_ERROR, - ); + $requirements['image_fupload'] = array( + 'title' => t('Image FUpload'), + 'value' => t('Missing or wrong files in subdirectory "swfupload"'), + 'description' => t('Some needed files which are not bundled with this module, are missing or out-of-date! This can be either "swfupload.swf", "swfupload.js" or "swfupload.queue.js" which should be located in "%path". These files can be downloaded from !page. Note: Version 2.2.0 or higher is needed.', array('%path' => $path, '!page' => l(t('SWFUploads project page'), 'http://code.google.com/p/swfupload/'))), + 'severity' => REQUIREMENT_ERROR, + ); } } - + return $requirements; } /** - * Implementation of hook_schemea + * Implementation of hook_schema(). */ function image_fupload_schema() { // Currently, schema 1 is the only schema we have. As we make updates, @@ -124,13 +128,12 @@ function image_fupload_schema_1() { 'indexes' => array('fieldname' => array('fieldname'), 'uid' => array('uid')), 'primary key' => array('fid'), ); - + return $schema; } - /** - * Implementation of hook_update_N() + * Implementation of hook_update_N(). */ function image_fupload_update_6100() { $ret = array(); @@ -162,39 +165,39 @@ function image_fupload_update_6110() { } function image_fupload_update_6300() { - $ret = array(); - - // create our image preview list table + $ret = array(); + + // create our image preview list table $schema = image_fupload_schema_1(); _drupal_initialize_schema('image_fupload', $schema); foreach ($schema as $name => $table) { db_create_table($ret, $name, $table); } - + return $ret; } /** -* Update from 3.0 alpha 1 to alpha 2 -*/ -function image_fupload_update_6301() { + * Update from 3.0 alpha 1 to alpha 2 + */ +function image_fupload_update_6301() { $ret = array(); - + // it's not really an update, but we have to force the user to run update.php // because some theme related things changed - + return $ret; } /** -* Update from 3.0 alpha 3 to alpha 4 -*/ -function image_fupload_update_6304() { + * Update from 3.0 alpha 3 to alpha 4 + */ +function image_fupload_update_6304() { $ret = array(); - + // it's not really an update, but we have to force the user to run update.php // because some theme related things changed - + return $ret; } \ No newline at end of file Index: image_fupload.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/image_fupload/image_fupload.module,v retrieving revision 1.33 diff -u -p -r1.33 image_fupload.module --- image_fupload.module 6 Apr 2009 21:15:41 -0000 1.33 +++ image_fupload.module 1 May 2009 01:16:37 -0000 @@ -21,15 +21,15 @@ function image_fupload_menu() { $items['fupload/js/deletequeue/%'] = array( 'title' => 'Image FUpload', 'page callback' => 'fupload_empty_queue', - 'page arguments' => array(3), + 'page arguments' => array(3), 'access arguments' => array('mass upload images'), - 'type' => MENU_CALLBACK, - ); + 'type' => MENU_CALLBACK, + ); $items['node/add/%image_node_type/list_images'] = array( 'title' => 'Edit Captions', 'access arguments' => array('edit captions'), 'page callback' => 'drupal_get_form', - 'page arguments' => array('fupload_list_images_image', 2), + 'page arguments' => array('fupload_list_images_image', 2), 'type' => MENU_CALLBACK, 'file' => 'includes/images.previewlist.image.inc', ); @@ -37,7 +37,7 @@ function image_fupload_menu() { 'title' => 'Edit Captions', 'access arguments' => array('edit captions'), 'page callback' => 'drupal_get_form', - 'page arguments' => array('fupload_list_images_imagefield', 2), + 'page arguments' => array('fupload_list_images_imagefield', 2), 'type' => MENU_CALLBACK, 'file' => 'includes/images.previewlist.imagefield.inc', ); @@ -45,39 +45,43 @@ function image_fupload_menu() { } /** -* Menu callback; loads a image node type object -*/ + * Menu callback; loads a image node type object + */ function image_node_type_load($node_type, $simple_check = FALSE) { $image_node_types = variable_get('image_node_types', array()); // test if given node type is image (field) node type $node_type = str_replace("-", "_", $node_type); // simple check without checking url arguments - if ($simple_check && isset($image_node_types[$node_type])) + if ($simple_check && isset($image_node_types[$node_type])) { return $node_type; - + } + if (isset($image_node_types[$node_type])) { if (arg(3) == "list_imagefields" && $image_node_types[$node_type]['type'] == "cck") { return $node_type; - } elseif (arg(3) == "list_images" && $image_node_types[$node_type]['type'] == "image") { + } + elseif (arg(3) == "list_images" && $image_node_types[$node_type]['type'] == "image") { return $node_type; - } else { + } + else { return FALSE; } - } else { + } + else { return FALSE; } } /** -* returns a identifier for images so that their status (current step) can easily be set -*/ + * returns a identifier for images so that their status (current step) can easily be set + */ function image_fupload_image_status($field_name, $status = IMAGE_UNMACHINED) { - switch ($status) { + switch ($status) { case IMAGE_NOT_COMPLETED: - return ""; + return ""; break; default: - return $field_name ."/" .$status; + return $field_name ."/". $status; break; } } @@ -90,14 +94,14 @@ function image_fupload_perm() { } /** - * Implementation of hook_help + * Implementation of hook_help(). */ function image_fupload_help($path, $arg) { switch ($path) { case 'admin/help#image_fupload': $output = '

'. t("The Image FUpload module is used to provide an alternate upload form to image module itself.") .'

'; $output .= '

'. t("This is a great advantage because multiple images can be selected with one click which are automatically uploaded and processed without any further user interaction. Additionally, this module fully integrates in image module. Consequently, all settings made by image module are observed (thumb creation, file size limit etc.).") .'

'; - $output .= '

' .t("Image FUpload administration allows to define some characters which are replaced in the node title by a whitespace. In addition to that, the option can be selected to show a link to the original upload form to those users whose browser doesn't support this Flash / JS solution.") . '

'; + $output .= '

'. t("Image FUpload administration allows to define some characters which are replaced in the node title by a whitespace. In addition to that, the option can be selected to show a link to the original upload form to those users whose browser doesn't support this Flash / JS solution.") .'

'; $output .= t('

You can