Index: contributions/modules/workflow_ng/workflow_ng/workflow_ng.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng/Attic/workflow_ng.module,v
retrieving revision 1.1.2.15.2.6
diff -u -p -r1.1.2.15.2.6 workflow_ng.module
--- contributions/modules/workflow_ng/workflow_ng/workflow_ng.module	9 Jul 2008 14:45:38 -0000	1.1.2.15.2.6
+++ contributions/modules/workflow_ng/workflow_ng/workflow_ng.module	10 Jul 2008 19:28:49 -0000
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 
 /*
  * Defines if an execution log should be displayed
@@ -6,7 +7,7 @@
 define('WORKFLOW_NG_ENABLE_DEBUG', FALSE);
 
 // Also load available integration for all activated modules
-$path = drupal_get_path('module', 'workflow_ng') . '/modules';
+$path = drupal_get_path('module', 'workflow_ng') .'/modules';
 $files = drupal_system_listing('workflow_ng_.*\.inc$', $path, 'name', 0);
 
 foreach($files as $file) {
@@ -508,7 +509,7 @@ function workflow_ng_write_log(&$log, $m
 /*
  * Returns the execution arguments needed by the given element
  * It applies the #argument map and gets all needed arguments.
- * 
+ *
  * @param $element The configured element, which is to be executed
  * @param $arguments An array of arguments in format as returned from _workflow_ng_process_arguments()
  * @param $log An array of log entries. Set it to FALSE to disable logging
@@ -638,10 +639,10 @@ function workflow_ng_add_new_arguments($
 function workflow_ng_get_element_info(&$element) {
   _workflow_ng_element_defaults($element);
   if ($element['#info'] && $element['#name']) {
-    $info = workflow_ng_gather_data($element['#type']. '_info', FALSE, 'all', $element['#name']);
+    $info = workflow_ng_gather_data($element['#type'] .'_info', FALSE, 'all', $element['#name']);
     if (isset($info)) {
       //apply the element info defaults
-      $info['#type'] = $element['#type']. '_info';
+      $info['#type'] = $element['#type'] .'_info';
       _workflow_ng_element_defaults($info);
 
       if (array_key_exists('#description', $element) && isset($info['#description'])) {
@@ -729,8 +730,8 @@ function workflow_ng_show_log($log) {
     $output = array();
     foreach ($log as $data) {
       $diff = ($data['time']['sec'] - $start['sec'])*1000000 + $data['time']['usec'] - $start['usec'];
-      $formatted_diff = round($diff * 1000, 3). ' ms';
-      $output[] = $formatted_diff . ' '. $data['msg'];
+      $formatted_diff = round($diff * 1000, 3) .' ms';
+      $output[] = $formatted_diff .' '. $data['msg'];
     }
     drupal_set_message(implode('<br />', $output));
   }
@@ -824,7 +825,7 @@ function workflow_ng_handle_error_msg($m
 
 /*
  * Determines if the given entity type is supported by the given info
- * 
+ *
  * @param $entity_type The entity type to check
  * @param $info The information data containing the #entity property
  */
