diff -urp ../image_fupload/image_fupload_image/image_fupload_image.module .//image_fupload_image/image_fupload_image.module --- ../image_fupload/image_fupload_image/image_fupload_image.module 2009-03-21 10:42:57.000000000 +0200 +++ .//image_fupload_image/image_fupload_image.module 2010-01-30 14:39:26.000000000 +0200 @@ -34,16 +34,17 @@ function image_fupload_image_form_alter( if ($form_id == "image_node_form" && !isset($form['#node']->nid) && arg(0) != 'img_assist' && arg(3) != "noflash" && arg(3) != "list_images" && user_access('mass upload images')) { // Some needed JS & CSS - Files to be included $module_path = drupal_get_path('module', 'image_fupload'); - drupal_add_js($module_path .'/swfupload/swfupload.js', 'module'); - drupal_add_js($module_path .'/swfupload/swfupload.queue.js', 'module'); - drupal_add_js($module_path .'/swfupload/fileprogress.js', 'module'); - drupal_add_js($module_path .'/swfupload/handlers.js', 'module'); + $library_path = libraries_get_path('swfupload'); + drupal_add_js($library_path .'/swfupload.js', 'module'); + drupal_add_js($library_path .'/plugins/swfupload.queue.js', 'module'); + drupal_add_js($module_path .'/swfupload/fileprogress.js', 'module'); + drupal_add_js($module_path .'/swfupload/handlers.js', 'module'); /* Check if another step with editing options is provided for this user*/ $redirect_url = ''; if (user_access('edit captions')) $redirect_url = url('node/add/image/list_images'); /* Check END */ - drupal_add_js(theme('swfupload_settings', base_path() . $module_path, url('fupload/flash'), round(variable_get('image_max_upload_size', 800)), '*.jpg; *.jpeg; *.png; *.gif', (!empty($user->sid) ? $user->sid : session_id()), 100, 'image', 'images', 'true', '', $redirect_url), 'inline'); + drupal_add_js(theme('swfupload_settings', base_path() . $module_path, base_path() . $library_path, url('fupload/flash'), round(variable_get('image_max_upload_size', 800)), '*.jpg; *.jpeg; *.png; *.gif', (!empty($user->sid) ? $user->sid : session_id()), 100, 'image', 'images', 'true', '', $redirect_url), 'inline'); drupal_add_css($module_path .'/image_fupload-style.css', 'module', 'all', FALSE); // Style of swfUpload unset($form['title'], $form['rebuild_images'], $form['buttons']); //don't need this, title will be generated later using filepath diff -urp ../image_fupload/image_fupload_imagefield/image_fupload_imagefield.module .//image_fupload_imagefield/image_fupload_imagefield.module --- ../image_fupload/image_fupload_imagefield/image_fupload_imagefield.module 2009-04-08 15:44:42.000000000 +0300 +++ .//image_fupload_imagefield/image_fupload_imagefield.module 2010-01-30 14:37:58.000000000 +0200 @@ -65,8 +65,9 @@ function image_fupload_imagefield_form_a if ($field['widget']['type'] == "image_fupload_imagefield_widget" && arg(3) != "noflash" && arg(3) != "list_imagefields" && user_access('mass upload images')) { // load needed JS & CSS - Files $module_path = drupal_get_path('module', 'image_fupload'); - drupal_add_js($module_path .'/swfupload/swfupload.js', 'module'); - drupal_add_js($module_path .'/swfupload/swfupload.queue.js', 'module'); + $library_path = libraries_get_path('swfupload'); + drupal_add_js($library_path .'/swfupload.js', 'module'); + drupal_add_js($library_path .'/plugins/swfupload.queue.js', 'module'); drupal_add_js($module_path .'/swfupload/fileprogress.js', 'module'); drupal_add_js($module_path .'/swfupload/handlers.js', 'module'); @@ -93,7 +94,7 @@ function image_fupload_imagefield_form_a $fupload_widget_weight = $field['widget']['weight']; $file_max_size = parse_size($field['widget']['max_filesize_per_file']); // maximal allowed file size (bytes) - drupal_add_js(theme('swfupload_settings', base_path() . $module_path, url('fupload/flash'), round($file_max_size/1024), ("*." .str_replace(" ", "; *.", $field['widget']['file_extensions'])), (!empty($user->sid) ? $user->sid : session_id()), $upload_limit_count, $node_type, $field_name, (!empty($field['required']) ? "true" : "false"), $field['widget']['fupload_mode'], $redirect_url), 'inline'); + drupal_add_js(theme('swfupload_settings', base_path() . $module_path, base_path() . $library_path, url('fupload/flash'), round($file_max_size/1024), ("*." .str_replace(" ", "; *.", $field['widget']['file_extensions'])), (!empty($user->sid) ? $user->sid : session_id()), $upload_limit_count, $node_type, $field_name, (!empty($field['required']) ? "true" : "false"), $field['widget']['fupload_mode'], $redirect_url), 'inline'); drupal_add_css($module_path .'/image_fupload-style.css', 'module', 'all', FALSE); // unvisible elements, will be written in cache diff -urp ../image_fupload/image_fupload.info .//image_fupload.info --- ../image_fupload/image_fupload.info 2009-04-08 15:50:44.000000000 +0300 +++ .//image_fupload.info 2010-01-30 14:09:37.000000000 +0200 @@ -2,6 +2,7 @@ name = Image FUpload description = "Allows uploading several images all at once using swfUpload" core = 6.x +dependencies[] = libraries ; Information added by drupal.org packaging script on 2009-04-08 version = "6.x-3.0-rc2" core = "6.x" diff -urp ../image_fupload/image_fupload.install .//image_fupload.install --- ../image_fupload/image_fupload.install 2009-03-21 21:10:14.000000000 +0200 +++ .//image_fupload.install 2010-01-30 14:50:51.000000000 +0200 @@ -49,13 +49,19 @@ function image_fupload_requirements($pha 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')) { + $path = libraries_get_path('swfupload'); + if (!file_exists($path .'/swfupload.js') || !file_exists($path .'/plugins/swfupload.queue.js') || !file_exists($path .'/Flash/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/'))), + 'description' => t('Some needed files which are not bundled with this module, are missing or out-of-date! This can be either: + + They should be located in your libraries folder, "%path". Download the swfupload 2.2.x Core package from !page, and extract its contents into %path. Note: Version 2.5.x is not compatible with this version of Image Fupload', array('%path' => $path, '!page' => l(t('SWFUploads project page'), 'http://code.google.com/p/swfupload/'))), 'severity' => REQUIREMENT_ERROR, ); } diff -urp ../image_fupload/image_fupload.module .//image_fupload.module --- ../image_fupload/image_fupload.module 2009-04-07 00:15:41.000000000 +0300 +++ .//image_fupload.module 2010-01-30 14:09:37.000000000 +0200 @@ -115,7 +115,7 @@ function image_fupload_theme() { return array( 'swfupload_settings' => array( 'template' => 'swfupload-settings', - 'arguments' => array('modulepath' => NULL, 'uploadpath' => NULL, 'maxfilesize' => NULL, 'fileextensions' => NULL, 'sessionid' => NULL, 'uploadlimit' => NULL, 'nodetype' => NULL, 'fieldname' => NULL, 'field_required' => NULL, 'storage_mode' => NULL, 'redirect_url' => NULL), + 'arguments' => array('modulepath' => NULL, 'libpath' => NULL, 'uploadpath' => NULL, 'maxfilesize' => NULL, 'fileextensions' => NULL, 'sessionid' => NULL, 'uploadlimit' => NULL, 'nodetype' => NULL, 'fieldname' => NULL, 'field_required' => NULL, 'storage_mode' => NULL, 'redirect_url' => NULL), ), 'fupload_create_filename' => array( 'arguments' => array('image' => NULL, 'replacements' => NULL), Только в ./: image_fupload-swfupload_as_library.patch Только в ./: PATCHES.txt diff -urp ../image_fupload/swfupload-settings.tpl.php .//swfupload-settings.tpl.php --- ../image_fupload/swfupload-settings.tpl.php 2009-03-21 10:32:50.000000000 +0200 +++ .//swfupload-settings.tpl.php 2010-01-30 14:33:11.000000000 +0200 @@ -10,7 +10,7 @@ window.onload = function() { var settings = { - flash_url : "/swfupload/swfupload.swf", + flash_url : "/Flash/swfupload.swf", upload_url: "", // Relative to the SWF file post_params: {"PHPSESSID" : "" , "nodetype" : "", "fieldname" : ""}, file_post_name: "Filedata",