--- webform.module_orig	2009-01-19 22:45:55.000000000 -0500
+++ webform.module	2009-01-19 22:45:48.000000000 -0500
@@ -136,7 +136,7 @@ function webform_menu($may_cache) {
         'title' => t('Results'),
         'callback' => 'webform_results',
         'callback arguments' => array($node),
-        'access' => webform_results_access($node, 'access webform results'),
+        'access' => webform_results_access($node),
         'weight' => 2,
         'type' => MENU_LOCAL_TASK,
       );
@@ -145,7 +145,7 @@ function webform_menu($may_cache) {
         'title' => t('Submissions'),
         'callback' => 'webform_results',
         'callback arguments' => array($node),
-        'access' => webform_results_access($node, 'access webform results'),
+        'access' => webform_results_access($node),
         'weight' => 4,
         'type' => MENU_DEFAULT_LOCAL_TASK,
       );
@@ -154,7 +154,7 @@ function webform_menu($may_cache) {
         'title' => t('Analysis'),
         'callback' => 'webform_results',
         'callback arguments' => array($node, 'analysis'),
-        'access' => webform_results_access($node, 'access webform results'),
+        'access' => webform_results_access($node),
         'weight' => 5,
         'type' => MENU_LOCAL_TASK,
       );
@@ -163,7 +163,7 @@ function webform_menu($may_cache) {
         'title' => t('Table'),
         'callback' => 'webform_results',
         'callback arguments' => array($node, 'table'),
-        'access' => webform_results_access($node, 'access webform results'),
+        'access' => webform_results_access($node),
         'weight' => 6,
         'type' => MENU_LOCAL_TASK,
       );
@@ -172,7 +172,7 @@ function webform_menu($may_cache) {
         'title' => t('Download'),
         'callback' => 'webform_results',
         'callback arguments' => array($node, 'download'),
-        'access' => webform_results_access($node, 'access webform results'),
+        'access' => webform_results_access($node),
         'weight' => 7,
         'type' => MENU_LOCAL_TASK,
       );
@@ -181,7 +181,7 @@ function webform_menu($may_cache) {
         'title' => t('Clear'),
         'callback' => 'webform_results',
         'callback arguments' => array($node, 'clear'),
-        'access' => webform_results_access($node, 'clear webform results'),
+        'access' => webform_results_clear_access($node, 'clear webform results'),
         'weight' => 8,
         'type' => MENU_LOCAL_TASK,
       );
@@ -190,7 +190,7 @@ function webform_menu($may_cache) {
         'title' => t('Submissions'),
         'callback' => 'webform_results',
         'callback arguments' => array($node, 'user_submissions'),
-        'access' => user_access('access webform results') || user_access('access webform submissions') || (user_access('access own webform submissions')  && $user->uid),
+        'access' => user_access('access webform results') || (user_access('access own webform results') && $user->uid == $node->uid) || user_access('access webform submissions') || (user_access('access own webform submissions')  && $user->uid),
         'weight' => 2,
         'type' => MENU_CALLBACK,
       );
@@ -241,9 +241,17 @@ function webform_menu($may_cache) {
 }
 
 /**
- * Menu access callback. Ensure a user both access and node 'view' permission.
+ * Results menu access callback. Ensure a user both access and node 'view' permission.
  */
-function webform_results_access($node, $perm) {
+function webform_results_access($node) {
+  global $user;
+  return (node_access('view', $node) && (user_access('access webform results') || (user_access('access own webform results') && $user->uid == $node->uid)));
+}
+
+/**
+ * Results->Clear menu access callback. Ensure a user both access and node 'view' permission.
+ */
+function webform_results_clear_access($node, $perm) {
   return node_access('view', $node) && user_access($perm);
 }
 
@@ -251,7 +259,7 @@ function webform_results_access($node, $
  * Implementation of hook_perm().
  */
 function webform_perm() {
-  return array('create webforms', 'edit own webforms', 'edit webforms', 'access webform results', 'clear webform results', 'access own webform submissions', 'edit own webform submissions', 'edit webform submissions', 'use PHP for additional processing');
+  return array('create webforms', 'edit own webforms', 'edit webforms', 'access webform results', 'clear webform results', 'access own webform submissions', 'edit own webform submissions', 'edit webform submissions', 'use PHP for additional processing', 'access own webform results');
 }
 
 /**
@@ -302,8 +310,9 @@ function webform_forms($args) {
  * Only allow users with view webform submissions to download files.
  */
 function webform_file_download($file) {
+  global $user;
   $file = file_check_location(file_directory_path() .'/'. $file, file_directory_path() .'/webform/');
-  if ($file && user_access('access webform results')) {
+  if ($file && (user_access('access webform results') || (user_access('access own webform results') && $user->uid == $node->uid))) {
     $info = image_get_info(file_create_path($file));
     if (isset($info['mime_type'])) {
       $headers = array('Content-type: '. $info['mime_type']);
@@ -938,7 +947,7 @@ function webform_view(&$node, $teaser = 
   }
 
   // Get a count of previous submissions by this user.
-  if ($user->uid && (user_access('access own webform submissions') || user_access('access webform results') || user_access('access webform submissions'))) {
+  if ($user->uid && (user_access('access own webform submissions') || user_access('access webform results') || (user_access('access own webform results') && $user->uid == $node->uid) || user_access('access webform submissions'))) {
     $submission_count = db_result(db_query('SELECT count(*) FROM {webform_submissions} WHERE nid = %d AND uid = %d', $node->nid, $user->uid));
   }
 
@@ -1196,6 +1205,7 @@ function theme_webform_admin_settings($f
  *   specified when using drupal_get_form().
  */
 function webform_client_form(&$node, $submission, $enabled, $preview, $form_values = NULL) {
+  global $user;
   include_once(drupal_get_path('module', 'webform') .'/webform_components.inc');
   webform_load_components();
 
@@ -1204,7 +1214,7 @@ function webform_client_form(&$node, $su
   }
 
   // Set a header for navigating results.
-  if ($submission && user_access('access webform results')) {
+  if ($submission && (user_access('access webform results') || (user_access('access own webform results') && $user->uid == $node->uid))) {
     // 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', 'module', 'all', FALSE);