Index: webform.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.module,v
retrieving revision 1.196
diff -u -r1.196 webform.module
--- webform.module	3 Mar 2010 00:53:27 -0000	1.196
+++ webform.module	3 Mar 2010 02:45:36 -0000
@@ -63,8 +63,8 @@
       ", array('!webform-types-message' => $types_message, '!create-content' => url('node/add'), '!types' => $types));
       break;
     case 'node/%/webform/components':
-      $output .= '<p>'. t('This page displays all the components currently configured for this webform node. You may add any number of components to the form, even multiple of the same type. To add a new component, fill in a name and select a type from the fields at the bottom of the table. Submit the form to create the new component or update any changed form values.') .'</p>';
-      $output .= '<p>'. t('Click on any existing component\'s name to edit its settings.') .'</p>';
+      $output .= '<p>' . t('This page displays all the components currently configured for this webform node. You may add any number of components to the form, even multiple of the same type. To add a new component, fill in a name and select a type from the fields at the bottom of the table. Submit the form to create the new component or update any changed form values.') . '</p>';
+      $output .= '<p>' . t('Click on any existing component\'s name to edit its settings.') . '</p>';
       break;
   }
 
@@ -459,7 +459,7 @@
   if (variable_get('node_admin_theme', '0') && arg(0) == 'node' && (arg(2) == 'webform' || arg(2) == 'webform-results')) {
     global $custom_theme;
     $custom_theme = variable_get('admin_theme', '0');
-    drupal_add_css(drupal_get_path('module', 'system') .'/admin.css', 'module');
+    drupal_add_css(drupal_get_path('module', 'system') . '/admin.css', 'module');
 
     // Support for Admin module (1.x).
     if (function_exists('_admin_init_theme')) {
@@ -980,7 +980,7 @@
     if ($teaser && !$node->webform['teaser']) {
       $links['webform_goto'] = array(
         'title' => t('Go to form'),
-        'href' => 'node/'. $node->nid,
+        'href' => 'node/' . $node->nid,
         'attributes' => array('title' => t('View this form.'), 'class' => 'read-more')
       );
     }
@@ -1016,7 +1016,7 @@
  */
 function webform_form_submit($form, &$form_state) {
   drupal_set_message(t('The new webform %title has been created. Add new fields to your webform with the form below.', array('%title' => $form_state['values']['title'])));
-  $form_state['redirect'] = 'node/'. $form_state['nid'] .'/webform/components';
+  $form_state['redirect'] = 'node/' . $form_state['nid'] . '/webform/components';
 }
 
 /**
@@ -1086,7 +1086,7 @@
   }
 
   // Render the form and generate the output.
-  $form = drupal_get_form('webform_client_form_'. $node->nid, $node, $submission, $is_draft);
+  $form = drupal_get_form('webform_client_form_' . $node->nid, $node, $submission, $is_draft);
   $output = theme('webform_view', $node, $teaser, $page, $form, $enabled);
 
   // Remove the surrounding <form> tag if this is a preview.
@@ -1190,10 +1190,10 @@
   // If the user has submitted before, give them a link to their submissions.
   if ($submission_count > 0 && $node->webform['submit_notice'] == 1 && !$cached) {
     if (empty($message)) {
-      $message = t('You have already submitted this form.') .' '. t('<a href="!url">View your previous submissions</a>.', array('!url' => url('node/'. $node->nid .'/submissions')));
+      $message = t('You have already submitted this form.') . ' ' . t('<a href="!url">View your previous submissions</a>.', array('!url' => url('node/' . $node->nid . '/submissions')));
     }
     else {
-      $message .= ' '. t('<a href="!url">View your previous submissions</a>.', array('!url' => url('node/'. $node->nid .'/submissions')));
+      $message .= ' ' . t('<a href="!url">View your previous submissions</a>.', array('!url' => url('node/' . $node->nid . '/submissions')));
     }
   }
 
@@ -1234,7 +1234,7 @@
   global $user;
 
   // Add a theme function for this form.
-  $form['#theme'] = array('webform_form_'. $node->nid, 'webform_form');
+  $form['#theme'] = array('webform_form_' . $node->nid, 'webform_form');
 
   // Add a css class for all client forms.
   $form['#attributes'] = array('class' => 'webform-client-form');
@@ -1245,7 +1245,7 @@
   // Set the form action to the node ID in case this is being displayed on the
   // teaser, subsequent pages should be on the node page directly.
   if (empty($submission)) {
-    $form['#action'] = url('node/'. $node->nid);
+    $form['#action'] = url('node/' . $node->nid);
   }
 
   $form['#submit'][] = 'webform_client_form_submit';
@@ -1464,7 +1464,7 @@
         $display_element['#parents'] = $parents;
       }
       if (!isset($display_element['#id'])) {
-        $display_element['#id'] = form_clean_id('edit-'. implode('-', $display_element['#parents']));
+        $display_element['#id'] = form_clean_id('edit-' . implode('-', $display_element['#parents']));
       }
       $parent_fieldset[$component['form_key']] = $display_element;
     }
@@ -1537,7 +1537,7 @@
     // Support for Drupal 5 validation code.
     $form_values =& $form_state['values'];
     // We use eval here (rather than drupal_eval) because the user needs access to local variables.
-    eval('?>'. $node->webform['additional_validate']);
+    eval('?>' . $node->webform['additional_validate']);
 
     // Restore the original form state so that the submit handler can reflatten.
     $form_state['values']['submitted'] = $form_state['values']['submitted_tree'];
@@ -1725,7 +1725,7 @@
     // Support for Drupal 5 validation code.
     $form_values =& $form_state['values'];
     // We use eval here (rather than drupal_eval) because the user needs access to local variables.
-    eval('?>'. $node->webform['additional_submit']);
+    eval('?>' . $node->webform['additional_submit']);
   }
 
   // Check if user is submitting as a draft.
@@ -1750,9 +1750,9 @@
     // Set a cookie including the server's submission time.
     // The cookie expires in the length of the interval plus a day to compensate for different timezones.
     if (variable_get('webform_use_cookies', 0)) {
-      $cookie_name = 'webform-'. $node->nid;
+      $cookie_name = 'webform-' . $node->nid;
       $time = time();
-      setcookie($cookie_name .'['. $time .']', $time, $time + $node->webform['submit_interval'] + 86400);
+      setcookie($cookie_name . '[' . $time . ']', $time, $time + $node->webform['submit_interval'] + 86400);
     }
 
     // Save session information about this submission for anonymous users,
@@ -1780,7 +1780,7 @@
 
       // Pass through the theme layer if using the default template.
       if ($email['template'] == 'default') {
-        $email['message'] = theme(array('webform_mail_'. $node->nid, 'webform_mail', 'webform_mail_message'), $node, $submission, $cid);
+        $email['message'] = theme(array('webform_mail_' . $node->nid, 'webform_mail', 'webform_mail_message'), $node, $submission, $cid);
       }
       else {
         $email['message'] = $email['template'];
@@ -1790,7 +1790,7 @@
       $email['message'] = _webform_filter_values($email['message'], $node, $submission, $email, FALSE, TRUE);
 
       // Build the e-mail headers.
-      $email['headers'] = theme(array('webform_mail_headers_'. $node->nid, 'webform_mail_headers'), $node, $submission, $cid);
+      $email['headers'] = theme(array('webform_mail_headers_' . $node->nid, 'webform_mail_headers'), $node, $submission, $cid);
 
       // Assemble the FROM string.
       if (isset($email['headers']['From'])) {
@@ -1843,7 +1843,7 @@
       foreach ($addresses_final as $address) {
         // Verify that this submission is not attempting to send any spam hacks.
         if (_webform_submission_spam_check($address, $email['subject'], $email['from'], $email['headers'])) {
-          watchdog('webform', 'Possible spam attempt from @remote_addr'."<br />\n". nl2br(htmlentities($email['message'])), array('@remote_add' => ip_address()));
+          watchdog('webform', 'Possible spam attempt from @remote_addr' . "<br />\n" . nl2br(htmlentities($email['message'])), array('@remote_add' => ip_address()));
           drupal_set_message(t('Illegal information. Data not submitted.'), 'error');
           return FALSE;
         }
@@ -1860,7 +1860,7 @@
   
         // Debugging output for email.
         if (variable_get('webform_debug', 0) >= 2) {
-          drupal_set_message('E-mail Headers: <pre>'. check_plain(print_r($headers[$cid], TRUE)) .'</pre>To: '. check_plain($address) .'<br />From: '. check_plain($email['from']) .'<br />Subject: '. check_plain($email['subject']) .'<br />E-mail Body: <pre>'. check_plain($email['message']) .'</pre>');
+          drupal_set_message('E-mail Headers: <pre>' . check_plain(print_r($headers[$cid], TRUE)) . '</pre>To: ' . check_plain($address) . '<br />From: ' . check_plain($email['from']) . '<br />Subject: ' . check_plain($email['subject']) . '<br />E-mail Body: <pre>' . check_plain($email['message']) . '</pre>');
         }
       }
 
@@ -1869,14 +1869,14 @@
 
   // More debugging output.
   if (variable_get('webform_debug', 0) >= 2) {
-    drupal_set_message('$form_state is: <pre>'. htmlentities(print_r($form_state, TRUE)) .'</pre>');
-    drupal_set_message('$_SERVER is: <pre>'. htmlentities(print_r($_SERVER, TRUE)) .'</pre>');
-    drupal_set_message('$_POST is: <pre>'. htmlentities(print_r($_POST, TRUE)) .'</pre>');
+    drupal_set_message('$form_state is: <pre>' . htmlentities(print_r($form_state, TRUE)) . '</pre>');
+    drupal_set_message('$_SERVER is: <pre>' . htmlentities(print_r($_SERVER, TRUE)) . '</pre>');
+    drupal_set_message('$_POST is: <pre>' . htmlentities(print_r($_POST, TRUE)) . '</pre>');
   }
 
   // Log to watchdog if normal debug is on.
   if (variable_get('webform_debug', 0) >= 1) {
-    watchdog('webform', 'Submission posted to %title. <a href="!url">Results</a>. !details', array('%title' => $node->title, '!url' => url('node/'. $node->nid .'/submission/'. $sid), '!results' => "<br />\n<pre>". htmlentities(print_r($form_state['values'], TRUE)) .'</pre>'));
+    watchdog('webform', 'Submission posted to %title. <a href="!url">Results</a>. !details', array('%title' => $node->title, '!url' => url('node/' . $node->nid . '/submission/' . $sid), '!results' => "<br />\n<pre>" . htmlentities(print_r($form_state['values'], TRUE)) . '</pre>'));
   }
 
   // Strip out empty tags added by WYSIWYG editors if needed.
@@ -1982,7 +1982,7 @@
   drupal_set_title(check_plain($node->title));
   webform_set_breadcrumb($node);
   if (empty($output)) {
-    $output = theme(array('webform_confirmation_'. $node->nid, 'webform_confirmation'), $node, $_GET['sid']);
+    $output = theme(array('webform_confirmation_' . $node->nid, 'webform_confirmation'), $node, $_GET['sid']);
   }
   return $output;
 }
@@ -2042,17 +2042,17 @@
    $element['#format'] == 'html' ? 'webform-display-item' : 'webform-item',
   );
   $output = '<div class="' . implode(' ', $wrapper_classes) . '" id="' . $element['#id'] . '-wrapper">' . "\n";
-  $required = !empty($element['#required']) ? '<span class="form-required" title="'. t('This field is required.') .'">*</span>' : '';
+  $required = !empty($element['#required']) ? '<span class="form-required" title="' . t('This field is required.') . '">*</span>' : '';
 
   if (!empty($element['#title'])) {
     $title = $element['#title'];
-    $output .= ' <label for="'. $element['#id'] . '">' . t('!title: !required', array('!title' => filter_xss_admin($title), '!required' => $required)) . "</label>\n";
+    $output .= ' <label for="' . $element['#id'] . '">' . t('!title: !required', array('!title' => filter_xss_admin($title), '!required' => $required)) . "</label>\n";
   }
 
-  $output .= '<div id="' . $element['#id'] . '">' . $value . '</div>'. "\n";
+  $output .= '<div id="' . $element['#id'] . '">' . $value . '</div>' . "\n";
 
   if (!empty($element['#description'])) {
-    $output .= ' <div class="description">'. $element['#description'] ."</div>\n";
+    $output .= ' <div class="description">' . $element['#description'] . "</div>\n";
   }
 
   $output .= "</div>\n";
@@ -2133,7 +2133,7 @@
  */
 function theme_webform_mail_headers($node, $submission, $cid) {
   $headers = array(
-    'X-Mailer' => 'Drupal Webform (PHP/'. phpversion() .')',
+    'X-Mailer' => 'Drupal Webform (PHP/' . phpversion() . ')',
   );
   return $headers;
 }
@@ -2211,7 +2211,7 @@
     }
 
     // Submission edit URL.
-    $replacements['unsafe']['%submission_url'] = url('node/'. $node->nid .'/submission/'. $submission->sid, array('absolute' => TRUE));
+    $replacements['unsafe']['%submission_url'] = url('node/' . $node->nid . '/submission/' . $submission->sid, array('absolute' => TRUE));
   }
 
   // Token for the entire form tree for e-mails.
