Index: stormproject/stormproject.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormproject/stormproject.module,v
retrieving revision 1.8.4.64.2.1
diff -u -p -r1.8.4.64.2.1 stormproject.module
--- stormproject/stormproject.module	5 Jan 2011 00:10:37 -0000	1.8.4.64.2.1
+++ stormproject/stormproject.module	17 Jan 2011 00:40:59 -0000
@@ -818,6 +818,20 @@ function stormproject_token_list($type='
   $tokens = array();
   if (($type == 'node') || ($type == 'all')) {
     $tokens['node']['stormproject-projectstatus'] = t('Storm Project: Project Status.');
+    $tokens['node']['stormproject-projectcategory'] = t('Storm Project: Project Category.');
+    $tokens['node']['stormproject-projectpriority'] = t('Storm Project: Project Priority.');
+    $tokens['node']['stormproject-durationunit'] = t('Storm Project: Project Duration Unit.');
+    $tokens['node']['stormproject-duration'] = t('Storm Project: Project Duration.');
+    $tokens['node']['stormproject-datebegin'] = t('Storm Project: Project Begin Date.');
+    $tokens['node']['stormproject-dateend'] = t('Storm Project: Project End Date.');
+    $tokens['node']['stormproject-billable'] = t('Storm Project: Project Billable.');
+    $tokens['node']['stormproject-billed'] = t('Storm Project: Project Billed.');
+    $tokens['node']['stormproject-price'] = t('Storm Project: Project Price.');
+    $tokens['node']['stormproject-pricemode'] = t('Storm Project: Project Price Mode.');
+    if(module_exists('stormorganization')) {
+      $tokens['node']['stormproject-organization-nid'] = t('Storm Project: Organization Node ID.');
+      $tokens['node']['stormproject-organization-title'] = t('Storm Project: Organization Title.');
+    }    
     if (module_exists('stormperson')) {
       // Project Manager
       $tokens['node']['stormproject-manager-title'] = t('Storm Project: Project Manager Title.');
@@ -841,6 +855,20 @@ function stormproject_token_values ($typ
   $node = $object;
   if ((($type == 'node') || ($type == 'all')) && ($node->type === 'stormproject')) {
     $values['stormproject-projectstatus'] = $node->projectstatus;
+    $values['stormproject-projectpriority'] = $node->projectpriority;
+    $values['stormproject-projectcategory'] = $node->projectcategory;
+    $values['stormproject-durationunit'] = $node->durationunit;
+    $values['stormproject-duration'] = $node->duration;
+    $values['stormproject-datebegin'] = format_date($node->datebegin,'medium','',variable_get('date_default_timezone',NULL));
+    $values['stormproject-dateend'] = format_date($node->dateend,'medium','',variable_get('date_default_timezone',NULL));
+    $values['stormproject-price'] = $node->price;
+    $values['stormproject-pricemode'] = $node->pricemode;
+    $values['stormproject-billable'] = $node->billable;
+    $values['stormproject-billed'] = $node->billed;
+    if(module_exists('stormorganization')) {
+      $values['stormproject-organization-nid'] = $node->organization_nid;
+      $values['stormproject-organization-title'] = $node->organization_title;
+    }    
     if (module_exists('stormperson')) {
       // Project Manager
       if ($node->manager_nid) {
Index: stormtask/stormtask.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormtask/stormtask.module,v
retrieving revision 1.6.4.64
diff -u -p -r1.6.4.64 stormtask.module
--- stormtask/stormtask.module	11 Oct 2010 15:40:14 -0000	1.6.4.64
+++ stormtask/stormtask.module	17 Jan 2011 00:41:00 -0000
@@ -1020,3 +1020,89 @@ function stormtask_storminvoice_auto_add
   
   return $invoice_nid;
 }
+
+/**
+*  Implementation of hook_token_list().
+*/
+function stormtask_token_list($type='all') {
+  $tokens = array();
+  if (($type == 'node') || ($type == 'all')) {
+    $tokens['node']['stormtask-step-no'] = t('Storm Task: Step No.');
+    $tokens['node']['stormtask-organization-nid'] = t('Storm Task: Organization Node ID.');
+    $tokens['node']['stormtask-organization-title'] = t('Storm Task: Organization Title.');
+    $tokens['node']['stormtask-project-nid'] = t('Storm Task: Project Node ID.');
+    $tokens['node']['stormtask-project-title'] = t('Storm Task: Project Title.');
+    $tokens['node']['stormtask-parent-nid'] = t('Storm Task: Parent NID.');
+    $tokens['node']['stormtask-taskstatus'] = t('Storm Task: Project Status.');
+    $tokens['node']['stormtask-taskcategory'] = t('Storm Task: Task Category.');
+    $tokens['node']['stormtask-taskpriority'] = t('Storm Task: Task Priority.');
+    $tokens['node']['stormtask-durationunit'] = t('Storm Task: Task Duration Unit.');
+    $tokens['node']['stormtask-duration'] = t('Storm Task: Task Duration.');
+    $tokens['node']['stormtask-datebegin'] = t('Storm Task: Task Begin Date.');
+    $tokens['node']['stormtask-dateend'] = t('Storm Task: Task End Date.');
+    $tokens['node']['stormtask-billable'] = t('Storm Task: Task Billable.');
+    $tokens['node']['stormtask-billed'] = t('Storm Task: Task Billed.');
+    $tokens['node']['stormtask-price'] = t('Storm Task: Task Price.');
+    $tokens['node']['stormtask-pricemode'] = t('Storm Task: Task Price Mode.');
+    if (module_exists('stormperson')) {
+      // Assignee(s)
+      $tokens['node']['stormtask-assigned-to-email'] = t('Storm Task: Task Assignee(s) Email Address(s).');
+      $tokens['node']['stormtask-assigned-title'] = t('Storm Task: Task Assignee(s) Title(s).');
+    }
+  }
+  return $tokens;
+}
+
+/**
+*  Implementation of hook_token_values().
+*/
+function stormtask_token_values ($type, $object = NULL) {
+  $values = array();
+  $node = $object;
+  if ((($type == 'node') || ($type == 'all')) && ($node->type === 'stormtask')) {
+    $values['stormtask-stepno'] = $node->stepno;
+    $values['stormtask-organization-nid'] = $node->organization_nid;
+    $values['stormtask-organization-title'] = $node->organization_title;
+    $values['stormtask-project-nid'] = $node->project_nid;
+    $values['stormtask-project-title'] = $node->project_title;
+    $values['stormtask-parent-nid'] = $node->parent_nid;
+    $values['stormtask-taskstatus'] = $node->taskstatus;
+    $values['stormtask-taskpriority'] = $node->taskpriority;
+    $values['stormtask-taskcategory'] = $node->taskcategory;
+    $values['stormtask-durationunit'] = $node->durationunit;
+    $values['stormtask-duration'] = $node->duration;
+    $values['stormtask-datebegin'] = format_date($node->datebegin,'medium','',variable_get('date_default_timezone',NULL));
+    $values['stormtask-dateend'] = format_date($node->dateend,'medium','',variable_get('date_default_timezone',NULL));
+    $values['stormtask-price'] = $node->price;
+    $values['stormtask-pricemode'] = $node->pricemode;
+    $values['stormtask-billable'] = $node->billable;
+    $values['stormtask-billed'] = $node->billed;
+    if (module_exists('stormperson')) {
+      // Project Assignee(s) e-mail
+      if ($node->assigned_nid) {
+        $values['stormtask-assigned-title'] = $node->assigned_title;
+        $assignees_node = node_load($node->assigned_nid);
+        // Assigned to one person
+        if ($assignees_node->type === 'stormperson') {
+          $values['stormtask-assigned-to-email'] = stormperson_primary_email($assignees_node);
+        }
+        // Assigned to a team
+        else {
+          $assignees_array = $assignees_node->members_array;
+          $assignees = array();
+          foreach ($assignees_array as $nid => $name) {
+            $assignee = node_load($nid);
+            $assignees[] = stormperson_primary_email($assignee);
+          }
+          $assigned = implode(", ", $assignees);
+          // Return comma separated list of emails
+          $values['stormtask-assigned-to-email'] = $assigned;
+        }
+      }
+      else {
+        $values['stormtask-assigned-to-email'] = NULL;
+      }
+    }
+  }
+  return $values;
+}
Index: stormticket/stormticket.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/stormticket/stormticket.module,v
retrieving revision 1.5.4.51
diff -u -p -r1.5.4.51 stormticket.module
--- stormticket/stormticket.module	11 Oct 2010 15:40:14 -0000	1.5.4.51
+++ stormticket/stormticket.module	17 Jan 2011 00:41:00 -0000
@@ -820,3 +820,85 @@ function stormticket_storminvoice_auto_a
   
   return $invoice_nid;
 }
+
+/**
+*  Implementation of hook_token_list().
+*/
+function stormticket_token_list($type='all') {
+  $tokens = array();
+  if (($type == 'node') || ($type == 'all')) {
+    $tokens['node']['stormticket-organization-nid'] = t('Storm Ticket: Organization Node ID.');
+    $tokens['node']['stormticket-organization-title'] = t('Storm Ticket: Organization Title.');
+    $tokens['node']['stormticket-project-nid'] = t('Storm Ticket: Project Node ID.');
+    $tokens['node']['stormticket-project-title'] = t('Storm Ticket: Project Title.');
+    $tokens['node']['stormticket-ticketstatus'] = t('Storm Ticket: Project Status.');
+    $tokens['node']['stormticket-ticketcategory'] = t('Storm Ticket: Ticket Category.');
+    $tokens['node']['stormticket-ticketpriority'] = t('Storm Ticket: Ticket Priority.');
+    $tokens['node']['stormticket-durationunit'] = t('Storm Ticket: Ticket Duration Unit.');
+    $tokens['node']['stormticket-duration'] = t('Storm Ticket: Ticket Duration.');
+    $tokens['node']['stormticket-datebegin'] = t('Storm Ticket: Ticket Begin Date.');
+    $tokens['node']['stormticket-dateend'] = t('Storm Ticket: Ticket End Date.');
+    $tokens['node']['stormticket-billable'] = t('Storm Ticket: Ticket Billable.');
+    $tokens['node']['stormticket-billed'] = t('Storm Ticket: Ticket Billed.');
+    $tokens['node']['stormticket-price'] = t('Storm Ticket: Ticket Price.');
+    $tokens['node']['stormticket-pricemode'] = t('Storm Ticket: Ticket Price Mode.');
+    if (module_exists('stormperson')) {
+      // Assignee(s)
+      $tokens['node']['stormticket-assigned-to-email'] = t('Storm Ticket: Ticket Assignee(s) Email Address(s).');
+      $tokens['node']['stormticket-assigned-title'] = t('Storm Ticket: Ticket Assignee(s) Title(s).');
+    }
+  }
+  return $tokens;
+}
+
+/**
+*  Implementation of hook_token_values().
+*/
+function stormticket_token_values ($type, $object = NULL) {
+  $values = array();
+  $node = $object;
+  if ((($type == 'node') || ($type == 'all')) && ($node->type === 'stormticket')) {
+    $values['stormticket-organization-nid'] = $node->organization_nid;
+    $values['stormticket-organization-title'] = $node->organization_title;
+    $values['stormticket-project-nid'] = $node->project_nid;
+    $values['stormticket-project-title'] = $node->project_title;
+    $values['stormticket-ticketstatus'] = $node->ticketstatus;
+    $values['stormticket-ticketpriority'] = $node->ticketpriority;
+    $values['stormticket-ticketcategory'] = $node->ticketcategory;
+    $values['stormticket-durationunit'] = $node->durationunit;
+    $values['stormticket-duration'] = $node->duration;
+    $values['stormticket-datebegin'] = format_date($node->datebegin,'medium','',variable_get('date_default_timezone',NULL));
+    $values['stormticket-dateend'] = format_date($node->dateend,'medium','',variable_get('date_default_timezone',NULL));
+    $values['stormticket-price'] = $node->price;
+    $values['stormticket-pricemode'] = $node->pricemode;
+    $values['stormticket-billable'] = $node->billable;
+    $values['stormticket-billed'] = $node->billed;
+    if (module_exists('stormperson')) {
+      // Project Assignee(s) e-mail
+      if ($node->assigned_nid) {
+        $values['stormticket-assigned-title'] = $node->assigned_title;
+        $assignees_node = node_load($node->assigned_nid);
+        // Assigned to one person
+        if ($assignees_node->type === 'stormperson') {
+          $values['stormticket-assigned-to-email'] = stormperson_primary_email($assignees_node);
+        }
+        // Assigned to a team
+        else {
+          $assignees_array = $assignees_node->members_array;
+          $assignees = array();
+          foreach ($assignees_array as $nid => $name) {
+            $assignee = node_load($nid);
+            $assignees[] = stormperson_primary_email($assignee);
+          }
+          $assigned = implode(", ", $assignees);
+          // Return comma separated list of emails
+          $values['stormticket-assigned-to-email'] = $assigned;
+        }
+      }
+      else {
+        $values['stormticket-assigned-to-email'] = NULL;
+      }
+    }
+  }
+  return $values;
+}