Index: webform_report.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform_report/Attic/webform_report.inc,v
retrieving revision 1.1.2.27.2.10
diff -u -r1.1.2.27.2.10 webform_report.inc
--- webform_report.inc	9 Nov 2010 21:10:01 -0000	1.1.2.27.2.10
+++ webform_report.inc	17 Nov 2010 15:23:18 -0000
@@ -275,6 +275,10 @@
           
           // empty raw data row
           $data = array();
+          
+          // save submitter uid and node nid
+          $data['uid'] = $row->uid;
+          $data['nid'] = $row->nid;
             
           // fill in meta fields
           if (array_key_exists(-1, $fields)) {
@@ -370,6 +374,10 @@
   // if any filters
   if (count($filters) > 0) {
   
+    // load submitter user and webform node for later
+    $submitter = user_load($data['uid']);
+    $wfnode = node_load($data['nid']);
+
     // loop through all filters  
     foreach($filters as $index => $filter) {
 
@@ -389,6 +397,16 @@
         $filter_data = strip_tags(strtolower(trim($value['data'])));
         $filter_value = strtolower(trim($filter['value']));
         
+        // do token substitution, if installed
+        if (module_exists('token')) {
+          // replace globals
+          $filter_value = token_replace($filter_value);
+          // replace submitter user values
+          $filter_value = token_replace($filter_value, 'user', $submitter);
+          // replace webform node values
+          $filter_value = token_replace($filter_value, 'node', $wfnode);
+        }
+        
         // flag eq, ne, gt, lt, ge, le compares
         $cmpflag = (
           $filter['ftype'] == 5 || $filter['ftype'] == 6 ||