@@ -2263,12 +2263,12 @@
         foreach ($variable as $key => $value) {
           // This special case for profile module dates.
           if ($token == '%profile' && is_array($value) && isset($value['year'])) {
-            $replacement = format_date(strtotime($value['month'] .'/'. $value['day'] .'/'. $value['year']), 'custom', 'F j, Y', '0');
+            $replacement = format_date(strtotime($value['month'] . '/' . $value['day'] . '/' . $value['year']), 'custom', 'F j, Y', '0');
           }
           else {
             $replacement = (!is_array($value) && !is_object($value)) ? $value : '';
           }
-          $replacements[$safe_state][$token .'['. $key .']'] = $replacement;
+          $replacements[$safe_state][$token . '[' . $key . ']'] = $replacement;
         }
       }
     }
@@ -2296,7 +2296,7 @@
   // Clean up any unused tokens.
   foreach ($special_tokens as $safe_state => $tokens) {
     foreach (array_keys($tokens) as $token) {
-      $string = preg_replace('/\\'. $token .'\[\w+\]/', '', $string);
+      $string = preg_replace('/\\' . $token . '\[\w+\]/', '', $string);
     }
   }
 
@@ -2366,15 +2366,15 @@
   );
 
   $special_tokens = array(
-    '%server['. t('key') .']',
-    '%session['. t('key') .']',
-    '%get['. t('key') .']',
-    '%post['. t('key') .']',
-    '%request['. t('key') .']',
+    '%server[' . t('key') . ']',
+    '%session[' . t('key') . ']',
+    '%get[' . t('key') . ']',
+    '%post[' . t('key') . ']',
+    '%request[' . t('key') . ']',
   );
 
   if (module_exists('profile')) {
-    $special_tokens[] = '%profile['. t('key') .']';
+    $special_tokens[] = '%profile[' . t('key') . ']';
   }
 
   if (isset($node)) {
@@ -2397,7 +2397,7 @@
   $output .= theme('item_list', $special_tokens, t('Special variables'));
   $output .= '<p>' . t('You can use %server[key] to add any of the special PHP <a href="http://www.php.net/reserved.variables#reserved.variables.server">$_SERVER</a> variables, %session[key] to add any of the special PHP <a href="http://www.php.net/reserved.variables#reserved.variables.session">$_SESSION</a> variables and %get[key] to create prefilled forms from the <a href="http://www.php.net/reserved.variables#reserved.variables.get">URL</a>. %cookie, %request and %post also work with their respective PHP variables. For example %server[HTTP_USER_AGENT], %session[id], or %get[q].') . '</p>';
   if (module_exists('profile')) {
-    $output .= '<p>'. t('If you are using the Profile module, you can also access all profile data using the syntax %profile[form_name]. If you for example have a profile value named profile_city, add the variable %profile[profile_city].') . '</p>';
+    $output .= '<p>' . t('If you are using the Profile module, you can also access all profile data using the syntax %profile[form_name]. If you for example have a profile value named profile_city, add the variable %profile[profile_city].') . '</p>';
   }
 
   $fieldset = array(
@@ -2405,7 +2405,7 @@
     '#type' => 'fieldset',
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-    '#children' => '<div>'. $output .'</div>',
+    '#children' => '<div>' . $output . '</div>',
   );
   return theme('fieldset', $fieldset);
 }
