diff -upN orig\acl.module new\acl.module
--- orig\acl.module	Sat Nov 17 21:02:41 2007
+++ new\acl.module	Thu Dec 20 14:31:38 2007
@@ -10,6 +10,10 @@
  * ACLs can easily co-exist with the existing node_access system.
  */
 
+if (module_exists('workflow_ng')) {
+  include_once(drupal_get_path('module', 'acl') .'/acl_workflow_ng.inc');
+}
+
 /**
  * Create a new ACL.
  */
@@ -21,12 +25,35 @@ function acl_create_new_acl($module, $na
 
 /**
  * Delete an existing ACL.
+ * @param $write_grants
+ *    Optional: If TRUE it will write the node grants to the database
  */
-function acl_delete_acl($acl_id) {
+function acl_delete_acl($acl_id, $write_grants = NULL) {
   db_query("DELETE FROM {acl} WHERE acl_id = %d", $acl_id);
   db_query("DELETE FROM {acl_user} WHERE acl_id = %d", $acl_id);
+  if ($write_grants) {
+    $result = db_query("SELECT * FROM {acl_node} WHERE acl_id = %d", $acl_id);
+    while ($data = db_fetch_object($result)) {
+      $node = node_load ($data->nid);
+      node_access_acquire_grants($node);
+    }
+  }
   db_query("DELETE FROM {acl_node} WHERE acl_id = %d", $acl_id);
+  //Return the removed nodes 
+  return $removed_nodes;
+}
+
+/**
+ * Check if ACL exists, or else create it
+ */
+function acl_get_acl($acl_name) {
+  $acl_id = acl_get_id_by_name('acl', $acl_name);
+  if (!$acl_id) {
+    $acl_id = acl_create_new_acl ('acl', $acl_name);
+  }  
+  return $acl_id;
 }
+
 
 /**
  * Add the specified UID to an ACL.
diff -upN orig\acl_workflow_ng.inc new\acl_workflow_ng.inc
--- orig\acl_workflow_ng.inc	Thu Jan 01 01:00:00 1970
+++ new\acl_workflow_ng.inc	Thu Dec 20 14:33:37 2007
@@ -0,0 +1,279 @@
+<?php
+
+/**
+ * @file ACL integration for the Workflow-ng module 
+ */
+
+
+/*
+ * Implementation of hook_action_info()
+ */
+function acl_action_info() {
+  return array(
+    'acl_workflow_ng_add_user_to_acl' => array(
+      '#label' => t('Add user to ACL'),
+      '#arguments' => array(
+        'author' => array('#entity' => 'user', '#label' => t('User which will be added to the ACL')),
+      ),
+      '#module' => t('ACL'),
+    ),
+    'acl_workflow_ng_remove_user_from_acl' => array(
+      '#label' => t('Remove user from ACL'),
+      '#arguments' => array(
+        'node' => array('#entity' => 'user', '#label' => t('User which will be removed from the ACL')),
+      ),
+      '#module' => t('ACL'),
+    ),
+    'acl_workflow_ng_add_node_to_acl' => array(
+      '#label' => t('Add node to ACL'),
+      '#arguments' => array(
+        'node' => array('#entity' => 'node', '#label' => t('Content')),
+      ),
+      '#module' => t('ACL'),
+    ),
+    'acl_workflow_ng_remove_node_from_acl' => array(
+      '#label' => t('Remove node from ACL'),
+      '#arguments' => array(
+        'node' => array('#entity' => 'node', '#label' => t('Content')),
+      ),
+      '#module' => t('ACL'),
+    ),  
+    'acl_workflow_ng_delete_whole_acl' => array(
+      '#label' => t('Delete ACL(s) from node'),
+      '#arguments' => array(
+        'node' => array('#entity' => 'node', '#label' => t('Content')),
+      ),
+      '#module' => t('ACL'),
+    ),  
+    'acl_workflow_ng_delete_acl' => array(
+      '#label' => t('Delete ACL'),
+      '#module' => t('ACL'),
+    ),     
+  );
+}
+
+
+/*
+ * Action: Add a user to ACL
+ */
+function acl_workflow_ng_add_user_to_acl($author, $settings, &$arguments, &$log) {
+  $token = workflow_ng_token_replace_all (array('acl'), $settings, $arguments, $log);
+  //Make sure ACL exists, or create a new one
+  $acl_id = acl_get_acl ($token['acl']);
+  //TODO: Check if user not already in ACL
+  acl_add_user($acl_id, $author->uid);
+}
+
+/*
+ * Action: Add a user to ACL form
+ */
+function acl_workflow_ng_add_user_to_acl_form($settings = array(), $argument_info) {
+  $form = array();
+  $form['acl'] = array(
+    '#type' => 'textfield',
+    '#title' => t('ACL name'),
+    '#description' => t('Enter the name of the ACL. You may have a single user/ node assigned to several ACL lists'),
+    '#default_value' => $settings['acl'],
+    '#required' => TRUE,
+  );
+  workflow_ng_token_replacement_help($form, $argument_info);  
+  return $form;
+}
+
+function acl_workflow_ng_add_user_to_acl_submit($form_id, $form_values) {
+  $token = workflow_ng_token_get_settings(array('acl'), $form_values);
+  $settings =  array('acl' => $form_values['acl']);
+  return $token + $settings;
+}
+
+/*
+ * Action: Remove a user from ACL
+ */
+function acl_workflow_ng_remove_user_from_acl($author, $settings, &$arguments, &$log) {
+  //Make sure ACL exists
+  $token = workflow_ng_token_replace_all (array('acl'), $settings, $arguments, $log);
+  $acl_id = acl_get_id_by_name('acl', $token['acl']);
+  if ($acl_id) {
+    //TODO: Check if user not already in ACL
+    acl_remove_user($acl_id, $author->uid);
+  }
+}
+
+/*
+ * Action: Remove a user from ACL form
+ */
+function acl_workflow_ng_remove_user_from_acl_form($settings = array(), $argument_info) {
+  $form = array();
+  $form['acl'] = array(
+    '#type' => 'textfield',
+    '#title' => t('ACL name'),
+    '#description' => t('Enter the name of the ACL.'),
+    '#default_value' => $settings['acl'],
+    '#required' => TRUE,
+  );
+  workflow_ng_token_replacement_help($form, $argument_info);
+  return $form;
+}
+
+function acl_workflow_ng_remove_user_from_acl_submit($form_id, $form_values) {
+  $token = workflow_ng_token_get_settings(array('acl'), $form_values);
+  $settings =  array('acl' => $form_values['acl']);
+  return $token + $settings;
+}
+
+
+/*
+ * Action: Add a node to ACL
+ */
+function acl_workflow_ng_add_node_to_acl($node, $settings, &$arguments, &$log) {
+  //Make sure ACL exists, or create a new one
+  $token = workflow_ng_token_replace_all (array('acl'), $settings, $arguments, $log);
+  $acl_id = acl_get_acl ($token['acl']);
+  
+  //TODO: Check if node not already in ACL
+  acl_node_add_acl($node->nid, $acl_id, (boolean)$settings['access_permissions']['view'], (boolean)$settings['access_permissions']['edit'], (boolean)$settings['access_permissions']['delete']);
+  //Make sure new node access grants are written.
+  return array('node' => $node);  
+}
+
+/*
+ * Action: Add a node from ACL form
+ */
+function acl_workflow_ng_add_node_to_acl_form($settings = array(), $argument_info) {
+  $form = array();
+  $form['acl'] = array(
+    '#type' => 'textfield',
+    '#title' => t('ACL name'),
+    '#description' => t('Enter the name of the ACL.'),
+    '#default_value' => $settings['acl'],
+    '#required' => TRUE,
+  );
+  workflow_ng_token_replacement_help($form, $argument_info);
+  $form['access_permissions'] = array(
+    '#type' => 'checkboxes',
+    '#title' => t('Access permissions'),
+    '#description' => t('Select the operations users will have access rights to, when added to the ACL.'),
+    '#default_value' => $settings['access_permissions'],
+    '#options' => array (
+      'view'=> t('View'), 
+      'edit' => t('Edit'), 
+      'delete' => t('Delete'),
+    ),  
+    '#required' => TRUE,
+  );  
+  return $form;
+}
+
+function acl_workflow_ng_add_node_to_acl_submit($form_id, $form_values) {
+  $token = workflow_ng_token_get_settings(array('acl'), $form_values);
+  $settings =  array('acl' => $form_values['acl'], 'access_permissions' => $form_values['access_permissions']);
+  return $token + $settings;
+}
+
+/*
+ * Action: Remove a node from ACL
+ */
+function acl_workflow_ng_remove_node_from_acl($node, $settings, &$arguments, &$log) {
+  //Make sure ACL exists
+  $token = workflow_ng_token_replace_all (array('acl'), $settings, $arguments, $log);
+  $acl_id = acl_get_id_by_name('acl', $token['acl']);
+  if ($acl_id) {
+    //TODO: Check if node not already in ACL
+    acl_node_remove_acl($node->nid, $acl_id);
+    //Make sure new node access grants are written.
+    return array('node' => $node);    
+  }
+}
+
+/*
+ * Action: Remove a node from ACL form
+ */
+function acl_workflow_ng_remove_node_from_acl_form($settings = array(), $argument_info) {
+  $form = array();
+  $form['acl'] = array(
+    '#type' => 'textfield',
+    '#title' => t('ACL name'),
+    '#description' => t('Enter the name of the ACL.'),
+    '#default_value' => $settings['acl'],
+    '#required' => TRUE,
+  );
+  workflow_ng_token_replacement_help($form, $argument_info);
+  return $form;
+}
+
+function acl_workflow_ng_remove_node_from_acl_submit($form_id, $form_values) {
+  $token = workflow_ng_token_get_settings(array('acl'), $form_values);
+  $settings =  array('acl' => $form_values['acl']);
+  return $token + $settings;
+}
+
+/*
+ * Action: Delete a whole ACL(s) from node
+ */
+function acl_workflow_ng_delete_whole_acl($node, $settings, &$arguments, &$log) {
+  //Make sure ACL exists
+  //TODO: Check if node has any ACL defined
+  acl_node_clear_acls($node->nid, 'acl');
+
+  //Make sure new node access grants are written.
+  return array('node' => $node);
+}
+
+
+/*
+ * Action: Delete ACL
+ */
+function acl_workflow_ng_delete_acl($settings, &$arguments, &$log) {
+  //Make sure ACL exists
+  $token = workflow_ng_token_replace_all (array('acl'), $settings, $arguments, $log);
+  $acl_id = acl_get_id_by_name('acl', $token['acl']);
+  if ($acl_id) {
+    //ACL will take care of writing the node grants to the database. 
+    acl_delete_acl($acl_id, TRUE);
+  }
+}
+
+/*
+ * Action: Delete ACL form
+ */
+function acl_workflow_ng_delete_acl_form($settings = array(), $argument_info) {
+  $form = array();
+  $form['acl'] = array(
+    '#type' => 'textfield',
+    '#title' => t('ACL name'),
+    '#description' => t('Enter the name of the ACL.'),
+    '#default_value' => $settings['acl'],
+    '#required' => TRUE,
+  );
+  workflow_ng_token_replacement_help($form, $argument_info);
+  return $form;
+}
+
+function acl_workflow_ng_delete_acl_submit($form_id, $form_values) {
+  $token = workflow_ng_token_get_settings(array('acl'), $form_values);
+  $settings =  array('acl' => $form_values['acl']);
+  return $token + $settings;
+}
+
+/*
+ * Used by the ACL module
+ */
+function acl_enabled() {
+  return !acl_disabling();
+}
+
+/*
+ * Remembers if we have disabled access
+ */
+function acl_disabling($set = NULL) {
+  static $disabling = FALSE;
+
+  if (isset($set)) {
+    $disabling = $set;
+  }
+  return $disabling;
+}
+
+
+
+