Merge lp:~jody-zivtech/uc/trunk into lp:uc

[Jody Hamilton]

[Jody Hamilton (jody-zivtech)]

See http://drupal.org/node/639778

Unmerged revisions

5. By Jody Hamilton <email address hidden> on 2009-11-22

d.o. #615306, more changes to function names, updating the non-admin ca functions, and fixing the dsm action form to use regular drupal input formats

4. By Jody Hamilton <email address hidden> on 2009-11-21

Ubercore D7 Conditional actions upgrade: Upgrade for the Conditional Actions UI to D7 and coding standards

=== added file 'includes/ubercore.admin.inc'
--- includes/ubercore.admin.inc	1970-01-01 00:00:00 +0000
+++ includes/ubercore.admin.inc	2009-11-22 17:00:24 +0000
@@ -0,0 +1,17 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * General administrative pages for Ubercore.
+ */
+
+/**
+ * Menu callback. Main settings page for the store.
+ */
+function ubercore_admin() {
+  $output =  'Placeholder for the main admin page.';
+  $output .= '<br />';
+  $output .= l('Conditional Actions Admin', 'admin/store/ca');
+  return $output;
+}
\ No newline at end of file

=== added directory 'modules/uc_ca'
=== added directory 'modules/uc_ca/includes'
=== added file 'modules/uc_ca/includes/uc_ca.admin.inc'
--- modules/uc_ca/includes/uc_ca.admin.inc	1970-01-01 00:00:00 +0000
+++ modules/uc_ca/includes/uc_ca.admin.inc	2009-11-22 17:00:24 +0000
@@ -0,0 +1,1027 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Administrative pages for Conditional Actions.
+ */
+ 
+/**
+ * Menu callback.
+ * Display the general Conditional Actions administration page.
+ * This page lists the defined predicates.
+ */
+function uc_ca_admin($groupby = 'trigger') {
+  drupal_add_css(drupal_get_path('module', 'uc_ca') .'/theme/uc_ca.css');
+  
+  $output = '';
+  
+  // Load all the module-defined predicates into a temporary array.
+  $temp = module_invoke_all('uc_ca_predicate');
+
+  // Assign a default weight if need be.
+  foreach ($temp as $key => $value) {
+    $temp[$key]['#pid'] = $key;
+    if (!isset($value['#weight'])) {
+      $temp[$key]['#weight'] = 0;
+    }
+  }
+
+  // Load and loop through all the database stored predicates.
+  $result = db_query("SELECT * FROM {uc_ca_predicates}", array(), array('fetch' => PDO::FETCH_ASSOC));
+  foreach ($result as $predicate) {
+    // Prepare the database data into a predicate.
+    $predicate = uc_ca_db_predicate_prepare($predicate);
+    // Overrides the module-defined predicate if it's been modified by a user.
+    $temp[$predicate['#pid']] = $predicate;
+  }
+
+  usort($temp, 'uc_ca_weight_sort');
+
+  // Copy the temporary array of predicates into a keyed array.
+  $predicates = array();
+  foreach ($temp as $predicate) {
+    $predicates[$predicate['#pid']] = $predicate;
+  }
+
+  // Load up the trigger data so we can display them by title.
+  $triggers = module_invoke_all('uc_ca_trigger');
+
+  // Build the header for the predicate tables based on the grouping type.
+  if ($groupby == 'trigger') {
+    $header = array(
+      array('data' => t('Title'), 'class' => 'col-title'),
+      t('Class'),
+      t('Status'),
+      t('Weight'),
+      t('Operations'),
+    );
+
+    $table_class = 'ca-predicate-trigger';
+    $table_label = '<strong>' . t('Trigger') . ':</strong> ';
+  }
+  elseif ($groupby == 'class') {
+    $header = array(
+      array('data' => t('Title'), 'class' => 'col-title'),
+      t('Trigger'),
+      t('Status'),
+      t('Weight'),
+      t('Operations'),
+    );
+
+    $table_class = 'ca-predicate-class';
+    $table_label = '<strong>' . t('Class') . ':</strong> ';
+  }
+
+  $tables = array();
+
+  foreach ($predicates as $key => $value) {
+    // Build the basic operation links for each predicate.
+    $ops = array(
+      l(t('edit'), 'admin/store/ca/' . $key . '/edit'),
+    );
+
+    // Add the reset link if a module defined predicate has been modified.
+    if (!is_numeric($key) && isset($value['#modified'])) {
+      $ops[] = l(t('reset'), 'admin/store/ca/'. $key .'/reset');
+    }
+
+    // Add a delete link if displaying a custom predicate.
+    if (is_numeric($key)) {
+      $ops[] = l(t('delete'), 'admin/store/ca/'. $key .'/delete');
+    }
+
+    // Add the predicate's row to the table based on the grouping type.
+    if ($groupby == 'trigger') {
+      $tables[$triggers[$value['#trigger']]['#title']]['rows'][] = array(
+        check_plain($value['#title']),
+        strpos($value['#class'], 'custom') === 0 ? check_plain(substr($value['#class'], 7)) : $value['#class'],
+        $value['#status'] == 0 ? t('Disabled') : t('Enabled'),
+        array('data' => $value['#weight'], 'class' => 'ca-predicate-table-weight'),
+        array('data' => implode(' ', $ops), 'class' => 'ca-predicate-table-ops'),
+      );
+    }
+    elseif ($groupby == 'class') {
+      $class = strpos($value['#class'], 'custom') === 0 ? check_plain(substr($value['#class'], 7)) : $value['#class'];
+
+      $tables[$class]['rows'][] = array(
+        check_plain($value['#title']),
+        check_plain($triggers[$value['#trigger']]['#title']),
+        $value['#status'] == 0 ? t('Disabled') : t('Enabled'),
+        array('data' => $value['#weight'], 'class' => 'ca-predicate-table-weight'),
+        array('data' => implode(' ', $ops), 'class' => 'ca-predicate-table-ops'),
+      );
+    }
+  }
+
+  // Put the tables in alphabetical order.
+  ksort($tables);
+
+  // Add the tables for each trigger to the output.
+  foreach ($tables as $key => $value) {
+    // Accommodate empty class names.
+    if (empty($key)) {
+      $key = t('- None -');
+    }
+
+    $output .= theme('table', array(
+      'header' => $header, 
+      'rows' => $value['rows'], 
+      'attributes' => array(
+        'class' => array($table_class),
+      ), 
+      'caption' => $table_label . check_plain($key),
+    ));
+  }
+
+  $output .= l(t('Add a predicate'), 'admin/store/ca/add');
+
+  return $output;
+}
+
+/**
+ * Form to allow the creation and editing of conditional action predicates.
+ */
+function uc_ca_predicate_meta_form($form_state, &$form_state, $predicate = array()) {
+  // Load the predicate if an ID is passed in.
+  if (isset($predicate['#title'])) {
+    drupal_set_title(check_plain($predicate['#title']));
+  }
+  $pid = isset($predicate['#pid']) ? check_plain($predicate['#pid']) : 0;
+
+  $form['predicate_pid'] = array(
+    '#type' => 'value',
+    '#value' => $pid,
+  );
+
+  $form['predicate_title'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Title'),
+    '#description' => t('Enter a title used for display on the overview tables.'),
+    '#default_value' => $pid ? check_plain($predicate['#title']) : '',
+    '#required' => TRUE,
+  );
+
+  // Create an array of triggers for the select box.
+  $triggers = module_invoke_all('uc_ca_trigger');
+  $options = array();
+  foreach ($triggers as $key => $value) {
+    $options[$value['#category']][$key] = check_plain($value['#title']);
+  }
+
+  $form['predicate_trigger'] = array(
+    '#type' => 'select',
+    '#title' => t('Trigger'),
+    '#description' => t('Select the trigger for this predicate. This cannot be modified if the predicate has conditions or actions.'),
+    '#options' => $options,
+    '#default_value' => $pid ? check_plain($predicate['#trigger']) : '',
+    '#disabled' => empty($predicate['#conditions']) && empty($predicate['#actions']) ? FALSE : TRUE,
+    '#required' => TRUE,
+  );
+
+  $form['predicate_description'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Description'),
+    '#description' => t('Enter a description that summarizes the use and intent of the predicate.'),
+    '#default_value' => $pid ? check_plain($predicate['#description']) : '',
+  );
+
+  // Accommodate the mandatory custom prefix for predicate classes.
+  $class = isset($predicate['#class']) ? $predicate['#class'] : '';
+  if (strpos($class, 'custom') === 0) {
+    $class = ltrim(substr($class, 6), ':');
+  }
+
+  if (is_numeric($pid)) {
+    $form['predicate_class'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Class'),
+      '#description' => t('Classes let you categorize your predicates based on the type of functionality they provide.'),
+      '#field_prefix' => 'custom:',
+      '#default_value' => check_plain($class),
+    );
+  }
+  else {
+    $form['predicate_class'] = array(
+      '#type' => 'value',
+      '#value' => $class,
+    );
+  }
+
+  $form['predicate_status'] = array(
+    '#type' => 'radios',
+    '#title' => t('Status'),
+    '#description' => t('Disabled predicates will not be processed when their trigger is pulled.'),
+    '#options' => array(
+      1 => t('Enabled'),
+      0 => t('Disabled'),
+    ),
+    '#default_value' => $pid ? $predicate['#status'] : 1,
+  );
+
+  $form['predicate_weight'] = array(
+    '#type' => 'weight',
+    '#title' => t('Weight'),
+    '#description' => t('Predicates will be sorted by weight and processed sequentially.'),
+    '#default_value' => ($pid && isset($predicate['#weight'])) ? check_plain($predicate['#weight']) : 0,
+  );
+
+  $form['submit'] = array(
+    '#type' => 'submit',
+    '#value' => t('Save predicate'),
+    '#suffix' => l(t('Cancel'), 'admin/store/ca'),
+  );
+
+  return $form;
+}
+
+/**
+ * Submit handler for predicate creation and editing form.
+ * @see uc_ca_predicate_meta_form()
+ */
+function uc_ca_predicate_meta_form_submit($form, &$form_state) {
+
+  $form_state['redirect'] = 'admin/store/ca';
+  $predicate = array();
+  
+  // Load the original predicate.
+  if ($form_state['values']['predicate_pid']) {
+    $predicate = uc_ca_predicate_load($form_state['values']['predicate_pid']);
+  }
+
+  // Setup a list of fields to check for and apply changes.
+  $fields = array('title', 'trigger', 'description', 'class', 'status', 'weight');
+
+  // Compare the values from the form submission with what is already set.
+  $save = FALSE;
+  foreach ($fields as $field) {
+    if (!isset($predicate['#' . $field]) || $form_state['values']['predicate_' . $field] != $predicate['#' . $field]) {
+      $predicate['#' . $field] = $form_state['values']['predicate_' .  $field];
+      $save = TRUE;
+    }
+  }
+  
+  // Add a new predicate.
+  if (!isset($predicate['#pid'])) {
+    uc_ca_predicate_save($predicate);
+    drupal_set_message(t('The new predicate was added.'));
+    // For new predicates, redirect to the conditions tab.
+    $form_state['redirect'] = 'admin/store/ca/' . $predicate['#pid'] .'/edit/conditions';
+  }
+  
+  elseif ($save) {
+    uc_ca_predicate_save($predicate);
+    drupal_set_message(t('The predicate meta-data was saved.'));
+  }
+}
+
+/**
+ * Build a form for adding and editing conditions on a predicate.
+ *
+ * @ingroup forms
+ * @see
+ *   uc_ca_conditions_form_add_condition_group_submit()
+ *   uc_ca_conditions_form_remove_condition_group_submit()
+ *   uc_ca_conditions_form_add_condition_submit()
+ *   uc_ca_conditions_form_remove_condition_submit()
+ *   uc_ca_conditions_form_save_changes_submit()
+ */
+function uc_ca_conditions_form($form, &$form_state, $predicate = array()) {
+
+  // Return an empty form if the predicate does not exist.
+  if (empty($predicate)) {
+    return array();
+  }
+
+  // Include the JS for conditional actions forms.
+  drupal_add_js(drupal_get_path('module', 'uc_ca') .'/theme/ca.js');
+
+  // Display the title.
+  drupal_set_title($predicate['#title']);
+
+  // Initialize the conditions available for this predicate.
+  uc_ca_trigger_conditions_load($predicate['#trigger']);
+
+  // Add the predicate ID to the form array.
+  $form['pid'] = array(
+    '#type' => 'value',
+    '#value' => $predicate['#pid'],
+  );
+
+  // If the predicate conditions array isn't already a container of containers,
+  // make it so.  i.e. group => array('group' => array('cond', 'cond'))
+  if (empty($predicate['#conditions'])) {
+    $predicate['#conditions'] = uc_ca_new_conditions();
+  }
+  else {
+    $key = array_shift(array_keys($predicate['#conditions']['#conditions']));
+
+    if (empty($predicate['#conditions']['#conditions'][$key]['#operator'])) {
+      $predicate['#conditions'] = array(
+        '#operator' => 'AND',
+        '#conditions' => array(
+          $predicate['#conditions'],
+        ),
+      );
+    }
+  }
+
+  // Recurse through the predicate's conditions to build the form.
+  $form['conditions'] = _uc_ca_conditions_form_tree($predicate['#conditions'], $predicate['#trigger']);
+  $form['conditions'] = $form['conditions'][0];
+
+  // Always remove the top level condition group controls.
+  unset($form['conditions']['condition']);
+  unset($form['conditions']['add_condition']);
+  unset($form['conditions']['remove_condition_group']);
+
+  // If there are more than one top level condition groups...
+  if (count($form['conditions']['conditions']) > 1) {
+    // Update the top level fieldset.
+    $form['conditions']['#title'] = t('Condition groups');
+    $form['conditions']['#collapsible'] = FALSE;
+
+    // Adjust the titles of the operator options to be more explicit.
+    $form['conditions']['operator']['#options'] = array(
+      'AND' => t('AND. If all of these condition groups are TRUE.'),
+      'OR' => t('OR. If any of these condition groups are TRUE.'),
+    );
+  }
+  else {
+    // Otherwise remove the top level fieldset and operator.
+    unset($form['conditions']['#type']);
+    unset($form['conditions']['operator']);
+
+    // Adjust the second level conditions group to not collapse.
+    $form['conditions']['conditions'][0]['#collapsible'] = FALSE;
+  }
+
+  // Set the conditions array to a tree so the submitted form values mirror the
+  // structure of a predicate's #conditions array.
+  $form['conditions']['#tree'] = TRUE;
+
+  $form['add_condition_group'] = array(
+    '#type' => 'submit',
+    '#value' => t('Add condition group'),
+    '#submit' => array('uc_ca_conditions_form_add_condition_group_submit'),
+  );
+
+  $form['save'] = array(
+    '#type' => 'submit',
+    '#value' => t('Save changes'),
+    '#submit' => array('uc_ca_conditions_form_save_changes_submit'),
+  );
+
+  uc_ca_filter_configure_form($form);
+
+  return $form;
+}
+
+/**
+ * Submit handler for button to add a condition group.
+ *
+ * @see uc_ca_conditions_form()
+ */
+function uc_ca_conditions_form_add_condition_group_submit($form, &$form_state) {
+  // Save the existing conditions to preserve any changes.
+  uc_ca_conditions_form_update_conditions($form_state['values']['pid'], $form_state['values']['conditions']);
+
+  // Add the condition group to the predicate.
+  uc_ca_condition_group_add($form_state['values']['pid']);
+
+  // Display a confirmation message.
+  drupal_set_message(t('Condition group added.'));
+}
+
+/**
+ * Submit handler for button to remove a condition group.
+ *
+ * @see uc_ca_conditions_form()
+ */
+function uc_ca_conditions_form_remove_condition_group_submit($form, &$form_state) {
+  $group_key = FALSE;
+
+  // Loop through the array keys of the conditions group.
+  foreach (array_keys($form['conditions']['conditions']) as $key => $value) {
+    // If we find the key we're looking for...
+    if (is_numeric($value) && $value == $form_state['clicked_button']['#array_parents'][2]) {
+      // Store its position as the new group key once the conditions are saved.
+      // This is necessary because the save function will truncate any holes so
+      // the keys are in numerical order starting with 0.
+      $group_key = $key;
+    }
+  }
+
+  // Save the existing conditions to preserve any changes.
+  uc_ca_conditions_form_update_conditions($form_state['values']['pid'], $form_state['values']['conditions']);
+
+  // Fail if we didn't find a new group key for some reason.
+  if ($group_key === FALSE) {
+    drupal_set_message(t('An error occurred when trying to add the condition.  Please try again.'), 'error');
+  }
+  else {
+    // Remove the condition group from the predicate.
+    uc_ca_condition_group_remove($form_state['values']['pid'], $group_key);
+
+    // Display a confirmation message.
+    drupal_set_message(t('Condition group removed.'));
+  }
+}
+
+/**
+ * Save changes submit handler for the conditions form.
+ *
+ * @see uc_ca_conditions_form()
+ */
+function uc_ca_conditions_form_save_changes_submit($form, &$form_state) {
+  // Save the existing conditions to preserve any changes.
+  uc_ca_conditions_form_update_conditions($form_state['values']['pid'], $form_state['values']['conditions']);
+
+  drupal_set_message(t('Conditions saved.'));
+}
+
+/**
+ * Update a predicate's conditions based on the values from a conditions form.
+ *
+ * @param $pid
+ *   The ID of the predicate whose conditions should be updated.
+ * @param $data
+ *   The conditions values from the form state that should be used to update the
+ *     predicate; normally $form_state['values']['conditions'].
+ * @return
+ *   An array representing the full, updated predicate.
+ */
+function uc_ca_conditions_form_update_conditions($pid, $data) {
+  // Build the new conditions array from scratch.
+  $conditions = uc_ca_new_conditions();
+
+  // Override the top level operator if need be.
+  if (isset($data['operator'])) {
+    $conditions['#operator'] = $data['operator'];
+  }
+
+  // Use a variable to track the group array key so we can "reset" the keys.
+  $group = 0;
+
+  // Loop through each second level condition group.
+  foreach ($data['conditions'] as $key => $value) {
+    // Save the operator setting.
+    $conditions['#conditions'][$group]['#operator'] = $value['operator'];
+    $conditions['#conditions'][$group]['#conditions'] = array();
+
+    // If conditions exist...
+    if (isset($value['conditions']) && count($value['conditions']) > 0) {
+      // Use a variable to track the condition array key as for groups.
+      $condition = 0;
+
+      // Loop through the conditions in this group.
+      foreach ($value['conditions'] as $cond_key => $cond_value) {
+        // Save the condition's settings.
+        $conditions['#conditions'][$group]['#conditions'][$condition] = array(
+          '#name' => $cond_value['name'],
+          '#title' => $cond_value['title'],
+          '#argument_map' => isset($cond_value['argument_map']) ? $cond_value['argument_map'] : array(),
+          '#settings' => $cond_value['settings'],
+        );
+
+        $condition++;
+      }
+    }
+
+    $group++;
+  }
+
+  // Load the predicate as it is now.
+  $predicate = uc_ca_predicate_load($pid);
+
+  // Update the actions and save the result.
+  $predicate['#conditions'] = $conditions;
+  uc_ca_predicate_save($predicate);
+
+  return $predicate;
+}
+
+/**
+ * Recursively add logical groups to the conditions form as fieldsets.
+ *
+ * @param $condition
+ *   An array consisting of an #operator and another array of #conditions, or
+ *   a condition array with data pertaining to its callback function.
+ * @param $trigger
+ *   The trigger name and data concerning the arguments that are passed in to
+ *   the condition.
+ * @return
+ *   A form array representing the tree of conditions.
+ */
+function _uc_ca_conditions_form_tree($condition, $trigger) {
+  // We need an index so condition group fieldsets have unique keys.
+  static $index = 0;
+  $form = array();
+
+  // If we're dealing with a conditions group and not a single condition.
+  if (isset($condition['#operator']) && is_array($condition['#conditions'])) {
+    $level = $index;
+
+    $form[$level] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Conditions group'),
+      '#collapsible' => TRUE,
+    );
+
+    // Add an operator radio select for the group.
+    $form[$level]['operator'] = array(
+      '#type' => 'radios',
+      '#title' => t('Operator'),
+      '#options' => array(
+        'AND' => t('AND. If all of these conditions are TRUE.'),
+        'OR' => t('OR. If any of these conditions are TRUE.'),
+      ),
+      '#default_value' => $condition['#operator'],
+    );
+
+    $form[$level]['conditions'] = array();
+
+    // For each condition in #conditions, add a condition fieldset to the form.
+    foreach ($condition['#conditions'] as $sub_condition) {
+      $result = _uc_ca_conditions_form_tree($sub_condition, $trigger);
+
+      if (is_array($result)) {
+        $form[$level]['conditions'] = array_merge($form[$level]['conditions'], $result);
+      }
+    }
+
+    $form[$level]['condition'] = array(
+      '#type' => 'select',
+      '#title' => t('Available conditions'),
+      '#options' => uc_ca_trigger_conditions_load(),
+    );
+    $form[$level]['add_condition'] = array(
+      '#type' => 'submit',
+      '#value' => t('Add condition'),
+      '#submit' => array('uc_ca_conditions_form_add_condition_submit'),
+      '#name' => 'add_condition_' . $level,
+    );
+    $form[$level]['remove_condition_group'] = array(
+      '#type' => 'submit',
+      '#value' => t('Remove group'),
+      '#submit' => array('uc_ca_conditions_form_remove_condition_group_submit'),
+      '#attributes' => array('class' => array('ca-remove-confirm')),
+      '#name' => 'remove_condition_group_' . $level,
+    );
+    $index++;
+
+    return $form;
+  }
+  elseif (!empty($condition)) {
+    // Load the data for the conditions as defined by modules.
+    $condition_data = uc_ca_condition_load();
+
+    // Otherwise add a fieldset for the individual condition.
+    $form[0] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Condition: @title', array('@title' => $condition_data[$condition['#name']]['#title'])),
+      '#description' => t('@description', array('@description' => $condition_data[$condition['#name']]['#description'])),
+      '#collapsible' => TRUE,
+      '#collapsed' => isset($condition['#expanded']) ? FALSE : TRUE,
+    );
+
+    // Add form elements to the fieldset to adjust the condition's settings.
+    $form[0] += _uc_ca_conditions_form_condition($condition, $trigger);
+
+    return $form;
+  }
+}
+
+/**
+ * Add a single condition's fieldset to the conditions form.
+ *
+ * @param $condition
+ *   The condition data array.
+ * @param $trigger
+ *   The trigger name and data concerning the arguments that are passed in to
+ *   the condition.
+ * @return
+ *   A form array representing the condition.
+ */
+function _uc_ca_conditions_form_condition($condition, $trigger) {
+  static $identifier = 0;
+
+  // Load the data for the conditions as defined by modules.
+  $condition_data = uc_ca_condition_load();
+
+  // Condition name is a hard reference to the condition and so not editable.
+  $form['name'] = array(
+    '#type' => 'value',
+    '#value' => $condition['#name'],
+  );
+
+  // The title for this particular instance of this condition.
+  $form['title'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Title'),
+    '#default_value' => $condition['#title'],
+  );
+
+  $form['argument_map'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Arguments'),
+    '#description' => t('Some triggers pass in multiple options for arguments related to a particular condition, so you must specify which options to use in the fields below.'),
+    '#collapsible' => TRUE,
+  );
+
+  // Setup a variable to decide if we can collapse the arguments fieldset.
+  $collapsed = TRUE;
+
+  // Cast to an array to accommodate conditions that need no arguments.
+  foreach ((array) $condition_data[$condition['#name']]['#arguments'] as $key => $value) {
+    // Load the available arguments for each entity as received by the
+    // trigger when it was pulled.
+    $options = uc_ca_trigger_arguments_load($trigger, $value['#entity']);
+
+    // If we have more than one option for any argument, do not collapse.
+    if (count($options) > 1) {
+      $collapsed = FALSE;
+    }
+
+    $form['argument_map'][$key] = array(
+      '#type' => 'select',
+      '#title' => check_plain($value['#title']),
+      '#options' => $options,
+      '#default_value' => $condition['#argument_map'][$key],
+    );
+  }
+
+  $form['argument_map']['#collapsed'] = $collapsed;
+
+  // Whether or not to negate the result of this condition.
+  $form['settings']['negate'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Negate this condition.'),
+    '#description' => t('Return FALSE if the condition is TRUE and vice versa.'),
+    '#default_value' => isset($condition['#settings']['negate']) ? $condition['#settings']['negate'] : '',
+  );
+
+  // Get the callback for the condition we're displaying.
+  $callback = $condition_data[$condition['#name']]['#callback'] . '_form';
+
+  if (function_exists($callback)) {
+   // Load the trigger data.
+   $trigger_data = uc_ca_trigger_load($trigger);
+
+  // Add the condition's form elements to the fieldset.
+    $form['settings'] += $callback(array(), $condition['#settings'], $trigger_data['#arguments']);
+  }
+
+  $form['remove'] = array(
+    '#type' => 'submit',
+    '#value' => t('Remove this condition'),
+    '#submit' => array('uc_ca_conditions_form_remove_condition_submit'),
+    '#attributes' => array('class' => array('ca-remove-confirm')),
+    '#name' => 'remove_condition_group_' . $identifier++,
+  );
+
+  return $form;
+}
+
+/**
+ * Submit handler for button to add a condition to a condition group.
+ *
+ * @see uc_ca_conditions_form()
+ */
+function uc_ca_conditions_form_add_condition_submit($form, &$form_state) {
+  $group_key = FALSE;
+
+  // Loop through the array keys of the conditions group.
+  foreach (array_keys($form['conditions']['conditions']) as $key => $value) {
+    // If we find the key we're looking for...
+    if (is_numeric($value) && $value == $form_state['clicked_button']['#array_parents'][2]) {
+      // Store its position as the new group key once the conditions are saved.
+      // This is necessary because the save function will truncate any holes so
+      // the keys are in numerical order starting with 0.
+      $group_key = $key;
+    }
+  }
+
+  // Save the existing conditions to preserve any changes.
+  uc_ca_conditions_form_update_conditions($form_state['values']['pid'], $form_state['values']['conditions']);
+
+  // Fail if we didn't find a new group key for some reason.
+  if ($group_key === FALSE) {
+    drupal_set_message(t('An error occurred when trying to add the condition.  Please try again.'), 'error');
+  }
+  else {
+    // Otherwise add the condition to the specified group.
+    $name = $form_state['values']['conditions']['conditions'][$group_key]['condition'];
+
+    uc_ca_condition_add($form_state['values']['pid'], $name, $group_key);
+
+    $condition = uc_ca_condition_load($name);
+
+    drupal_set_message(t('%title condition added.', array('%title' => $condition['#title'])));
+  }
+}
+
+/**
+ * Submit handler for button to remove a condition from a condition group.
+ *
+ * @see uc_ca_conditions_form()
+ */
+function uc_ca_conditions_form_remove_condition_submit($form, &$form_state) {
+  $group_key = FALSE;
+  $cond_key = FALSE;
+
+  // Loop through the array keys of the conditions group.
+  foreach (array_keys($form['conditions']['conditions']) as $key => $value) {
+    // If we find the key we're looking for...
+    if (is_numeric($value) && $value == $form_state['clicked_button']['#array_parents'][2]) {
+      // Store its position as the new group key once the conditions are saved.
+      // This is necessary because the save function will truncate any holes so
+      // the keys are in numerical order starting with 0.
+      $group_key = $key;
+    }
+  }
+
+  // Loop through the array keys of the conditions in the group.
+  foreach (array_keys($form['conditions']['conditions'][$form_state['clicked_button']['#array_parents'][2]]['conditions']) as $key => $value) {
+    // If we find the key we're looking for...
+    if (is_numeric($value) && $value == $form_state['clicked_button']['#array_parents'][4]) {
+      // Store its position as the new condition key once the conditions are
+      // saved. This is necessary because the save function will truncate any
+      // holes so the keys are in numerical order starting with 0.
+      $cond_key = $key;
+    }
+  }
+
+  // Save the existing conditions to preserve any changes.
+  uc_ca_conditions_form_update_conditions($form_state['values']['pid'], $form_state['values']['conditions']);
+
+  // Fail if we didn't find a new group key for some reason.
+  if ($group_key === FALSE || $cond_key === FALSE) {
+    drupal_set_message(t('An error occurred when trying to remove the condition.  Please try again.'), 'error');
+  }
+  else {
+    // Otherwise remove the condition from the specified group.
+    uc_ca_condition_remove($form_state['values']['pid'], $group_key, $cond_key);
+
+    drupal_set_message(t('Condition removed.'));
+  }
+}
+
+/**
+ * Form to delete or reset a predicate.
+ */
+function uc_ca_predicate_delete_form($form, &$form_state, $predicate) {
+
+  $form['predicate_pid'] = array(
+    '#type' => 'value',
+    '#value' => $predicate['#pid'],
+  );
+
+  $form['predicate_title'] = array(
+    '#type' => 'value',
+    '#value' => $predicate['#title'],
+  );
+
+  $description = '<p><strong>' . check_plain($predicate['#title']) . '</strong><br />'
+               . check_plain($predicate['#description']) . '</p><p>'
+                . t('This action cannot be undone.') .'</p>';
+
+  return confirm_form($form, t('Are you sure you want to !op this predicate?', array('!op' => is_numeric($predicate['#pid']) ? t('delete') : t('reset'))), 'admin/store/ca', $description);
+}
+
+/**
+ * Submit handler for predicate delete form.
+ * @see uc_ca_predicate_delete_form()
+ */
+function uc_ca_predicate_delete_form_submit($form, &$form_state) {
+  uc_ca_predicate_delete($form_state['values']['predicate_pid']);
+
+  drupal_set_message(t('Predicate %title !op.', array('%title' => $form_state['values']['predicate_title'], '!op' => is_numeric($form_state['values']['predicate_pid']) ? t('deleted') : t('reset'))));
+
+  $form_state['redirect'] = 'admin/store/ca';
+}
+
+/**
+ * Build a form for adding and editing actions on a predicate.
+ *
+ * @param $predicate
+ *   The loaded predicate array whose actions are being modified.
+ * @return
+ *   The form array for the actions form.
+ *
+ * @ingroup forms
+ * @see
+ *   uc_ca_actions_form_add_action_submit()
+ *   uc_ca_actions_form_add_action_submit()
+ *   uc_ca_actions_form_save_changes_submit()
+ */
+function uc_ca_actions_form($form, &$form_state, $predicate) {
+
+  // Include the JS for conditional actions forms.
+  drupal_add_js(drupal_get_path('module', 'uc_ca') .'/theme/uc_ca.js');
+
+  // Display the title.
+  drupal_set_title($predicate['#title']);
+
+  // Load up any actions that could possibly be on this predicate.
+  $action_data = uc_ca_action_load();
+
+  $form['pid'] = array(
+    '#type' => 'value',
+    '#value' => $predicate['#pid'],
+  );
+
+  $form['actions'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Actions'),
+    '#description' => t('These actions will be performed in order when this predicate passes the conditions evaluation.'),
+    '#tree' => TRUE,
+  );
+
+  // Loop through the actions and add them to the form if valid.
+  $i = 0;
+
+  foreach ($predicate['#actions'] as $key => $action) {
+    // Add it to the form if the action's callback exists.
+    $callback = isset($action_data[$action['#name']]['#callback']) ? $action_data[$action['#name']]['#callback'] : '';
+
+    if (function_exists($callback)) {
+      $form['actions'][$i] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Action: @title', array('@title' => $action_data[$action['#name']]['#title'])),
+        '#description' => isset($action_data[$action['#name']]['#description']) ? $action_data[$action['#name']]['#description'] : '',
+        '#collapsible' => TRUE,
+        '#collapsed' => isset($_SESSION['ca_action_focus']) && $i == $_SESSION['ca_action_focus'] ? FALSE : TRUE,
+      );
+
+      $form['actions'][$i]['name'] = array(
+        '#type' => 'value',
+        '#value' => $action['#name'],
+      );
+
+      $form['actions'][$i]['title'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Title'),
+        '#default_value' => $action['#title'],
+      );
+
+      $form['actions'][$i]['argument_map'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Arguments'),
+        '#description' => t('Some triggers pass in multiple options for arguments related to a particular action, so you must specify which options to use in the fields below.'),
+        '#collapsible' => TRUE,
+      );
+
+      // Setup a variable to decide if we can collapse the arguments fieldset.
+      $collapsed = TRUE;
+
+      foreach ($action_data[$action['#name']]['#arguments'] as $key => $value) {
+        // Load the available arguments for each entity as received by the
+        // trigger when it was pulled.
+        $options = uc_ca_trigger_arguments_load($predicate['#trigger'], $value['#entity']);
+
+        // If we have more than one option for any argument, do not collapse.
+        if (count($options) > 1) {
+          $collapsed = FALSE;
+        }
+
+        $form['actions'][$i]['argument_map'][$key] = array(
+          '#type' => 'select',
+          '#title' => check_plain($value['#title']),
+          '#options' => $options,
+          '#default_value' => isset($action['#argument_map']) ? $action['#argument_map'][$key] : '',
+        );
+      }
+
+      $form['actions'][$i]['argument_map']['#collapsed'] = $collapsed;
+
+      // Add the action's form elements if any exist.
+      $callback .= '_form';
+
+      if (function_exists($callback)) {
+        // Load the trigger data.
+        $trigger_data = uc_ca_trigger_load($predicate['#trigger']);
+
+        $form['actions'][$i]['settings'] = $callback(array(), isset($action['#settings']) ? $action['#settings'] : array(), $trigger_data['#arguments']);
+      }
+
+      $form['actions'][$i]['remove'] = array(
+        '#type' => 'submit',
+        '#value' => t('Remove this action'),
+        '#name' => 'ca_remove_action_'. $i,
+        '#submit' => array('uc_ca_actions_form_remove_action_submit'),
+        '#attributes' => array('class' => array('ca-remove-confirm')),
+      );
+
+      $i++;
+    }
+  }
+
+  // Unset the session variable used to focus on the new action.
+  unset($_SESSION['ca_action_focus']);
+
+  $form['actions']['add_action'] = array(
+    '#type' => 'select',
+    '#title' => t('Available actions'),
+    '#options' => uc_ca_trigger_actions_load($predicate['#trigger']),
+  );
+
+  $form['actions']['add'] = array(
+    '#type' => 'submit',
+    '#value' => t('Add action'),
+    '#submit' => array('uc_ca_actions_form_add_action_submit'),
+  );
+
+  $form['submit'] = array(
+    '#type' => 'submit',
+    '#value' => t('Save changes'),
+    '#submit' => array('uc_ca_actions_form_save_changes_submit'),
+  );
+
+  uc_ca_filter_configure_form($form);
+
+  return $form;
+}
+
+/**
+ * Remove action submit handler.
+ *
+ * @see uc_ca_actions_form()
+ */
+function uc_ca_actions_form_remove_action_submit($form, &$form_state) {
+  // Save the existing actions to preserve any changes.
+  uc_ca_actions_form_update_actions($form_state['values']['pid'], $form_state['values']['actions']);
+
+  // Remove the appropriate action from the predicate and save it.
+  uc_ca_action_remove($form_state['values']['pid'], $form_state['clicked_button']['#parents'][1]);
+
+  drupal_set_message(t('Action removed.'));
+}
+
+/**
+ * Add action submit handler.
+ *
+ * @see uc_ca_actions_form()
+ */
+function uc_ca_actions_form_add_action_submit($form, &$form_state) {
+  // Save the existing actions to preserve any changes.
+  $predicate = uc_ca_actions_form_update_actions($form_state['values']['pid'], $form_state['values']['actions']);
+
+  // Store the presumed key of the new action.
+  $_SESSION['ca_action_focus'] = count($predicate['#actions']);
+
+  // Add the specified action to the predicate.
+  uc_ca_action_add($form_state['values']['pid'], $form_state['values']['actions']['add_action']);
+
+  drupal_set_message(t('Action added.'));
+}
+
+/**
+ * Save changes submit handler for the actions form.
+ *
+ * @see uc_ca_actions_form()
+ */
+function uc_ca_actions_form_save_changes_submit($form, &$form_state) {
+  // Save the existing actions to preserve any changes.
+  uc_ca_actions_form_update_actions($form_state['values']['pid'], $form_state['values']['actions']);
+
+  drupal_set_message(t('Actions saved.'));
+}
+
+/**
+ * Updates a predicate's actions based on the values from an actions form.
+ *
+ * @param $pid
+ *   The ID of the predicate whose actions should be updated.
+ * @param $data
+ *   The actions values from the form state that should be used to update the
+ *     predicate; normally $form_state['values']['actions'].
+ * @return
+ *   An array representing the full, updated predicate.
+ */
+function uc_ca_actions_form_update_actions($pid, $data) {
+  $actions = array();
+
+  // Unset top level components we don't want to get in the way.
+  unset($data['add_action'], $data['add']);
+
+  // Loop through the actions from the form and add them to our temporary array.
+  foreach ((array) $data as $key => $value) {
+    $actions[] = array(
+      '#name' => $value['name'],
+      '#title' => $value['title'],
+      '#argument_map' => isset($value['argument_map']) ? $value['argument_map'] : array(),
+      '#settings' => empty($value['settings']) ? array() : $value['settings'],
+    );
+  }
+
+  // Load the predicate as it is now.
+  $predicate = uc_ca_predicate_load($pid);
+
+  // Update the actions and save the result.
+  $predicate['#actions'] = $actions;
+  uc_ca_predicate_save($predicate);
+
+  return $predicate;
+}
+