@@ -2702,7 +2702,7 @@
     $webform_breadcrumb[] = l($node->title, 'node/' . $node->nid);
     if (isset($submission)) {
       $last_link = array_shift($breadcrumb);
-      $webform_breadcrumb[] = l(t('Submissions'), 'node/' . $node->nid .'/submissions');
+      $webform_breadcrumb[] = l(t('Submissions'), 'node/' . $node->nid . '/submissions');
       if (isset($last_link)) {
         $webform_breadcrumb[] = $last_link;
       }
Index: webform.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.install,v
retrieving revision 1.40
diff -u -r1.40 webform.install
--- webform.install	11 Feb 2010 23:31:11 -0000	1.40
+++ webform.install	3 Mar 2010 02:45:35 -0000
@@ -344,9 +344,9 @@
   // Create the default webform type.
   $webform_type = array(
     'type' => 'webform',
-    'name' => t('Webform'),
+    'name' => st('Webform'),
     'module' => 'node',
-    'description' => t('Create a new form or questionnaire accessible to users. Submission results and statistics are recorded and accessible to privileged users.'),
+    'description' => st('Create a new form or questionnaire accessible to users. Submission results and statistics are recorded and accessible to privileged users.'),
     'custom' => TRUE,
     'modified' => TRUE,
     'locked' => FALSE,
@@ -369,10 +369,10 @@
   variable_del('webform_csv_delimiter');
 
   $component_list = array();
-  $path = drupal_get_path('module', 'webform') .'/components';
+  $path = drupal_get_path('module', 'webform') . '/components';
   $files = file_scan_directory($path, '^.*\.inc$');
   foreach ($files as $filename => $file) {
-    variable_del('webform_enable_'. $file->name, 1);
+    variable_del('webform_enable_' . $file->name, 1);
   }
 
   // Delete uploaded files.
@@ -533,7 +533,7 @@
  */
 function webform_update_6204() {
   $ret = array();
-  $ret[] = update_sql("UPDATE {files} SET status = 1 WHERE filepath LIKE '". file_directory_path() ."/webform/%'");
+  $ret[] = update_sql("UPDATE {files} SET status = 1 WHERE filepath LIKE '" . file_directory_path() . "/webform/%'");
   return $ret;
 }
 
@@ -853,7 +853,7 @@
   $result = db_query("SELECT r.rid, p.perm FROM {role} r INNER JOIN {permission} p ON p.rid = r.rid");
   while ($role = db_fetch_object($result)) {
     $perms = explode(',', $role->perm);
-    foreach($perms as $id => $perm) {
+    foreach ($perms as $id => $perm) {
       $perms[$id] = trim($perm);
     }
     $ret[] = update_sql("UPDATE {permission} SET perm = '" . implode(', ', $perms) . "' WHERE rid = " . $role->rid);
@@ -907,7 +907,7 @@
  */
 function _webform_recursive_delete($path) {
   if ($path && is_dir($path)) {
-    $listing = $path .'/*';
+    $listing = $path . '/*';
     foreach (glob($listing) as $file) {
       if (is_file($file) === TRUE) {
         @unlink($file);
Index: components/textfield.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/textfield.inc,v
retrieving revision 1.21
diff -u -r1.21 textfield.inc
--- components/textfield.inc	9 Feb 2010 05:39:08 -0000	1.21
+++ components/textfield.inc	3 Mar 2010 02:45:37 -0000
@@ -60,7 +60,7 @@
     '#type' => 'textfield',
     '#title' => t('Width'),
     '#default_value' => $component['extra']['width'],
-    '#description' => t('Width of the textfield.') .' '. t('Leaving blank will use the default size.'),
+    '#description' => t('Width of the textfield.') . ' ' . t('Leaving blank will use the default size.'),
     '#size' => 5,
     '#maxlength' => 10,
     '#weight' => 0,
@@ -131,7 +131,7 @@
     '#field_suffix'  => empty($component['extra']['field_suffix']) ? NULL : check_plain($component['extra']['field_suffix']),
     '#description'   => $filter ? _webform_filter_descriptions($component['extra']['description']) : $component['extra']['description'],
     '#attributes'    => $component['extra']['attributes'],
-    '#prefix'        => '<div class="webform-component-'. $component['type'] .'" id="webform-component-'. $component['form_key'] .'">',
+    '#prefix'        => '<div class="webform-component-' . $component['type'] . '" id="webform-component-' . $component['form_key'] . '">',
     '#suffix'        => '</div>',
     '#webform_component' => $component,
     '#element_validate' => array(),
@@ -234,11 +234,11 @@
  */
 function _webform_analysis_textfield($component, $sids = array()) {
   $placeholders = count($sids) ? array_fill(0, count($sids), "'%s'") : array();
-  $sidfilter = count($sids) ? " AND sid in (".implode(",", $placeholders).")" : "";
-  $query = 'SELECT data '.
-    ' FROM {webform_submitted_data} '.
-    ' WHERE nid = %d '.
-    ' AND cid = %d '. $sidfilter;
+  $sidfilter = count($sids) ? " AND sid in (" . implode(",", $placeholders) . ")" : "";
+  $query = 'SELECT data ' .
+    ' FROM {webform_submitted_data} ' .
+    ' WHERE nid = %d ' .
+    ' AND cid = %d ' . $sidfilter;
   $nonblanks = 0;
   $submissions = 0;
   $wordcount = 0;
Index: components/time.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/time.inc,v
retrieving revision 1.24
diff -u -r1.24 time.inc
--- components/time.inc	10 Feb 2010 08:38:20 -0000	1.24
+++ components/time.inc	3 Mar 2010 02:45:37 -0000
@@ -50,7 +50,7 @@
     '#type' => 'textfield',
     '#title' => t('Default value'),
     '#default_value' => $component['value'],
-    '#description' => t('The default value of the field.') .'<br />'. t('Accepts a time in any <a href="http://www.gnu.org/software/tar/manual/html_chapter/Date-input-formats.html">GNU Date Input Format</a>. Strings such as now, +2 hours, and 10:30pm are all valid.'),
+    '#description' => t('The default value of the field.') . '<br />' . t('Accepts a time in any <a href="http://www.gnu.org/software/tar/manual/html_chapter/Date-input-formats.html">GNU Date Input Format</a>. Strings such as now, +2 hours, and 10:30pm are all valid.'),
     '#size' => 60,
     '#maxlength' => 127,
     '#weight' => 0,
@@ -145,7 +145,7 @@
     '#required' => $component['mandatory'],
     '#weight' => $component['weight'],
     '#description' => _webform_filter_descriptions($component['extra']['description']),
-    '#prefix' => '<div class="webform-component-'. $component['type'] .'" id="webform-component-'. $component['form_key'] .'">',
+    '#prefix' => '<div class="webform-component-' . $component['type'] . '" id="webform-component-' . $component['form_key'] . '">',
     '#suffix' => '</div>',
     '#theme' => 'webform_time',
     '#element_validate' => array('webform_validate_time'),
@@ -177,7 +177,7 @@
   
     // Match the hourly data to the hour format.
     if ($value[1]) {
-      $timestamp = strtotime($value[0] .':'. $value[1] . (isset($value[2]) ? $value[2] : ''));
+      $timestamp = strtotime($value[0] . ':' . $value[1] . (isset($value[2]) ? $value[2] : ''));
       if ($component['extra']['hourformat'] == '24-hour') {
         $element['hour']['#default_value'] = date('H', $timestamp);
       }
@@ -242,10 +242,10 @@
   $output = ' ';
   if ($element['#value']['hour'] && $element['#value']['minute']) {
     if ($element['#hourformat'] == '24-hour') {
-      $output = $element['#value']['hour'] .':'. $element['#value']['minute'];
+      $output = $element['#value']['hour'] . ':' . $element['#value']['minute'];
     }
     else {
-      $output = $element['#value']['hour'] .':'. $element['#value']['minute'] .' '. $element['#value']['ampm'];
+      $output = $element['#value']['hour'] . ':' . $element['#value']['minute'] . ' ' . $element['#value']['ampm'];
     }
   }
   return $output;
@@ -256,11 +256,11 @@
  */
 function _webform_analysis_time($component, $sids = array()) {
   $placeholders = count($sids) ? array_fill(0, count($sids), "'%s'") : array();
-  $sidfilter = count($sids) ? " AND sid in (".implode(",", $placeholders).")" : "";
-  $query = 'SELECT no,data '.
-    ' FROM {webform_submitted_data} '.
-    ' WHERE nid = %d '.
-    ' AND  cid = %d '. $sidfilter.
+  $sidfilter = count($sids) ? " AND sid in (" . implode(",", $placeholders) . ")" : "";
+  $query = 'SELECT no,data ' .
+    ' FROM {webform_submitted_data} ' .
+    ' WHERE nid = %d ' .
+    ' AND  cid = %d ' . $sidfilter .
     ' ORDER BY sid,no ASC ';
 
   $result = db_query($query, array_merge(array($component['nid'], $component['cid']), $sids));
@@ -279,12 +279,12 @@
               $ampm = $row['data'];
               // Build the full timestamp.
               if (drupal_strlen($hour) > 0 && drupal_strlen($minute) > 0 ) {
-                $timestamps[] = strtotime($hour .':'. $minute .' '. $ampm);
+                $timestamps[] = strtotime($hour . ':' . $minute . ' ' . $ampm);
               }
             }
             else {
               // Build military time.
-              $timestamps[] = strtotime($hour .':'. $minute);
+              $timestamps[] = strtotime($hour . ':' . $minute);
             }
           }
         }
@@ -305,7 +305,7 @@
  */
 function _webform_table_time($component, $value) {
   if (drupal_strlen($value[0]) > 0 && drupal_strlen($value[1]) > 0) {
-    $timestamp = strtotime($value[0] .':'. $value[1] . $value[2]);
+    $timestamp = strtotime($value[0] . ':' . $value[1] . $value[2]);
     if ($component['extra']['hourformat'] == '24-hour') {
       return check_plain(date('H:i', $timestamp));
     }
@@ -334,7 +334,7 @@
  */
 function _webform_csv_data_time($component, $export_options, $value) {
   if (drupal_strlen($value[0]) > 0 && drupal_strlen($value[1]) > 0) {
-    $timestamp = strtotime($value[0] .':'. $value[1] . $value[2]);
+    $timestamp = strtotime($value[0] . ':' . $value[1] . $value[2]);
     if ($component['extra']['hourformat'] == '24-hour') {
       return date('H:i', $timestamp);
     }
@@ -352,7 +352,7 @@
  */
 function theme_webform_time($element) {
   $element['#type'] = 'element';
-  $element['#children'] = '<div class="container-inline">'. drupal_render($element['hour']) . drupal_render($element['minute']) . drupal_render($element['ampm']) .'</div>';
+  $element['#children'] = '<div class="container-inline">' . drupal_render($element['hour']) . drupal_render($element['minute']) . drupal_render($element['ampm']) . '</div>';
 
   return theme('form_element', $element, $element['#children']);
 }
Index: components/textarea.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/textarea.inc,v
retrieving revision 1.20
diff -u -r1.20 textarea.inc
--- components/textarea.inc	9 Feb 2010 05:39:08 -0000	1.20
+++ components/textarea.inc	3 Mar 2010 02:45:37 -0000
@@ -59,7 +59,7 @@
     '#type' => 'textfield',
     '#title' => t('Width'),
     '#default_value' => $component['extra']['cols'],
-    '#description' => t('Width of the textarea.') .' '. t('Leaving blank will use the default size.'),
+    '#description' => t('Width of the textarea.') . ' ' . t('Leaving blank will use the default size.'),
     '#size' => 5,
     '#maxlength' => 10,
     '#parents' => array('extra', 'cols'),
@@ -68,7 +68,7 @@
     '#type' => 'textfield',
     '#title' => t('Height'),
     '#default_value' => $component['extra']['rows'],
-    '#description' => t('Height of the textarea.') .' '. t('Leaving blank will use the default size.'),
+    '#description' => t('Height of the textarea.') . ' ' . t('Leaving blank will use the default size.'),
     '#size' => 5,
     '#maxlength' => 10,
     '#parents' => array('extra', 'rows'),
@@ -108,7 +108,7 @@
     '#cols'          => !empty($component['extra']['cols']) ? $component['extra']['cols'] : 60,
     '#attributes'    => $component['extra']['attributes'],
     '#resizable'     => (bool) $component['extra']['resizable'], // MUST be FALSE to disable.
-    '#prefix'        => '<div class="webform-component-'. $component['type'] .'" id="webform-component-'. $component['form_key'] .'">',
+    '#prefix'        => '<div class="webform-component-' . $component['type'] . '" id="webform-component-' . $component['form_key'] . '">',
     '#suffix'        => '</div>',
   );
 
@@ -194,11 +194,11 @@
  */
 function _webform_analysis_textarea($component, $sids = array()) {
   $placeholders = count($sids) ? array_fill(0, count($sids), "'%s'") : array();
-  $sidfilter = count($sids) ? " AND sid in (".implode(",", $placeholders).")" : "";
-  $query = 'SELECT data '.
-    ' FROM {webform_submitted_data} '.
-    ' WHERE nid = %d '.
-    ' AND cid = %d '. $sidfilter;
+  $sidfilter = count($sids) ? " AND sid in (" . implode(",", $placeholders) . ")" : "";
+  $query = 'SELECT data ' .
+    ' FROM {webform_submitted_data} ' .
+    ' WHERE nid = %d ' .
+    ' AND cid = %d ' . $sidfilter;
   $nonblanks = 0;
   $submissions = 0;
   $wordcount = 0;
Index: components/date.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/date.inc,v
retrieving revision 1.29
diff -u -r1.29 date.inc
--- components/date.inc	1 Mar 2010 00:23:34 -0000	1.29
+++ components/date.inc	3 Mar 2010 02:45:36 -0000
@@ -51,7 +51,7 @@
     '#type' => 'textfield',
     '#title' => t('Default value'),
     '#default_value' => $component['value'],
-    '#description' => t('The default value of the field.') .'<br />'. t('Accepts any date in any <a href="http://www.gnu.org/software/tar/manual/html_chapter/Date-input-formats.html">GNU Date Input Format</a>. Strings such as today, +2 months, and Dec 9 2004 are all valid.'),
+    '#description' => t('The default value of the field.') . '<br />' . t('Accepts any date in any <a href="http://www.gnu.org/software/tar/manual/html_chapter/Date-input-formats.html">GNU Date Input Format</a>. Strings such as today, +2 months, and Dec 9 2004 are all valid.'),
     '#size' => 60,
     '#maxlength' => 127,
     '#weight' => 0,
@@ -115,7 +115,7 @@
     '#weight' => $component['weight'],
     '#type' => 'date',
     '#description' => _webform_filter_descriptions($component['extra']['description']),
-    '#prefix' => '<div class="webform-component-'. $component['type'] .'" id="webform-component-'. $component['form_key'] .'">',
+    '#prefix' => '<div class="webform-component-' . $component['type'] . '" id="webform-component-' . $component['form_key'] . '">',
     '#suffix' => '</div>',
     '#required' => $component['mandatory'],
     '#webform_component' => $component,
@@ -249,7 +249,7 @@
     $start = $component['extra']['year_start'] < $component['extra']['year_end'] ? $component['extra']['year_start'] : $component['extra']['year_end'];
     $end   = $component['extra']['year_start'] > $component['extra']['year_end'] ? $component['extra']['year_start'] : $component['extra']['year_end'];
     if ($element['year']['#value'] < $start || $element['year']['#value'] > $end) {
-      form_set_error($form_key .'][year', t('The entered date needs to be between the years @start and @end.', array('@start' => $start, '@end' => $end)));
+      form_set_error($form_key . '][year', t('The entered date needs to be between the years @start and @end.', array('@start' => $start, '@end' => $end)));
       return;
     }
   }
@@ -292,7 +292,7 @@
 function theme_webform_display_date($element) {
   $output = ' ';
   if ($element['#value']) {
-    $timestamp = webform_strtotime($element['#value']['month'] .'/'. $element['#value']['day'] .'/'. $element['#value']['year']);
+    $timestamp = webform_strtotime($element['#value']['month'] . '/' . $element['#value']['day'] . '/' . $element['#value']['year']);
     $format = webform_date_format('medium');
     $output = format_date($timestamp, 'custom', $format, 0);
   }
@@ -305,11 +305,11 @@
  */
 function _webform_analysis_date($component, $sids = array()) {
   $placeholders = count($sids) ? array_fill(0, count($sids), "'%s'") : array();
-  $sidfilter = count($sids) ? " AND sid in (".implode(",", $placeholders).")" : "";
-  $query = 'SELECT no,data '.
-    ' FROM {webform_submitted_data} '.
-    ' WHERE nid = %d '.
-    ' AND  cid = %d '. $sidfilter.
+  $sidfilter = count($sids) ? " AND sid in (" . implode(",", $placeholders) . ")" : "";
+  $query = 'SELECT no,data ' .
+    ' FROM {webform_submitted_data} ' .
+    ' WHERE nid = %d ' .
+    ' AND  cid = %d ' . $sidfilter .
     ' ORDER BY sid,no ASC ';
 
   $result = db_query($query, array_merge(array($component['nid'], $component['cid']), $sids));
@@ -328,7 +328,7 @@
               $year = $row['data'];
               // Build the full timestamp.
               if (drupal_strlen($month) > 0  && drupal_strlen($day) > 0  && drupal_strlen($year) > 0) {
-                $timestamp = webform_strtotime($month .'/'. $day .'/'. $year);
+                $timestamp = webform_strtotime($month . '/' . $day . '/' . $year);
                 // Add usefull information about this date into an array.
                 $timestamps[$timestamp] = array(
                   date('l', $timestamp), // Day of the week (Monday, Tuesday, etc.).
@@ -356,7 +356,7 @@
  */
 function _webform_table_date($component, $value) {
   if (drupal_strlen($value[0]) > 0 && drupal_strlen($value[1]) > 0 && drupal_strlen($value[2]) > 0) {
-    $timestamp = webform_strtotime($value[0] .'/'. $value[1] .'/'. $value[2]);
+    $timestamp = webform_strtotime($value[0] . '/' . $value[1] . '/' . $value[2]);
     $format = webform_date_format('short');
     return format_date($timestamp, 'custom', $format, 0);
   }
@@ -381,7 +381,7 @@
  */
 function _webform_csv_data_date($component, $export_options, $value) {
   if (drupal_strlen($value[0]) > 0 && drupal_strlen($value[1]) > 0 && drupal_strlen($value[2]) > 0) {
-    $timestamp = webform_strtotime($value[0] .'/'. $value[1] .'/'. $value[2]);
+    $timestamp = webform_strtotime($value[0] . '/' . $value[1] . '/' . $value[2]);
     $format = webform_date_format('short');
     return format_date($timestamp, 'custom', $format, 0);
   }
@@ -409,7 +409,7 @@
  */
 function webform_date_format($size = 'medium') {
     // Format date according to site's given format.
-    $format = variable_get('date_format_'. $size, 'D, m/d/Y - H:i');
+    $format = variable_get('date_format_' . $size, 'D, m/d/Y - H:i');
     $time = 'aABgGhHisueIOPTZ';
     $day_of_week = 'Dlw';
     $special = ',-: ';
Index: components/fieldset.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/fieldset.inc,v
retrieving revision 1.11
diff -u -r1.11 fieldset.inc
--- components/fieldset.inc	28 Feb 2010 23:38:12 -0000	1.11
+++ components/fieldset.inc	3 Mar 2010 02:45:36 -0000
@@ -58,7 +58,7 @@
     '#description'   => $filter ? _webform_filter_descriptions($component['extra']['description']) : $component['extra']['description'],
     '#collapsible'   => $component['extra']['collapsible'],
     '#collapsed'     => $component['extra']['collapsed'],
-    '#attributes'    => array('class' => 'webform-component-'. $component['type'], 'id' => 'webform-component-'. $component['form_key']),
+    '#attributes'    => array('class' => 'webform-component-' . $component['type'], 'id' => 'webform-component-' . $component['form_key']),
   );
 
   return $element;
Index: components/email.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/email.inc,v
retrieving revision 1.28
diff -u -r1.28 email.inc
--- components/email.inc	9 Feb 2010 20:49:47 -0000	1.28
+++ components/email.inc	3 Mar 2010 02:45:36 -0000
@@ -67,7 +67,7 @@
     '#type' => 'textfield',
     '#title' => t('Width'),
     '#default_value' => $component['extra']['width'],
-    '#description' => t('Width of the textfield.') .' '. t('Leaving blank will use the default size.'),
+    '#description' => t('Width of the textfield.') . ' ' . t('Leaving blank will use the default size.'),
     '#size' => 5,
     '#maxlength' => 10,
     '#parents' => array('extra', 'width'),
@@ -115,7 +115,7 @@
     '#weight'        => $component['weight'],
     '#description'   => _webform_filter_descriptions($component['extra']['description']),
     '#attributes'    => $component['extra']['attributes'],
-    '#prefix'        => '<div class="webform-component-'. $component['type'] .'" id="webform-component-'. $component['form_key'] .'">',
+    '#prefix'        => '<div class="webform-component-' . $component['type'] . '" id="webform-component-' . $component['form_key'] . '">',
     '#suffix'        => '</div>',
     '#element_validate'  => array('_webform_validate_email'),
     '#webform_component' => $component,
@@ -230,11 +230,11 @@
  */
 function _webform_analysis_email($component, $sids = array()) {
   $placeholders = count($sids) ? array_fill(0, count($sids), "'%s'") : array();
-  $sidfilter = count($sids) ? " AND sid in (".implode(",", $placeholders).")" : "";
-  $query = 'SELECT data '.
-    ' FROM {webform_submitted_data} '.
-    ' WHERE nid = %d '.
-    ' AND cid = %d '. $sidfilter;
+  $sidfilter = count($sids) ? " AND sid in (" . implode(",", $placeholders) . ")" : "";
+  $query = 'SELECT data ' .
+    ' FROM {webform_submitted_data} ' .
+    ' WHERE nid = %d ' .
+    ' AND cid = %d ' . $sidfilter;
   $nonblanks = 0;
   $submissions = 0;
   $wordcount = 0;
Index: components/hidden.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/hidden.inc,v
retrieving revision 1.21
diff -u -r1.21 hidden.inc
--- components/hidden.inc	9 Feb 2010 05:39:08 -0000	1.21
+++ components/hidden.inc	3 Mar 2010 02:45:37 -0000
@@ -130,11 +130,11 @@
  */
 function _webform_analysis_hidden($component, $sids = array()) {
   $placeholders = count($sids) ? array_fill(0, count($sids), "'%s'") : array();
-  $sidfilter = count($sids) ? " AND sid in (".implode(",", $placeholders).")" : "";
-  $query = 'SELECT data '.
-    ' FROM {webform_submitted_data} '.
-    ' WHERE nid = %d '.
-    ' AND cid = %d '. $sidfilter;
+  $sidfilter = count($sids) ? " AND sid in (" . implode(",", $placeholders) . ")" : "";
+  $query = 'SELECT data ' .
+    ' FROM {webform_submitted_data} ' .
+    ' WHERE nid = %d ' .
+    ' AND cid = %d ' . $sidfilter;
   $nonblanks = 0;
   $submissions = 0;
   $wordcount = 0;
Index: components/file.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/file.inc,v
retrieving revision 1.17
diff -u -r1.17 file.inc
--- components/file.inc	10 Feb 2010 04:03:27 -0000	1.17
+++ components/file.inc	3 Mar 2010 02:45:36 -0000
@@ -127,7 +127,7 @@
       '#type' => 'textfield',
       '#title' => t('Upload Directory'),
       '#default_value' => $component['extra']['savelocation'],
-      '#description' => '<div style="display: block">'. t('Webform uploads are always saved in the site files directory. You may optionally specify a subfolder to store your files.') .'</div>',
+      '#description' => '<div style="display: block">' . t('Webform uploads are always saved in the site files directory. You may optionally specify a subfolder to store your files.') . '</div>',
       '#weight' => 3,
       '#element_validate' => array('_webform_edit_file_check_directory', '_webform_edit_file_validate'),
       '#after_build' => array('_webform_edit_file_check_directory'),
@@ -136,7 +136,7 @@
       '#type' => 'textfield',
       '#title' => t('Width'),
       '#default_value' => $component['extra']['width'],
-      '#description' => t('Width of the file field.') .' '. t('Leaving blank will use the default size.'),
+      '#description' => t('Width of the file field.') . ' ' . t('Leaving blank will use the default size.'),
       '#size' => 5,
       '#maxlength' => 10,
       '#weight' => 4,
@@ -151,10 +151,10 @@
  * Ensure that the destination directory exists and is writable.
  */
 function _webform_edit_file_check_directory($element) {
-  $base_dir = file_directory_path() .'/webform';
+  $base_dir = file_directory_path() . '/webform';
   $base_success = file_check_directory($base_dir, FILE_CREATE_DIRECTORY);
 
-  $destination_dir = $base_dir .'/'. $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)));
@@ -224,7 +224,7 @@
         $checkbox = $checkboxes[$key];
         if ($checkbox['#type'] == 'checkbox') {
           $checkcount++;
-          $jsboxes .= "'". $checkbox['#return_value'] ."',";
+          $jsboxes .= "'" . $checkbox['#return_value'] . "',";
           if ($checkcount <= $per_row) {
             $row[] = array('data' => drupal_render($checkbox));
           }
@@ -247,7 +247,7 @@
       // Add the javascript links.
       $jsboxes = drupal_substr($jsboxes, 0, drupal_strlen($jsboxes) - 1);
       $rows[] = array('data' => $row);
-      $select_link = ' <a href="javascript:check_category_boxes(\''. $filtergroup .'\','. $jsboxes .')">(select)</a>';
+      $select_link = ' <a href="javascript:check_category_boxes(\'' . $filtergroup . '\',' . $jsboxes . ')">(select)</a>';
       $rows[$first_row]['data'][1] = array('data' => $select_link, 'width' => 40);
       unset($form['validation']['filtering']['types'][$filtergroup]);
     }
@@ -273,7 +273,7 @@
   $output = drupal_render($form);
 
   // Prefix the upload location field with the default path for webform.
-  $output = str_replace('Upload Directory: </label>', 'Upload Directory: </label>'. file_directory_path() .'/webform/', $output);
+  $output = str_replace('Upload Directory: </label>', 'Upload Directory: </label>' . file_directory_path() . '/webform/', $output);
 
   return $output;
 }
@@ -302,7 +302,7 @@
   $element['#webform_form_key'] = $form_key;
   $element['#weight'] = $component['weight'];
   $element['#theme'] = 'webform_render_file';
-  $element['#prefix'] = '<div class="webform-component-'. $component['type'] .'" id="webform-component-'. $component['form_key'] .'">';
+  $element['#prefix'] = '<div class="webform-component-' . $component['type'] . '" id="webform-component-' . $component['form_key'] . '">';
   $element['#suffix'] = '</div>';
 
 
@@ -401,9 +401,9 @@
   $extension_list = '';
   if (count($extensions) > 1) {
     for ($n = 0; $n < count($extensions) - 1; $n++) {
-      $extension_list .= $extensions[$n] .', ';
+      $extension_list .= $extensions[$n] . ', ';
     }
-    $extension_list .= 'or '. $extensions[count($extensions)-1];
+    $extension_list .= 'or ' . $extensions[count($extensions) - 1];
   }
   elseif (!empty($extensions)) {
     $extension_list = $extensions[0];
@@ -429,7 +429,7 @@
 
   // Save the file to a temporary location.
   if (!$file_error) {
-    $upload_dir = file_directory_path() .'/webform/'. $component['extra']['savelocation'];
+    $upload_dir = file_directory_path() . '/webform/' . $component['extra']['savelocation'];
     if (file_check_directory($upload_dir, FILE_CREATE_DIRECTORY)) {
       $file = file_save_upload($form_key, array(), $upload_dir);
       if ($file) {
@@ -515,11 +515,11 @@
  */
 function _webform_analysis_file($component, $sids = array()) {
   $placeholders = count($sids) ? array_fill(0, count($sids), "'%s'") : array();
-  $sidfilter = count($sids) ? " AND sid in (".implode(",", $placeholders).")" : "";
-  $query = 'SELECT data '.
-    ' FROM {webform_submitted_data} '.
-    ' WHERE nid = %d '.
-    ' AND cid = %d'. $sidfilter;
+  $sidfilter = count($sids) ? " AND sid in (" . implode(",", $placeholders) . ")" : "";
+  $query = 'SELECT data ' .
+    ' FROM {webform_submitted_data} ' .
+    ' WHERE nid = %d ' .
+    ' AND cid = %d' . $sidfilter;
   $nonblanks = 0;
   $sizetotal = 0;
   $submissions = 0;
@@ -536,7 +536,7 @@
 
   $rows[0] = array(t('Left Blank'), ($submissions - $nonblanks));
   $rows[1] = array(t('User uploaded file'), $nonblanks);
-  $rows[2] = array(t('Average uploaded file size'), ($sizetotal !=0 ? (int) (($sizetotal/$nonblanks)/1024) .' KB' : '0'));
+  $rows[2] = array(t('Average uploaded file size'), ($sizetotal != 0 ? (int) (($sizetotal/$nonblanks)/1024) . ' KB' : '0'));
   return $rows;
 }
 
@@ -590,7 +590,7 @@
 function webform_file_url($filepath) {
   if (!empty($filepath)) {
     $info = pathinfo($filepath);
-    $file_url = file_create_url($info['dirname'] .'/'. rawurlencode($info['basename']));
+    $file_url = file_create_url($info['dirname'] . '/' . rawurlencode($info['basename']));
   }
   return isset($file_url) ? $file_url : '';
 }
Index: components/grid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/grid.inc,v
retrieving revision 1.14
diff -u -r1.14 grid.inc
--- components/grid.inc	10 Feb 2010 02:04:53 -0000	1.14
+++ components/grid.inc	3 Mar 2010 02:45:37 -0000
@@ -246,12 +246,12 @@
 
   // Generate a lookup table of results.
   $placeholders = count($sids) ? array_fill(0, count($sids), "'%s'") : array();
-  $sidfilter = count($sids) ? " AND sid in (".implode(",", $placeholders).")" : "";
-  $query = 'SELECT no, data, count(data) as datacount '.
-    ' FROM {webform_submitted_data} '.
-    ' WHERE nid = %d '.
-    ' AND cid = %d '.
-    " AND data != '' ". $sidfilter .
+  $sidfilter = count($sids) ? " AND sid in (" . implode(",", $placeholders) . ")" : "";
+  $query = 'SELECT no, data, count(data) as datacount ' .
+    ' FROM {webform_submitted_data} ' .
+    ' WHERE nid = %d ' .
+    ' AND cid = %d ' .
+    " AND data != '' " . $sidfilter .
     ' GROUP BY no, data';
   $result = db_query($query, array_merge(array($component['nid'], $component['cid']), $sids));
   $counts = array();
@@ -292,7 +292,7 @@
   if (is_array($value)) {
     foreach ($value as $item => $value) {
       if ($value !== '') {
-        $output .= _webform_filter_xss($questions[$item]) .': '. _webform_filter_xss($value) .'<br />';
+        $output .= _webform_filter_xss($questions[$item]) . ': ' . _webform_filter_xss($value) . '<br />';
       }
     }
   }
Index: components/markup.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/markup.inc,v
retrieving revision 1.13
diff -u -r1.13 markup.inc
--- components/markup.inc	19 Feb 2010 21:20:36 -0000	1.13
+++ components/markup.inc	3 Mar 2010 02:45:37 -0000
@@ -54,7 +54,7 @@
     '#weight' => $component['weight'],
     '#markup' => $filter ? _webform_filter_values(check_markup($component['value'], $component['extra']['format'], FALSE), NULL, NULL, NULL, FALSE) : $component['value'],
     '#input_format' => $component['extra']['format'],
-    '#prefix' => '<div class="webform-component-'. $component['type'] .'" id="webform-component-'. $component['form_key'] .'">',
+    '#prefix' => '<div class="webform-component-' . $component['type'] . '" id="webform-component-' . $component['form_key'] . '">',
     '#suffix' => '</div>',
   );
 
Index: components/select.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/select.inc,v
retrieving revision 1.39
diff -u -r1.39 select.inc
--- components/select.inc	26 Feb 2010 13:21:33 -0000	1.39
+++ components/select.inc	3 Mar 2010 02:45:37 -0000
@@ -446,7 +446,7 @@
   $options = '';
 
   foreach ($form_element['#options'] as $key => $option_value) {
-    $options .= $key .'|'. $option_value ."\n";
+    $options .= $key . '|' . $option_value . "\n";
   }
 
   $component['extra']['items'] = $options;
@@ -519,7 +519,7 @@
   $show_other_results = $single;
 
   $sid_placeholders = count($sids) ? array_fill(0, count($sids), "'%s'") : array();
-  $sid_filter = count($sids) ? " AND sid IN (".implode(",", $sid_placeholders).")" : "";
+  $sid_filter = count($sids) ? " AND sid IN (" . implode(",", $sid_placeholders) . ")" : "";
 
   $not = $show_other_results ? 'NOT ' : '';
   $placeholders = count($options) ? array_fill(0, count($options), "'%s'") : array();
@@ -577,7 +577,7 @@
   if (is_array($value)) {
     foreach ($value as $option_value) {
       if ($option_value !== '') {
-        $output .= _webform_filter_xss($option_value) .'<br />';
+        $output .= _webform_filter_xss($option_value) . '<br />';
       }
     }
   }
Index: includes/webform.export.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/includes/webform.export.inc,v
retrieving revision 1.4
diff -u -r1.4 webform.export.inc
--- includes/webform.export.inc	12 Feb 2010 08:19:31 -0000	1.4
+++ includes/webform.export.inc	3 Mar 2010 02:45:38 -0000
@@ -119,12 +119,12 @@
   function add_row(&$file_handle, $data) {
     foreach ($data as $key => $value) {
       // Escape inner quotes and wrap all contents in new quotes.
-      $data[$key] = '"'. str_replace('"', '""', $data[$key]) .'"';
+      $data[$key] = '"' . str_replace('"', '""', $data[$key]) . '"';
 
       // Remove <script> tags, which mysteriously cause Excel not to import.
       $data[$key] = preg_replace('!<(/?script.*?)>!', '[$1]', $data[$key]);
     }
-    $row = implode($this->delimiter, $data) ."\n";
+    $row = implode($this->delimiter, $data) . "\n";
 
     if (function_exists('mb_convert_encoding')) {
       $row = mb_convert_encoding($row, 'UTF-16LE', 'UTF-8');
Index: includes/webform.report.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/includes/webform.report.inc,v
retrieving revision 1.16
diff -u -r1.16 webform.report.inc
--- includes/webform.report.inc	7 Feb 2010 01:36:23 -0000	1.16
+++ includes/webform.report.inc	3 Mar 2010 02:45:38 -0000
@@ -69,7 +69,7 @@
 
   foreach ($counts as $number => $text) {
     if ($number < $total_count) {
-      $count_links[] = l($text, $_GET['q'], array('query' => 'results='. $number, 'attributes' => array('class' => $pager_count == $number ? 'selected' : '')));
+      $count_links[] = l($text, $_GET['q'], array('query' => 'results=' . $number, 'attributes' => array('class' => $pager_count == $number ? 'selected' : '')));
     }
   }
 
@@ -81,7 +81,7 @@
     $output .= t('Showing all results.');
   }
   if ($total_count > 1) {
-    $output .= ' '. t('@total results total.', array('@total' => $total_count));
+    $output .= ' ' . t('@total results total.', array('@total' => $total_count));
   }
   $output .= '</div>';
 
@@ -125,7 +125,7 @@
 function theme_webform_results_submissions($node, $submissions, $total_count = 0, $pager_count = 0) {
   global $user;
 
-  drupal_add_css(drupal_get_path('module', 'webform') .'/webform.css', 'theme', 'all', FALSE);
+  drupal_add_css(drupal_get_path('module', 'webform') . '/webform.css', 'theme', 'all', FALSE);
 
   // This header has to be generated separately so we can add the SQL necessary
   // to sort the results.
@@ -168,14 +168,14 @@
   }
 
   if (count($rows) == 0) {
-    $rows[] = array(array('data' => t('There are no submissions for this form. <a href="!url">View this form</a>.', array('!url' => url('node/'. $node->nid))), 'colspan' => 4 + $operation_total));
+    $rows[] = array(array('data' => t('There are no submissions for this form. <a href="!url">View this form</a>.', array('!url' => url('node/' . $node->nid))), 'colspan' => 4 + $operation_total));
   }
 
   $output = '';
   $output .= theme('webform_results_per_page', $total_count, $pager_count);
   $output .= theme('table', $header, $rows);
   if (arg(2) == 'submissions') {
-    $output .= theme('links', array('webform' => array('title' => t('Go back to the form'), 'href' => 'node/'. $node->nid)));
+    $output .= theme('links', array('webform' => array('title' => t('Go back to the form'), 'href' => 'node/' . $node->nid)));
   }
   if ($pager_count) {
     $output .= theme('pager', NULL, $pager_count, 0);
@@ -227,7 +227,7 @@
  *   The number of results to be shown per page.
  */
 function theme_webform_results_table($node, $components, $submissions, $total_count, $pager_count) {
-  drupal_add_css(drupal_get_path('module', 'webform') .'/webform.css', 'theme', 'all', FALSE);
+  drupal_add_css(drupal_get_path('module', 'webform') . '/webform.css', 'theme', 'all', FALSE);
 
   $header = array();
   $rows = array();
@@ -239,7 +239,7 @@
 
   // Generate a row for each submission.
   foreach ($submissions as $sid => $submission) {
-    $cell[] = l($sid, 'node/'. $node->nid .'/submission/'. $sid);
+    $cell[] = l($sid, 'node/' . $node->nid . '/submission/' . $sid);
     $cell[] = format_date($submission->submitted, 'small');
     $cell[] = theme('username', $submission);
     $cell[] = $submission->remote_addr;
@@ -263,7 +263,7 @@
   }
 
   if (count($rows) == 0) {
-    $rows[] = array(array('data' => t('There are no submissions for this form. <a href="!url">View this form</a>.', array('!url' => url('node/'. $node->nid))), 'colspan' => 4));
+    $rows[] = array(array('data' => t('There are no submissions for this form. <a href="!url">View this form</a>.', array('!url' => url('node/' . $node->nid))), 'colspan' => 4));
   }
 
 
@@ -300,7 +300,7 @@
   $form['nid'] = array('#type' => 'value', '#value' => $node->nid);
   $question = t('Are you sure you want to delete all submissions for this form?');
 
-  return confirm_form($form, $question, 'node/'. $node->nid .'/webform-results', NULL, t('Clear'), t('Cancel'));
+  return confirm_form($form, $question, 'node/' . $node->nid . '/webform-results', NULL, t('Clear'), t('Cancel'));
 }
 
 function webform_results_clear_form_submit($form, &$form_state) {
@@ -311,7 +311,7 @@
   $message = t('Webform %title entries cleared.', array('%title' => $title));
   drupal_set_message($message);
   watchdog('webform', $message);
-  $form_state['redirect'] = 'node/'. $form_state['values']['nid'] .'/webform-results';
+  $form_state['redirect'] = 'node/' . $form_state['values']['nid'] . '/webform-results';
 }
 
 /**
@@ -412,7 +412,7 @@
  * Theme the output of the export form.
  */
 function theme_webform_results_download_form($form) {
-  drupal_add_css(drupal_get_path('module', 'webform') .'/webform.css', 'theme', 'all', FALSE);
+  drupal_add_css(drupal_get_path('module', 'webform') . '/webform.css', 'theme', 'all', FALSE);
 
   return drupal_render($form);
 }
@@ -421,7 +421,7 @@
  * Theme the output of the select list format radio buttons.
  */
 function theme_webform_results_download_select_format($element) {
-  drupal_add_css(drupal_get_path('module', 'webform') .'/webform.css', 'theme', 'all', FALSE);
+  drupal_add_css(drupal_get_path('module', 'webform') . '/webform.css', 'theme', 'all', FALSE);
 
   $output = '';
 
@@ -670,15 +670,15 @@
     if (is_array($row_data)) {
       $row = array();
       if (!$single) {
-        $row[] = array('data' => '<strong>'. $question_number .'</strong>', 'rowspan' => count($row_data) + 1, 'valign' => 'top');
-        $row[] = array('data' => '<strong>'. check_plain($node->webform['components'][$cid]['name']) .'</strong>', 'colspan' => '10');
+        $row[] = array('data' => '<strong>' . $question_number . '</strong>', 'rowspan' => count($row_data) + 1, 'valign' => 'top');
+        $row[] = array('data' => '<strong>' . check_plain($node->webform['components'][$cid]['name']) . '</strong>', 'colspan' => '10');
       }
       $rows = array_merge($rows, array_merge(array($row), $row_data));
     }
   }
 
   if (count($rows) == 0) {
-    $rows[] = array(array('data' => t('There are no submissions for this form. <a href="!url">View this form</a>.', array('!url' => url('node/'. $node->nid))), 'colspan' => 20));
+    $rows[] = array(array('data' => t('There are no submissions for this form. <a href="!url">View this form</a>.', array('!url' => url('node/' . $node->nid))), 'colspan' => 20));
   }
 
   return theme('table', $headers, $rows);
Index: includes/webform.form_builder.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/includes/webform.form_builder.inc,v
retrieving revision 1.5
diff -u -r1.5 webform.form_builder.inc
--- includes/webform.form_builder.inc	23 Jan 2010 02:10:06 -0000	1.5
+++ includes/webform.form_builder.inc	3 Mar 2010 02:45:38 -0000
@@ -1,4 +1,10 @@
 <?php
+// $Id$
+
+/**
+ * @file
+ * Form Builder integratations for Webform.
+ */
 
 /**
  * Menu callback; displays the main component editing screen.
@@ -54,8 +60,8 @@
 
   // Delete components that have been removed.
   foreach ($node->webform['components'] as $component) {
-    $element_id = 'cid_'. $component['cid'];
-    if (!in_array($element_id, $element_ids)){
+    $element_id = 'cid_' . $component['cid'];
+    if (!in_array($element_id, $element_ids)) {
       webform_component_delete($node, $component);
     }
   }
@@ -184,7 +190,7 @@
     foreach (element_children($form) as $key) {
       $cid = webform_get_cid($node, $key, $pid);
       $form[$key]['#form_builder'] = array(
-        'element_id' => 'cid_'. $cid,
+        'element_id' => 'cid_' . $cid,
       );
 
       // Add any component-specific loading. Note that all components are
Index: includes/webform.submissions.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/includes/webform.submissions.inc,v
retrieving revision 1.18
diff -u -r1.18 webform.submissions.inc
--- includes/webform.submissions.inc	1 Mar 2010 16:29:51 -0000	1.18
+++ includes/webform.submissions.inc	3 Mar 2010 02:45:39 -0000
@@ -155,7 +155,7 @@
   webform_submission_delete($form_state['values']['node'], $form_state['values']['submission']);
   drupal_set_message(t('Submission deleted.'));
 
-  $form_state['redirect'] = 'node/'. $form_state['values']['node']->nid .'/webform-results';
+  $form_state['redirect'] = 'node/' . $form_state['values']['node']->nid . '/webform-results';
 }
 
 /**
@@ -173,7 +173,7 @@
   webform_set_breadcrumb($node, $submission);
 
   if ($format == 'form') {
-    $output = drupal_get_form('webform_client_form_'. $node->nid, $node, $submission);
+    $output = drupal_get_form('webform_client_form_' . $node->nid, $node, $submission);
   }
   else {
     $output = webform_submission_render($node, $submission, NULL, $format);
@@ -269,7 +269,7 @@
     }
 
     $where_clause = implode(' AND ', $where);
-    $pager_query = "SELECT sid FROM {webform_submissions} WHERE $where_clause";
+    $pager_query = 'SELECT sid FROM {webform_submissions} WHERE ' . $where_clause;
 
     if (is_array($header)) {
       $pager_query .= tablesort_sql($header);
@@ -298,11 +298,11 @@
   }
 
   // Query the required submission data.
-  $query = 'SELECT s.*, sd.cid, sd.no, sd.data, u.name, u.mail, u.status '.
-           'FROM {webform_submissions} s '.
-           'LEFT JOIN {webform_submitted_data} sd ON sd.sid = s.sid '.
-           'LEFT JOIN {users} u ON u.uid = s.uid '.
-           'WHERE s.sid IN (' . implode($sids, ',') . ') '.
+  $query = 'SELECT s.*, sd.cid, sd.no, sd.data, u.name, u.mail, u.status ' .
+           'FROM {webform_submissions} s ' .
+           'LEFT JOIN {webform_submitted_data} sd ON sd.sid = s.sid ' .
+           'LEFT JOIN {users} u ON u.uid = s.uid ' .
+           'WHERE s.sid IN (' . implode($sids, ',') . ') ' .
            'ORDER BY sd.sid ASC, sd.cid ASC, sd.no ASC';
 
   $result = db_query($query);
@@ -395,7 +395,7 @@
 function _webform_submission_spam_check($to, $subject, $from, $headers = array()) {
   $headers = implode('\n', (array)$headers);
   // Check if they are attempting to spam using a bcc or content type hack.
-  if (preg_match('/(b?cc\s?:)|(content\-type:)/i', $to ."\n". $subject ."\n". $from ."\n". $headers)) {
+  if (preg_match('/(b?cc\s?:)|(content\-type:)/i', $to . "\n" . $subject . "\n" . $from . "\n" . $headers)) {
     return TRUE; // Possible spam attempt.
   }
   return FALSE; // Not spam.
@@ -418,9 +418,9 @@
   }
 
   // Retrieve submission data for this IP address or username from the database.
-  $query = 'SELECT count(*) '.
-           'FROM {webform_submissions} '.
-           "WHERE (( 0 = %d AND remote_addr = '%s') OR (uid > 0 AND uid = %d)) ".
+  $query = 'SELECT count(*) ' .
+           'FROM {webform_submissions} ' .
+           "WHERE (( 0 = %d AND remote_addr = '%s') OR (uid > 0 AND uid = %d)) " .
            'AND submitted > %d AND nid = %d AND is_draft = 0';
 
   // Fetch all the entries from the database within the submit interval with this username and IP.
@@ -429,13 +429,13 @@
   // Double check the submission history from the users machine using cookies.
   $num_submissions_cookie = 0;
   if ($user->uid == 0 && variable_get('webform_use_cookies', 0)) {
-    $cookie_name = 'webform-'. $node->nid;
+    $cookie_name = 'webform-' . $node->nid;
 
     if (isset($_COOKIE[$cookie_name]) && is_array($_COOKIE[$cookie_name])) {
       foreach ($_COOKIE[$cookie_name] as $key => $timestamp) {
         if ($node->webform['submit_interval'] != -1 && $timestamp <= time() - $node->webform['submit_interval']) {
           // Remove the cookie if past the required time interval.
-          setcookie($cookie_name .'['. $key .']', '', 0);
+          setcookie($cookie_name . '[' . $key . ']', '', 0);
         }
       }
       // Count the number of submissions recorded in cookies.
Index: includes/webform.components.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/includes/webform.components.inc,v
retrieving revision 1.25
diff -u -r1.25 webform.components.inc
--- includes/webform.components.inc	20 Feb 2010 21:24:13 -0000	1.25
+++ includes/webform.components.inc	3 Mar 2010 02:45:38 -0000
@@ -38,8 +38,8 @@
   $output = '';
 
   // Add CSS and JS. Don't preprocess because these files are used rarely.
-  drupal_add_css(drupal_get_path('module', 'webform') .'/webform.css', 'theme', 'all', FALSE);
-  drupal_add_js(drupal_get_path('module', 'webform') .'/webform.js', 'module', 'header', FALSE, TRUE, FALSE);
+  drupal_add_css(drupal_get_path('module', 'webform') . '/webform.css', 'theme', 'all', FALSE);
+  drupal_add_js(drupal_get_path('module', 'webform') . '/webform.js', 'module', 'header', FALSE, TRUE, FALSE);
 
   if (module_exists('form_builder')) {
     $output .= '<div class="webform-components-mode">';
@@ -155,8 +155,8 @@
  */
 function theme_webform_components_form($form) {
   // Add CSS to display submission info. Don't preprocess because this CSS file is used rarely.
-  drupal_add_css(drupal_get_path('module', 'webform') .'/webform.css', 'theme', 'all', FALSE);
-  drupal_add_js(drupal_get_path('module', 'webform') .'/webform.js', 'module', 'header', FALSE, TRUE, FALSE);
+  drupal_add_css(drupal_get_path('module', 'webform') . '/webform.css', 'theme', 'all', FALSE);
+  drupal_add_js(drupal_get_path('module', 'webform') . '/webform.js', 'module', 'header', FALSE, TRUE, FALSE);
 
   drupal_add_tabledrag('webform-components', 'order', 'sibling', 'webform-weight');
   drupal_add_tabledrag('webform-components', 'match', 'parent', 'webform-pid', 'webform-pid', 'webform-cid');
@@ -221,9 +221,9 @@
         ($component['value'] == '') ? '-' : $component['value'],
         drupal_render($form['components'][$cid]['mandatory']),
         drupal_render($form['components'][$cid]['cid']) . drupal_render($form['components'][$cid]['pid']) . drupal_render($form['components'][$cid]['weight']),
-        l(t('Edit'), 'node/'. $node->nid .'/webform/components/'. $cid, array('query' => drupal_get_destination())),
-        l(t('Clone'), 'node/'. $node->nid .'/webform/components/'. $cid .'/clone', array('query' => drupal_get_destination())),
-        l(t('Delete'), 'node/'. $node->nid .'/webform/components/'. $cid .'/delete', array('query' => drupal_get_destination())),
+        l(t('Edit'), 'node/' . $node->nid . '/webform/components/' . $cid, array('query' => drupal_get_destination())),
+        l(t('Clone'), 'node/' . $node->nid . '/webform/components/' . $cid . '/clone', array('query' => drupal_get_destination())),
+        l(t('Delete'), 'node/' . $node->nid . '/webform/components/' . $cid . '/delete', array('query' => drupal_get_destination())),
       );
       $row_class = 'draggable';
       if ($component['type'] != 'fieldset' && $component['type'] != 'pagebreak') {
@@ -290,11 +290,11 @@
     $node->status = 1;
     node_save($node);
     drupal_set_message(t('Your webform has been published.'));
-    return 'node/'. $node->nid;
+    return 'node/' . $node->nid;
   }
   elseif (isset($_POST['op']) && $_POST['op'] == t('Add')) {
     $component = $form_state['values']['add'];
-    $form_state['redirect'] = array('node/'. $node->nid .'/webform/components/new/'. $component['type'], 'name='. urlencode($component['name']) .'&mandatory='. $component['mandatory'] .'&pid='. $component['pid'] .'&weight='. $component['weight']);
+    $form_state['redirect'] = array('node/' . $node->nid . '/webform/components/new/' . $component['type'], 'name=' . urlencode($component['name']) . ' &mandatory=' . $component['mandatory'] . '&pid=' . $component['pid'] . '&weight=' . $component['weight']);
   }
   else {
     drupal_set_message(t('The component positions and mandatory values have been updated.'));
@@ -308,7 +308,7 @@
 
 function webform_component_edit_form(&$form_state, $node, $component, $clone = FALSE) {
   drupal_set_title(t('Edit component: @name (@type)', array('@name' => $component['name'], '@type' => t($component['type']))));
-  drupal_add_css(drupal_get_path('module', 'webform') .'/webform.css', 'theme', 'all', FALSE);
+  drupal_add_css(drupal_get_path('module', 'webform') . '/webform.css', 'theme', 'all', FALSE);
 
   // Print the correct field type specification.
   // We always need: name and description.
@@ -578,7 +578,7 @@
   // the updated webform is visible to anonymous users.
   cache_clear_all();
 
-  $form_state['redirect'] = array('node/'. $form_state['values']['nid'] .'/webform/components', isset($cid) ? 'cid='. $cid : '');
+  $form_state['redirect'] = array('node/' . $form_state['values']['nid'] . '/webform/components', isset($cid) ? 'cid=' . $cid : '');
 }
 
 function webform_component_delete_form($form_state, $node, $component) {
@@ -603,13 +603,13 @@
     $description = t('This will immediately delete the %name component from the %webform webform. This cannot be undone.', array('%name' => $node->webform['components'][$cid]['name'], '%webform' => $node->title));
   }
 
-  return confirm_form($form, $question, 'node/'. $node->nid .'/webform/components', $description, t('Delete'));
+  return confirm_form($form, $question, 'node/' . $node->nid . '/webform/components', $description, t('Delete'));
 }
 
 function webform_component_delete_form_submit($form, &$form_state) {
   drupal_set_message(t('Component %name deleted.', array('%name' => $form_state['values']['component']['name'])));
   webform_component_delete($form_state['values']['node'], $form_state['values']['component']);
-  $form_state['redirect'] = 'node/'. $form_state['values']['node']->nid .'/webform/components';
+  $form_state['redirect'] = 'node/' . $form_state['values']['node']->nid . '/webform/components';
 }
 
 /**
@@ -667,7 +667,7 @@
   // load all submissions and allow the component to delete each one.
 
   webform_component_include($component['type']);
-  $delete_function = '_webform_delete_'. $component['type'];
+  $delete_function = '_webform_delete_' . $component['type'];
   if (function_exists($delete_function)) {
     module_load_include('inc', 'webform', 'includes/webform.submissions');
     $submissions = webform_get_submissions($node->nid);
@@ -818,7 +818,7 @@
  */
 function theme_webform_component_select($element) {
   drupal_add_js('misc/tableselect.js');
-  drupal_add_js(drupal_get_path('module', 'webform') .'/webform.js', 'module', 'header', FALSE, TRUE, FALSE);
+  drupal_add_js(drupal_get_path('module', 'webform') . '/webform.js', 'module', 'header', FALSE, TRUE, FALSE);
 
   $rows = array();
   $header = array();
@@ -878,7 +878,7 @@
 function webform_validate_unique($element, $form_state) {
   $nid = $form_state['values']['details']['nid'];
   $sid = $form_state['values']['details']['sid'];
-  $count = db_result(db_query("SELECT count(*) FROM {webform_submitted_data} WHERE nid = %d AND cid = %d AND sid != %d AND LOWER(data) = '%s'", $nid, $element['#webform_component']['cid'], $sid, $element['#value']));
+  $count = db_result(db_query("SELECT count(*) FROM {webform_submitted_data} WHERE nid = %d AND cid = %d AND sid <> %d AND LOWER(data) = '%s'", $nid, $element['#webform_component']['cid'], $sid, $element['#value']));
   if ($count) {
     form_error($element, t('The value %value has already been submitted once for the %title field. You may have already submitted this form, or you need to use a different value.', array('%value' => $element['#value'], '%title' => $element['#title'])));
   }
Index: includes/webform.emails.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/includes/webform.emails.inc,v
retrieving revision 1.9
diff -u -r1.9 webform.emails.inc
--- includes/webform.emails.inc	20 Feb 2010 21:03:13 -0000	1.9
+++ includes/webform.emails.inc	3 Mar 2010 02:45:38 -0000
@@ -85,8 +85,8 @@
  */
 function theme_webform_emails_form($form) {
   // Add CSS to display submission info. Don't preprocess because this CSS file is used rarely.
-  drupal_add_css(drupal_get_path('module', 'webform') .'/webform.css', 'theme', 'all', FALSE);
-  drupal_add_js(drupal_get_path('module', 'webform') .'/webform.js', 'module', 'header', FALSE, TRUE, FALSE);
+  drupal_add_css(drupal_get_path('module', 'webform') . '/webform.css', 'theme', 'all', FALSE);
+  drupal_add_js(drupal_get_path('module', 'webform') . '/webform.js', 'module', 'header', FALSE, TRUE, FALSE);
 
   $node = $form['#node'];
 
@@ -100,8 +100,8 @@
         drupal_render($form['emails'][$eid]['email']),
         drupal_render($form['emails'][$eid]['subject']),
         drupal_render($form['emails'][$eid]['from']),
-        l(t('Edit'), 'node/'. $node->nid .'/webform/emails/'. $eid),
-        l(t('Delete'), 'node/'. $node->nid .'/webform/emails/'. $eid .'/delete'),
+        l(t('Edit'), 'node/' . $node->nid . '/webform/emails/' . $eid),
+        l(t('Delete'), 'node/' . $node->nid . '/webform/emails/' . $eid . '/delete'),
       );
     }
   }
@@ -129,11 +129,11 @@
   // Add a default value to the custom e-mail textfield.
   $form['email_custom']['#value'] = t('email@example.com');
   $form['email_custom']['#attributes']['class'] = 'webform-set-active webform-default-value';
-  $form['email_option']['custom']['#title'] = $form['email_option']['custom']['#title'] .': '. drupal_render($form['email_custom']);
+  $form['email_option']['custom']['#title'] = $form['email_option']['custom']['#title'] . ': ' . drupal_render($form['email_custom']);
 
   // Render the component value.
   $form['email_component']['#attributes']['class'] = 'webform-set-active';
-  $form['email_option']['component']['#title'] = $form['email_option']['component']['#title'] .': '. drupal_render($form['email_component']);
+  $form['email_option']['component']['#title'] = $form['email_option']['component']['#title'] . ': ' . drupal_render($form['email_component']);
 
   // For spacing consistency, every option is wrapped in container-inline.
   foreach (element_children($form['email_option']) as $option) {
@@ -154,7 +154,7 @@
   else {
     $email = $form_state['values']['email_component'];
   }
-  $form_state['redirect'] = array('node/'. $form['#node']->nid .'/webform/emails/new', 'option='. urlencode($form_state['values']['email_option']) .'&email='. urlencode(trim($email)));
+  $form_state['redirect'] = array('node/' . $form['#node']->nid . '/webform/emails/new', 'option=' . urlencode($form_state['values']['email_option']) . '&email=' . urlencode(trim($email)));
 }
 
 /**
@@ -245,7 +245,7 @@
     '#attributes' => array('id' => 'webform-template-fieldset'),
   );
 
-  $default_template = theme(array('webform_mail_'. $node->nid, 'webform_mail', 'webform_mail_message'), $node, NULL, 'default');
+  $default_template = theme(array('webform_mail_' . $node->nid, 'webform_mail', 'webform_mail_message'), $node, NULL, 'default');
   $template = $email['template'] == 'default' ? $default_template : $email['template'];
   $form['template']['template'] = array(
     '#type' => 'textarea',
@@ -299,14 +299,14 @@
  * Theme the Webform mail settings section of the node form.
  */
 function theme_webform_email_edit_form($form) {
-  drupal_add_css(drupal_get_path('module', 'webform') .'/webform.css', 'theme', 'all', FALSE);
-  drupal_add_js(drupal_get_path('module', 'webform') .'/webform.js', 'module', 'header', FALSE, TRUE, FALSE);
+  drupal_add_css(drupal_get_path('module', 'webform') . '/webform.css', 'theme', 'all', FALSE);
+  drupal_add_js(drupal_get_path('module', 'webform') . '/webform.js', 'module', 'header', FALSE, TRUE, FALSE);
 
   // Loop through fields, rendering them into radio button options.
   foreach (array('email', 'subject', 'from_address', 'from_name') as $field) {
     foreach (array('custom' => t('Custom'), 'component' => t('Component')) as $option => $title) {
       $form[$field . '_' . $option]['#attributes']['class'] = 'webform-set-active';
-      $form[$field .'_option'][$option]['#title'] = $title .': '. drupal_render($form[$field . '_' . $option]);
+      $form[$field . '_option'][$option]['#title'] = $title . ': ' . drupal_render($form[$field . '_' . $option]);
     }
     // For spacing consistency, every option is wrapped in container-inline.
     foreach (element_children($form[$field . '_option']) as $option) {
@@ -314,8 +314,8 @@
       $form[$field . '_option'][$option]['#suffix'] = '</div>';
     }
     // Wrap the default option in a placeholder tag..
-    if (isset($form[$field .'_option']['#options']['default'])) {
-      $form[$field . '_option']['default']['#title'] = t('Default') .': '. theme('placeholder', $form[$field . '_option']['default']['#title']);
+    if (isset($form[$field . '_option']['#options']['default'])) {
+      $form[$field . '_option']['default']['#title'] = t('Default') . ': ' . theme('placeholder', $form[$field . '_option']['default']['#title']);
     }
   }
 
@@ -376,12 +376,12 @@
   );
 
   foreach (array('email', 'from_name', 'from_address', 'subject') as $field) {
-    $option = $form_state['values'][$field .'_option'];
+    $option = $form_state['values'][$field . '_option'];
     if ($option == 'default') {
       $email[$field] = 'default';
     }
     else {
-      $email[$field] = $form_state['values'][$field .'_'. $option];
+      $email[$field] = $form_state['values'][$field . '_' . $option];
     }
   }
 
@@ -414,7 +414,7 @@
     webform_email_update($email);
   }
 
-  $form_state['redirect'] = array('node/'. $form_state['values']['node']->nid .'/webform/emails');
+  $form_state['redirect'] = array('node/' . $form_state['values']['node']->nid . '/webform/emails');
 }
 
 /**
@@ -441,7 +441,7 @@
     $description = t('This will immediately delete the e-mail settings sending to the @address address.', array('@address' => $email['email']));
   }
 
-  return confirm_form($form, $question, 'node/'. $node->nid .'/webform/emails', $description, t('Delete'));
+  return confirm_form($form, $question, 'node/' . $node->nid . '/webform/emails', $description, t('Delete'));
 }
 
 /**
@@ -450,7 +450,7 @@
 function webform_email_delete_form_submit($form, &$form_state) {
   drupal_set_message(t('E-mail settings deleted.'));
   webform_email_delete($form_state['values']['node'], $form_state['values']['email']);
-  $form_state['redirect'] = 'node/'. $form_state['values']['node']->nid .'/webform/emails';
+  $form_state['redirect'] = 'node/' . $form_state['values']['node']->nid . '/webform/emails';
 }
 
 /**
Index: includes/webform.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/includes/webform.admin.inc,v
retrieving revision 1.4
diff -u -r1.4 webform.admin.inc
--- includes/webform.admin.inc	12 Feb 2010 06:57:35 -0000	1.4
+++ includes/webform.admin.inc	3 Mar 2010 02:45:37 -0000
@@ -236,13 +236,13 @@
   $rows = array();
   foreach ($nodes as $node) {
     $rows[] = array(
-      l($node->title, 'node/'. $node->nid),
-      l(t('Submissions'), 'node/'. $node->nid .'/webform-results'),
-      l(t('Analysis'), 'node/'. $node->nid .'/webform-results/analysis'),
-      l(t('Table'), 'node/'. $node->nid .'/webform-results/table'),
-      l(t('Download'), 'node/'. $node->nid .'/webform-results/download'),
-      node_access('update', $node) ? l(t('Edit'), 'node/'. $node->nid .'/edit') : '',
-      user_access('delete all webform submissions') ? l(t('Clear'), 'node/'. $node->nid .'/webform-results/clear') : '',
+      l($node->title, 'node/' . $node->nid),
+      l(t('Submissions'), 'node/' . $node->nid . '/webform-results'),
+      l(t('Analysis'), 'node/' . $node->nid . '/webform-results/analysis'),
+      l(t('Table'), 'node/' . $node->nid . '/webform-results/table'),
+      l(t('Download'), 'node/' . $node->nid . '/webform-results/download'),
+      node_access('update', $node) ? l(t('Edit'), 'node/' . $node->nid . '/edit') : '',
+      user_access('delete all webform submissions') ? l(t('Clear'), 'node/' . $node->nid . '/webform-results/clear') : '',
     );
   }
 
Index: tests/permissions.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/tests/permissions.test,v
retrieving revision 1.3
diff -u -r1.3 permissions.test
--- tests/permissions.test	9 Feb 2010 22:52:19 -0000	1.3
+++ tests/permissions.test	3 Mar 2010 02:45:39 -0000
@@ -6,7 +6,7 @@
  * Webform module permission tests.
  */
 
-include_once(dirname(__FILE__) .'/webform.test');
+include_once(dirname(__FILE__) . '/webform.test');
 
 class WebformPermissionsTestCase extends WebformTestCase {
   /**
@@ -45,8 +45,8 @@
 
     // Test that the authenticated user is able to access.
     $this->drupalLogin($this->webform_users['userAccess']);
-    $this->drupalGet('node/'. $node->nid);
-    $this->assertText($node->body, t('Webform node created and accessible to authenticated users at !url', array('!url' => 'node/'. $node->nid)), t('Webform'));
+    $this->drupalGet('node/' . $node->nid);
+    $this->assertText($node->body, t('Webform node created and accessible to authenticated users at !url', array('!url' => 'node/' . $node->nid)), t('Webform'));
 
     // Confirm that the submission has been created.
     $this->drupalPost(NULL, array(), 'Submit');
@@ -54,10 +54,10 @@
     $this->drupalLogout();
 
     // The anonymous user should not be able to submit.
-    $this->drupalGet('node/'. $node->nid);
+    $this->drupalGet('node/' . $node->nid);
     // Note: Should be: You must <a href="!login">login</a> or <a href="!register">register</a> to view this form.
     // Something in SimpleTest isn't handling the string correctly.
-    $this->assertText(t(' to view this form.', array('!login' => url('user/login'), '!register' => url('user/register'))), t('Anonymous user is not allowed to submit form.'), t('Webform'));
+    $this->assertText(t('to view this form.', array('!login' => url('user/login'), '!register' => url('user/register'))), t('Anonymous user is not allowed to submit form.'), t('Webform'));
     $this->drupalLogout();
   }
 
Index: tests/components.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/tests/components.test,v
retrieving revision 1.3
diff -u -r1.3 components.test
--- tests/components.test	9 Feb 2010 22:52:19 -0000	1.3
+++ tests/components.test	3 Mar 2010 02:45:39 -0000
@@ -6,7 +6,7 @@
  * Webform module component tests.
  */
 
-include_once(dirname(__FILE__) .'/webform.test');
+include_once(dirname(__FILE__) . '/webform.test');
 
 class WebformComponentsTestCase extends WebformTestCase {
   /**
Index: tests/submission.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/tests/submission.test,v
retrieving revision 1.4
diff -u -r1.4 submission.test
--- tests/submission.test	9 Feb 2010 22:52:19 -0000	1.4
+++ tests/submission.test	3 Mar 2010 02:45:39 -0000
@@ -6,7 +6,7 @@
  * Webform module submission tests.
  */
 
-include_once(dirname(__FILE__) .'/webform.test');
+include_once(dirname(__FILE__) . '/webform.test');
 
 class WebformSubmissionTestCase extends WebformTestCase {
   /**
@@ -66,8 +66,8 @@
     $submission_values = $value_type == 'sample' ? $this->testWebformPost() : array();
 
     // Visit the node page with the "foo=bar" query, to test %get[] default values.
-    $this->drupalGet('node/'. $node->nid, array('query' => 'foo=bar'));
-    $this->assertText($node->body, t('Webform node created and accessible at !url', array('!url' => 'node/'. $node->nid)), t('Webform'));
+    $this->drupalGet('node/' . $node->nid, array('query' => 'foo=bar'));
+    $this->assertText($node->body, t('Webform node created and accessible at !url', array('!url' => 'node/' . $node->nid)), t('Webform'));
 
     // Submit our test data.
     $this->drupalPost(NULL, $submission_values, 'Submit');
@@ -89,7 +89,7 @@
       $actual_value = $actual_submission->data[$cid]['value'];
       $result = $this->assertEqual($stable_value, $actual_value, t('Component @form_key data integrity check', array('@form_key' => $component['form_key'])), t('Webform'));
       if (!$result || $result === 'fail') {
-        $this->fail(t('Expected !expected', array('!expected' => print_r($stable_value, TRUE))) ."\n\n". t('Recieved !recieved', array('!recieved' => print_r($actual_value, TRUE))), t('Webform'));
+        $this->fail(t('Expected !expected', array('!expected' => print_r($stable_value, TRUE))) . "\n\n" . t('Recieved !recieved', array('!recieved' => print_r($actual_value, TRUE))), t('Webform'));
       }
     }
   }
Index: views/webform_handler_field_is_draft.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/views/webform_handler_field_is_draft.inc,v
retrieving revision 1.1
diff -u -r1.1 webform_handler_field_is_draft.inc
--- views/webform_handler_field_is_draft.inc	9 Feb 2010 20:08:04 -0000	1.1
+++ views/webform_handler_field_is_draft.inc	3 Mar 2010 02:45:39 -0000
@@ -1,5 +1,11 @@
 <?php
-//$Id: webform_handler_field_is_draft.inc,v 1.1 2010/02/09 20:08:04 quicksketch Exp $
+// $Id: webform_handler_field_is_draft.inc,v 1.1 2010/02/09 20:08:04 quicksketch Exp $
+
+/**
+* @file
+* Views handler to display the draft status of a submission.
+*/
+
 /**
  * Field handler to show if submission is draft or not.
  *
Index: views/webform_handler_field_submission_count.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/views/webform_handler_field_submission_count.inc,v
retrieving revision 1.3
diff -u -r1.3 webform_handler_field_submission_count.inc
--- views/webform_handler_field_submission_count.inc	10 Jan 2010 07:03:27 -0000	1.3
+++ views/webform_handler_field_submission_count.inc	3 Mar 2010 02:45:39 -0000
@@ -2,6 +2,11 @@
 // $Id: webform_handler_field_submission_count.inc,v 1.3 2010/01/10 07:03:27 quicksketch Exp $
 
 /**
+* @file
+* Views handler to display the number of submissions in a webform.
+*/
+
+/**
  * Field handler to present the submission count of a node to the user.
  */
 class webform_handler_field_submission_count extends views_handler_field {
@@ -12,7 +17,7 @@
     if ($this->count_type == 'node') {
       $this->additional_fields['nid'] = 'nid';
     }
-    else if ($this->count_type == 'users') {
+    elseif ($this->count_type == 'users') {
       $this->additional_fields['uid'] = 'uid';
     }
   }
@@ -43,7 +48,7 @@
         $output = l($count, "node/$node->nid/submissions");
       }
     }
-    else if ($this->count_type == 'users') {
+    elseif ($this->count_type == 'users') {
       $sql = "SELECT COUNT(sid) FROM {webform_submissions} WHERE uid = %d";
       $output = db_result(db_query($sql, $values->{$this->aliases['uid']}));
     }
Index: views/webform_handler_field_submission_link.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/views/webform_handler_field_submission_link.inc,v
retrieving revision 1.2
diff -u -r1.2 webform_handler_field_submission_link.inc
--- views/webform_handler_field_submission_link.inc	9 Feb 2010 20:08:04 -0000	1.2
+++ views/webform_handler_field_submission_link.inc	3 Mar 2010 02:45:39 -0000
@@ -2,6 +2,11 @@
 // $Id: webform_handler_field_submission_link.inc,v 1.2 2010/02/09 20:08:04 quicksketch Exp $
 
 /**
+* @file
+* Views handler to display links to a submission.
+*/
+
+/**
  * Field handler to present a link to the user.
  */
 class webform_handler_field_submission_link extends views_handler_field {
@@ -78,7 +83,7 @@
       case 'delete':
         $text = !empty($this->options['text']) ? $this->options['text'] : t('view');
         $path = drupal_get_path_alias($_GET['q']);
-        $link = l($text, "node/$submission->nid/submission/$submission->sid/delete", array('query' => 'destination='. $path));
+        $link = l($text, "node/$submission->nid/submission/$submission->sid/delete", array('query' => 'destination=' . $path));
         $access = webform_submission_access($node, $submission, 'delete');
         break;
       default:
Index: views/webform_handler_field_form_body.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/views/webform_handler_field_form_body.inc,v
retrieving revision 1.1
diff -u -r1.1 webform_handler_field_form_body.inc
--- views/webform_handler_field_form_body.inc	12 May 2009 16:04:30 -0000	1.1
+++ views/webform_handler_field_form_body.inc	3 Mar 2010 02:45:39 -0000
@@ -2,6 +2,11 @@
 // $Id: webform_handler_field_form_body.inc,v 1.1 2009/05/12 16:04:30 djalloway Exp $
 
 /**
+* @file
+* Views handler to display the content of a webform form.
+*/
+
+/**
  * Field handler to present the Webform form body to the user.
  */
 class webform_handler_field_form_body extends views_handler_field {
Index: views/webform_handler_filter_is_draft.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/views/webform_handler_filter_is_draft.inc,v
retrieving revision 1.1
diff -u -r1.1 webform_handler_filter_is_draft.inc
--- views/webform_handler_filter_is_draft.inc	9 Feb 2010 20:08:04 -0000	1.1
+++ views/webform_handler_filter_is_draft.inc	3 Mar 2010 02:45:39 -0000
@@ -1,5 +1,11 @@
 <?php
-//$Id: webform_handler_filter_is_draft.inc,v 1.1 2010/02/09 20:08:04 quicksketch Exp $
+// $Id: webform_handler_filter_is_draft.inc,v 1.1 2010/02/09 20:08:04 quicksketch Exp $
+
+/**
+* @file
+* Views handler to filter submissions by draft state.
+*/
+
 /**
  * Filter by submission status
  */