diff --git a/upload_nodes.admin.inc b/upload_nodes.admin.inc
index e46206f..7d72869 100644
--- a/upload_nodes.admin.inc
+++ b/upload_nodes.admin.inc
@@ -54,8 +54,8 @@ function upload_nodes_admin_enable($node_type, $field_name) {
variable_set('upload_nodes_targets', $managed_targets);
}
else {
- drupal_set_message(t('Field !field of !type is not manageable by Upload nodes.',
- array('!field' => $field_name, '!type' => $node_type)), 'error');
+ drupal_set_message(t('Field %field of %type is not manageable by Upload nodes.',
+ array('%field' => $field_name, '%type' => $node_type)), 'error');
}
}
drupal_goto('admin/config/media/upload-nodes');
@@ -84,23 +84,23 @@ function upload_nodes_admin_edit_form($form, &$form_state, $type_name, $field_na
if (!$target = _upload_nodes_get_target($type_name, $field_name))
drupal_not_found();
else {
- drupal_set_title(t('Upload nodes configuration for !field from !type',
- array('!type' => $target['type_label'], '!field' => $target['field_label'])), PASS_THROUGH);
-
- $form['upload_nodes_type_name'] = array(
- '#type' => 'value',
- '#value' => $type_name,
- );
- $form['upload_nodes_field_name'] = array(
- '#type' => 'value',
- '#value' => $field_name,
- );
-
- $form['edit_phase'] = array(
- '#type' => 'checkbox',
- '#title' => t('Enable edit phase after nodes creation.'),
- '#default_value' => $target['settings']['edit phase'],
- );
+ drupal_set_title(t('Upload nodes configuration for !field from !type',
+ array('!type' => $target['type_label'], '!field' => $target['field_label'])), PASS_THROUGH);
+
+ $form['upload_nodes_type_name'] = array(
+ '#type' => 'value',
+ '#value' => $type_name,
+ );
+ $form['upload_nodes_field_name'] = array(
+ '#type' => 'value',
+ '#value' => $field_name,
+ );
+
+ $form['edit_phase'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Enable edit phase after nodes creation.'),
+ '#default_value' => $target['settings']['edit phase'],
+ );
$form['#tree'] = TRUE;
$form['fields'] = array(
@@ -109,46 +109,46 @@ function upload_nodes_admin_edit_form($form, &$form_state, $type_name, $field_na
'#theme' => 'upload_nodes_admin_fieldset',
);
- $field_info_instances = array('title' => array('field_name'=>'title', 'label'=>t('Title'), ))
+ $field_info_instances = array('title' => array('field_name' => 'title', 'label' => t('Title'), ))
+ field_info_instances('node', $type_name);
foreach ($field_info_instances as $field_info_instance) {
$field = $field_info_instance['field_name'];
if ($field != $field_name) {
- if (isset($target['settings']['fields'][$field])) {
- $on_upload = $target['settings']['fields'][$field]['on_upload'];
- $on_edit = $target['settings']['fields'][$field]['on_edit'];
- }
- else {
+ if (isset($target['settings']['fields'][$field])) {
+ $on_upload = $target['settings']['fields'][$field]['on_upload'];
+ $on_edit = $target['settings']['fields'][$field]['on_edit'];
+ }
+ else {
// Defaults
- $on_upload = 0;
- $on_edit = 1;
- }
+ $on_upload = 0;
+ $on_edit = 1;
+ }
- $form['fields'][$field]['name'] = array(
- '#markup' => $field_info_instance['label'],
- );
+ $form['fields'][$field]['name'] = array(
+ '#markup' => $field_info_instance['label'],
+ );
- $form['fields'][$field]['on_upload'] = array(
- '#type' => 'checkbox',
+ $form['fields'][$field]['on_upload'] = array(
+ '#type' => 'checkbox',
'#title' => t('On upload form'),
- '#default_value' => $on_upload,
- );
+ '#default_value' => $on_upload,
+ );
- $form['fields'][$field]['on_edit'] = array(
- '#type' => 'checkbox',
+ $form['fields'][$field]['on_edit'] = array(
+ '#type' => 'checkbox',
'#title' => t('On edit form'),
- '#default_value' => $on_edit,
- );
+ '#default_value' => $on_edit,
+ );
}
}
- $form['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Submit'),
- );
+ $form['submit'] = array(
+ '#type' => 'submit',
+ '#value' => t('Submit'),
+ );
- return $form;
+ return $form;
}
}
@@ -195,15 +195,13 @@ function upload_nodes_admin_edit_form_submit($form, &$form_state) {
if (!$target = _upload_nodes_get_target($type_name, $field_name))
drupal_not_found();
else {
- $target['settings']['edit phase'] = $form_state['values']['edit_phase'];
- $target['settings']['fields'] = $form_state['values']['fields'];
-
- $managed_targets = _upload_nodes_get_managed_targets();
- $managed_targets[$type_name . '/' . $field_name] = $target;
- variable_set('upload_nodes_targets', $managed_targets);
-
- $form_state['redirect'] = 'admin/config/media/upload-nodes';
+ $target['settings']['edit phase'] = $form_state['values']['edit_phase'];
+ $target['settings']['fields'] = $form_state['values']['fields'];
+
+ $managed_targets = _upload_nodes_get_managed_targets();
+ $managed_targets[$type_name . '/' . $field_name] = $target;
+ variable_set('upload_nodes_targets', $managed_targets);
+
+ $form_state['redirect'] = 'admin/config/media/upload-nodes';
}
}
-
-?>
diff --git a/upload_nodes.install b/upload_nodes.install
index be9a083..ac056e1 100644
--- a/upload_nodes.install
+++ b/upload_nodes.install
@@ -1,6 +1,12 @@
type);
+ $field_info_instances = field_info_instances('node', $node_type->type);
foreach ($field_info_instances as $field_info_instance) {
$field_info = field_info_field($field_info_instance['field_name']);
// TODO: Find a clever way to select field types
@@ -30,7 +30,7 @@ function _upload_nodes_get_manageable_targets() {
'field_type' => $field_info['type'],
);
}
- }
+ }
}
return $targets;
}
@@ -51,7 +51,7 @@ function _upload_nodes_get_target($type_name, $field_name) {
$targets = _upload_nodes_get_managed_targets();
if (!isset($targets[$type_name . '/' . $field_name]))
- return false;
+ return FALSE;
return $targets[$type_name . '/' . $field_name];
}
@@ -70,8 +70,8 @@ function _upload_nodes_rebuild_targets() {
foreach ($managed_targets as $key => $managed_target) {
if (isset($manageable_targets[$key])) {
$targets[$key] = $manageable_targets[$key];
- if (isset($managed_target[$key]['settings']))
- $targets[$key]['settings'] = $managed_target[$key]['settings'];
+ if (isset($managed_target['settings']))
+ $targets[$key]['settings'] = $managed_target['settings'];
}
}
@@ -89,7 +89,7 @@ function _upload_nodes_rebuild_targets() {
function _upload_nodes_add_node_to_edit($nid) {
global $user;
db_insert('upload_nodes_nodes_to_edit')
- ->fields(array('nid'=>$nid, 'sid'=>$user->sid))->execute();
+ ->fields(array('nid' => $nid, 'sid' => $user->sid))->execute();
}
/**
@@ -109,14 +109,14 @@ function _upload_nodes_remove_node_to_edit($nid) {
function _upload_nodes_get_next_node_to_edit() {
global $user;
- while (true) {
- $result = db_query_range(
- 'SELECT n.nid FROM {upload_nodes_nodes_to_edit} n WHERE n.sid = :sid order by n.nid',
- 0, 1, array(':sid' => $user->sid))->fetchAssoc();
+ while (TRUE) {
+ $result = db_query_range(
+ 'SELECT n.nid FROM {upload_nodes_nodes_to_edit} n WHERE n.sid = :sid order by n.nid',
+ 0, 1, array(':sid' => $user->sid))->fetchAssoc();
// no more node to edit.
- if (!$result)
- return null;
+ if (!$result)
+ return NULL;
// found a loadable node !
if ($node = node_load($result['nid']))
@@ -179,7 +179,7 @@ function _upload_nodes_file_uri_to_object($uri, $use_existing = FALSE) {
global $user;
$uri = file_stream_wrapper_uri_normalize($uri);
$wrapper = file_stream_wrapper_get_instance_by_uri($uri);
- $file = new StdClass;
+ $file = new stdClass;
$file->uid = $user->uid;
$file->filename = basename($uri);
$file->uri = $uri;
@@ -333,22 +333,32 @@ function upload_nodes_field_update_field($field, $prior_field, $has_data) {
function _upload_remove_unwanted_fields(&$form, $target, $setting, $default) {
// Remove fields
- foreach (field_info_instances('node', $target['type_name']) as $key => $field_info_instance)
- if (isset($form[$key]))
- if (isset($target['settings']['fields'][$key]))
- if ($target['settings']['fields'][$key][$setting])
- unset($form[$key]);
- else
- if (!$default)
- unset($form[$key]);
+ foreach (field_info_instances('node', $target['type_name']) as $key => $field_info_instance) {
+ if (isset($form[$key])) {
+ if (isset($target['settings']['fields'][$key])) {
+ if ($target['settings']['fields'][$key][$setting] == 0) {
+ $form[$key]['#access'] = FALSE;
+ }
+ }
+ else {
+ if (!$default) {
+ $form[$key]['#access'] = FALSE;
+ }
+ }
+ }
+ }
// Remove title if needed
- if (isset($target['settings']['fields']['title']))
- if ($target['settings']['fields']['title'][$setting])
- unset($form['title']);
- else
- if (!$default)
- unset($form['title']);
+ if (isset($target['settings']['fields']['title'])) {
+ if ($target['settings']['fields']['title'][$setting] == 0) {
+ $form['title']['#access'] = FALSE;
+ }
+ }
+ else {
+ if (!$default) {
+ $form['title']['#access'] = FALSE;
+ }
+ }
}
/**
@@ -364,36 +374,36 @@ function _upload_nodes_upload_widgets($target) {
switch ($target['field_type']) {
case 'file':
- // Upload widgets for "file" fields --> faire un container
- $form_element['upload_nodes_files'] = array(
- '#type' => 'plupload',
- '#title' => t('Files to upload :'),
- );
-
- $field_info = field_info_field($target['field_name']);
-
- // See file.field.inc, file_field_widget_process :
- if ($field_info['settings']['display_field']) {
- $form_element['upload_nodes_files_display'] = array(
- '#type' => 'checkbox',
- '#title' => t('Include files in display'),
- '#value' => $field_info['settings']['display_default'],
- );
- }
- else {
- $form_element['upload_nodes_files_display'] = array(
- '#type' => 'hidden',
- '#value' => '1',
- );
- }
+ // Upload widgets for "file" fields --> faire un container
+ $form_element['upload_nodes_files'] = array(
+ '#type' => 'plupload',
+ '#title' => t('Files to upload :'),
+ );
+
+ $field_info = field_info_field($target['field_name']);
+
+ // See file.field.inc, file_field_widget_process :
+ if ($field_info['settings']['display_field']) {
+ $form_element['upload_nodes_files_display'] = array(
+ '#type' => 'checkbox',
+ '#title' => t('Include files in display'),
+ '#value' => $field_info['settings']['display_default'],
+ );
+ }
+ else {
+ $form_element['upload_nodes_files_display'] = array(
+ '#type' => 'hidden',
+ '#value' => '1',
+ );
+ }
break;
case 'image':
- // Upload widgets for "image" fields
- $form_element['upload_nodes_files'] = array(
- '#type' => 'plupload',
- '#title' => t('Images to upload :'),
- );
+ // Upload widgets for "image" fields
+ $form_element['upload_nodes_files'] = array(
+ '#type' => 'plupload',
+ '#title' => t('Images to upload :'),
+ );
break;
}
@@ -414,24 +424,24 @@ function upload_nodes_upload_form($form, &$form_state, $type_name, $field_name)
drupal_not_found();
return;
}
-
+
// Create new node if needed
- if (!isset($form_state['node'])) {
- $node = new StdClass();
+ if (!isset($form_state['node'])) {
+ $node = new stdClass();
$node->title = NULL;
// TODO: check that there is no need of creating NULL fields
- $node->type = $type_name;
- $node->language = LANGUAGE_NONE;
- node_object_prepare($node);
- $form_state['node'] = $node;
- }
- else {
- $node = $form_state['node'];
- }
+ $node->type = $type_name;
+ $node->language = LANGUAGE_NONE;
+ node_object_prepare($node);
+ $form_state['node'] = $node;
+ }
+ else {
+ $node = $form_state['node'];
+ }
// Page title
- drupal_set_title(t('Create multiple !type uploading files in !field',
- array('!type' => $target['type_label'], '!field' => $target['field_label'])), PASS_THROUGH);
+ drupal_set_title(t('Create multiple !type uploading files in !field',
+ array('!type' => $target['type_label'], '!field' => $target['field_label'])), PASS_THROUGH);
// Create a node form
$form = node_form($form, $form_state, $node);
@@ -440,7 +450,7 @@ function upload_nodes_upload_form($form, &$form_state, $type_name, $field_name)
$weight = $form[$field_name]['#weight'];
// Remove unwanted fields from upload form
- _upload_remove_unwanted_fields($form, $target, 'on_upload', false);
+ _upload_remove_unwanted_fields($form, $target, 'on_upload', FALSE);
// Replace file field by plupload widget
$form[$field_name] = _upload_nodes_upload_widgets($target);
@@ -452,17 +462,17 @@ function upload_nodes_upload_form($form, &$form_state, $type_name, $field_name)
unset($form['options']);
// Replace actions
- $form['actions'] = array(
+ $form['actions'] = array(
'#type' => 'actions',
'submit' => array(
- '#type' => 'submit',
- '#value' => t('Upload files and create nodes'),
- '#weight' => $form['actions']['submit']['#weight'],
- '#submit' => array('upload_nodes_upload_form_submit'),
- ),
+ '#type' => 'submit',
+ '#value' => t('Upload files and create nodes'),
+ '#weight' => $form['actions']['submit']['#weight'],
+ '#submit' => array('upload_nodes_upload_form_submit'),
+ ),
);
- return $form;
+ return $form;
}
/**
@@ -481,75 +491,76 @@ function upload_nodes_upload_form_submit($form, &$form_state) {
}
// Remove any previous "nodes to edit"
- _upload_nodes_clean_nodes_to_edit();
+ _upload_nodes_clean_nodes_to_edit();
// Will there be an edit phase ?
$edit_phase = $target['settings']['edit phase'] &&
- user_access('edit own '.$type_name.' content');
+ user_access('edit own ' . $type_name . ' content');
// Get field information
- $field_info_instance = field_info_instance('node', $field_name, $type_name);
- $field_info = field_info_field($field_name);
+ $field_info_instance = field_info_instance('node', $field_name, $type_name);
+ $field_info = field_info_field($field_name);
// Check destination
- $destination_dir = $field_info['settings']['uri_scheme'] . '://' .
- trim($field_info_instance['settings']['file_directory'], '/');
-
- if (!file_prepare_directory($destination_dir, FILE_CREATE_DIRECTORY)) {
- watchdog('upload_nodes', 'The upload directory %directory for the file field !name could not be created or is not accessible. A newly uploaded file could not be saved in this directory as a consequence, and the upload was canceled.', array('%directory' => $destination_dir, '!name' => $field_name));
- form_set_error('upload_nodes_upload_form', t('The file could not be uploaded.'));
- return FALSE;
- }
+ $destination_dir = $field_info['settings']['uri_scheme'] . '://' .
+ trim($field_info_instance['settings']['file_directory'], '/');
+
+ if (!file_prepare_directory($destination_dir, FILE_CREATE_DIRECTORY)) {
+ watchdog('upload_nodes', 'The upload directory %directory for the file field !name could not be created or is not accessible. A newly uploaded file could not be saved in this directory as a consequence, and the upload was canceled.', array('%directory' => $destination_dir, '!name' => $field_name));
+ form_set_error('upload_nodes_upload_form', t('The file could not be uploaded.'));
+ return FALSE;
+ }
// Process files
- foreach ($form_state['values']['upload_nodes_files'] as $uploaded_file) {
+ foreach ($form_state['values']['upload_nodes_files'] as $uploaded_file) {
- if ($uploaded_file['status'] == 'done') {
+ if ($uploaded_file['status'] == 'done') {
// Move file into Drupal
- $source = $uploaded_file['tmppath'];
+ $source = $uploaded_file['tmppath'];
+ $destination = $destination_dir . $uploaded_file['name'];
- $destination = file_unmanaged_move($source, $destination_dir, FILE_EXISTS_RENAME);
- $file = file_uri_to_object($destination);
+ $destination = file_unmanaged_move($source, $destination, FILE_EXISTS_RENAME);
+ $file = file_uri_to_object($destination);
- if ($target['field_type'] == 'file') {
- $file->display = $form_state['values']['upload_nodes_files_display'];
- }
- file_save($file);
+ if ($target['field_type'] == 'file') {
+ $file->display = $form_state['values']['upload_nodes_files_display'];
+ }
+ file_save($file);
// Create corresponding node
- $node = node_form_submit_build_node($form, $form_state);
+ $node = node_form_submit_build_node($form, $form_state);
// Remove files copied from the form
- unset($node->upload_nodes_files);
+ unset($node->upload_nodes_files);
// Add current file
- $node->{$field_name}[LANGUAGE_NONE][0] = (array)$file;
+ $node->{$field_name}[LANGUAGE_NONE][0] = (array)$file;
// Set a title if none
if (!$node->title)
- $node->title = _upload_nodes_filter_name($uploaded_file['name']);
+ $node->title = _upload_nodes_filter_name($uploaded_file['name']);
- node_save($node);
+ node_save($node);
// Add node to "node to edit" list
if ($edit_phase) {
_upload_nodes_add_node_to_edit($node->nid);
}
- }
- else {
- // TODO: move this to element validate or something
- form_set_error('upload_nodes_upload_form', t('Upload of !file failed.',
- array('!file'=>$uploaded_file['name'])));
- }
- }
+ }
+ else {
+ // TODO: move this to element validate or something
+ form_set_error('upload_nodes_upload_form', t('Upload of !file failed.',
+ array('!file' => $uploaded_file['name'])));
+ }
+ }
- // Trigger edit phase if enabled
+ // Trigger edit phase if enabled
if ($edit_phase) {
- $form_state['redirect'] = 'upload_nodes/' . $type_name . '/' . $field_name . '/edit';
+ $form_state['redirect'] = 'upload_nodes/' . $type_name . '/' . $field_name . '/edit';
}
- else {
- $form_state['redirect'] = _upload_nodes_get_redirect_page();
+ else {
+ $form_state['redirect'] = _upload_nodes_get_redirect_page();
}
}
@@ -582,7 +593,7 @@ function upload_nodes_edit_form($form, &$form_state, $type_name, $field_name) {
}*/
// Fetch node if needed
- if (!isset($form_state['node'])) {
+ if (!isset($form_state['node'])) {
// Check if there is a node to be edited
$node = _upload_nodes_get_next_node_to_edit();
@@ -590,14 +601,14 @@ function upload_nodes_edit_form($form, &$form_state, $type_name, $field_name) {
if (!$node) drupal_goto(_upload_nodes_get_redirect_page());
node_object_prepare($node); // Avoid an error about missing "revision" attribute
- $form_state['node'] = $node;
- }
- else {
- $node = $form_state['node'];
- }
+ $form_state['node'] = $node;
+ }
+ else {
+ $node = $form_state['node'];
+ }
// Page title
- drupal_set_title(t('Edit @type @title',
+ drupal_set_title(t('Edit @type @title',
array('@type' => $target['type_label'], '@title' => $node->title)), PASS_THROUGH);
// Create a node form
@@ -608,30 +619,30 @@ function upload_nodes_edit_form($form, &$form_state, $type_name, $field_name) {
$weight = $form[$field_name]['#weight'];
// Remove unwanted fields from upload form
- _upload_remove_unwanted_fields($form, $target, 'on_edit', true);
+ _upload_remove_unwanted_fields($form, $target, 'on_edit', TRUE);
- // Replace image field with an image display
+ // Replace image field with an image display
if ($target['field_type'] == 'image')
- $form[$field_name] = array(
- '#type' => 'item',
- '#title' => $field['#title'],
- '#markup' => theme_image_style(array('style_name'=>$image_style,
- 'path'=>$field['#default_value']['uri'])),
- '#weight' => $weight,
- );
+ $form[$field_name] = array(
+ '#type' => 'item',
+ '#title' => check_plain($field['#title']),
+ '#markup' => theme_image_style(array('style_name' => $image_style,
+ 'path' => $field['#default_value']['uri'])),
+ '#weight' => $weight,
+ );
if ($target['field_type'] == 'file')
- $form[$field_name] = array(
- '#type' => 'item',
- '#title' => $field['#title'],
- '#markup' => $field['#default_value']['uri'],
- '#weight' => $weight,
- );
+ $form[$field_name] = array(
+ '#type' => 'item',
+ '#title' => check_plain($field['#title']),
+ '#markup' => $field['#default_value']['uri'],
+ '#weight' => $weight,
+ );
// Add a submit handler to submit action (the node will be process by standard handler)
$form['actions']['submit']['#submit'][] = 'upload_nodes_edit_form_submit';
- return $form;
+ return $form;
}
/**
@@ -659,24 +670,23 @@ function upload_nodes_edit_form_submit($form, &$form_state) {
function upload_nodes_clean_files() {
$result = '';
$scheme = variable_get('file_default_scheme', 'public') . '://';
- $files = file_scan_directory($scheme, '/.*/', array('recurse'=>false));
+ $files = file_scan_directory($scheme, '/.*/', array('recurse' => FALSE));
foreach ($files as $props) {
- $file = _upload_nodes_file_uri_to_object($props->uri, true);
+ $file = _upload_nodes_file_uri_to_object($props->uri, TRUE);
if (is_object($file)
and property_exists($file, 'fid')
and count(file_usage_list($file)) == 0
- )
- {
- $result.='' .$props->uri. '';
+ ) {
+ $result .= '' . $props->uri . '';
file_delete($file);
}
}
if ($result)
- $result = 'Removed files:
';
+ $result = '' . t('Removed files') . ':
';
else
- $result = 'No file to remove.
';
+ $result = '' . t('No file to remove.') . '
';
return $result;
}
@@ -690,18 +700,18 @@ function upload_nodes_view() {
$targets = _upload_nodes_get_managed_targets();
$types = node_type_get_types();
- drupal_set_title(t('Upload files and create nodes'), PASS_THROUGH);
+ drupal_set_title(t('Upload files and create nodes'), PASS_THROUGH);
foreach ($targets as $target) {
if (user_access('create ' . $target['type_name'] . ' content')) {
- $output.='' .l(t('Create multiple !type uploading files in !field',
- Array('!type' => $target['type_label'], '!field' => $target['field_label'])),
- 'upload_nodes/' . $target['type_name'] . '/' . $target['field_name'] . '/upload'). '';
+ $output .= '' . l(t('Create multiple !type uploading files in !field',
+ Array('!type' => $target['type_label'], '!field' => $target['field_label'])),
+ 'upload_nodes/' . $target['type_name'] . '/' . $target['field_name'] . '/upload') . '';
}
}
if ($output)
- return '';
+ return '';
else
- return '' .t('No field enabled. To use Upload Nodes you have to enable fields in configuration'). '
';
+ return '' . t('No field enabled. To use Upload Nodes you have to enable fields in configuration') . '
';
}
/**
@@ -712,14 +722,12 @@ include('modules/node/node.pages.inc');
function upload_nodes_test_view() {
$output = '';
$field_info_instance = field_info_instance('node', 'field_test', 'photo');
- $output .= 'field_info_instance
' . print_r($field_info_instance, true) . '
';
+ $output .= 'field_info_instance
' . print_r($field_info_instance, TRUE) . '
';
$field_info_widget_types = field_info_widget_types('options_buttons');
- $output .= 'field_info_widget_types
' . print_r($field_info_widget_types, true) . '
';
+ $output .= 'field_info_widget_types
' . print_r($field_info_widget_types, TRUE) . '
';
$node = node_load(112);
$form_state = array();
$node_form = node_form(array(), $form_state, $node);
- $output .= 'node_form[field_test]
' . print_r($node_form['field_test'], true) . '
';
+ $output .= 'node_form[field_test]
' . print_r($node_form['field_test'], TRUE) . '
';
return $output;
-}
-
-?>
+}
\ No newline at end of file