? webform-246371-48.patch
? webform-246371-54.patch
Index: webform.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.module,v
retrieving revision 1.141
diff -u -p -r1.141 webform.module
--- webform.module	6 Nov 2009 01:59:43 -0000	1.141
+++ webform.module	8 Nov 2009 21:20:12 -0000
@@ -187,7 +187,7 @@ function webform_menu() {
     'page callback' => 'webform_results_submissions',
     'page arguments' => array(1, FALSE, '50'),
     'access callback' => 'webform_results_access',
-    'access arguments' => array(1, 'access webform results'),
+    'access arguments' => array(1),
     'file' => 'includes/webform.report.inc',
     'weight' => 2,
     'type' => MENU_LOCAL_TASK,
@@ -197,7 +197,7 @@ function webform_menu() {
     'page callback' => 'webform_results_submissions',
     'page arguments' => array(1, FALSE, '50'),
     'access callback' => 'webform_results_access',
-    'access arguments' => array(1, 'access webform results'),
+    'access arguments' => array(1),
     'file' => 'includes/webform.report.inc',
     'weight' => 4,
     'type' => MENU_DEFAULT_LOCAL_TASK,
@@ -207,7 +207,7 @@ function webform_menu() {
     'page callback' => 'webform_results_analysis',
     'page arguments' => array(1),
     'access callback' => 'webform_results_access',
-    'access arguments' => array(1, 'access webform results'),
+    'access arguments' => array(1),
     'file' => 'includes/webform.report.inc',
     'weight' => 5,
     'type' => MENU_LOCAL_TASK,
@@ -217,7 +217,7 @@ function webform_menu() {
     'page callback' => 'webform_results_table',
     'page arguments' => array(1, '50'),
     'access callback' => 'webform_results_access',
-    'access arguments' => array(1, 'access webform results'),
+    'access arguments' => array(1),
     'file' => 'includes/webform.report.inc',
     'weight' => 6,
     'type' => MENU_LOCAL_TASK,
@@ -227,7 +227,7 @@ function webform_menu() {
     'page callback' => 'drupal_get_form',
     'page arguments' => array('webform_results_download_form', 1),
     'access callback' => 'webform_results_access',
-    'access arguments' => array(1, 'access webform results'),
+    'access arguments' => array(1),
     'file' => 'includes/webform.report.inc',
     'weight' => 7,
     'type' => MENU_LOCAL_TASK,
@@ -236,7 +236,7 @@ function webform_menu() {
     'title' => 'Clear',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('webform_results_clear_form', 1),
-    'access callback' => 'webform_results_access',
+    'access callback' => 'webform_results_clear_access',
     'access arguments' => array(1, 'clear webform results'),
     'file' => 'includes/webform.report.inc',
     'weight' => 8,
@@ -374,20 +374,25 @@ function webform_submission_access($node
 
   switch ($op) {
     case 'view':
-      return user_access('access webform results') || (user_access('access own webform submissions') && ($account->uid == $submission->uid));
+      return user_access('access webform results') || (user_access('access own webform submissions') && ($account->uid == $submission->uid)) || (user_access('access own webform results') && $user->uid == $node->uid);
     case 'edit':
       return user_access('edit webform submissions') || (user_access('edit own webform submissions') && ($account->uid == $submission->uid));
     case 'delete':
       return user_access('edit webform submissions') || (user_access('edit own webform submissions') && ($account->uid == $submission->uid)) || user_access('clear webform results');
     case 'list':
-      return user_access('access webform results') || user_access('access webform submissions') || (user_access('access own webform submissions')  && $user->uid);
+      return user_access('access webform results') || user_access('access webform submissions') || (user_access('access own webform submissions')  && $user->uid) || (user_access('access own webform results') && $user->uid == $node->uid);
   }
 }
 
 /**
  * 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)));
+}
+
+function webform_results_clear_access($node, $perm) {
   return node_access('view', $node) && user_access($perm);
 }
 
@@ -404,7 +409,7 @@ function webform_init() {
  * 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', 'access own webform results', 'clear webform results', 'access own webform submissions', 'edit own webform submissions', 'edit webform submissions', 'use PHP for additional processing');
 }
 
 /**
@@ -548,8 +553,9 @@ function webform_forms($form_id) {
  * 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']);
@@ -804,7 +810,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 webform submissions') || (user_access('access own webform results') && $user->uid == $node->uid))) {
     $submission_count = db_result(db_query('SELECT count(*) FROM {webform_submissions} WHERE nid = %d AND uid = %d', $node->nid, $user->uid));
   }
 
@@ -1106,6 +1112,7 @@ function webform_client_form_load($node,
  *   Form Builder.
  */
 function webform_client_form(&$form_state, $node, $submission, $enabled = FALSE, $filter = TRUE) {
+  global $user;
   module_load_include('inc', 'webform', 'includes/webform.components');
   webform_load_components();
 
@@ -1114,7 +1121,7 @@ function webform_client_form(&$form_stat
   }
 
   // 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);
 
Index: includes/webform.report.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/includes/webform.report.inc,v
retrieving revision 1.1
diff -u -p -r1.1 webform.report.inc
--- includes/webform.report.inc	15 Jun 2009 20:31:02 -0000	1.1
+++ includes/webform.report.inc	8 Nov 2009 21:20:12 -0000
@@ -88,11 +88,12 @@ function theme_webform_results_per_page(
  * use it for sorting the results.
  */
 function theme_webform_results_submissions_header($node) {
+  global $user;
   $columns = array(
     array('data' => t('#'), 'field' => 'sid', 'sort' => 'asc'),
     array('data' => t('Submitted'), 'field' => 'submitted'),
   );
-  if (user_access('access webform results')) {
+  if (user_access('access webform results') || (user_access('access own webform results') && $user->uid == $node->uid)) {
     $columns[] = array('data' => t('User'), 'field' => 'name');
     $columns[] = array('data' => t('IP Address'), 'field' => 'remote_addr');
   }
@@ -128,7 +129,7 @@ function theme_webform_results_submissio
       $sid,
       format_date($submission->submitted, 'small'),
     );
-    if (user_access('access webform results')) {
+    if (user_access('access webform results') || (user_access('access own webform results') && $user->uid == $node->uid)) {
       $row[] = theme('username', $submission);
       $row[] = $submission->remote_addr;
     }