Only in webform: CVS
diff webform-4.7.4/INSTALL.txt webform/INSTALL.txt
54c54
< $Id: INSTALL.txt,v 1.8.2.3 2006/09/03 22:36:45 quicksketch Exp $
---
> $Id: INSTALL.txt,v 1.11 2006/07/14 17:45:28 ullgren Exp $
Only in webform-4.7.4/: LICENSE.txt
diff webform-4.7.4/README.txt webform/README.txt
33c33
< $Id: README.txt,v 1.6.2.1 2006/09/03 22:36:45 quicksketch Exp $
\ No newline at end of file
---
> $Id: README.txt,v 1.7 2006/07/04 07:13:28 quicksketch Exp $
\ No newline at end of file
diff webform-4.7.4/THEMING.txt webform/THEMING.txt
93c93
< echo form_render($form)
---
> echo drupal_render($form)
105c105
< $Id: THEMING.txt,v 1.1.2.3 2006/09/03 22:36:45 quicksketch Exp $
---
> $Id: THEMING.txt,v 1.7 2006/09/03 22:06:47 quicksketch Exp $
Common subdirectories: webform-4.7.4/components and webform/components
Common subdirectories: webform-4.7.4/po and webform/po
diff webform-4.7.4/webform.inc webform/webform.inc
2c2
< // $Id: webform.inc,v 1.25.2.7 2006/10/23 00:50:06 quicksketch Exp $
---
> // $Id: webform.inc,v 1.45 2006/10/23 00:48:46 quicksketch Exp $
59c59
< drupal_goto('admin/webform');
---
> drupal_goto('admin/settings/webform');
62c62,75
< $form['delete'] = array (
---
> drupal_set_title(t("Clear Form Submissions"));
> $output = t("Are you sure you want to delete all submissions for this form?")." ".t('This action cannot be undone.');
> $output .= drupal_get_form('webform_clear_results_form',$nid);
> return $output;
> }
> } // end function _webform_results_clear
>
> /*
> * Added during 4.7 to 5.0 Upgrade attempt by Pr0f3t
> * Form Builder function for _webform_results_clear
> * @param integer ID of node for which to clear submissions
> */
> function webform_clear_results_form($nid){
> $form['delete'] = array (
70,77c83,84
<
< drupal_set_title(t("Clear Form Submissions"));
< $output = t("Are you sure you want to delete all submissions for this form?")." ".t('This action cannot be undone.');
< $output .= drupal_get_form('clear_results',$form);
< return $output;
< }
< } // end function _webform_results_clear
<
---
> return $form;
> }
85c92
< if ($_POST['op']['Delete']) {
---
> if ($_POST['Delete']) {
95c102,117
< $form['delete'] = array (
---
> $node = node_load($nid);
> drupal_set_title(t("Are you sure you want to delete this submission?"));
> $output .= t('This action cannot be undone');
> $output .= drupal_get_form('webform_delete_submission_form', $nid);
> return $output;
> }
> } // end function _webform_submission_delete
>
> /*
> * Added during 4.7.* to 5.0.* Upgrade attempt by Pr0f3t
> * Form Builder function for _webform_submission_delete
> * @param integer ID of node for which to clear submissions
> */
> function webform_delete_submission_form($nid){
> $form = array();
> $form['delete'] = array (
103,110c125,126
<
< $node = node_load($nid);
< drupal_set_title(t("Are you sure you want to delete this submission?"));
< $output .= t('This action cannot be undone');
< $output .= drupal_get_form('delete_submission',$form);
< return $output;
< }
< } // end function _webform_submission_delete
---
> return $form;
> }
Only in webform: webform.info
diff webform-4.7.4/webform.install webform/webform.install
2c2
< // $Id: webform.install,v 1.3.2.7 2006/09/03 22:36:45 quicksketch Exp $
---
> // $Id: webform.install,v 1.14 2006/09/17 23:45:34 quicksketch Exp $
18a19,20
> additional_validate text default NULL,
> additional_submit text default NULL,
60,69c62,73
< nid integer NOT NULL default '0',
< confirmation text NOT NULL default '',
< redirect_post smallint NOT NULL default '0',
< submit_limit smallint NOT NULL default '-1',
< submit_interval integer NOT NULL default '157784630',
< email varchar(255) NOT NULL default '',
< email_from varchar(255) NOT NULL default '',
< email_subject varchar(255) NOT NULL default '',
< PRIMARY KEY (nid)
< )"
---
> nid integer NOT NULL default '0',
> confirmation text NOT NULL default '',
> redirect_post smallint NOT NULL default '0',
> submit_limit smallint NOT NULL default '-1',
> submit_interval integer NOT NULL default '157784630',
> email varchar(255) NOT NULL default '',
> email_from varchar(255) NOT NULL default '',
> email_subject varchar(255) NOT NULL default '',
> additional_validate text default NULL,
> additional_submit text default NULL,
> PRIMARY KEY (nid)
> )"
73,83c77,87
< nid integer NOT NULL default '0',
< cid integer NOT NULL default '0',
< pid integer NOT NULL default '0',
< name varchar(128) NOT NULL default '',
< type varchar(16) NOT NULL default '',
< value text NOT NULL default '',
< extra text NOT NULL default '',
< mandatory smallint NOT NULL default '0',
< weight smallint NOT NULL default '0',
< PRIMARY KEY (nid,cid)
< )"
---
> nid integer NOT NULL default '0',
> cid integer NOT NULL default '0',
> pid integer NOT NULL default '0',
> name varchar(128) NOT NULL default '',
> type varchar(16) NOT NULL default '',
> value text NOT NULL default '',
> extra text NOT NULL default '',
> mandatory smallint NOT NULL default '0',
> weight smallint NOT NULL default '0',
> PRIMARY KEY (nid,cid)
> )"
87,93c91,97
< nid integer NOT NULL default '0',
< sid serial,
< submitted integer NOT NULL default '0',
< \"user\" varchar(128),
< remote_addr varchar(128) NOT NULL default '',
< PRIMARY KEY (nid,sid)
< )"
---
> nid integer NOT NULL default '0',
> sid serial,
> submitted integer NOT NULL default '0',
> \"user\" varchar(128),
> remote_addr varchar(128) NOT NULL default '',
> PRIMARY KEY (nid,sid)
> )"
97,103c101,107
< nid integer NOT NULL default '0',
< sid integer NOT NULL default '0',
< cid integer NOT NULL default '0',
< no integer NOT NULL default '0',
< data text NOT NULL default '',
< PRIMARY KEY (nid,sid,cid,no)
< )"
---
> nid integer NOT NULL default '0',
> sid integer NOT NULL default '0',
> cid integer NOT NULL default '0',
> no integer NOT NULL default '0',
> data text NOT NULL default '',
> PRIMARY KEY (nid,sid,cid,no)
> )"
277a282,299
> /*
> * Add additional validate and submit processing columns
> */
> function webform_update_8() {
> $ret = array();
>
> switch ($GLOBALS['db_type']) {
> case 'pgsql':
> case 'mysqli':
> case 'mysql':
> $ret[] = update_sql("ALTER TABLE {webform} ADD additional_validate text DEFAULT NULL AFTER email_subject");
> $ret[] = update_sql("ALTER TABLE {webform} ADD additional_submit text DEFAULT NULL AFTER additional_validate");
> break;
> }
>
> return $ret;
> }
>
343a366,376
>
> /**
> * Implementation of hook_uninstall().
> */
> function webform_uninstall() {
> db_query('DROP TABLE {webform}');
> db_query('DROP TABLE {webform_component}');
> db_query('DROP TABLE {webform_submissions}');
> db_query('DROP TABLE {webform_submitted_data}');
> variable_del('webform_version');
> }
diff webform-4.7.4/webform.module webform/webform.module
3c3
< // $Id: webform.module,v 1.61.2.21 2006/10/10 18:07:24 quicksketch Exp $
---
> // $Id: webform.module,v 1.109 2006/10/10 18:08:03 quicksketch Exp $
69c69
< return array ("create webforms", "edit own webforms", "edit webforms", "access webform results", "clear webform results");
---
> return array ("create webforms", "edit own webforms", "edit webforms", "access webform results", "clear webform results","use PHP for additional processing");
76c76,81
< return array ('webform' => array ('name' => t('webform'), 'base' => 'webform'));
---
> return array ('webform' => array (
> 'name' => t('Webform'),
> 'module' => 'webform',
> 'description' => 'A webform nodetype can be used to create questionnaires, contact or request/register forms, surveys, polls or a front end to issues tracking systems.',
> )
> );
97c102
< if ($_POST['edit']['enforce_limit'] === 'no') {
---
> if ($form_values['edit']['enforce_limit'] === 'no') {
103c108
< db_query("INSERT INTO {webform} (nid, confirmation, redirect_post, submit_limit, submit_interval, email, email_from, email_subject) VALUES (%d, '%s', %d, %d, %d, '%s', '%s', '%s')", $node->nid, $node->confirmation, $node->redirect_post, $node->submit_limit, $node->submit_interval, $node->email, $node->email_from, $node->email_subject);
---
> db_query("INSERT INTO {webform} (nid, confirmation, redirect_post, submit_limit, submit_interval, email, email_from, email_subject, additional_validate, additional_submit) VALUES (%d, '%s', %d, %d, %d, '%s', '%s', '%s', '%s', '%s')", $node->nid, $node->confirmation, $node->redirect_post, $node->submit_limit, $node->submit_interval, $node->email, $node->email_from, $node->email_subject, $node->additional_validate, $node->additional_submit);
238c243
< $items[]= array ('path' => 'node/add/webform', 'title' => t('webform'),
---
> $items[]= array ('path' => 'node/add/webform', 'title' => t('Webform'),
242c247
< $items[]= array ('path' => 'admin/webform', 'title' => t('webform'),
---
> $items[]= array ('path' => 'admin/content/webform', 'title' => t('Webforms'),
304c309,314
< $links[]= l(t('go to form'), "node/$node->nid", array ('title' => t('View this form.'), 'class' => 'read-more'));
---
> #--#$links[]= l(t('go to form'), "node/$node->nid", array ('title' => t('View this form.'), 'class' => 'read-more'));
> $links['webform_goto'] = array(
> '#title' => t('go to form'),
> '#href' => "node/$node->nid",
> '#attributes' => array ('title' => t('View this form.'),'class' => 'read-more')
> );
651a662,691
> if (user_access('use PHP for additional processing')) {
> $form['advanced']['additional_validate'] = array(
> '#type' => 'textarea',
> '#title' => 'Additional Validation',
> '#description' => t('Enter PHP code to preform additional validation for this form. Include the <?php ?> tags. $form_id and $form_values are available variables. If validation fails, use the form_set_error function to prevent the form from being submitted. Use the same syntax as a _validate function used in the Forms API.'),
> '#default_value' => $node->additional_validate,
> '#cols' => 40,
> '#rows' => 10,
> );
>
> $form['advanced']['additional_submit'] = array(
> '#type' => 'textarea',
> '#title' => 'Additional Processing',
> '#description' => t('Enter PHP code to preform additional processing for this form (after the validation). Include the <?php ?> tags. $form_id and $form_values are available variables, use the same syntax as a _submit function used in the Forms API.'),
> '#default_value' => $node->additional_submit,
> '#cols' => 40,
> '#rows' => 10,
> );
> }
> else {
> $form['advanced']['additional_validate'] = array(
> '#type' => 'value',
> '#value' => $node->additional_validate,
> );
>
> $form['advanced']['additional_submit'] = array(
> '#type' => 'value',
> '#value' => $node->additional_submit,
> );
> }
737c777
< return form_render($form);
---
> return drupal_render($form);
1070a1111,1115
>
> if (trim($node->additional_validate)) {
> // We use eval here (rather than drupal_eval) because the user needs access to local variables
> eval("?>".$node->additional_validate);
> }
1157a1203,1207
>
> if (trim($node->additional_submit)) {
> // We use eval here (rather than drupal_eval) because the user needs access to local variables
> eval("?>".$node->additional_submit);
> }
Only in webform: webform_links.patch
diff webform-4.7.4/webform_report.inc webform/webform_report.inc
2c2
< // $Id: webform_report.inc,v 1.7.2.4 2006/09/16 07:04:41 quicksketch Exp $
---
> // $Id: webform_report.inc,v 1.15 2006/09/16 06:43:21 quicksketch Exp $