Index: includes/webform.components.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/webform/includes/webform.components.inc,v retrieving revision 1.11 diff -u -r1.11 webform.components.inc --- includes/webform.components.inc 14 Jan 2010 06:12:47 -0000 1.11 +++ includes/webform.components.inc 20 Jan 2010 05:56:18 -0000 @@ -3,7 +3,7 @@ /** * @file - * Webform module components handling. + * Webform module component handling. */ /** @@ -671,6 +671,19 @@ } /** + * Find a components parents within a node. + */ +function webform_component_parent_keys($node, $component) { + $parents = array($component['form_key']); + $pid = $component['pid']; + while ($pid) { + $parents[] = $node->webform['components'][$pid]['form_key']; + $pid = $node->webform['components'][$pid]['pid']; + } + return array_reverse($parents); +} + +/** * Populate a component with the defaults for that type. */ function webform_component_defaults(&$component) { Index: webform.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.module,v retrieving revision 1.153 diff -u -r1.153 webform.module --- webform.module 14 Jan 2010 06:12:47 -0000 1.153 +++ webform.module 20 Jan 2010 05:56:17 -0000 @@ -1275,7 +1275,9 @@ $parent_fieldset[$component['form_key']]['#default_value'] = $component_value; if (is_array($component_value)) { foreach ($component_value as $key => $value) { - $parent_fieldset[$component['form_key']][$key]['#default_value'] = $value; + if (isset($parent_fieldset[$component['form_key']][$key])) { + $parent_fieldset[$component['form_key']][$key]['#default_value'] = $value; + } } } } @@ -1937,13 +1939,8 @@ $replacements['unsafe']['%cid[' . $cid . ']'] = drupal_render(webform_component_invoke($component['type'], 'display', $component, $value['value'], 'text')); // Find by form key. - $parents = array($component['form_key']); - $pid = $component['pid']; - while ($pid) { - $parents[] = $node->webform['components'][$pid]['form_key']; - $pid = $node->webform['components'][$pid]['pid']; - } - $form_key = implode('][', array_reverse($parents)); + $parents = webform_component_parent_keys($node, $component); + $form_key = implode('][', $parents); $replacements['unsafe']['%email[' . $form_key . ']'] = $replacements['unsafe']['%cid[' . $cid . ']']; } Index: webform.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.install,v retrieving revision 1.30 diff -u -r1.30 webform.install --- webform.install 11 Jan 2010 01:13:35 -0000 1.30 +++ webform.install 20 Jan 2010 05:56:16 -0000 @@ -1259,6 +1259,39 @@ } /** + * Convert the file component to use only FIDs instead of serialized arrays. + */ +function webform_update_6307() { + $ret = array(); + + $result = db_query("SELECT d.*, s.uid, s.submitted FROM {webform_submitted_data} d INNER JOIN {webform_component} c ON d.cid = c.cid AND d.nid = c.nid AND c.type = 'file' INNER JOIN {webform_submissions} s ON d.sid = s.sid"); + while ($row = db_fetch_object($result)) { + $file = @unserialize($row->data); + // File name should always exist, even when upgrading from Drupal 5. + if ($file && isset($file['filename'])) { + // Create an entry in the files table if needed. + if (!isset($file['fid'])) { + db_query("INSERT INTO {files} (uid, filename, filepath, filemime, filesize, status, timestamp) VALUES (%d, %d, '%s', '%s', '%s', %d, 1, %d)", $row->uid, $file['filename'], $file['filepath'], $file['filemime'], $file['filesize'], $row->submitted); + $fid = db_last_insert_id('files', 'fid'); + } + else { + $fid = $file['fid']; + } + // Update the submitted data with the FID. + db_query("UPDATE {webform_submitted_data} SET data = '%d' WHERE nid = %d AND sid = %d AND cid = %d", $fid, $row->nid, $row->sid, $row->cid); + } + // Insert an empty entry, now just an empty string. + else { + db_query("UPDATE {webform_submitted_data} SET data = '' WHERE nid = %d AND sid = %d AND cid = %d", $row->nid, $row->sid, $row->cid); + } + } + + $ret[] = array('success' => TRUE, 'query' => t('Updated file components to use numeric file IDs in the submitted values.')); + + return $ret; +} + +/** * Recursively delete all files and folders in the specified filepath, then * delete the containing folder. * Index: components/file.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/file.inc,v retrieving revision 1.8 diff -u -r1.8 file.inc --- components/file.inc 14 Jan 2010 06:12:47 -0000 1.8 +++ components/file.inc 20 Jan 2010 05:56:17 -0000 @@ -39,6 +39,9 @@ 'webform_edit_file' => array( 'arguments' => array('form' => NULL), ), + 'webform_render_file' => array( + 'arguments' => array('element' => NULL), + ), 'webform_display_file' => array( 'arguments' => array('element' => NULL), ), @@ -148,16 +151,16 @@ * * Ensure that the destination directory exists and is writable. */ -function _webform_edit_file_check_directory($form_element) { +function _webform_edit_file_check_directory($element) { $base_dir = file_directory_path() .'/webform'; $base_success = file_check_directory($base_dir, FILE_CREATE_DIRECTORY); - $destination_dir = $base_dir .'/'. $form_element['#value']; + $destination_dir = $base_dir .'/'. $element['#value']; $destination_success = file_check_directory($destination_dir, FILE_CREATE_DIRECTORY); if (!$base_success || !$destination_success) { form_set_error('savelocation', t('The save directory %directory could not be created. Check that the webform files directory is writtable.', array('%directory' => $destination_dir))); } - return $form_element; + return $element; } /** @@ -166,19 +169,19 @@ * Change the submitted values of the component so that all filtering extensions * are saved as a single array. */ -function _webform_edit_file_filtering_validate($form_element, &$form_state) { +function _webform_edit_file_filtering_validate($element, &$form_state) { // Predefined types. $extensions = array(); - foreach (element_children($form_element['types']) as $category) { - foreach (array_keys($form_element['types'][$category]['#value']) as $extension) { - if ($form_element['types'][$category][$extension]['#value']) { + foreach (element_children($element['types']) as $category) { + foreach (array_keys($element['types'][$category]['#value']) as $extension) { + if ($element['types'][$category][$extension]['#value']) { $extensions[] = $extension; } } } // Additional types. - $additional_extensions = explode(',', $form_element['addextensions']['#value']); + $additional_extensions = explode(',', $element['addextensions']['#value']); foreach ($additional_extensions as $extension) { $clean_extension = drupal_strtolower(trim($extension)); if (!empty($clean_extension) && !in_array($clean_extension, $extensions)) { @@ -186,7 +189,7 @@ } } - form_set_value($form_element['types'], $extensions, $form_state); + form_set_value($element['types'], $extensions, $form_state); } function theme_webform_edit_file($form) { @@ -280,7 +283,9 @@ * Implementation of _webform_render_component(). */ function _webform_render_file($component, $value = NULL) { - $element[$component['form_key']] = array( + $node = node_load($component['nid']); + $form_key = implode('_', webform_component_parent_keys($node, $component)); + $element[$form_key] = array( '#type' => $component['type'], '#title' => $component['name'], //'#required' => $component['mandatory'], // Drupal core bug with required file uploads. @@ -288,53 +293,62 @@ '#description' => _webform_filter_descriptions($component['extra']['description']), '#attributes' => $component['extra']['attributes'], '#tree' => FALSE, // file_check_upload assumes a flat $_FILES structure. - '#prefix' => '
', - '#suffix' => '
', - '#element_validate' => array( + '#element_validate' => array( '_webform_validate_file', '_webform_required_file', // Custom required routine. ), '#webform_component' => $component, ); $element['#weight'] = $component['weight']; - $element['new'] = array( - '#type' => 'hidden', - '#weight' => $component['weight'], - '#value' => $component['form_key'], - '#tree' => TRUE, - ); + $element['#theme'] = 'webform_render_file'; + $element['#prefix'] = '
'; + $element['#suffix'] = '
'; - if (isset($value)) { - $file_data = unserialize($value[0]); - if (isset($file_data['filename'])) { - $element['#suffix'] = ' ' . l(t('Download !filename', array('!filename' => $file_data['filename'])), webform_file_url($file_data['filepath'])) . (isset($element['#suffix']) ? $element['#suffix'] : ''); - $element['#description'] = t('Uploading a new file will replace the current file.'); - $element['existing'] = array( - '#type' => 'value', - '#value' => $file_data, - ); - } - } // Change the 'width' option to the correct 'size' option. if ($component['extra']['width'] > 0) { - $element[$component['form_key']]['#size'] = $component['extra']['width']; + $element[$form_key]['#size'] = $component['extra']['width']; } + // Add a hidden element to store the FID for new files. + $element['_fid'] = array( + '#type' => 'hidden', + '#default_value' => '', + ); + + // Add a hidden element to store the FID for existing files. + $element['_old'] = array( + '#type' => 'hidden', + '#value' => isset($value[0]) ? $value[0] : NULL, + ); + return $element; } /** + * Render a File component. + */ +function theme_webform_render_file($element) { + $value = $element['_fid']['#value'] ? $element['_fid']['#value'] : $element['_old']['#value']; + if ($value && ($file = webform_get_file($value))) { + $element['#suffix'] = ' ' . l(t('Download !filename', array('!filename' => $file->filename)), webform_file_url($file->filepath)) . (isset($element['#suffix']) ? $element['#suffix'] : ''); + $element['#description'] = t('Uploading a new file will replace the current file.'); + } + + return drupal_render($element); +} + +/** * A Form API element validate function. * * Fix Drupal core's handling of required file fields. */ -function _webform_required_file($form_element, $form_state) { - $component = $form_element['#webform_component']; - $form_key = $component['form_key']; +function _webform_required_file($element, $form_state) { + $component = $element['#webform_component']; + $form_key = implode('_', $element['#parents']); if (empty($_FILES['files']['name'][$form_key]) && $component['mandatory']) { - form_error($form_element, t('%field field is required.', array('%field' => $component['name']))); + form_error($element, t('%field field is required.', array('%field' => $component['name']))); } } @@ -343,9 +357,9 @@ * * Ensure that the uploaded file matches the specified file types. */ -function _webform_validate_file($form_element, &$form_state) { - $component = $form_element['#webform_component']; - $form_key = $component['form_key']; +function _webform_validate_file($element, &$form_state) { + $component = $element['#webform_component']; + $form_key = implode('_', $element['#parents']); if (empty($_FILES['files']['name'][$form_key])) { return; @@ -370,41 +384,59 @@ $dot = strrpos($_FILES['files']['name'][$form_key], '.'); $extension = drupal_strtolower(substr($_FILES['files']['name'][$form_key], $dot+1)); + $file_error = FALSE; if (!in_array($extension, $extensions)) { - form_set_error($form_key, t("Files with the '%ext' extension are not allowed, please upload a file with a %exts extension.", array('%ext' => $extension, '%exts' => $extension_list))); + form_error($element, t("Files with the '%ext' extension are not allowed, please upload a file with a %exts extension.", array('%ext' => $extension, '%exts' => $extension_list))); + $file_error = TRUE; } // Now let's check the file size (limit is set in KB). if ($_FILES['files']['size'][$form_key] > $component['extra']['filtering']['size'] * 1024) { - form_set_error($form_key, t("The file '%filename' is too large (%filesize KB). Please upload a file %maxsize KB or smaller.", array('%filename' => $_FILES['files']['name'][$form_key], '%filesize' => (int)($_FILES['files']['size'][$form_key]/1024), '%maxsize' => $component['extra']['filtering']['size']))); + form_error($element, t("The file '%filename' is too large (%filesize KB). Please upload a file %maxsize KB or smaller.", array('%filename' => $_FILES['files']['name'][$form_key], '%filesize' => (int)($_FILES['files']['size'][$form_key]/1024), '%maxsize' => $component['extra']['filtering']['size']))); + $file_error = TRUE; } -} -/** - * Implementation of _webform_submit_component(). - */ -function _webform_submit_file($component, $value) { - $upload_dir = file_directory_path() .'/webform/'. $component['extra']['savelocation']; - if (!empty($_FILES['files']['name'][$value['new']])) { + // Save the file to a temporary location. + if (!$file_error) { + $upload_dir = file_directory_path() .'/webform/'. $component['extra']['savelocation']; if (file_check_directory($upload_dir, FILE_CREATE_DIRECTORY)) { - $file_saved = file_save_upload($value['new'], array(), $upload_dir); - if (!$file_saved) { - drupal_set_message(t('The uploaded file %filename was unable to be saved. The destination directory may not be writable.', array('%filename' => $file_saved['filename'])), 'error'); + $file = file_save_upload($form_key, array(), $upload_dir); + if ($file) { + // Set the hidden field value. + $parents = $element['#array_parents']; + array_pop($parents); + $parents[] = '_fid'; + form_set_value(array('#parents' => $parents), $file->fid, $form_state); } else { - file_set_status($file_saved, FILE_STATUS_PERMANENT); - if (isset($value['existing']['filepath'])) { - file_delete($value['existing']['filepath']); - } - $value = serialize((array) $file_saved); + drupal_set_message(t('The uploaded file %filename was unable to be saved. The destination directory may not be writable.', array('%filename' => $file->filename)), 'error'); } } else { drupal_set_message(t('The uploaded file was unable to be saved. The destination directory does not exist.'), 'error'); } } +} + +/** + * Implementation of _webform_submit_component(). + */ +function _webform_submit_file($component, $value) { + + if ($value['_fid'] && ($file = webform_get_file($value['_fid']))) { + // Save any new files permanently. + file_set_status($file, FILE_STATUS_PERMANENT); + + // Delete any previous files. + if ($value['_old'] && ($existing = webform_get_file($value['_old']))) { + file_delete($existing->filepath); + db_query("DELETE FROM {files} WHERE fid = %d", $existing->fid); + } + + $value = $file->fid; + } else { - $value = serialize(array()); + $value = $value['_old'] ? $value['_old'] : NULL; } return $value; @@ -414,10 +446,10 @@ * Implementation of _webform_display_component(). */ function _webform_display_file($component, $value, $format = 'html') { - $file_data = isset($value[0]) ? unserialize($value[0]) : array(); + $fid = isset($value[0]) ? $value[0] : NULL; return array( '#title' => $component['name'], - '#value' => $file_data, + '#value' => $fid ? webform_get_file($fid) : NULL, '#weight' => $component['weight'], '#theme' => 'webform_display_file', '#theme_wrappers' => $format == 'text' ? array('webform_element_text') : array('webform_element'), @@ -432,8 +464,8 @@ */ function theme_webform_display_file($element) { $file = $element['#value']; - $url = !empty($file) ? webform_file_url($file['filepath']) : t('no upload'); - return !empty($file) ? ($element['#format'] == 'plain' ? $url : l($file['filename'], $url)) : ''; + $url = !empty($file) ? webform_file_url($file->filepath) : t('no upload'); + return !empty($file) ? ($element['#format'] == 'plain' ? $url : l($file->filename, $url)) : ''; } /** @@ -441,12 +473,9 @@ */ function _webform_delete_file($component, $value) { // Delete an individual submission file. - if (isset($value[0])) { - $file_data = unserialize($value[0]); - if (isset($file_data['filepath']) && is_file($file_data['filepath'])) { - unlink($file_data['filepath']); - db_query("DELETE FROM {files} WHERE filepath = '%s'", $file_data['filepath']); - } + if (isset($value[0]) && ($file = webform_get_file($value[0]))) { + unlink($file->filepath); + db_query("DELETE FROM {files} WHERE fid = '%d'", $file->fid); } } @@ -466,10 +495,10 @@ $result = db_query($query, array_merge(array($component['nid'], $component['cid']), $sids)); while ($data = db_fetch_array($result)) { - $file_data = unserialize($data['data']); - if (isset($file_data['filesize'])) { + $file = webform_get_file($data['data']); + if (isset($file->filesize)) { $nonblanks++; - $sizetotal += $file_data['filesize']; + $sizetotal += $file->filesize; } $submissions++; } @@ -485,13 +514,10 @@ */ function _webform_table_file($component, $value) { $output = ''; - $file_data = unserialize($value[0]); - if (!empty($file_data['filename'])) { - $output = ''. $file_data['filename'] .''; - $output .= ' ('. (int)($file_data['filesize']/1024) .' KB)'; - } - elseif (!empty($file_data['error'])) { - $output = $file_data['error']; + $file = webform_get_file($value[0]); + if (!empty($file->fid)) { + $output = ''. $file->filename .''; + $output .= ' ('. (int)($file->filesize/1024) .' KB)'; } return $output; } @@ -513,8 +539,8 @@ * Implementation of _webform_csv_data_component(). */ function _webform_csv_data_file($component, $value) { - $file_data = unserialize($value[0]); - return empty($file_data['filename']) ? array('', '') : array($file_data['filename'], (int) ($file_data['filesize']/1024)); + $file = webform_get_file($value[0]); + return empty($file->filename) ? array('', '') : array($file->filename, (int) ($file->filesize/1024)); } /** @@ -527,3 +553,21 @@ } return isset($file_url) ? $file_url : ''; } + +/** + * Helper function to load a file from the database. + */ +function webform_get_file($fid) { + static $files; + + if (!isset($files[$fid])) { + if (empty($fid)) { + $files[$fid] = FALSE; + } + else { + $files[$fid] = db_fetch_object(db_query("SELECT * FROM {files} WHERE fid = %d", $fid)); + } + } + + return $files[$fid]; +} \ No newline at end of file