=== added file 'modules/uc_ca/includes/uc_ca.ca.inc'
--- modules/uc_ca/includes/uc_ca.ca.inc	1970-01-01 00:00:00 +0000
+++ modules/uc_ca/includes/uc_ca.ca.inc	2009-11-22 17:00:24 +0000
@@ -0,0 +1,512 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * This file includes some generic conditions and actions.
+ */
+
+/*******************************************************************************
+ * Conditional Actions Hooks
+ ******************************************************************************/
+
+/**
+ * Implement hook_uc_ca_entity().
+ *
+ * Demonstrates defining a data object that may be passed in to uc_ca_trigger_pull
+ * and mapped to a predicate's arguments.
+ */
+function uc_ca_uc_ca_entity() {
+  $entities = array();
+
+  $entities['user'] = array(
+    '#title' => t('Drupal user'),
+    '#type' => 'object',
+    '#load' => 'user_load',
+    '#save' => 'user_save',
+  );
+  $entities['node'] = array(
+    '#title' => t('Node'),
+    '#type' => 'object',
+    '#load' => 'node_load',
+    '#save' => 'node_save',
+  );
+  $entities['arguments'] = array(
+    '#title' => t('Trigger arguments'),
+    '#type' => 'array',
+  );
+
+  return $entities;
+}
+
+/**
+ * Implement hook_uc_ca_condition().
+ */
+function uc_ca_uc_ca_condition() {
+  $conditions = array();
+
+  $conditions['uc_ca_condition_date'] = array(
+    '#title' => t('Check the current date'),
+    '#description' => t('Used to determine if the action should be performed on the current date.'),
+    '#category' => t('Drupal'),
+    '#callback' => 'uc_ca_condition_date',
+    '#arguments' => array(),
+  );
+
+  $conditions['node_field_comparison'] = array(
+    '#title' => t('Compare a node field value'),
+    '#description' => t('Returns TRUE if the node field selected below compares to the value entered as specified by the operator.'),
+    '#category' => t('Node'),
+    '#callback' => 'uc_ca_condition_node_field_comparison',
+    '#arguments' => array(
+      'node' => array('#entity' => 'node'),
+    ),
+  );
+
+  $conditions['uc_ca_condition_custom_php'] = array(
+    '#title' => t('Execute custom PHP code'),
+    '#description' => t('Returns whatever your custom PHP code returns.'),
+    '#category' => t('System'),
+    '#callback' => 'uc_ca_condition_custom_php',
+    '#arguments' => array(
+      'arguments' => array('#entity' => 'arguments', '#title' => t('Arguments')),
+    ),
+  );
+
+  $conditions['uc_ca_condition_user_roles'] = array(
+    '#title' => t("Check the user's roles"),
+    '#category' => t('User'),
+    '#description' => t('Returns TRUE if the user roles match your settings.'),
+    '#callback' => 'uc_ca_condition_user_roles',
+    '#arguments' => array(
+      'account' => array('#entity' => 'user', '#title' => t('User')),
+    ),
+  );
+
+  return $conditions;
+}
+
+/**
+ * Implement hook_uc_ca_action().
+ *
+ * Demonstrates defining an action for predicates to use; primarily specifies a
+ * callback function to perform the action and an array that specifies arguments
+ * and their data types.
+ */
+function uc_ca_uc_ca_action() {
+  $actions['uc_ca_drupal_set_message'] = array(
+    '#title' => t('Display a message to the user'),
+    '#category' => t('Drupal'),
+    '#callback' => 'uc_ca_action_drupal_set_message',
+    '#arguments' => array(),
+  );
+
+  $actions['uc_ca_action_custom_php'] = array(
+    '#title' => t('Execute custom PHP code'),
+    '#category' => t('System'),
+    '#callback' => 'uc_ca_action_custom_php',
+    '#arguments' => array(
+      'arguments' => array('#entity' => 'arguments', '#title' => t('Arguments')),
+    ),
+  );
+
+  return $actions;
+}
+
+/**
+ * Check that the current time is within a specified range.
+ *
+ * @see uc_ca_condition_date_form()
+ */
+function uc_ca_condition_date($settings) {
+  $set_date_start = gmmktime(0, 0, 0, $settings['date']['month'], $settings['date']['day'], $settings['date']['year']);
+  $set_date_end = gmmktime(23, 59, 59, $settings['date']['month'], $settings['date']['day'], $settings['date']['year']);
+
+  $curr_time = time();
+
+  switch ($settings['operator']) {
+    case 'before':
+      return $curr_time < $set_date_start;
+    case 'only':
+      return ($set_date_start < $curr_time) && ($curr_time < $set_date_end);
+    case 'after':
+      return $set_date_end < $curr_time;
+    default:
+      return FALSE;
+  }
+}
+
+/**
+ * @see uc_ca_condition_date()
+ */
+function uc_ca_condition_date_form($form_state, $settings = array()) {
+  $form = array();
+
+  $form['operator'] = array(
+    '#type' => 'radios',
+    '#title' => t('Comparison'),
+    '#options' => array(
+      'before' => t('Before'),
+      'only' => t('Only'),
+      'after' => t('After'),
+    ),
+    '#default_value' => isset($settings['operator']) ? $settings['operator'] : '',
+    '#description' => t('Example: "The current date is before the date below."'),
+  );
+
+  $form['date'] = array(
+    '#type' => 'date',
+    '#title' => t('Date'),
+    '#default_value' => isset($settings['date']) ? $settings['date'] : '',
+    '#description' => t('When the predicate is evaluated, the current date is compared to this date.'),
+  );
+
+  return $form;
+}
+
+/**
+ * Compare a node field to a specified value using an operator list.
+ *
+ * @see uc_ca_condition_node_field_comparison_form()
+ */
+function uc_ca_condition_node_field_comparison($node, $settings) {
+  // Convert the node to an array.
+  $node_array = (array) $node;
+
+  // Store the value of the field we're comparing.
+  $field_value = $node_array[$settings['field']];
+
+  // Return the result based on the operator.
+  switch ($settings['operator']) {
+    case 'equal':
+      if ($field_value == $settings['value']) {
+        return TRUE;
+      }
+      break;
+
+    case 'not':
+      if ($field_value != $settings['value']) {
+        return TRUE;
+      }
+      break;
+
+    case 'greater':
+      if ($field_value > $settings['value']) {
+        return TRUE;
+      }
+      break;
+
+    case 'less':
+      if ($field_value < $settings['value']) {
+        return TRUE;
+      }
+      break;
+
+    case 'greater_equal':
+      if ($field_value >= $settings['value']) {
+        return TRUE;
+      }
+      break;
+
+    case 'less_equal':
+      if ($field_value <= $settings['value']) {
+        return TRUE;
+      }
+      break;
+
+    case 'begins':
+      if (strpos($field_value, $settings['value']) === 0) {
+        return TRUE;
+      }
+      break;
+
+    case 'ends':
+      if (substr($field_value, -1 * strlen($settings['value'])) === $settings['value']) {
+        return TRUE;
+      }
+      break;
+
+    case 'contains':
+      if (strpos($field_value, $settings['value']) !== FALSE) {
+        return TRUE;
+      }
+      break;
+
+    case 'yes':
+      if ($field_value) {
+        return TRUE;
+      }
+      break;
+
+    case 'no':
+      if (!$field_value) {
+        return TRUE;
+      }
+      break;
+  }
+
+  return FALSE;
+}
+
+/**
+ * @see uc_ca_condition_node_field_comparision()
+ */
+function uc_ca_condition_node_field_comparison_form($form_state, $settings = array()) {
+  $form = array();
+
+  // Define the fields this works for.
+  $options = array(
+    t('Core node fields') => array(
+      'nid' => t('Node ID'),
+      'vid' => t('Node revision ID'),
+      'type' => t('Node type'),
+      'title' => t('Title'),
+      'uid' => t("Author's user ID"),
+      'status' => t('Node is published?'),
+      'promote' => t('Node is promoted?'),
+      'sticky' => t('Node is sticky?'),
+    ),
+  );
+
+  $form['field'] = array(
+    '#type' => 'select',
+    '#title' => t('Node field'),
+    '#options' => $options,
+    '#default_value' => $settings['field'],
+  );
+
+  // Define the operators for the fields.
+  $options = array(
+    t('Simple comparison') => array(
+      'equal' => t('is equal to'),
+      'not' => t('is not equal to'),
+      'greater' => t('is greater than'),
+      'less' => t('is less than'),
+      'greater_equal' => t('is greater than or equal to'),
+      'less_equal' => t('is less than or equal to'),
+    ),
+    t('Text matching') => array(
+      'begins' => t('begins with'),
+      'contains' => t('contains'),
+      'ends' => t('ends with'),
+    ),
+    t('Yes/No') => array(
+      'yes' => t('yes'),
+      'no' => t('no'),
+    ),
+  );
+
+  $form['operator'] = array(
+    '#type' => 'select',
+    '#title' => t('Operator'),
+    '#description' => t('Please note that not every operator makes sense for every field.'),
+    '#options' => $options,
+    '#default_value' => $settings['operator'],
+  );
+
+  $form['value'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Comparison value'),
+    '#description' => t('You do not need to specify a value if your operator is in the Yes/No category.'),
+    '#default_value' => $settings['value'],
+  );
+
+  return $form;
+}
+
+/**
+ * Display a message to the user.
+ *
+ * @see uc_ca_action_drupal_set_message_form()
+ */
+function uc_ca_action_drupal_set_message($settings) {
+  // Filter the text using the default format.
+  $message = check_markup($settings['message_text'], $settings['message_text_format'], FALSE);
+
+  // Return if there's nothing to display.
+  if (empty($message) || empty($settings['message_text'])) {
+    return;
+  }
+
+  // Make sure we have a valid message type.
+  if ($settings['message_type'] == 'error') {
+    $type = $settings['message_type'];
+  }
+  else {
+    $type = 'status';
+  }
+
+  // Output the message using the Drupal message API.
+  drupal_set_message($message, $type);
+}
+
+/**
+ * @see uc_ca_action_drupal_set_message()
+ */
+function uc_ca_action_drupal_set_message_form($form_state, $settings = array()) {
+  $form = array();
+
+  $form['message_text'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Message text'),
+    '#default_value' => isset($settings['message_text']) ? $settings['message_text'] : '',
+    '#text_format' => isset($settings['message_text_format']) ? $settings['message_text_format'] : filter_default_format(),
+  );
+
+  $form['message_type'] = array(
+    '#type' => 'radios',
+    '#title' => t('Message type'),
+    '#options' => array(
+      'status' => t('Status'),
+      'error' => t('Error'),
+    ),
+    '#default_value' => isset($settings['message_type']) ? $settings['message_type'] : 'status',
+  );
+
+  return $form;
+}
+
+/**
+ * Evaluate a custom PHP condition.
+ *
+ * @see uc_ca_condition_custom_php_form()
+ */
+function uc_ca_condition_custom_php($arguments, $settings) {
+  return _uc_ca_custom_php_eval($settings['php'], $arguments);
+}
+
+/**
+ * @see uc_ca_condition_custom_php()
+ */
+function uc_ca_condition_custom_php_form($form_state, $settings = array(), $arguments = array()) {
+  $form['variables'] = _uc_ca_custom_php_variables_table($arguments);
+
+  $form['php'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Custom PHP'),
+    '#description' => t('Enter the custom PHP to be evaluated when this condition is executed.  Should not include &lt;?php ?> delimiters.'),
+    '#default_value' => isset($settings['php']) ? $settings['php'] : '',
+  );
+
+  return $form;
+}
+
+/**
+ * Check a user's roles.
+ *
+ * @see uc_ca_condition_user_roles_form()
+ */
+function uc_ca_condition_user_roles($account, $settings) {
+  $settings['roles'] = array_filter($settings['roles']);
+
+  if ($settings['operator'] == 'AND') {
+    foreach ($settings['roles'] as $key) {
+      if (!isset($account->roles[$key])) {
+        return FALSE;
+      }
+    }
+    return TRUE;
+  }
+  else {
+    foreach ($settings['roles'] as $key) {
+      if (isset($account->roles[$key])) {
+        return TRUE;
+      }
+    }
+    return FALSE;
+  }
+}
+
+/**
+ * @see uc_ca_condition_user_roles()
+ */
+function uc_ca_condition_user_roles_form($form_state, $settings = array()) {
+  $form['operator'] = array(
+    '#type' => 'radios',
+    '#title' => t('Operator'),
+    '#description' => t('If you specify <em>AND</em> and want to check a custom role, remember to specify <em>authenticated user</em> where applicable.'),
+    '#options' => array(
+      'OR' => t('OR: If the user has any of these roles.'),
+      'AND' => t('AND: If the user has all of these roles.'),
+    ),
+    '#default_value' => isset($settings['operator']) ? $settings['operator'] : 'OR',
+  );
+  $form['roles'] = array(
+    '#type' => 'checkboxes',
+    '#title' => t('Roles'),
+    '#options' => user_roles(),
+    '#default_value' => isset($settings['roles']) ? $settings['roles'] : array(),
+  );
+
+  return $form;
+}
+
+/**
+ * Perform a custom PHP action.
+ *
+ * @see uc_ca_action_custom_php_form()
+ */
+function uc_ca_action_custom_php($arguments, $settings) {
+  _uc_ca_custom_php_eval($settings['php'], $arguments);
+}
+
+/**
+ * @see uc_ca_action_custom_php()
+ */
+function uc_ca_action_custom_php_form($form_state, $settings = array(), $arguments = array()) {
+  $form['variables'] = _uc_ca_custom_php_variables_table($arguments);
+
+  $form['php'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Custom PHP'),
+    '#description' => t('Enter the custom PHP to be evaluated when this action is executed.  Should not include &lt;?php ?> delimiters.'),
+    '#default_value' => isset($settings['php']) ? $settings['php'] : '',
+  );
+
+  return $form;
+}
+
+/**
+ * Return a fieldset used to display available variables for custom PHP
+ * conditions and actions.
+ */
+function _uc_ca_custom_php_variables_table($arguments) {
+  $rows = array();
+
+  $header = array(t('Variable'), t('Type'), t('Description'));
+
+  // Translate the arguments into descriptive rows.
+  foreach ($arguments as $key => $value) {
+    $rows[] = array(check_plain('$'. $key), check_plain($value['#entity']), $value['#title']);
+  }
+
+  if (empty($rows)) {
+    $rows[] = array(array('data' => t('No variables available.'), 'colspan' => 3));
+  }
+
+  $fieldset = array(
+    '#type' => 'fieldset',
+    '#title' => t('Available PHP variables'),
+    '#description' => t('You may use these variables in your custom PHP.')
+                    . theme('table', array('header' => $header, 'rows' => $rows)),
+    '#collapsible' => TRUE,
+  );
+
+  return $fieldset;
+}
+
+/**
+ * Evaluate a custom PHP condition or action with trigger arguments available
+ * as variables.
+ */
+function _uc_ca_custom_php_eval($php, $arguments) {
+  $argument_data = array();
+
+  // Convert the arguments to an array of data that we can extract.
+  foreach ($arguments as $key => $value) {
+    $argument_data[$key] = $value['#data'];
+  }
+
+  extract($argument_data);
+  return eval($php);
+}