@@ -900,33 +901,32 @@ function workflow_ng_comment_save($comme
  * Own version of array_intersect_key for php < 5.1
  */
 if (!function_exists('array_intersect_key')) {
-    function array_intersect_key()
-    {
-        $arrs = func_get_args();
-        $result = array_shift($arrs);
-        foreach ($arrs as $array) {
-            foreach ($result as $key => $v) {
-                if (!array_key_exists($key, $array)) {
-                    unset($result[$key]);
-                }
-            }
+  function array_intersect_key() {
+    $arrs = func_get_args();
+    $result = array_shift($arrs);
+    foreach ($arrs as $array) {
+      foreach ($result as $key => $v) {
+        if (!array_key_exists($key, $array)) {
+          unset($result[$key]);
         }
-        return $result;
-   }
+      }
+    }
+    return $result;
+  }
 }
 
 /**
  * Own version of array_combine for php < 5.
  */
 if (!function_exists('array_combine')) {
-  function array_combine($arr1,$arr2) {
+  function array_combine($arr1, $arr2) {
     $out = array();
-    foreach($arr1 as $key1 => $value1) {
+    foreach ($arr1 as $key1 => $value1) {
       $out[$value1] = $arr2[$key1];
     }
     return $out;
   }
-} 
+}
 
 /**
  * Implementation of hook_form_alter()
@@ -954,7 +954,7 @@ function workflow_ng_include_file($filen
 function workflow_ng_module_include_all($filename) {
   $data = workflow_ng_gather_data('module_info', FALSE, 'all');
   foreach (module_list(FALSE, TRUE, $sort) as $module) {
-    if ($info = $data[$module. '_' . $filename]) {
+    if ($info = $data[$module .'_'. $filename]) {
       include_once($info['file path'] .'/'. $info['file']);
     }
   }
Index: contributions/modules/workflow_ng/workflow_ng/workflow_ng_configurations.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng/Attic/workflow_ng_configurations.inc,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 workflow_ng_configurations.inc
--- contributions/modules/workflow_ng/workflow_ng/workflow_ng_configurations.inc	14 May 2008 15:07:02 -0000	1.1.2.2
+++ contributions/modules/workflow_ng/workflow_ng/workflow_ng_configurations.inc	10 Jul 2008 19:28:49 -0000
@@ -1,11 +1,12 @@
 <?php
+// $Id$
 
 /**
  * @file Workflow-ng default configurations
- * 
+ *
  * Workflow-ng does already use hook_configuration itself, so we can't implement
  * hook_configuration again. Instead this gets called from the implementation and added
- * to the configurations. 
+ * to the configurations.
  */
 
 function workflow_ng_default_configuration() {
Index: contributions/modules/workflow_ng/workflow_ng/workflow_ng_ui_render.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng/Attic/workflow_ng_ui_render.inc,v
retrieving revision 1.1.2.1.2.1
diff -u -p -r1.1.2.1.2.1 workflow_ng_ui_render.inc
--- contributions/modules/workflow_ng/workflow_ng/workflow_ng_ui_render.inc	4 Jan 2008 18:08:53 -0000	1.1.2.1.2.1
+++ contributions/modules/workflow_ng/workflow_ng/workflow_ng_ui_render.inc	10 Jul 2008 19:28:49 -0000
@@ -1,4 +1,6 @@
 <?php
+// $Id$
+
 /**
  * @file
  * Contains functions, that are used for rendering configurations with drupal_render()
@@ -32,9 +34,9 @@ function workflow_ng_ui_prepare_configur
   $render['actions_headline'] = array('#weight' => 10, '#value' => '<h3 class="actions">'. t('Actions') .'</h3>');
   $render['actions']['#weight'] = 20;
 
-  $add_img = theme('workflow_ng_icon', 'add'). '';
-  $render['condition_add'] = array('#weight' => 5, '#value' => $add_img . l(t('Add a condition'), WORKFLOW_NG_UI_PATH .'/'. $element['#name']. '/add/1/condition', array('class' => 'modify'), drupal_get_destination()), '#prefix' => '<p>', '#suffix' => '</p>');
-  $render['action_add'] = array('#weight' => 30, '#value' => $add_img . l(t('Add an action'), WORKFLOW_NG_UI_PATH .'/'. $element['#name']. '/add/1/action', array('class' => 'modify'), drupal_get_destination()), '#prefix' => '<p>', '#suffix' => '</p>');
+  $add_img = theme('workflow_ng_icon', 'add') .'';
+  $render['condition_add'] = array('#weight' => 5, '#value' => $add_img . l(t('Add a condition'), WORKFLOW_NG_UI_PATH .'/'. $element['#name'] .'/add/1/condition', array('class' => 'modify'), drupal_get_destination()), '#prefix' => '<p>', '#suffix' => '</p>');
+  $render['action_add'] = array('#weight' => 30, '#value' => $add_img . l(t('Add an action'), WORKFLOW_NG_UI_PATH .'/'. $element['#name'] .'/add/1/action', array('class' => 'modify'), drupal_get_destination()), '#prefix' => '<p>', '#suffix' => '</p>');
   return $render;
 }
 
@@ -82,11 +84,11 @@ function theme_configuration($element) {
 function theme_condition($element) {
   $element += workflow_ng_get_element_info($element);
   $attributes = isset($element['#attributes']) ? $element['#attributes'] : array();
-  $title = theme('workflow_ng_icon', 'condition'). ' '. check_plain($element['#label']);
-  $path = WORKFLOW_NG_UI_PATH .'/'. $element['#configuration']. '/edit/'. $element['#id'];
+  $title = theme('workflow_ng_icon', 'condition') .' '. check_plain($element['#label']);
+  $path = WORKFLOW_NG_UI_PATH .'/'. $element['#configuration'] .'/edit/'. $element['#id'];
   $link = l($title, $path, _workflow_ng_attributes_add_class($attributes, 'condition'), drupal_get_destination(), NULL, FALSE, TRUE);
 
-  $path = WORKFLOW_NG_UI_PATH .'/'. $element['#configuration']. '/add/'. $element['#id'] .'/op';
+  $path = WORKFLOW_NG_UI_PATH .'/'. $element['#configuration'] .'/add/'. $element['#id'] .'/op';
   $indent_link = l(theme_workflow_ng_icon('indent', t('Indent this condition by adding a logical operation.')), $path, _workflow_ng_attributes_add_class($attributes, 'condition_add'), drupal_get_destination(), NULL, FALSE, TRUE);
 
   $print_op = $element['#negate'] ? theme('workflow_ng_logical_operation_label', 'not', t('NOT')) .' ' : '';
@@ -99,8 +101,8 @@ function theme_condition($element) {
 function theme_action($element) {
   $element += workflow_ng_get_element_info($element);
   $attributes = isset($element['#attributes']) ? $element['#attributes'] : array();
-  $title = theme('workflow_ng_icon', 'action'). ' '. check_plain($element['#label']);
-  $path = WORKFLOW_NG_UI_PATH .'/'. $element['#configuration']. '/edit/'. $element['#id'];
+  $title = theme('workflow_ng_icon', 'action') .' '. check_plain($element['#label']);
+  $path = WORKFLOW_NG_UI_PATH .'/'. $element['#configuration'] .'/edit/'. $element['#id'];
   return l($title, $path, _workflow_ng_attributes_add_class($attributes, 'action'), drupal_get_destination(), NULL, FALSE, TRUE);
 }
 
@@ -150,8 +152,8 @@ function theme_OR($element) {
 
   $print_op = $element['#negate'] ? t('NOT') .' ' : '';
   $element['#title'] = t("!not%label group", array('!not' =>  $print_op , '%label' => $element['#label']));
-  $element['#children'] .= '<p class="logical-op-add">'. theme('workflow_ng_icon', 'add'). l(t('Add another condition to this group'), WORKFLOW_NG_UI_PATH .'/'. $element['#configuration']. '/add/'. $element['#id'] .'/condition', array('class' => 'modify'), drupal_get_destination()). '</p>';
-  $element['#children'] .= '<p class="logical-op-edit">'. theme('workflow_ng_icon', 'edit'). l(t('Edit this condition group'), WORKFLOW_NG_UI_PATH .'/'. $element['#configuration']. '/edit/'. $element['#id'], array('class' => 'modify'), drupal_get_destination()). '</p>';
+  $element['#children'] .= '<p class="logical-op-add">'. theme('workflow_ng_icon', 'add') . l(t('Add another condition to this group'), WORKFLOW_NG_UI_PATH .'/'. $element['#configuration'] .'/add/'. $element['#id'] .'/condition', array('class' => 'modify'), drupal_get_destination()) .'</p>';
+  $element['#children'] .= '<p class="logical-op-edit">'. theme('workflow_ng_icon', 'edit') . l(t('Edit this condition group'), WORKFLOW_NG_UI_PATH .'/'. $element['#configuration'] .'/edit/'. $element['#id'], array('class' => 'modify'), drupal_get_destination()) .'</p>';
   return theme('fieldset', $element);
 }
 /*
Index: contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_comment.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng/modules/Attic/workflow_ng_comment.inc,v
retrieving revision 1.1.2.3.2.2
diff -u -p -r1.1.2.3.2.2 workflow_ng_comment.inc
--- contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_comment.inc	8 Mar 2008 11:01:40 -0000	1.1.2.3.2.2
+++ contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_comment.inc	10 Jul 2008 19:28:49 -0000
@@ -1,10 +1,11 @@
 <?php
+// $Id$
 
 /**
- * @file Workflow-ng integration for the comment module 
+ * @file Workflow-ng integration for the comment module
  */
 
-/** 
+/**
  * Implementation of hook_event_info()
  */
 function comment_event_info() {
Index: contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_content.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng/modules/Attic/workflow_ng_content.inc,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 workflow_ng_content.inc
--- contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_content.inc	9 Jul 2008 14:45:38 -0000	1.1.2.3
+++ contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_content.inc	10 Jul 2008 19:28:49 -0000
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 
 /**
  * @file workflow-ng integration for CCK
@@ -11,7 +12,7 @@ function content_module_info() {
   return array(
     'cck_workflow_ng_forms' => array(
       'file' => 'workflow_ng_content_forms.inc',
-      'file path' => drupal_get_path('module', 'workflow_ng'). '/modules/',
+      'file path' => drupal_get_path('module', 'workflow_ng') .'/modules/',
   ),
   );
 }
@@ -80,9 +81,9 @@ function workflow_ng_action_populate_fie
   ob_start();
   $result = eval($settings['default_value_php']);
   ob_end_clean();
-  
+
   if (!empty($field) && is_array($result)) {
     $node->$settings['field_name'] = $result;
-    return array('node' => $node);      
+    return array('node' => $node);
   }
 }
Index: contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_content_forms.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng/modules/Attic/workflow_ng_content_forms.inc,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 workflow_ng_content_forms.inc
--- contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_content_forms.inc	9 Jul 2008 14:45:38 -0000	1.1.2.2
+++ contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_content_forms.inc	10 Jul 2008 19:28:49 -0000
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 
 /**
  * @file workflow-ng forms for CCK
@@ -63,7 +64,7 @@ function workflow_ng_action_populate_fie
     '#title' => t('Field'),
     '#options' => $fields,
     '#default_value' => $settings['field_name'],
-    '#description' => t('Select the machine-name of the field.'), 
+    '#description' => t('Select the machine-name of the field.'),
     '#required' => TRUE,
   );
   $sample = 'array(
@@ -74,9 +75,9 @@ function workflow_ng_action_populate_fie
   2 => ...
 );
 
-Example: 
+Example:
 return array(0 => array(\'value\' => 10));';
-  
+
     $form['default_value_php'] = array(
       '#type' => 'textarea',
       '#title' => t('Value'),
@@ -86,7 +87,7 @@ return array(0 => array(\'value\' => 10)
       '#description' => t('PHP code that returns a default value. Should not include &lt;?php ?&gt; delimiters. Expected format :<pre>!sample</pre>Using !link_devel\'s \'devel load\' tab on a %type content page might help you figure out the expected format.', array('!sample' => $sample, '!link_devel' => l('devel.module', 'http://www.drupal.org/project/devel'), '%type' => $type_name)),
       '#required' => TRUE,
     );
-  
+
   return $form;
 }
 
Index: contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng/modules/Attic/workflow_ng_node.inc,v
retrieving revision 1.1.2.3.2.8
diff -u -p -r1.1.2.3.2.8 workflow_ng_node.inc
--- contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_node.inc	2 May 2008 12:46:20 -0000	1.1.2.3.2.8
+++ contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_node.inc	10 Jul 2008 19:28:50 -0000
@@ -1,7 +1,8 @@
 <?php
+// $Id$
 
 /**
- * @file Workflow-ng integration for the node module 
+ * @file Workflow-ng integration for the node module
  */
 
 /**
@@ -11,12 +12,12 @@ function node_module_info() {
   return array(
     'node_workflow_ng_forms' => array(
       'file' => 'workflow_ng_node_forms.inc',
-      'file path' => drupal_get_path('module', 'workflow_ng'). '/modules/',
+      'file path' => drupal_get_path('module', 'workflow_ng') .'/modules/',
     ),
   );
 }
 
-/** 
+/**
  * Implementation of hook_event_info()
  */
 function node_event_info() {
@@ -185,7 +186,7 @@ function node_action_info() {
        'node_loaded' => array('#entity' => 'node', '#label' => t('Loaded content')),
       ),
       '#module' => 'Node',
-    ),     
+    ),
   );
 }
 
@@ -237,17 +238,17 @@ function workflow_ng_action_add_node($au
   //TODO: In Drupal6, node_access($op, $node, $account = NULL), thus will allow checking also content author
   if (!$settings['node_access'] || node_access('create', $settings['type'])) {
     $node = (object)array();
-  	node_object_prepare($node);
-  	//load node options
-  	$node_options = variable_get('node_options_'. $settings['type'], array('status', 'promote'));
-  	foreach (array('status', 'moderate', 'promote', 'sticky', 'revision') as $key) {
-  	  $node->$key = in_array($key, $node_options);
-  	}
-
-  	$node->name = $author->name;
-  	$node->uid = $author->uid;
-  	$node->type = $settings['type'];
-  	$node->title = workflow_ng_token_replace($settings['title'], $settings['title_args'], $arguments, $log);
+      node_object_prepare($node);
+      //load node options
+      $node_options = variable_get('node_options_'. $settings['type'], array('status', 'promote'));
+      foreach (array('status', 'moderate', 'promote', 'sticky', 'revision') as $key) {
+        $node->$key = in_array($key, $node_options);
+      }
+
+      $node->name = $author->name;
+      $node->uid = $author->uid;
+      $node->type = $settings['type'];
+      $node->title = workflow_ng_token_replace($settings['title'], $settings['title_args'], $arguments, $log);
     return array('#new arguments' => array('node_added' => $node), 'node_added' => $node);
   }
 }
Index: contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_node_forms.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng/modules/Attic/workflow_ng_node_forms.inc,v
retrieving revision 1.1.2.4
diff -u -p -r1.1.2.4 workflow_ng_node_forms.inc
--- contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_node_forms.inc	9 Apr 2008 11:25:35 -0000	1.1.2.4
+++ contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_node_forms.inc	10 Jul 2008 19:28:50 -0000
@@ -1,7 +1,8 @@
 <?php
+// $Id$
 
 /**
- * @file Workflow-ng configuration forms for the node module 
+ * @file Workflow-ng configuration forms for the node module
  */
 
 /*
@@ -91,9 +92,9 @@ function workflow_ng_action_add_node_for
     '#type' => 'checkbox',
     '#title' => t('Create content only if the acting user (i.e. logged in user) has access rights to do so'),
     '#default_value' => $settings['node_access'],
-    '#description' => t('Enable this in order for the system to check if the user has access rights for creating the 
-      required content. Note that even if the user arguments are set to \'content author \' the system will still check the \'acting user\'' ),
-  );  
+    '#description' => t('Enable this in order for the system to check if the user has access rights for creating the'
+    .' required content. Note that even if the user arguments are set to \'content author \' the system will still check the \'acting user\'' ),
+  );
   $form['title'] = array(
     '#type' => 'textfield',
     '#title' => t('Title'),
Index: contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_path.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng/modules/Attic/workflow_ng_path.inc,v
retrieving revision 1.1.2.6.2.6
diff -u -p -r1.1.2.6.2.6 workflow_ng_path.inc
--- contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_path.inc	11 Jun 2008 13:31:38 -0000	1.1.2.6.2.6
+++ contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_path.inc	10 Jul 2008 19:28:50 -0000
@@ -1,7 +1,8 @@
 <?php
+// $Id$
 
 /**
- * @file Workflow-ng integration for the path module 
+ * @file Workflow-ng integration for the path module
  */
 
 /**
@@ -11,7 +12,7 @@ function path_module_info() {
   return array(
     'path_workflow_ng_forms' => array(
       'file' => 'workflow_ng_path_forms.inc',
-      'file path' => drupal_get_path('module', 'workflow_ng'). '/modules/',
+      'file path' => drupal_get_path('module', 'workflow_ng') .'/modules/',
     ),
   );
 }
@@ -91,9 +92,9 @@ function workflow_ng_action_node_path_al
 }
 
 /*
- * Cleans the given path by replacing non ASCII characters with the given 
+ * Cleans the given path by replacing non ASCII characters with the given
  * $replace parameter
- * 
+ *
  * Furthermore it allows customization by overriding the variable workflow_ng_clean_path in
  * the settings.php
  */
@@ -105,6 +106,6 @@ function workflow_ng_clean_path($path, $
     return trim(call_user_func_array('preg_replace', $array), $replace);
   }
   else {
-    return $path;     
+    return $path;
   }
 }
Index: contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_path_forms.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng/modules/Attic/workflow_ng_path_forms.inc,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 workflow_ng_path_forms.inc
--- contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_path_forms.inc	11 Jun 2008 13:31:38 -0000	1.1.2.2
+++ contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_path_forms.inc	10 Jul 2008 19:28:50 -0000
@@ -1,7 +1,8 @@
 <?php
+// $Id$
 
 /**
- * @file Workflow-ng configuration forms for the path module 
+ * @file Workflow-ng configuration forms for the path module
  */
 
 function workflow_ng_condition_url_has_alias_form($settings = array(), $argument_info) {
@@ -54,8 +55,8 @@ function workflow_ng_action_path_alias_f
     '#title' => t('Existing system path'),
     '#default_value' => $settings['src'],
     '#maxlength' => 256,
-    '#description' => t('Specify the existing path you wish to alias. For example: node/28, forum/1, taxonomy/term/1+2.') .' '.
-       t('Leave it empty to delete URL aliases pointing to the given path alias.'),
+    '#description' => t('Specify the existing path you wish to alias. For example: node/28, forum/1, taxonomy/term/1+2.')
+    .' '. t('Leave it empty to delete URL aliases pointing to the given path alias.'),
     '#field_prefix' => url(NULL, NULL, NULL, TRUE) . (variable_get('clean_url', 0) ? '' : '?q='),
   );
   $form['dst'] = array(
@@ -63,8 +64,8 @@ function workflow_ng_action_path_alias_f
     '#title' => t('Path alias'),
     '#default_value' => $settings['dst'],
     '#maxlength' => 256,
-    '#description' => t('Specify an alternative path by which this data can be accessed. For example, type "about" when writing an about page. Use a relative path and don\'t add a trailing slash or the URL alias won\'t work.') .' '.
-       t('Leave it empty to delete URL aliases pointing to the given system path.'),
+    '#description' => t('Specify an alternative path by which this data can be accessed. For example, type "about" when writing an about page. Use a relative path and don\'t add a trailing slash or the URL alias won\'t work.')
+    .' '. t('Leave it empty to delete URL aliases pointing to the given system path.'),
     '#field_prefix' => url(NULL, NULL, NULL, TRUE) . (variable_get('clean_url', 0) ? '' : '?q='),
   );
   $form['replace'] = array(
Index: contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_system.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng/modules/Attic/workflow_ng_system.inc,v
retrieving revision 1.1.2.7.2.5
diff -u -p -r1.1.2.7.2.5 workflow_ng_system.inc
--- contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_system.inc	4 Apr 2008 09:41:45 -0000	1.1.2.7.2.5
+++ contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_system.inc	10 Jul 2008 19:28:50 -0000
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 
 /**
  * @file Workflow-ng integration for the system module
@@ -11,7 +12,7 @@ function system_module_info() {
   return array(
     'system_workflow_ng_forms' => array(
       'file' => 'workflow_ng_system_forms.inc',
-      'file path' => drupal_get_path('module', 'workflow_ng'). '/modules/',
+      'file path' => drupal_get_path('module', 'workflow_ng') .'/modules/',
     ),
   );
 }
@@ -50,8 +51,8 @@ function system_condition_info() {
       '#label' => t('Textual comparison'),
       //we are not working with defined arguments, instead we make use of all available arguments
       '#arguments' => array(),
-      '#description' => t('This condition just compares two texts. It returns TRUE, if both texts are equal.').
-        ' '. t('You may use token replacements in both texts, e.g. the texts %text1 and %text2 are only equal, if the argument called "node" is of the type page.', array('%text1' => "[node:type]", '%text2' => 'page')),
+      '#description' => t('This condition just compares two texts. It returns TRUE, if both texts are equal.')
+        .' '. t('You may use token replacements in both texts, e.g. the texts %text1 and %text2 are only equal, if the argument called "node" is of the type page.', array('%text1' => "[node:type]", '%text2' => 'page')),
       '#module' => 'System',
     ),
     'workflow_ng_condition_token_numeric' => array(
@@ -214,7 +215,7 @@ function workflow_ng_action_drupal_goto(
   }
   if ($settings['override']) {
     //override the destination parameter, so another drupal_goto goes to our url :)
-    $_REQUEST['destination'] = urlencode($path) . ($query ? '?'. urlencode($query) : '').($fragment ? '#'. urlencode($fragment) : '');
+    $_REQUEST['destination'] = urlencode($path) . ($query ? '?'. urlencode($query) : '') . ($fragment ? '#'. urlencode($fragment) : '');
   }
   else {
     drupal_goto($path, $query ? $query : NULL, $fragment ? $fragment : NULL);
Index: contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_system_forms.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng/modules/Attic/workflow_ng_system_forms.inc,v
retrieving revision 1.1.2.4
diff -u -p -r1.1.2.4 workflow_ng_system_forms.inc
--- contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_system_forms.inc	8 Mar 2008 11:01:40 -0000	1.1.2.4
+++ contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_system_forms.inc	10 Jul 2008 19:28:50 -0000
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 
 /**
  * @file Workflow-ng configuration forms for the system module
Index: contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_token.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng/modules/Attic/workflow_ng_token.inc,v
retrieving revision 1.1.2.8.2.2
diff -u -p -r1.1.2.8.2.2 workflow_ng_token.inc
--- contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_token.inc	8 Mar 2008 11:01:40 -0000	1.1.2.8.2.2
+++ contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_token.inc	10 Jul 2008 19:28:51 -0000
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 
 /**
  * @file Workflow-ng integration for the token module
@@ -14,7 +15,7 @@ function workflow_ng_token_values($entit
   if ($entity_type == 'global') {
     $values['url'] = check_plain($_REQUEST['q']);
     $values['path'] = check_plain($_GET['q']);
-    $arguments = explode('/', $values['path']); 
+    $arguments = explode('/', $values['path']);
     foreach ($arguments as $key => $arg) {
       $values['path-arg-'. ($key+1)] = $arg;
     }
@@ -52,13 +53,13 @@ function workflow_ng_token_list($entity_
 
 
 /*
- * Some useful funtions that conditions and actions may use when token is enabled 
+ * Some useful funtions that conditions and actions may use when token is enabled
  */
 
 
 /*
  * Returns an array of all used arguments in $text
- * 
+ *
  * @param $text The $text, which will be processed
  * @param $argument_info The argument definitions we work with
  * @return The array of names of the used arguments
@@ -66,7 +67,7 @@ function workflow_ng_token_list($entity_
 function workflow_ng_token_get_used_arguments($text, $argument_info) {
   $used_args = array();
   foreach ($argument_info as $name => $argument) {
-    if (strpos($text, '['. $name . ':') !== FALSE) {
+    if (strpos($text, '['. $name .':') !== FALSE) {
       $used_args[] = $name;
     }
   }
@@ -76,7 +77,7 @@ function workflow_ng_token_get_used_argu
 /*
  * Performs the replacement of the replacement patterns.
  * If a used argument isn't loaded yet, it will be automatically loaded by workflow_ng_element_get_argument()
- * 
+ *
  * @param $text The $text, which will be processed
  * @param $used_arguments The array of names of used arguments
  * @param $arguments The workflow-ng arguments data structure
@@ -87,19 +88,19 @@ function workflow_ng_token_replace($text
   static $token_cache = array();
 
   if (is_array($used_arguments)) {
-    foreach($used_arguments as $name) {
+    foreach ($used_arguments as $name) {
       $data = workflow_ng_element_get_argument($arguments, $name, $log);
       $entity = $arguments['info'][$name]['#entity'];
-  
+
       $token_id = _token_get_id($entity, $data);
       if (isset($token_cache[$token_id]) && $token_cache[$token_id] != $name) {
         //this is another argument although it has the same id
-        //so we need to flush the token cache manually 
+        //so we need to flush the token cache manually
         token_get_values('global', NULL, TRUE);
       }
-  
-      $text = token_replace($text, $entity, $data, '['. $name . ':', ']');
-  
+
+      $text = token_replace($text, $entity, $data, '['. $name .':', ']');
+
       //remember that this argument has been used and token has cached it...
       $token_cache[$token_id] = $name;
     }
@@ -125,7 +126,7 @@ function workflow_ng_token_replacement_h
         '#collapsed' => TRUE,
       );
       $form['token_help'][$name]['content'] = array(
-        '#value' => theme('token_help', $argument['#entity'], '['. $name . ':', ']'),
+        '#value' => theme('token_help', $argument['#entity'], '['. $name .':', ']'),
       );
     }
   }
@@ -134,7 +135,7 @@ function workflow_ng_token_replacement_h
 
 /**
  * Prepares the settings array for the given elements
- * 
+ *
  * @param $names An array of element names, e.g. array('message')
  */
 function workflow_ng_token_get_settings($names, $form_values) {
@@ -148,7 +149,7 @@ function workflow_ng_token_get_settings(
 
 /**
  * Replaces the tokens for all given elements
- * 
+ *
  * @param $names An array of element names, e.g. array('message')
  * @return An array of replaced strings, keyed with the element names
  */
@@ -156,7 +157,7 @@ function workflow_ng_token_replace_all($
   $return = array();
   foreach ($names as $key) {
     if (array_key_exists($key .'_args', $settings)) {
-      $return[$key] = isset($settings[$key]) ? workflow_ng_token_replace($settings[$key], $settings[$key .'_args'], $arguments, $log) : NULL;      
+      $return[$key] = isset($settings[$key]) ? workflow_ng_token_replace($settings[$key], $settings[$key .'_args'], $arguments, $log) : NULL;
     }
     else {
       $return[$key] = $settings[$key];
Index: contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_user.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng/modules/Attic/workflow_ng_user.inc,v
retrieving revision 1.1.2.2.2.10
diff -u -p -r1.1.2.2.2.10 workflow_ng_user.inc
--- contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_user.inc	7 May 2008 09:21:50 -0000	1.1.2.2.2.10
+++ contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_user.inc	10 Jul 2008 19:28:51 -0000
@@ -1,7 +1,8 @@
 <?php
+// $Id$
 
 /**
- * @file Workflow-ng integration for the user module 
+ * @file Workflow-ng integration for the user module
  */
 
 /**
@@ -11,12 +12,12 @@ function user_module_info() {
   return array(
     'user_workflow_ng_forms' => array(
       'file' => 'workflow_ng_user_forms.inc',
-      'file path' => drupal_get_path('module', 'workflow_ng'). '/modules/',
+      'file path' => drupal_get_path('module', 'workflow_ng') .'/modules/',
     ),
   );
 }
 
-/** 
+/**
  * Implementation of hook_event_info()
  */
 function user_event_info() {
@@ -146,7 +147,7 @@ function workflow_ng_condition_user_comp
 function workflow_ng_condition_user_hasrole($user, $settings) {
   $roles = $settings['roles'];
   $operation = $settings['operation'];
-  
+
   switch ($operation) {
     case 'OR':
       foreach ($roles as $rid) {
@@ -193,7 +194,7 @@ function user_action_info() {
       ),
       '#description' => t('Enter an id or a name of the user to load.'),
       '#module' => 'User',
-     ),
+    ),
   );
 }
 
Index: contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_user_forms.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng/modules/Attic/workflow_ng_user_forms.inc,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 workflow_ng_user_forms.inc
--- contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_user_forms.inc	7 May 2008 09:18:26 -0000	1.1.2.3
+++ contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_user_forms.inc	10 Jul 2008 19:28:51 -0000
@@ -1,7 +1,8 @@
 <?php
+// $Id$
 
 /**
- * @file Workflow-ng configuration forms for the user module 
+ * @file Workflow-ng configuration forms for the user module
  */
 
 /*
@@ -74,18 +75,18 @@ function workflow_ng_action_load_user_fo
   $form = array();
   workflow_ng_ui_new_arguments_form($form, $info);
   $form['username'] = array(
-    '#type' => 'textfield', 
-    '#title' => t('User name'), 
-    '#maxlength' => 60, 
-    '#autocomplete_path' => 'user/autocomplete', 
-    '#default_value' => $settings['username'], 
-    '#weight' => -1, 
+    '#type' => 'textfield',
+    '#title' => t('User name'),
+    '#maxlength' => 60,
+    '#autocomplete_path' => 'user/autocomplete',
+    '#default_value' => $settings['username'],
+    '#weight' => -1,
     '#description' => t('Name of the user to be loaded.')
   );
   $form['userid'] = array(
-    '#type' => 'textfield', 
+    '#type' => 'textfield',
     '#title' => t('User id'),
-    '#default_value' => $settings['userid'], 
+    '#default_value' => $settings['userid'],
     '#description' => t('Id of the user to be loaded.')
   );
 
@@ -103,4 +104,4 @@ function workflow_ng_action_load_user_va
 function workflow_ng_action_load_user_submit($form_id, $form_values) {
   //returns the needed settings
   return workflow_ng_token_get_settings(array('username', 'userid'), $form_values);
-}
\ No newline at end of file
+}
Index: contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_workflow_ng.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng/modules/Attic/workflow_ng_workflow_ng.inc,v
retrieving revision 1.1.2.6.2.3
diff -u -p -r1.1.2.6.2.3 workflow_ng_workflow_ng.inc
--- contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_workflow_ng.inc	2 Mar 2008 15:52:22 -0000	1.1.2.6.2.3
+++ contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_workflow_ng.inc	10 Jul 2008 19:28:51 -0000
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 
 /**
  * @file Furthere workflow-ng integration that doesn't fit really to any other module
@@ -11,7 +12,7 @@ function workflow_ng_module_info() {
   return array(
     'workflow-ng_workflow_ng_forms' => array(
       'file' => 'workflow_ng_workflow_ng_forms.inc',
-      'file path' => drupal_get_path('module', 'workflow_ng'). '/modules/',
+      'file path' => drupal_get_path('module', 'workflow_ng') .'/modules/',
     ),
     'workflow_ng_workflow_ng_configuration' => array(
       'file' => 'workflow_ng_configurations.inc',
@@ -56,7 +57,7 @@ function workflow_ng_condition_info() {
 function workflow_ng_custom_php_get_php_argument_data($used_arguments, &$arguments, &$log) {
   $argument_data = array();
   if (is_array($used_arguments)) {
-    foreach($used_arguments as $name) {
+    foreach ($used_arguments as $name) {
       $data = workflow_ng_element_get_argument($arguments, $name, $log);
       $argument_data[$name] = $data;
     }
Index: contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_workflow_ng_forms.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/workflow_ng/workflow_ng/modules/Attic/workflow_ng_workflow_ng_forms.inc,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 workflow_ng_workflow_ng_forms.inc
--- contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_workflow_ng_forms.inc	30 Dec 2007 01:09:11 -0000	1.1.2.1
+++ contributions/modules/workflow_ng/workflow_ng/modules/workflow_ng_workflow_ng_forms.inc	10 Jul 2008 19:28:51 -0000
@@ -1,4 +1,5 @@
 <?php
+// $Id$
 
 /**
  * @file Some workflow-ng configuration forms
@@ -7,7 +8,7 @@
 /**
  * Returns an array of all used PHP arguments in $code
  * PHP arguments are $name rather than [name:...]
- * 
+ *
  * @param $code The $code, which will be processed
  * @param $argument_info The argument definitions we work with
  * @return The array of names of the used arguments