--- minutes.module.old	2007-05-08 16:13:35.000000000 +0200
+++ minutes.module	2008-05-15 13:00:09.000000000 +0200
@@ -67,7 +67,7 @@ function minutes_access($op, $node) {
  * tells if minutes are enabled for a given event type
  */
 function minutes_type_is_enabled($type) {
-  return variable_get('minutes_enabled_for_type_' . $type, false);
+  return variable_get('minutes_enabled_for_type_'. $type, false);
 }
 
 /**
@@ -196,15 +196,15 @@ function minutes_admin_settings_submit($
   foreach ($matches[1] as $field_name) {
     if (!isset($cols[$field_name])) {
       $fid = db_result(db_query("SELECT fid FROM {profile_fields} WHERE name = '%s'", $field_name));
-      $tbl = 't_' . $fid;
+      $tbl = 't_'. $fid;
             
       $cols[$field_name] = "$tbl.value as \"@$field_name\"";
       $joins[] = "LEFT OUTER JOIN {profile_values} as $tbl on (u.uid = $tbl.uid and $tbl.fid = $fid)";
     }
   }
     
-  $sql = "SELECT " . implode(", ", $cols) . " "
-       . "FROM {users} as u " . implode(" ", $joins);
+  $sql = "SELECT ". implode(", ", $cols) ." "
+       ."FROM {users} as u ". implode(" ", $joins);
     
   variable_set('minutes_user_display_sql', $sql);
    
@@ -217,11 +217,11 @@ function minutes_admin_settings_submit($
  * allows different types of events to have minutes or not
  */
 function minutes_form_alter($form_id, &$form) {
-  switch($form_id) {
+  switch ($form_id) {
     // Node settings form
     case 'node_type_form':
       $type = $form['old_type']['#value'];
-      if (variable_get('event_nodeapi_' . $type, 'never') != 'never') {
+      if (variable_get('event_nodeapi_'. $type, 'never') != 'never') {
         $form['workflow']['minutes'] = array(
           '#type' => 'fieldset',
           '#title' => t('Minutes settings'),
@@ -289,7 +289,7 @@ function minutes_form(&$node, &$param) {
   );
 
   $form['event_fs']['event_description'] = array(
-    '#value' => '<p>"' . $event->title . '" from ' . $event->start_format . ' to ' . $event->end_format . '</p>',
+    '#value' => '<p>"'. $event->title .'" from '. $event->start_format .' to '. $event->end_format .'</p>',
   );
     
   if (variable_get('minutes_track_users', 1)) {
@@ -297,7 +297,7 @@ function minutes_form(&$node, &$param) {
       '#type' => 'fieldset',
       '#title' => t('Attendees'),
       '#collapsible' => true,
-      '#collapsed' => ((isset($node->attendees) and (count($node->attendees) > 0)) ? FALSE : TRUE),
+      '#collapsed' => ((isset($node->attendees) && (count($node->attendees) > 0)) ? FALSE : TRUE),
     );
             
     $form['attendees_fs']['attendees'] = array(
@@ -317,7 +317,7 @@ function minutes_form(&$node, &$param) {
     '#type' => 'fieldset',
     '#title' => t($extra),
     '#collapsible' => true,
-    '#collapsed' => ((isset($node->extra_attendees) and ($node->extra_attendees != '')) ? false : true),
+    '#collapsed' => ((isset($node->extra_attendees) && ($node->extra_attendees != '')) ? false : true),
   );
     
   $form['extra_attendees_fs']['extra_attendees'] = array(
@@ -450,7 +450,7 @@ function minutes_load($node) {
   if (variable_get('minutes_track_users', 1)) {
     $additions['attendees'] = array();
     $attendees_query = db_query("SELECT uid FROM {minutes_attendees} WHERE vid = %d", $node->vid);
-    while($attendee = db_fetch_array($attendees_query)) {
+    while ($attendee = db_fetch_array($attendees_query)) {
       $additions['attendees'][] = $attendee['uid'];
     }
   }
@@ -463,7 +463,7 @@ function minutes_load($node) {
  */
 
 function minutes_view($node, $teaser = false, $page = false) {
-  drupal_add_css(drupal_get_path('module', 'minutes') . '/minutes.css');
+  drupal_add_css(drupal_get_path('module', 'minutes') .'/minutes.css');
 
   $node = node_prepare($node, $teaser);
    
@@ -507,40 +507,40 @@ function minutes_nodeapi($node, $op, $ar
  */
 function theme_minutes_event($event) {
   $output = '<p class="minutes_event">'
-          . '<span class="minutes_event_title">Minutes for:</span> '
+          .'<span class="minutes_event_title">Minutes for:</span> '
           . $event->title
-          . ' <span class="minutes_event_from">from</span> '
+          .' <span class="minutes_event_from">from</span> '
           . $event->start_format
-          . ' <span class="minutes_event_to">to</span> '
+          .' <span class="minutes_event_to">to</span> '
           . $event->end_format
-          . '</p>' . "\n";
+          .'</p>'."\n";
   return $output;
 }
 
 function theme_minutes_default_title($event) {
-  return 'Minutes from "' . $event->title . '" on ' . $event->start_format;
+  return 'Minutes from "'. $event->title .'" on '. $event->start_format;
 }
 
 function theme_minutes_attendees($uids, $extra_attendees) {
   $registered = '';
   if (variable_get('minutes_track_users', 1)) {
     $registered = '<span class="minutes_registered_users_title">(Users)</span> '
-                . '<span class="minutes_registered_users">'
+                .'<span class="minutes_registered_users">'
                 . implode("; ", _minutes_sort_users(_minutes_translate_uids_to_display($uids)))
-                . '</span>';
+                .'</span>';
   }
   $extra = '';
   if (!is_null($extra_attendees) and ($extra_attendees != '')) {
     $extra = (($registered != '') ? ';&nbsp;&nbsp;&nbsp;<span class="minutes_extra_users_title">(Other)</span> ' : '')
-           . '<span class="minutes_extra_users">'
+           .'<span class="minutes_extra_users">'
            . $extra_attendees
-           . '</span>';
+           .'</span>';
   }
   $output = '<p class="minutes_attendees">'
-          . '<span class="minutes_attendees_title">Attendees:</span> '
+          .'<span class="minutes_attendees_title">Attendees:</span> '
           . $registered
           . $extra
-          . '</p>' . "\n";
+          .'</p>'."\n";
   return $output;
 }
 
@@ -548,7 +548,7 @@ function theme_minutes_header($event, $a
   $output = '<div class="minutes_header">'
           . $event
           . $attendees
-          . '</div>' . "\n";
+          .'</div>'."\n";
   return $output;
 }
 
@@ -566,7 +566,7 @@ function _minutes_translate_uids_to_disp
   $ret = array();
 
   if (count($uids) > 0) {
-    $result = db_query($sql . ' WHERE u.uid IN (' . implode(',', $uids) . ')');
+    $result = db_query($sql .' WHERE u.uid IN ('. implode(',', $uids) .')');
     while ($args = db_fetch_array($result)) {
       $ret[$args['@uid']] = t($display_string, $args);
     }
@@ -590,7 +590,7 @@ function _minutes_sort_users($users) {
   }
   array_multisort(array_map('strtolower', $names), SORT_ASC, SORT_STRING, $names);
   $ret = array();
-  foreach($names as $name) {
+  foreach ($names as $name) {
     $uid = $backwards[$name];
     $ret[$uid] = $users[$uid];
   }
@@ -673,3 +673,31 @@ function minutes_views_arguments() {
 function minutes_views_default_views() {
 }
 
+/**
+ * Token support
+ */
+ 
+/**
+ * Implementation of hook_token_values().
+ */
+function minutes_token_values($type, $object = NULL, $options = array()) {
+  if ($type == 'node') {
+    $node = $object;
+    $tokens['minute-parent-eid'] = $node->event_id;
+    $event = node_load($node->event_id);
+    $tokens['minute-parent-ename'] = $event->title;
+    return $tokens;
+  }
+}
+
+/**
+ * Implementation of hook_token_list().
+ */
+function minutes_token_list($type = 'all') {
+  if ($type == 'node' || $type == 'all') {
+    $tokens['node']['minute-parent-eid'] = t("ID of the parent event");
+    $tokens['node']['minute-parent-ename'] = t("Name of the parent event");
+    return $tokens;
+  }
+}
+