=== added directory 'modules/uc_ca/theme'
=== added file 'modules/uc_ca/theme/uc_ca.css'
--- modules/uc_ca/theme/uc_ca.css	1970-01-01 00:00:00 +0000
+++ modules/uc_ca/theme/uc_ca.css	2009-11-22 17:00:24 +0000
@@ -0,0 +1,21 @@
+/* $Id$ */
+
+table.ca-predicate-trigger .col-title {
+  width: 70%;
+}
+
+table.ca-predicate-class .col-title {
+  width: 40%;
+}
+
+.ca-predicate-trigger tr, .ca-predicate-class tr {
+  vertical-align: top;
+}
+
+.ca-predicate-table-weight {
+  text-align: center;
+}
+
+.ca-predicate-table-ops {
+  white-space: nowrap;
+}

=== added file 'modules/uc_ca/theme/uc_ca.js'
--- modules/uc_ca/theme/uc_ca.js	1970-01-01 00:00:00 +0000
+++ modules/uc_ca/theme/uc_ca.js	2009-11-22 17:00:24 +0000
@@ -0,0 +1,19 @@
+// $Id$
+
+/**
+ * @file
+ *   Adds some helper JS to the conditional actions forms.
+ */
+(function ($) {
+  
+/**
+ * Add confirmation prompts to remove buttons.
+ */
+Drupal.behaviors.caRemoveConfirm = function(context) {
+  $('.ca-remove-confirm:not(.caRemoveConfirm-processed)', context).addClass('caRemoveConfirm-processed').click(function() {
+    return confirm(Drupal.t('Are you sure you want to remove this item?'));
+  });
+}
+
+})(jQuery);
+

