Index: components/date.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/date.inc,v
retrieving revision 1.15.2.12
diff -u -r1.15.2.12 date.inc
--- components/date.inc 7 Oct 2008 22:53:35 -0000 1.15.2.12
+++ components/date.inc 8 Oct 2008 06:41:03 -0000
@@ -437,4 +437,4 @@
$day_of_week = 'Dlw';
$special = ',-: ';
return trim($format, $time . $day_of_week . $special);
-}
\ No newline at end of file
+}
Index: components/file.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/file.inc,v
retrieving revision 1.4.2.22
diff -u -r1.4.2.22 file.inc
--- components/file.inc 21 Sep 2008 03:20:50 -0000 1.4.2.22
+++ components/file.inc 8 Oct 2008 06:40:57 -0000
@@ -26,7 +26,6 @@
);
}
-
/**
* Create a set of form items to be displayed on the form for editing this component.
* Use care naming the form items, as this correlates directly to the database schema.
Index: components/grid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/grid.inc,v
retrieving revision 1.3.2.11
diff -u -r1.3.2.11 grid.inc
--- components/grid.inc 21 Sep 2008 03:20:50 -0000 1.3.2.11
+++ components/grid.inc 8 Oct 2008 06:40:43 -0000
@@ -122,7 +122,7 @@
return $form_item;
}
-/**
+/**
* Display the result of a grid submission. The output of this function will be
* displayed under the "results" tab then "submissions"
* @param $data
@@ -144,10 +144,10 @@
return $form_item;
}
-/**
+/**
* Translates the submitted 'safe' form values back into their un-edited
* original form.
- *
+ *
* @param $data
* The POST data associated with the component
* @param $component
@@ -198,7 +198,7 @@
return $output;
}
-/**
+/**
* function _webform_help_select
* Module specific instance of hook_help
**/
@@ -223,11 +223,11 @@
);
}
-/**
+/**
* Calculate and returns statistics about results for this component from all
* submission to this webform. The output of this function will be displayed
* under the "results" tab then "analysis".
- *
+ *
* @param $component
* An array of information describing the component, directly correlating to
* the webform_component database schema.
@@ -268,7 +268,7 @@
return array(array(array('data' => $output, 'colspan' => 2)));
}
-/**
+/**
* function _webform_table_data_select
* Return the result of this component's submission for display in a table. The output of this function will be displayed under the "results" tab then "table"
* @param $data An array of information containing the submission result, directly correlating to the webform_submitted_data database schema
@@ -290,11 +290,11 @@
return $output;
}
-/**
+/**
* Return the header information for this component to be displayed in a comma
* seperated value file. The output of this function will be displayed under
* the "results" tab then "download".
- *
+ *
* @param $component
* An array of information describing the component, directly correlating to
* the webform_component database schema.
@@ -322,10 +322,10 @@
return $header;
}
-/**
+/**
* Return the result of a textfield submission. The output of this function will
* be displayed under the "results" tab then "submissions".
- *
+ *
* @param $data
* An array of information containing the submission result, directly
* correlating to the webform_submitted_data database schema.
Index: components/time.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/time.inc,v
retrieving revision 1.16.2.6
diff -u -r1.16.2.6 time.inc
--- components/time.inc 6 Sep 2008 20:51:40 -0000 1.16.2.6
+++ components/time.inc 8 Oct 2008 06:40:17 -0000
@@ -390,4 +390,4 @@
$element['#children'] = ''. drupal_render($element['hour']) . drupal_render($element['minute']) . drupal_render($element['ampm']) .'
';
return theme('form_element', $element, $element['#children']);
-}
\ No newline at end of file
+}
Index: tests/components.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/tests/Attic/components.test,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 components.test
--- tests/components.test 6 Sep 2008 03:12:37 -0000 1.1.2.1
+++ tests/components.test 8 Oct 2008 06:42:11 -0000
@@ -21,4 +21,4 @@
function setUp() {
parent::setUp();
}
-}
\ No newline at end of file
+}
Index: tests/permissions.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/tests/Attic/permissions.test,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 permissions.test
--- tests/permissions.test 6 Sep 2008 03:12:37 -0000 1.1.2.1
+++ tests/permissions.test 8 Oct 2008 06:42:09 -0000
@@ -60,4 +60,4 @@
* Create webform
*/
-}
\ No newline at end of file
+}
Index: tests/webform.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/tests/Attic/webform.test,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 webform.test
--- tests/webform.test 6 Sep 2008 03:12:37 -0000 1.1.2.1
+++ tests/webform.test 8 Oct 2008 06:41:53 -0000
@@ -56,7 +56,7 @@
foreach ($permissions as $user => $role_permissions) {
$rid = $this->drupalCreateRolePerm($role_permissions);
-
+
$ua = array();
$ua['name'] = $this->randomName();
$ua['mail'] = $ua['name'] . '@localhost';
@@ -65,7 +65,7 @@
$ua['status'] = 1;
// Add a sample profile field for testing %profile values.
$ua['profile_gender'] = 'Male';
-
+
$this->webform_users[$user] = user_save('', $ua);
$this->webform_users[$user]->pass_raw = $ua['pass'];
}
@@ -89,7 +89,7 @@
}
/**
- *
+ *
*/
function webformReset() {
$this->_webform_node = NULL;
Index: webform-confirmation.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/Attic/webform-confirmation.tpl.php,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 webform-confirmation.tpl.php
--- webform-confirmation.tpl.php 29 Jun 2008 23:19:09 -0000 1.1.2.1
+++ webform-confirmation.tpl.php 8 Oct 2008 06:41:12 -0000
@@ -21,4 +21,4 @@
\ No newline at end of file
+
Index: webform-form.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/Attic/webform-form.tpl.php,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 webform-form.tpl.php
--- webform-form.tpl.php 29 Jun 2008 23:19:09 -0000 1.1.2.1
+++ webform-form.tpl.php 8 Oct 2008 06:41:09 -0000
@@ -26,4 +26,4 @@
// Always print out the entire $form. This renders the remaining pieces of the
// form that haven't yet been rendered above.
print drupal_render($form);
-?>
\ No newline at end of file
+?>
Index: webform.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.info,v
retrieving revision 1.3
diff -u -r1.3 webform.info
--- webform.info 24 Feb 2008 20:28:16 -0000 1.3
+++ webform.info 8 Oct 2008 06:41:29 -0000
@@ -1,4 +1,4 @@
; $Id: $
name = Webform
description = Enables the creation of forms and questionnaires.
-core = 6.x
\ No newline at end of file
+core = 6.x
Index: webform.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.install,v
retrieving revision 1.22.2.12
diff -u -r1.22.2.12 webform.install
--- webform.install 5 Oct 2008 19:48:48 -0000 1.22.2.12
+++ webform.install 8 Oct 2008 06:41:26 -0000
@@ -806,7 +806,7 @@
}
/**
- * Set the upgrade
+ * Set the upgrade
*/
/**
Index: webform.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.module,v
retrieving revision 1.124.2.62
diff -u -r1.124.2.62 webform.module
--- webform.module 7 Oct 2008 21:52:12 -0000 1.124.2.62
+++ webform.module 8 Oct 2008 06:41:19 -0000
@@ -3,11 +3,11 @@
/**
* This module provides a simple way to create forms and questionnaires.
- *
+ *
* The initial development of this module was sponsered by ÅF Industri AB, Open
* Source City and Karlstad University Library. Continued development sponsored
* by Lullabot.
- *
+ *
* @author Nathan Haug
* @author Pontus Ullgren
*/
@@ -441,7 +441,7 @@
/**
* Implementation of hook_file_download().
- *
+ *
* Only allow users with view webform submissions to download files.
*/
function webform_file_download($file) {
@@ -1007,7 +1007,7 @@
/**
* Submit handler for the webform node form.
- *
+ *
* Redirect the user to the components form on new node inserts. Note that this
* fires after the hook_submit() function above.
*/
@@ -1339,13 +1339,13 @@
* Client form generation function. If this is displaying an existing
* submission, pass in the $submission variable with the contents of the
* submission to be displayed.
- *
+ *
* @param $form_state
* The current form values of a submission, used in multipage webforms.
* @param $node
* The current webform node.
* @param $submission
- * An object containing information about the form submission if we're
+ * An object containing information about the form submission if we're
* displaying a result.
* @param $enabled
* If displaying a result, specify if form elements are enabled for
@@ -1914,11 +1914,11 @@
/**
* Prepare to theme the fields portion of the e-mails sent by webform.
- *
+ *
* This function calls itself recursively to maintain the tree structure of
* components in the webform. It is called intially by
* theme_webform_create_mailmessage().
- *
+ *
* @param $cid
* The parent component ID we're currently printing.
* @param $value
@@ -1976,7 +1976,7 @@
/**
* Theme the headers when sending an email from webform.
- *
+ *
* @param $form_values
* An array of all form values submitted by the user. The array contains three
* keys containing the following:
@@ -2125,7 +2125,7 @@
/**
* Given a form_key and a list of form_key parents, determine the cid.
- *
+ *
* @param $node
* A fully loaded node object.
* @param $form_key
@@ -2200,8 +2200,8 @@
}
$new = str_replace(
- array(' ', '€', 'ƒ', 'Š', 'Ž', 'š', 'ž', 'Ÿ', '¢', '¥', 'µ', 'À', 'Á', 'Â', 'Ã', 'Ä', 'Å', 'Ç', 'È', 'É', 'Ê', 'Ë', 'Ì', 'Í', 'Î', 'Ï', 'Ñ', 'Ò', 'Ó', 'Ô', 'Õ', 'Ö', 'Ø', 'Ù', 'Ú', 'Û', 'Ü', 'Ý', 'à', 'á', 'â', 'ã', 'ä', 'å', 'ç', 'è', 'é', 'ê', 'ë', 'ì', 'í', 'î', 'ï', 'ñ', 'ò', 'ó', 'ô', 'õ', 'ö', 'ø', 'ù', 'ú', 'û', 'ü', 'ý', 'ÿ', 'Œ', 'œ', 'Æ', 'Ð', 'Þ', 'ß', 'æ', 'ð', 'þ'),
- array('_', 'E', 'f', 'S', 'Z', 's', 'z', 'Y', 'c', 'Y', 'u', 'A', 'A', 'A', 'A', 'A', 'A', 'C', 'E', 'E', 'E', 'E', 'I', 'I', 'I', 'I', 'N', 'O', 'O', 'O', 'O', 'O', 'O', 'U', 'U', 'U', 'U', 'Y', 'a', 'a', 'a', 'a', 'a', 'a', 'c', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i', 'n', 'o', 'o', 'o', 'o', 'o', 'o', 'u', 'u', 'u', 'u', 'y', 'y', 'OE', 'oe', 'AE', 'DH', 'TH', 'ss', 'ae', 'dh', 'th'),
+ array(' ', '€', 'ƒ', 'Š', 'Ž', 'š', 'ž', 'Ÿ', '¢', '¥', 'µ', 'À', 'Á', 'Â', 'Ã', 'Ä', 'Å', 'Ç', 'È', 'É', 'Ê', 'Ë', 'Ì', 'Í', 'Î', 'Ï', 'Ñ', 'Ò', 'Ó', 'Ô', 'Õ', 'Ö', 'Ø', 'Ù', 'Ú', 'Û', 'Ü', 'Ý', 'à', 'á', 'â', 'ã', 'ä', 'å', 'ç', 'è', 'é', 'ê', 'ë', 'ì', 'í', 'î', 'ï', 'ñ', 'ò', 'ó', 'ô', 'õ', 'ö', 'ø', 'ù', 'ú', 'û', 'ü', 'ý', 'ÿ', 'Œ', 'œ', 'Æ', 'Ð', 'Þ', 'ß', 'æ', 'ð', 'þ'),
+ array('_', 'E', 'f', 'S', 'Z', 's', 'z', 'Y', 'c', 'Y', 'u', 'A', 'A', 'A', 'A', 'A', 'A', 'C', 'E', 'E', 'E', 'E', 'I', 'I', 'I', 'I', 'N', 'O', 'O', 'O', 'O', 'O', 'O', 'U', 'U', 'U', 'U', 'Y', 'a', 'a', 'a', 'a', 'a', 'a', 'c', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i', 'n', 'o', 'o', 'o', 'o', 'o', 'o', 'u', 'u', 'u', 'u', 'y', 'y', 'OE', 'oe', 'AE', 'DH', 'TH', 'ss', 'ae', 'dh', 'th'),
trim($name));
$new = drupal_strtolower($new);
$new = preg_replace('/[^a-z0-9_]/', '', $new);
@@ -2211,12 +2211,12 @@
/**
* Given a set of components, determine which one are appropriate for a
* particular use, such as an email address or subject.
- *
+ *
* @param $components
* An array of components.
* @param $type
* Either 'email' or 'string' (for use as subject or from value).
- *
+ *
*/
function _webform_component_options($components, $type) {
$acceptable_types = $type == 'email' ? array('email', 'select', 'hidden') : array('textfield', 'select', 'hidden');
Index: webform_components.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform_components.inc,v
retrieving revision 1.9.2.20
diff -u -r1.9.2.20 webform_components.inc
--- webform_components.inc 7 Oct 2008 21:52:12 -0000 1.9.2.20
+++ webform_components.inc 8 Oct 2008 06:41:42 -0000
@@ -3,7 +3,7 @@
/**
* Provides interface and database handling for editing components of a webform.
- *
+ *
* @author Nathan Haug
*/
@@ -201,7 +201,7 @@
}
// Add the add form if this was the last edited component.
- if (isset($_GET['cid']) && $component['cid'] == $_GET['cid'] && $add_form) {
+ if (isset($_GET['cid']) && $component['cid'] == $_GET['cid'] && $add_form) {
$add_form['data'][0] = $indents . $add_form['data'][0];
$rows[] = $add_form;
$add_form = FALSE;
@@ -486,7 +486,7 @@
/**
* Insert a new component into the database.
- *
+ *
* @param $component
* A full component containing fields from the component form.
*/
@@ -502,7 +502,7 @@
/**
* Update an existing component with new values.
- *
+ *
* @param $component
* A full component containing a nid, cid, and all other fields from the
* component form. Additional properties are stored in the extra array.
@@ -581,4 +581,4 @@
}
}
}
-}
\ No newline at end of file
+}
Index: webform_export.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/Attic/webform_export.inc,v
retrieving revision 1.1.4.2
diff -u -r1.1.4.2 webform_export.inc
--- webform_export.inc 21 Sep 2008 03:20:51 -0000 1.1.4.2
+++ webform_export.inc 8 Oct 2008 06:41:40 -0000
@@ -161,4 +161,4 @@
drupal_set_header("Content-Type: application/x-msexcel");
drupal_set_header("Content-Disposition: attachment; filename=$filename.xls");
}
-}
\ No newline at end of file
+}
Index: webform_report.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform_report.inc,v
retrieving revision 1.17.2.8
diff -u -r1.17.2.8 webform_report.inc
--- webform_report.inc 7 Oct 2008 21:41:03 -0000 1.17.2.8
+++ webform_report.inc 8 Oct 2008 06:41:38 -0000
@@ -3,14 +3,14 @@
/**
* This file includes helper functions for creating reports for webform.module
- *
+ *
* @author Nathan Haug
* @author Pontus Ullgren
* @copyright Pontus Ullgren 2004
*/
-// All functions within this file need the webform_submissions.inc.
-module_load_include('inc', 'webform', 'webform_submissions');
+// All functions within this file need the webform_submissions.inc.
+module_load_include('inc', 'webform', 'webform_submissions');
/**
* Retrieve lists of submissions for a given webform.
@@ -31,7 +31,7 @@
/**
* Theme the header of the submissions table.
- *
+ *
* This is done in it's own function so that webform can retrieve the header and
* use it for sorting the results.
*/
@@ -51,7 +51,7 @@
/**
* Theme the submissions tab of the webform results page.
- *
+ *
* @param $node
* The node whose results are being displayed.
* @param $submissions
@@ -120,7 +120,7 @@
/**
* Theme the results table displaying all the submissions for a particular node.
- *
+ *
* @param $node
* The node whose results are being displayed.
* @param $components
@@ -173,7 +173,7 @@
/**
* Delete all submissions for a node.
- *
+ *
* @param $nid
* The node id whose submissions will be deleted.
*/
@@ -187,7 +187,7 @@
/**
* Confirmation form to delete all submissions for a node.
- *
+ *
* @param $nid
* ID of node for which to clear submissions.
*/
@@ -262,7 +262,7 @@
/**
* Generate a Excel-readable CSV file containing all submissions for a Webform.
- *
+ *
* The CSV requires that the data be presented in a flat file. In order
* to maximize usability to the Excel community and minimize subsequent
* stats or spreadsheet programming this program extracts data from the
@@ -276,21 +276,21 @@
* Heading line 2: gives column headings
* Data line 1 .....
* Data line 2 .....
- *
+ *
* An example of this format is given below. Note the columns have had spaces
* added so the columns line up. This is not the case with actual file where
* a column may be null. Note also, that multiple choice questions as produced
* by checkboxes or radio buttons have been presented as "yes" or "no" and the
* actual choice text is retained only in the header line 2.
* Data from text boxes and input fields are written out in the body of the table.
- *
+ *
* Submission Details, , , ,Question 1, , ,.., ,Question 2, , ,.., ,Question n
* timestamp ,time,SID,userid,Choice 1 ,Choice 2,Choice 3,..,Choice n,Choice 1 ,Choice 2,Choice 3,..,Choice n,Comment
* 21 Feb 2005 ,1835,23 ,34 ,X , , ,.., ,X ,X ,X ,..,X ,My comment
* 23 Feb 2005 ,1125,24 ,89 ,X ,X , ,.., ,X ,X ,X ,..,X ,Hello
* .................................................................................................................................
* 27 Feb 2005 ,1035,56 ,212 ,X , , ,.., ,X ,X ,X ,..,X ,How is this?
- *
+ *
*/
function webform_results_download($node, $format = 'delimiter', $options = array()) {
module_load_include('inc', 'webform', 'webform_export');
Index: webform_submissions.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform_submissions.inc,v
retrieving revision 1.6.2.17
diff -u -r1.6.2.17 webform_submissions.inc
--- webform_submissions.inc 7 Oct 2008 21:43:38 -0000 1.6.2.17
+++ webform_submissions.inc 8 Oct 2008 06:41:35 -0000
@@ -64,7 +64,7 @@
/**
* Delete a single submission.
- *
+ *
* @param $nid
* ID of node for which this webform was submitted.
* @param $sid
@@ -86,7 +86,7 @@
/**
* Confirm form to delete a single form submission.
- *
+ *
* @param $form_state
* The current form state.
* @param $node
@@ -114,7 +114,7 @@
/**
* Return all the submissions for a particular node.
- *
+ *
* @param $nid
* The node ID for which submissions are being fetched.
* @param $header