diff --git sites/all/modules/filefield_sources/filefield_sources.module sites/all/modules/filefield_sources/filefield_sources.module index 7fb1a2a..a18f134 100644 --- sites/all/modules/filefield_sources/filefield_sources.module +++ sites/all/modules/filefield_sources/filefield_sources.module @@ -64,7 +64,7 @@ function filefield_sources_form_field_ui_field_edit_form_alter(&$form, &$form_state) { $instance = $form['#instance']; if (in_array($instance['widget']['type'], module_invoke_all('filefield_sources_widgets'))) { - $form['instance']['settings'] += filefield_sources_form($instance); + $form['instance']['widget']['settings'] += filefield_sources_form($instance); } } @@ -86,7 +86,7 @@ * Configuration form for editing FileField Sources settings for a widget. */ function filefield_sources_form($instance) { - $settings = isset($instance['settings']['filefield_sources']) ? $instance['settings']['filefield_sources'] : array(); + $settings = $instance['widget']['settings']['filefield_sources']; $form['filefield_sources'] = array( '#type' => 'fieldset', @@ -102,7 +102,7 @@ '#type' => 'checkboxes', '#title' => t('Enabled sources'), '#options' => $sources, - '#default_value' => isset($settings['filefield_sources']) ? $settings['filefield_sources'] : array(), + '#default_value' => $settings['filefield_sources'], '#description' => t('Select the available locations from which this widget may select files.'), ); @@ -129,7 +129,7 @@ // Do all processing as needed by each source. $sources = filefield_sources_info(); - $enabled_sources = isset($instance['settings']['filefield_sources']['filefield_sources']) ? $instance['settings']['filefield_sources']['filefield_sources'] : array(); + $enabled_sources = $instance['widget']['settings']['filefield_sources']['filefield_sources']; foreach ($sources as $source_name => $source) { if (empty($enabled_sources[$source_name])) { unset($sources[$source_name]); diff --git sites/all/modules/filefield_sources/sources/attach.inc sites/all/modules/filefield_sources/sources/attach.inc index aeea94f..c71cf6e 100644 --- sites/all/modules/filefield_sources/sources/attach.inc +++ sites/all/modules/filefield_sources/sources/attach.inc @@ -44,7 +44,7 @@ $return = array(); if ($op == 'form') { - $settings = isset($instance['settings']['filefield_sources']) ? $instance['settings']['filefield_sources'] : array(); + $settings = $instance['widget']['settings']['filefield_sources']; $return['source_attach'] = array( '#title' => t('File attach settings'), @@ -58,7 +58,7 @@ $return['source_attach']['path'] = array( '#type' => 'textfield', '#title' => t('File attach path'), - '#default_value' => isset($settings['source_attach']['path']) ? $settings['source_attach']['path'] : 'file_attach', + '#default_value' => $settings['source_attach']['path'], '#size' => 60, '#maxlength' => 128, '#description' => t('The directory within the File attach location that will contain attachable files.'), @@ -70,7 +70,7 @@ 0 => t('Within the files directory'), 1 => t('Absolute server path'), ), - '#default_value' => isset($settings['source_attach']['absolute']) ? $settings['source_attach']['absolute'] : 0, + '#default_value' => $settings['source_attach']['absolute'], '#description' => t('The File attach path may be with the files directory (%file_directory) or from the root of your server. If an absolute path is used and it does not start with a "/" your path will be relative to your site directory: %realpath.', array('%file_directory' => drupal_realpath(file_default_scheme() . '://'), '%realpath' => realpath('./'))), ); $return['source_attach']['attach_mode'] = array( @@ -95,8 +95,8 @@ $return['source_attach']['attach_mode']['#description'] = '' . t('This feature is not yet supported on Drupal 7. All fields will by set to the "copy" mode, leaving the original file unmoved.') . ''; } elseif ($op == 'save') { - $return['source_attach']['path'] = ''; - $return['source_attach']['absolute'] = FALSE; + $return['source_attach']['path'] = 'file_attach'; + $return['source_attach']['absolute'] = 0; $return['source_attach']['attach_mode'] = 'move'; } @@ -120,7 +120,7 @@ */ function filefield_source_attach_process($element, &$form_state, $form) { $instance = field_widget_instance($element, $form_state); - $settings = $instance['settings']['filefield_sources']['source_attach']; + $settings = $instance['widget']['settings']['filefield_sources']['source_attach']; $element['filefield_attach'] = array( '#weight' => 100.5, @@ -211,7 +211,7 @@ // Clean up the file name extensions and transliterate. $original_filepath = $filepath; - $new_filepath = filefield_sources_clean_filename($filepath, $instance['settings']['file_extensions']); + $new_filepath = filefield_sources_clean_filename($filepath, $instance['widget']['settings']['file_extensions']); rename($filepath, $new_filepath); $filepath = $new_filepath; @@ -226,7 +226,7 @@ $item = array_merge($item, (array) $file); // Delete the original file if "moving" the file instead of copying. - if (empty($instance['settings']['filefield_sources']['source_attach']['attach_mode']) || $instance['settings']['filefield_sources']['source_attach']['attach_mode'] !== 'copy') { + if (empty($instance['widget']['settings']['filefield_sources']['source_attach']['attach_mode']) || $instance['settings']['filefield_sources']['source_attach']['attach_mode'] !== 'copy') { // TODO: Figure out a way to re-introduce this feature. By unlinking the // file it causes the option to be removed from the select list on the // form rebuild, thus throwing an illegal option error. @@ -267,8 +267,8 @@ function _filefield_source_attach_directory($instance, $account = NULL) { $field = field_info_field($instance['field_name']); $account = isset($account) ? $account : $GLOBALS['user']; - $path = isset($instance['settings']['filefield_sources']['source_attach']['path']) ? $instance['settings']['filefield_sources']['source_attach']['path'] : 'file_attach'; - $absolute = !empty($instance['settings']['filefield_sources']['source_attach']['absolute']); + $path = $instance['widget']['settings']['filefield_sources']['source_attach']['path']; + $absolute = !empty($instance['widget']['settings']['filefield_sources']['source_attach']['absolute']); // Replace user level tokens. // Node level tokens require a lot of complexity like temporary storage diff --git sites/all/modules/filefield_sources/sources/imce.inc sites/all/modules/filefield_sources/sources/imce.inc index 3cb5b6a..bbd6dd7 100644 --- sites/all/modules/filefield_sources/sources/imce.inc +++ sites/all/modules/filefield_sources/sources/imce.inc @@ -129,7 +129,7 @@ if (isset($item['filefield_imce']['file_path']) && $item['filefield_imce']['file_path'] != '') { $field = field_info_field($element['#field_name']); - $scheme = $field['settings']['uri_scheme']; + $scheme = $field['widget']['settings']['uri_scheme']; $wrapper = file_stream_wrapper_get_instance_by_scheme($scheme); $file_directory_prefix = $wrapper->getDirectoryPath(); $uri = preg_replace('/^' . preg_quote('/' . $file_directory_prefix . '/', '/') . '/', $scheme . '://', $item['filefield_imce']['file_path']); diff --git sites/all/modules/filefield_sources/sources/reference.inc sites/all/modules/filefield_sources/sources/reference.inc index c16b8be..78b66c1 100644 --- sites/all/modules/filefield_sources/sources/reference.inc +++ sites/all/modules/filefield_sources/sources/reference.inc @@ -67,7 +67,7 @@ $return = array(); if ($op == 'form') { - $settings = isset($instance['settings']['filefield_sources']) ? $instance['settings']['filefield_sources'] : array(); + $settings = $instance['widget']['settings']['filefield_sources']; $return['source_reference'] = array( '#title' => t('Autocomplete reference options'),