=== added file 'modules/uc_ca/uc_ca.info'
--- modules/uc_ca/uc_ca.info	1970-01-01 00:00:00 +0000
+++ modules/uc_ca/uc_ca.info	2009-11-22 17:00:24 +0000
@@ -0,0 +1,10 @@
+; $Id$
+name = Conditional Actions
+description = Ubercore Decision Engine
+package = Ubercore
+files[] = uc_ca.module
+files[] = uc_ca.install
+files[] = includes/uc_ca.admin.inc
+files[] = includes/uc_ca.ca.inc
+core = 7.x
+configure = admin/store/ca
\ No newline at end of file

=== added file 'modules/uc_ca/uc_ca.install'
--- modules/uc_ca/uc_ca.install	1970-01-01 00:00:00 +0000
+++ modules/uc_ca/uc_ca.install	2009-11-22 17:00:24 +0000
@@ -0,0 +1,110 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Install hooks for uc_ca.module.
+ */
+
+/**
+ * Implement hook_schema().
+ */
+function uc_ca_schema() {
+  $schema = array();
+
+  $schema['uc_ca_predicates'] = array(
+    'fields' => array(
+      'pid' => array(
+        'type' => 'varchar',
+        'length' => 255,
+        'not null' => TRUE,
+        'default' => '',
+      ),
+      'title' => array(
+        'type' => 'varchar',
+        'length' => 255,
+        'not null' => TRUE,
+        'default' => '',
+      ),
+      'description' => array(
+        'type' => 'text',
+      ),
+      'class' => array(
+        'type' => 'varchar',
+        'length' => 255,
+        'not null' => TRUE,
+        'default' => '',
+      ),
+      'status' => array(
+        'type' => 'int',
+        'size' => 'tiny',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'weight' => array(
+        'type' => 'int',
+        'size' => 'small',
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'ca_trigger' => array(
+        'type' => 'varchar',
+        'length' => 255,
+        'not null' => TRUE,
+        'default' => '',
+      ),
+      'conditions' => array(
+        'type' => 'text',
+        'size' => 'big',
+        'serialize' => TRUE,
+      ),
+      'actions' => array(
+        'type' => 'text',
+        'size' => 'big',
+        'serialize' => TRUE,
+      ),
+      'created' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'modified' => array(
+        'type' => 'int',
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+    ),
+    'indexes' => array(
+      'uc_ca_predicates_class' => array('class'),
+      'uc_ca_predicates_status' => array('status'),
+      'uc_ca_predicates_ca_trigger' => array('ca_trigger'),
+    ),
+    'primary key' => array('pid'),
+  );
+
+  return $schema;
+}
+
+/**
+ * Implement hook_install().
+ */
+function uc_ca_install() {
+  drupal_install_schema('uc_ca');
+}
+
+/**
+ * Implement hook_uninstall().
+ */
+function uc_ca_uninstall() {
+  drupal_uninstall_schema('uc_ca');
+}
+
+/**
+ * Updates for the D7 version.
+ */
+function uc_ca_update_7000() {
+  db_rename_table('ca_predicates', 'uc_ca_predicates');
+  db_drop_field('uc_ca_predicates', 'uid');
+  variable_del('ca_predicates_pid');
+}

=== added file 'modules/uc_ca/uc_ca.module'
--- modules/uc_ca/uc_ca.module	1970-01-01 00:00:00 +0000
+++ modules/uc_ca/uc_ca.module	2009-11-22 17:00:24 +0000
@@ -0,0 +1,1082 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Ubercore decision engine. 
+ */
+
+require_once('includes/uc_ca.ca.inc');
+
+/**
+ * Implement hook_permission().
+ */
+function uc_ca_permission() {
+  $permissions = array(
+    'administer conditional actions' => array(
+      'title' => t('Administer Ubercore Conditional Actions'),
+      'description' => t('Manage the Ubercore decision engine.'),
+    ),
+  );
+  return $permissions;
+}
+ 
+/**
+ * Implement hook_menu().
+ */
+function uc_ca_menu() {
+  $items = array();
+
+  $items['admin/store/ca'] = array(
+    'title' => 'Conditional Actions',
+    'description' => 'Administer the predicates setup to automate your store.',
+    'page callback' => 'uc_ca_admin',
+    'access arguments' => array('administer conditional actions'),
+    'file' => 'includes/uc_ca.admin.inc',
+  );
+  $items['admin/store/ca/overview'] = array(
+    'title' => 'Overview',
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+    'weight' => 0,
+  );
+  $items['admin/store/ca/overview/trigger'] = array(
+    'title' => 'By trigger',
+    'description' => 'Administer the predicates setup to automate your store.',
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+    'weight' => 0,
+  );
+  $items['admin/store/ca/overview/class'] = array(
+    'title' => 'By class',
+    'description' => 'Administer the predicates setup to automate your store.',
+    'page callback' => 'uc_ca_admin',
+    'page arguments' => array('class'),
+    'access arguments' => array('administer conditional actions'),
+    'type' => MENU_LOCAL_TASK,
+    'file' => 'includes/uc_ca.admin.inc',
+    'weight' => 5,
+  );
+  $items['admin/store/ca/add'] = array(
+    'title' => 'Add a predicate',
+    'description' => 'Allows an administrator to create a new predicate.',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('uc_ca_predicate_meta_form'),
+    'access arguments' => array('administer conditional actions'),
+    'type' => MENU_LOCAL_TASK,
+    'file' => 'includes/uc_ca.admin.inc',
+    'weight' => 5,
+  );
+  $items['admin/store/ca/%uc_ca_predicate/edit'] = array(
+    'title' => 'Edit predicate',
+    'description' => "Edit a predicate's meta data, conditions, and actions.",
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('uc_ca_predicate_meta_form', 3),
+    'access arguments' => array('administer conditional actions'),
+    'file' => 'includes/uc_ca.admin.inc',
+    'type' => MENU_CALLBACK,
+  );
+  $items['admin/store/ca/%uc_ca_predicate/edit/meta'] = array(
+    'title' => 'Meta data',
+    'description' => 'Edit the meta data for a predicate like title, trigger, etc.',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('uc_ca_predicate_meta_form', 3),
+    'access arguments' => array('administer conditional actions'),
+    'file' => 'includes/uc_ca.admin.inc',
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+    'weight' => -10,
+  );
+  $items['admin/store/ca/%uc_ca_predicate/edit/conditions'] = array(
+    'title' => 'Conditions',
+    'description' => 'Edit the conditions for a predicate.',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('uc_ca_conditions_form', 3),
+    'access arguments' => array('administer conditional actions'),
+    'file' => 'includes/uc_ca.admin.inc',
+    'type' => MENU_LOCAL_TASK,
+    'weight' => -5,
+  );
+  $items['admin/store/ca/%uc_ca_predicate/edit/actions'] = array(
+    'title' => 'Actions',
+    'description' => 'Edit the actions for a predicate.',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('uc_ca_actions_form', 3),
+    'access arguments' => array('administer conditional actions'),
+    'file' => 'includes/uc_ca.admin.inc',
+    'type' => MENU_LOCAL_TASK,
+    'weight' => 0,
+  );
+  $items['admin/store/ca/%uc_ca_predicate/reset'] = array(
+    'title' => 'Reset a predicate',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('uc_ca_predicate_delete_form', 3),
+    'access arguments' => array('administer conditional actions'),
+    'file' => 'includes/uc_ca.admin.inc',
+    'type' => MENU_CALLBACK,
+  );
+  $items['admin/store/ca/%uc_ca_predicate/delete'] = array(
+    'title' => 'Delete a predicate',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('uc_ca_predicate_delete_form', 3),
+    'access arguments' => array('administer conditional actions'),
+    'file' => 'includes/uc_ca.admin.inc',
+    'type' => MENU_CALLBACK,
+  );
+  
+  return $items;
+}
+
+/**
+ * Prepare predicate data from the database into a full predicate array.
+ *
+ * @param $data
+ *   An array of data representing a row in the predicates table.
+ * @return
+ *   A predicate array.
+ */
+function uc_ca_db_predicate_prepare($data) {
+  $predicate = array();
+
+  foreach ($data as $key => $value) {
+    switch ($key) {
+      // Condition and action data needs to be unserialized.
+      case 'conditions':
+      case 'actions':
+        $predicate['#'. $key] = unserialize($value);
+        break;
+      case 'ca_trigger':
+        $predicate['#trigger'] = $value;
+        break;
+      default:
+        $predicate['#'. $key] = $value;
+        break;
+    }
+  }
+
+  return $predicate;
+}
+
+/**
+ * Compare two conditional action arrays to sort them by #weight.
+ */
+function uc_ca_weight_sort($a, $b) {
+  if ($a['#weight'] == $b['#weight']) {
+    return 0;
+  }
+
+  return ($a['#weight'] > $b['#weight']) ? 1 : -1;
+}
+
+/**
+ * Load a predicate by its ID.
+ *
+ * @param $pid
+ *   The ID of the predicate to load.
+ * @return
+ *   A fully loaded predicate array.
+ */
+function uc_ca_predicate_load($pid) {
+  $predicate = array();
+  
+  // First attempt to load the predicate from the database.
+  $predicate = db_query("SELECT * FROM {uc_ca_predicates} WHERE pid = :pid", array(':pid' => $pid))->fetchAssoc();
+  
+  if ($predicate) {
+    $predicate = uc_ca_db_predicate_prepare($predicate);
+  }
+  else {
+    // Otherwise look for it in the module defined predicates.
+    $predicates = module_invoke_all('uc_ca_predicate');
+
+    if (!empty($predicates[$pid])) {
+      $predicate = $predicates[$pid];
+    }
+  }
+
+  // Add the pid to the predicate so it can be resaved later.
+  if (!empty($predicate)) {
+    $predicate['#pid'] = $pid;
+    return $predicate;
+  }  
+  else {
+    return FALSE;
+  }
+}
+
+/**
+ * Save a predicate array to the database.
+ *
+ * @param $predicate
+ *   A fully loaded predicate array.
+ */
+function uc_ca_predicate_save(&$predicate) {
+  $count = 0;
+  if (!isset($predicate['#pid']) || !$predicate['#pid']) { // A new predicate is being saved.
+    // Give the new predicate a numeric pid higher than the last numeric pid.
+    $pids = db_query("SELECT pid FROM {uc_ca_predicates} ORDER BY pid DESC")->fetchCol();
+    $highest_pid = 0;
+    foreach ($pids as $pid) {
+      print $pid;
+      if (!$highest_pid) {
+        if (is_numeric($pid) && $pid > 0) {
+          $highest_pid = $pid;
+          print $highest_pid;
+        }
+      }
+    }
+    print $highest_pid;
+    $predicate['#pid'] = $highest_pid + 1;
+  }
+  else {
+    // Check to see if the predicate has been previously saved to the database.
+    $count = db_query("SELECT COUNT(*) FROM {uc_ca_predicates} WHERE pid = :pid", array(':pid' => $predicate['#pid']))->fetchField();
+  }
+  
+  $fields = array(
+    'title' => $predicate['#title'], 
+    'description' => $predicate['#description'],
+    'class' => $predicate['#class'],
+    'status' => $predicate['#status'],
+    'weight' => $predicate['#weight'],
+    'ca_trigger' => $predicate['#trigger'],
+    'conditions' => isset($predicate['#conditions']) ? serialize($predicate['#conditions']) : serialize(array()),
+    'actions' => isset($predicate['#actions']) ? serialize($predicate['#actions']) : serialize(array()),
+    'modified' => time(),
+  );
+  
+  if (!$count) { // Insert a new record.
+    $fields['created'] = time();
+    $fields['pid'] = $predicate['#pid'];
+    db_insert('uc_ca_predicates')
+      ->fields($fields)
+      ->execute();
+  }
+  else { // Update a record.
+    db_update('uc_ca_predicates')
+      ->fields($fields)
+      ->condition('pid', $predicate['#pid'])
+      ->execute();
+  }
+}
+
+/**
+ * Delete a predicate from the database.
+ *
+ * @param $pid
+ *   The ID of the predicate to delete.
+ */
+function uc_ca_predicate_delete($pid) {
+  db_delete('uc_ca_predicates')
+    ->condition('pid', $pid)
+    ->execute();
+}
+
+/**
+ * Return an array of conditions available for the specified trigger.
+ *
+ * @param $trigger
+ *   The name of a trigger to find conditions for; if left empty, the function
+ *   returns conditions for the previously specified trigger.
+ * @return
+ *   A nested array of names/titles for the conditions available for the
+ *   trigger; in the format required by select elements in FAPI.
+ */
+function uc_ca_trigger_conditions_load($trigger = '') {
+  static $options = array();
+
+  if (!empty($trigger)) {
+    // Load the specified trigger.
+    $trigger = uc_ca_trigger_load($trigger);
+    $trigger_entities = array();
+
+    // Organize trigger arguments by entity.
+    foreach ($trigger['#arguments'] as $argument) {
+      $trigger_entities[$argument['#entity']] = $argument;
+    }
+
+    // Load and loop through all the conditions defined by modules.
+    $conditions = uc_ca_condition_load();
+
+    foreach ($conditions as $name => $condition) {
+      // Check through each argument needed for the condition.
+      // Cast to an array to accommodate conditions that need no arguments.
+      foreach ((array) $condition['#arguments'] as $argument) {
+        $entity = $argument['#entity'];
+        // If the condition requires an entity the trigger doesn't provide,
+        // then skip to the next condition.
+        if ($entity != 'arguments' && !isset($trigger_entities[$entity])) {
+          continue 2;
+        }
+      }
+
+      // Getting this far means that all of the condition's arguments have
+      // the same entity types as the trigger's. Add it to the options,
+      // and group them by category for usability.
+      $options[$condition['#category']][$name] = $condition['#title'];
+    }
+
+    // Alphabetically sort the groups and their options.
+    foreach ($options as $group => $conditions) {
+      asort($conditions);
+      $options[$group] = $conditions;
+    }
+    ksort($options);
+  }
+
+  return $options;
+}
+
+/**
+ * Return an array of actions available for the specified trigger.
+ *
+ * @param $trigger
+ *   The name of a trigger to find actions for; if left empty, the function
+ *   returns conditions for the previously specified trigger.
+ * @return
+ *   A nested array of names/titles for the actions available for the trigger;
+ *   in the format required by select elements in FAPI.
+ */
+function uc_ca_trigger_actions_load($trigger = '') {
+  static $options = array();
+
+  if (!empty($trigger)) {
+    // Load the specified trigger.
+    $trigger = uc_ca_trigger_load($trigger);
+    $trigger_entities = array();
+
+    // Organize trigger arguments by entity.
+    foreach ($trigger['#arguments'] as $argument) {
+      $trigger_entities[$argument['#entity']] = $argument;
+    }
+
+    // Load and loop through all the actions defined by modules.
+    $actions = uc_ca_action_load();
+
+    foreach ($actions as $name => $action) {
+      // Check through each argument needed for the condition.
+      foreach ($action['#arguments'] as $argument) {
+        $entity = $argument['#entity'];
+        // If the action requires an entity the trigger doesn't provide,
+        // then skip to the next action.
+        if ($entity != 'arguments' && !$trigger_entities[$entity]) {
+          continue 2;
+        }
+      }
+
+      // Getting this far means that all of the condition's arguments have
+      // the same entity types as the trigger's. Add it to the options,
+      // and group them by category for usability.
+      $options[$action['#category']][$name] = $action['#title'];
+    }
+
+    // Alphabetically sort the groups and their options.
+    foreach ($options as $group => $actions) {
+      asort($actions);
+      $options[$group] = $actions;
+    }
+    ksort($options);
+  }
+
+  return $options;
+}
+
+
+/**
+ * Load triggers defined in modules via hook_uc_ca_trigger().
+ *
+ * @param $trigger
+ *   Defaults to 'all'; may instead be the name of the trigger to load.
+ * @return
+ *   An array of data for the specified trigger or an array of all the trigger
+ *   data if 'all' was specified.  Returns FALSE if a specified trigger is
+ *   non-existent.
+ */
+function uc_ca_trigger_load($trigger = 'all') {
+  static $triggers;
+
+  // Load the triggers defined in enabled modules to a cached variable.
+  if (empty($triggers)) {
+    $triggers = module_invoke_all('uc_ca_trigger');
+  }
+
+  // Return the whole array if the trigger specified is 'all'.
+  if ($trigger === 'all') {
+    return $triggers;
+  }
+
+  // If the specified trigger is non-existent, return FALSE.
+  if (!isset($triggers[$trigger])) {
+    return FALSE;
+  }
+
+  return $triggers[$trigger];
+}
+
+/**
+ * Return a trigger's arguments formatted for select element options.
+ *
+ * @param $trigger
+ *   The name of the trigger to load arguments for.
+ * @param $entity
+ *   The name of the entity type we must restrict our returned arguments to.
+ * @return
+ *   An array of arguments in FAPI options format.
+ */
+function uc_ca_trigger_arguments_load($trigger, $entity) {
+  static $arguments = array();
+
+  // Load the arguments if we can't find a cached version.
+  if (!isset($arguments[$trigger][$entity])) {
+    $arguments[$trigger][$entity] = array();
+
+    // Handle the arguments entity specially, as it should never be specified
+    // in a trigger.
+    if ($entity == 'arguments') {
+      $arguments[$trigger][$entity]['arguments'] = t('Arguments');
+    }
+    else {
+      // Load the trigger data.
+      $trigger_data = uc_ca_trigger_load($trigger);
+
+      // Add the trigger's arguments to the options array if the entity matches.
+      foreach ((array) $trigger_data['#arguments'] as $key => $value) {
+        if ($value['#entity'] == $entity) {
+          $arguments[$trigger][$entity][$key] = $value['#title'];
+        }
+      }
+    }
+  }
+
+  return $arguments[$trigger][$entity];
+}
+
+
+/**
+ * Load conditions defined in modules via hook_uc_ca_condition().
+ *
+ * @param $condition
+ *   Defaults to 'all'; may instead be the name of the condition to load.
+ * @return
+ *   An array of data for the specified condition or an array of all the
+ *     condition data if 'all' was specified.  Returns FALSE if a specified
+ *     condition is non-existent.
+ */
+function uc_ca_condition_load($condition = 'all') {
+  static $conditions;
+
+  // Load the conditions defined in enabled modules to a cached variable.
+  if (empty($conditions)) {
+    $conditions = module_invoke_all('uc_ca_condition');
+  }
+
+  // Return the whole array if the trigger specified is 'all'.
+  if ($condition === 'all') {
+    return $conditions;
+  }
+
+  // If the specified trigger is non-existent, return FALSE.
+  if (!isset($conditions[$condition])) {
+    return FALSE;
+  }
+
+  return $conditions[$condition];
+}
+
+/**
+ * Add a new condition to a predicate.
+ *
+ * @param $pid
+ *   The ID of the predicate to add the condition to.
+ * @param $name
+ *   The name of the condition to add.
+ * @param $group_key
+ *   The key of the condition group we're adding the condition to.
+ * @param $mark_expanded
+ *   If set to TRUE marks the condition so that it will be expanded next time it
+ *   displays in the UI so the user can adjust its settings.
+ * @return
+ *   An array representing the full, updated predicate.
+ */
+function uc_ca_condition_add($pid, $name, $group_key, $mark_expanded = TRUE) {
+  // Load the predicate.
+  $predicate = uc_ca_predicate_load($pid);
+
+  // Load the condition we want to add to the predicate.
+  $data = uc_ca_condition_load($name);
+
+  // If the condition exists...
+  if ($data) {
+    // Build the condition array.
+    $condition = array(
+      '#name' => $name,
+      '#title' => $data['#title'],
+      '#argument_map' => array(),
+      '#settings' => array(),
+    );
+
+    // Mark it for expansion in the form if specified.
+    if ($mark_expanded) {
+      $condition['#expanded'] = TRUE;
+    }
+
+    // Add the condition to the predicate.
+    $predicate['#conditions']['#conditions'][$group_key]['#conditions'][] = $condition;
+  }
+
+  uc_ca_predicate_save($predicate);
+
+  return $predicate;
+}
+
+/**
+ * Remove a condition from a predicate.
+ *
+ * @param $pid
+ *   The ID of the predicate to remove the condition group from.
+ * @param $group_key
+ *   The key of the condition group the condition is in.
+ * @param $cond_key
+ *   The key of the condition to remove.
+ * @return
+ *   An array representing the full, updated predicate.
+ */
+function uc_ca_condition_remove($pid, $group_key, $cond_key) {
+  // Load the predicate as it is now.
+  $predicate = uc_ca_predicate_load($pid);
+
+  // Update, save, and return the predicate.
+  unset($predicate['#conditions']['#conditions'][$group_key]['#conditions'][$cond_key]);
+  uc_ca_predicate_save($predicate);
+
+  return $predicate;
+}
+
+
+/**
+ * Return a default conditions array for use on new predicates or in the UI.
+ */
+function uc_ca_new_conditions() {
+  return array(
+    '#operator' => 'AND',
+    '#conditions' => array(
+      array(
+        '#operator' => 'AND',
+        '#conditions' => array(),
+      ),
+    ),
+  );
+}
+
+/**
+ * Add a new condition group to a predicate.
+ *
+ * @param $pid
+ *   The ID of the predicate to add the condition group to.
+ * @return
+ *   An array representing the full, updated predicate.
+ */
+function uc_ca_condition_group_add($pid) {
+  // Load the predicate.
+  $predicate = uc_ca_predicate_load($pid);
+
+  // Add the condition group to the conditions array in the appropriate place.
+  if (empty($predicate['#conditions'])) {
+    $predicate['#conditions'] = uc_ca_new_conditions();
+  }
+  else {
+    $predicate['#conditions']['#conditions'][] = array(
+      '#operator' => 'AND',
+      '#conditions' => array(),
+    );
+  }
+
+  // Save the changes.
+  uc_ca_predicate_save($predicate);
+
+  return $predicate;
+}
+
+/**
+ * Remove a condition group from a predicate.
+ *
+ * @param $pid
+ *   The ID of the predicate to remove the condition group from.
+ * @param $group_key
+ *   The key of the condition group to remove.
+ * @return
+ *   An array representing the full, updated predicate.
+ */
+function uc_ca_condition_group_remove($pid, $group_key) {
+  // Load the predicate as it is now.
+  $predicate = uc_ca_predicate_load($pid);
+
+  // Update, save, and return the predicate.
+  unset($predicate['#conditions']['#conditions'][$group_key]);
+  uc_ca_predicate_save($predicate);
+
+  return $predicate;
+}
+
+/**
+ * Configure the #parents and #id field of any child filter_forms.
+ *
+ * Unfortunately, FAPI doesn't give us any way to know we have a filter
+ * element, so we require all filters to have an #is_format element.
+ */
+function uc_ca_filter_configure_form(&$form) {
+  // Grab all the filters, and search for the formats.
+  $formats = filter_formats();
+  _uc_ca_filter_configure_form_recur($form, $formats, array());
+}
+
+/**
+ * Recursive filter configuration.
+ */
+function _uc_ca_filter_configure_form_recur(&$form, &$formats, $parents) {
+  // Look for our special element, then search the children.
+  if (isset($form['#is_format']) ? $form['#is_format'] : FALSE) {
+    foreach (element_children($form) as $key) {
+      // Found a filter.
+      if (array_key_exists($key, $formats)) {
+        // Configure the parents and ID so FAPI is happy.
+        $form[$key] = array(
+          '#parents' => $parents,
+          '#id' => form_clean_id('edit-'. implode('-', array_merge($parents, array($key)))),
+        ) + $form[$key];
+
+      }
+    }
+  }
+  else {
+    // Keep looking.
+    foreach (element_children($form) as $key) {
+      _uc_ca_filter_configure_form_recur($form[$key], $formats, array_merge($parents, array($key)));
+    }
+  }
+}
+
+/**
+ * Load actions defined in modules via hook_uc_ca_action().
+ *
+ * @param $action
+ *   Defaults to 'all'; may instead be the name of the action to load.
+ * @return
+ *   An array of data for the specified action or an array of all the action
+ *   data if 'all' was specified.  Returns FALSE if a specified action is
+ *   non-existent.
+ */
+function uc_ca_action_load($action = 'all') {
+  static $actions;
+
+  // Load the actions defined in enabled modules to a cached variable.
+  if (empty($actions)) {
+    $actions = module_invoke_all('uc_ca_action');
+  }
+
+  // Return the whole array if the trigger specified is 'all'.
+  if ($action === 'all') {
+    return $actions;
+  }
+
+  // If the specified trigger is non-existent, return FALSE.
+  if (!isset($actions[$action])) {
+    return FALSE;
+  }
+
+  return $actions[$action];
+}
+
+/**
+ * Add a new action to a predicate.
+ *
+ * @param $pid
+ *   The ID of the predicate to add the action to.
+ * @param $name
+ *   The name of the action to add.
+ * @return
+ *   An array representing the full, updated predicate.
+ */
+function uc_ca_action_add($pid, $name) {
+  // Load the predicate as it is now.
+  $predicate = uc_ca_predicate_load($pid);
+
+  // Load the action.
+  $action = uc_ca_action_load($name);
+
+  // Abort if it did not exist.
+  if (empty($action)) {
+    return $predicate;
+  }
+
+  // Add the name to the action array so it's saved in the predicate.
+  $action['#name'] = $name;
+
+  // Add the action to the predicate's actions array.
+  $predicate['#actions'][] = $action;
+
+  // Save and return the updated predicate.
+  uc_ca_predicate_save($predicate);
+
+  return $predicate;
+}
+
+
+/**
+ * Remove an action from a predicate.
+ *
+ * @param $pid
+ *   The ID of the predicate to remove the action from.
+ * @param $index
+ *   The index of the action to remove.
+ * @return
+ *   An array representing the full, updated predicate.
+ */
+function uc_ca_action_remove($pid, $index) {
+  $actions = array();
+
+  // Load the predicate as it is now.
+  $predicate = uc_ca_predicate_load($pid);
+
+  // Build a new actions array, leaving out the one marked for removal.
+  foreach ($predicate['#actions'] as $key => $action) {
+    if ($key != $index) {
+      $actions[] = $action;
+    }
+  }
+
+  // Update, save, and return the predicate.
+  $predicate['#actions'] = $actions;
+  uc_ca_predicate_save($predicate);
+
+  return $predicate;
+}
+
+/**
+ * Evaluate a predicate's conditions.
+ *
+ * @param $predicate
+ *   A fully loaded predicate array.
+ * @param $arguments
+ *   The array of parsed arguments for the trigger.
+ * @return
+ *   TRUE or FALSE indicating the success or failure of the evaluation.
+ */
+function _uc_ca_conditions_evaluate($predicate, $arguments) {
+  // Automatically pass if there are no conditions.
+  if (count($predicate['#conditions']) == 0) {
+    return TRUE;
+  }
+
+  // Load the data for the conditions as defined by modules.
+  $condition_data = module_invoke_all('uc_ca_condition');
+
+  // Recurse through the predicate's conditions for evaluation.
+  $result = _uc_ca_conditions_evaluate_tree($predicate['#conditions'], $arguments, $condition_data);
+
+  if (is_null($result)) {
+    $result = FALSE;
+  }
+
+  return $result;
+}
+
+/**
+ * Recursively evaluate conditions to accommodate nested logical groups.
+ */
+function _uc_ca_conditions_evaluate_tree($condition, $arguments, $condition_data) {
+  if (isset($condition['#operator']) && is_array($condition['#conditions'])) {
+    // Default to TRUE for cases of empty conditions arrays.
+    $result = TRUE;
+
+    foreach ($condition['#conditions'] as $sub_condition) {
+      $result = _uc_ca_conditions_evaluate_tree($sub_condition, $arguments, $condition_data);
+
+      // Invalid conditions return NULL. Skip it and go to the next one.
+      if (is_null($result)) {
+        continue;
+      }
+      // Save the processors! Apply Boolean shortcutting if we can.
+      if ($condition['#operator'] == 'OR' && $result) {
+        return TRUE;
+      }
+      elseif ($condition['#operator'] == 'AND' && !$result) {
+        return FALSE;
+      }
+    }
+    return $result;
+  }
+  else {
+    return _uc_ca_condition_evaluate($condition, $arguments, $condition_data);
+  }
+}
+
+/**
+ * Evaluate a single condition.
+ */
+function _uc_ca_condition_evaluate($condition, $arguments, $condition_data) {
+  $args = array();
+
+  // Make sure the condition tree is sane.
+  if (!is_array($condition_data[$condition['#name']])) {
+    return NULL;
+  }
+
+  // Get the callback function for the current condition.
+  $callback = $condition_data[$condition['#name']]['#callback'];
+
+  // Skip this condition if the function does not exist.
+  if (!function_exists($callback)) {
+    return NULL;
+  }
+
+  // Loop through the expected arguments for a condition.
+  // Cast to an array to accommodate conditions that need no arguments.
+  foreach ((array) $condition_data[$condition['#name']]['#arguments'] as $key => $value) {
+    // Using the argument map for the condition on this predicate, fetch the
+    // argument that was passed to the trigger that matches to the argument
+    // needed to evaluate this condition.
+    if (isset($condition['#argument_map'][$key])) {
+      if ($value['#entity'] == 'arguments') {
+        $args[] = $arguments;
+      }
+      else {
+        $args[] = $arguments[$condition['#argument_map'][$key]]['#data'];
+      }
+    }
+    else {
+      // Skip this condition of the predicate didn't map the arguments needed.
+      return NULL;
+    }
+  }
+
+  // Add the condition settings to the argument list.
+  $args[] = $condition['#settings'];
+
+  // Call the condition's function with the appropriate arguments.
+  $result = call_user_func_array($callback, $args);
+
+  // If the negate operator is TRUE, then switch the result!
+  if ($condition['#settings']['negate']) {
+    $result = !$result;
+  }
+
+  return $result;
+}
+
+/**
+ * Perform a predicate's actions in order, preserving changes to the arguments.
+ *
+ * @param $predicate
+ *   A fully loaded predicate array.
+ * @param $arguments
+ *   The array of parsed arguments for the trigger.
+ * @return
+ *   An array of results, if any, that were returned by the actions.
+ */
+function uc_ca_actions_perform($predicate, $arguments) {
+  // Exit now if we don't have any actions.
+  if (count($predicate['#actions']) == 0) {
+    return;
+  }
+
+  $results = array();
+
+  // Load the data for the actions as defined by modules.
+  $action_data = module_invoke_all('uc_ca_action');
+
+  foreach ($predicate['#actions'] as $i => $action) {
+    $args = array();
+
+    // Get the callback function for the current action.
+    $callback = $action_data[$action['#name']]['#callback'];
+
+    // Do not perform the action if the function does not exist.
+    if (!function_exists($callback)) {
+      continue;
+    }
+
+    // Loop through the expected arguments for an action.
+    foreach ($action_data[$action['#name']]['#arguments'] as $key => $value) {
+      // Using the argument map for the action on this predicate, fetch the
+      // argument that was passed to the trigger that matches to the argument
+      // needed to perform this action.
+      if (isset($action['#argument_map'][$key])) {
+        // Adding the arguments as references so action functions can update the
+        // arguments here when they make changes to the argument data.
+        if ($value['#entity'] == 'arguments') {
+          $args[] = &$arguments;
+        }
+        else {
+          $args[] = &$arguments[$action['#argument_map'][$key]]['#data'];
+        }
+      }
+      else {
+        // Skip this action of the predicate didn't map the arguments needed.
+        continue 2;
+      }
+    }
+
+    // Add the condition settings to the argument list.
+    $args[] = is_array($action['#settings']) ? $action['#settings'] : array();
+
+    // Call the action's function with the appropriate arguments.
+    $results[$i] = call_user_func_array($callback, $args);
+  }
+
+  return $results;
+}
+
+/**
+ * Load predicates based on the specified parameters.
+ *
+ * @param $trigger
+ *   The name of the trigger for which to search when loading the predicates.
+ * @param $all
+ *   FALSE by default, specifies whether we want to load all possible predicates
+ *   or only those that are active (status > 0).
+ * @return
+ *   An array of predicates.
+ */
+function uc_ca_trigger_predicates_load($trigger, $all = FALSE) {
+  // Load all the module defined predicates.
+  $predicates = module_invoke_all('uc_ca_predicate');
+
+  // Loop through the module defined predicates to prepare the data - unsets
+  // inactive predicates if $all == FALSE and adds a default weight if need be.
+  foreach ($predicates as $key => $value) {
+    // Unset the predicate if it doesn't use the specified trigger.
+    if ($value['#trigger'] != $trigger) {
+      unset($predicates[$key]);
+      continue;
+    }
+
+    if (!$all && $value['#status'] <= 0) {
+      unset($predicates[$key]);
+    }
+    elseif (!isset($value['#weight'])) {
+      $predicates[$key]['#weight'] = 0;
+    }
+  }
+
+  // Load and loop through the predicates from the database for this trigger.
+  $result = db_query("SELECT * FROM {uc_ca_predicates} WHERE ca_trigger = :trigger", array(':trigger' => $trigger), array('fetch' => PDO::FETCH_ASSOC));
+  foreach ($result as $data) {
+    // Module defined predicates have string IDs.  When a user modifies one of
+    // these, we unset the module defined predicate and reconsider adding it in.
+    if (!is_numeric($data['pid'])) {
+      unset($predicates[$data['pid']]);
+    }
+
+    // Add predicates from the database to our return array if $all == TRUE or
+    // if the predicate is active.
+    if ($all || $data['status'] > 0) {
+      $predicate = uc_ca_db_predicate_prepare($data);
+
+      // Set the actions' weight if necessary and sort actions by their weight.
+      for ($i = 0; $i < count($predicate['#actions']); $i++) {
+        if (!isset($predicate['#actions'][$i]['#weight'])) {
+          $predicate['#actions'][$i]['#weight'] = 0;
+        }
+      }
+      usort($predicate['#actions'], 'uc_ca_weight_sort');
+
+      $predicates[$data['pid']] = $predicate;
+    }
+  }
+
+  uasort($predicates, 'uc_ca_weight_sort');
+
+  return $predicates;
+}
+
+/**
+ * Parse the argument array into a CA friendly array for the trigger.
+ *
+ * @param $trigger
+ *   The name of the trigger for which we are parsing the arguments.
+ * @param $args
+ *   An array of arguments to check against the expected arguments.
+ * @return
+ *   The array of arguments keyed according to the trigger's argument names.
+ */
+function uc_ca_trigger_args_parse($trigger, $args) {
+  // Fail if we didn't receive enough arguments for this trigger.
+  if (count($args) < count($trigger['#arguments'])) {
+    return FALSE;
+  }
+
+  // Load all the entity information.
+  $entities = module_invoke_all('uc_ca_entity');
+
+  // Loop through the expected arguments.
+  foreach ($trigger['#arguments'] as $key => $value) {
+    // Grab for comparison the next argument passed to the trigger.
+    $arg = array_shift($args);
+
+    // Check the type and fail if it is incorrect.
+    if (gettype($arg) != $entities[$value['#entity']]['#type']) {
+      return FALSE;
+    }
+
+    // Add the entity to the arguments array along with its meta data.
+    $arguments[$key] = array(
+      '#entity' => $value['#entity'],
+      '#title' => $value['#title'],
+      '#data' => $arg,
+    );
+  }
+
+  return $arguments;
+}
+
+/**
+ * Pull a trigger and evaluate any predicates associated with that trigger.
+ *
+ * @param ...
+ *   Accepts a variable number of arguments. The first should always be the
+ *   string name of the trigger to pull with any additional arguments being
+ *   the arguments expected by the trigger and used for evaluation.
+ * @return
+ *   TRUE or FALSE indicating if at least one predicate was evaluated.
+ */
+function uc_ca_trigger_pull() {
+  $args = func_get_args();
+  $trigger = array_shift($args);
+
+  // Load the data for the specified trigger.
+  $trigger_data = uc_ca_trigger_load($trigger);
+
+  // Fail if the specified trigger doesn't exist.
+  if (!$trigger_data) {
+    return FALSE;
+  }
+
+  // Load any predicates associated with the trigger.
+  $predicates = uc_ca_trigger_predicates_load($trigger);
+
+  // Fail if we didn't find any predicates.
+  if (!$predicates || count($predicates) == 0) {
+    return FALSE;
+  }
+
+  // Prepare the arguments for evaluation.
+  $arguments = uc_ca_trigger_args_parse($trigger_data, $args);
+
+  // Fail if we didn't receive the right type of or enough arguments.
+  if (!$arguments) {
+    return FALSE;
+  }
+
+  // Loop through the predicates and evaluate them one by one.
+  foreach ($predicates as $pid => $predicate) {
+    // If all of a predicate's conditions evaluate to TRUE...
+    if (_uc_ca_conditions_evaluate($predicate, $arguments)) {
+      // Then perform its actions.
+      uc_ca_actions_perform($predicate, $arguments);
+    }
+  }
+
+  return TRUE;
+}
+
+
+
+

=== added directory 'modules/uc_ca/uc_ca_test'
=== added file 'modules/uc_ca/uc_ca_test/uc_ca_test.info'
--- modules/uc_ca/uc_ca_test/uc_ca_test.info	1970-01-01 00:00:00 +0000
+++ modules/uc_ca/uc_ca_test/uc_ca_test.info	2009-11-22 17:00:24 +0000
@@ -0,0 +1,7 @@
+; $Id$
+name = Conditional Actions Test module
+description = A testing module for CA development
+package = Ubercore
+core = 7.x
+dependencies[] = uc_ca
+files[] = uc_ca_test.module
\ No newline at end of file

=== added file 'modules/uc_ca/uc_ca_test/uc_ca_test.module'
--- modules/uc_ca/uc_ca_test/uc_ca_test.module	1970-01-01 00:00:00 +0000
+++ modules/uc_ca/uc_ca_test/uc_ca_test.module	2009-11-22 17:00:24 +0000
@@ -0,0 +1,61 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * This module is to help test the functionality of uc_ca while ubercore is in development.
+ */
+ 
+/**
+ * Implement of hook_uc_ca_trigger().
+ */
+function uc_ca_test_uc_ca_trigger() {
+  $triggers['uc_test_trigger'] = array(
+    '#title' => t('A test trigger happens'),
+    '#category' => t('Test'),
+    '#arguments' => array(
+      'account' => array(
+        '#entity' => 'user',
+        '#title' => t('User'),
+      ),
+    ),
+  );
+
+  return $triggers;
+}
+
+/**
+ * Implement hook_uc_ca_condition().
+ */
+function uc_ca_test_uc_ca_condition() {
+  $conditions['uc_ca_test_condition_test'] = array(
+    '#title' => t('Check a test condition'),
+    '#category' => t('Test'),
+    '#callback' => 'uc_ca_test_check_test_condition',
+    '#arguments' => array('account' => array('#entity' => 'user')),
+  );
+
+  return $conditions;
+}
+
+/**
+ * Implement hook_uc_ca_action().
+ */
+function uc_ca_test_uc_ca_action() {
+  return array(
+    'uc_ca_test_action_do_test' => array(
+      '#title' => t('Do a test action'),
+      '#category' => t('Test'),
+      '#arguments' => array(),
+    ),
+  );
+}
+
+function uc_ca_test_check_test_condition($account, $settings) {
+  return TRUE;
+}
+
+function uc_ca_test_action_do_test() {
+  
+}
+

=== modified file 'ubercore.info'
--- ubercore.info	2009-11-03 18:50:27 +0000
+++ ubercore.info	2009-11-22 17:00:24 +0000
@@ -1,8 +1,10 @@
 ; $Id$
 name = Ubercore
 description = Defines the Ubercore entities and systems and integrates them with Drupal core and contributed modules.
+dependencies[] = uc_ca
 package = Ubercore
 files[] = ubercore.module
+files[] = includes/ubercore.admin.inc
 core = 7.x
 php = 5.2
-
+configure = admin/store

=== modified file 'ubercore.module'
--- ubercore.module	2009-11-03 18:37:11 +0000
+++ ubercore.module	2009-11-22 17:00:24 +0000
@@ -6,3 +6,33 @@
  * Defines the Ubercore entities and systems and provides integration with
  *   Drupal core and contributed modules.
  */
+
+/**
+ * Implement hook_permission().
+ */
+function ubercore_permission() {
+  $permissions = array(
+    'administer Ubercore' => array(
+      'title' => t('Administer Ubercore store'),
+      'description' => t('Manage store settings, products, orders and more.'),
+    ),
+  );
+  return $permissions;
+}
+
+/**
+ * Implement hook_menu().
+ */
+function ubercore_menu() {
+  $items = array();
+
+  $items['admin/store'] = array(
+    'title' => 'Store administration',
+    'description' => 'Administer store settings, products, orders and more.',
+    'page callback' => 'ubercore_admin',
+    'access arguments' => array('administer Ubercore'),
+    'type' => MENU_NORMAL_ITEM,
+    'file' => 'includes/ubercore.admin.inc',
+  );
+  return $items;
+}
\ No newline at end of file