--- ecommerce/contrib/shipcalc/shipcalc.module.orig	2005-11-23 10:30:57.000000000 -0900
+++ ecommerce/contrib/shipcalc/shipcalc.module	2006-05-16 14:37:43.000000000 -0800
@@ -1,509 +1,376 @@
 <?php
-// $Id: shipcalc.module,v 1.3 2005/11/23 19:30:57 jjeff Exp $
 
-/**
-  * Shipping calculator integration for Drupal's ecommerce package
-  */
+// $Id: $
 
 /**
- * @todo
- *
- * _ get this information onto the invoice
- *    (currently needs to be in a custom theme)
- * _ move to next screen when there are no shippable items
- *    talk to Matt about this..
- *
+ * @file
+ * Calculate shipping costs via third-party partner API's.
  */
 
-/**
-  * Implementation of hook_help()
-  */
+/*** Drupal hooks ***/
 
+/**
+ * Implementation of hook_help()
+ */
 function shipcalc_help($section) {
-  switch($section) {
+  switch ($section) {
     case 'admin/modules#description':
-      return t('Adds shipping calculation integration into the ecommerce package. (Currently only UPS is supported.)');
+      return t('Integrates the ecommerce package with third party partners (ie UPS, FedEX, USPS...) to provide live shipping calculation.');
+    case 'admin/store/settings/shipcalc':
+      return t('You must configure all shipping partners that you will be using to ship products with.');
   }
 }
 
-
 /**
-  * Implementation of ecommerce shippingapi
-  *
-  */
+ * Implementation of hook_menu()
+ */
+function shipcalc_menu($may_cache) {
+  $items = array();
 
-function shipcalc_shippingapi($edit, $op, $arg = NULL) {
-  switch ($op) {
-  case 'per_product':
-    return TRUE;
-  case 'per_product_form':
-    $group = form_textfield(t('Product Weight'), 'product_weight', $edit->weight, 5, 10, t('The weight of the product (in %unit)', array('%unit'=> (variable_get('shipcalc_units', 'LBS')) ? t('pounds') : t('kilograms'))));
-    $fields = form_group(t('Shipping Info'), $group);
-    return $fields;
-  case 'per_product_validate':
-    if (!is_numeric($edit->product_weight)) {
-      form_set_error('product_weight', t('Product weight needs to be numeric only.'));
-    }
-    break;
-  case 'per_product_insert':
-  case 'per_product_update':
-    shipcalc_product_save($edit);
-    break;
-  case 'per_product_load':
-    return db_fetch_array(db_query('SELECT * FROM {ec_product_shipinfo} WHERE nid = %d', $edit->nid));
-  case 'method select':
-    return array('shipcalc'=>t('Shipping costs are recieved <strong>directly from carrier</strong> (UPS) during checkout.'));
-  case 'form':
-    return shipcalc_ship_settings();
-  case 'validate':
-    if ($edit['shipcalc_state'] == 1 && !$edit['shipcalc_province']) {
-      form_set_error('', t('You need to enter either a state or province.'));
-    }
-    if (!$edit['shipcalc_postcode']) {
-      form_set_error('shipcalc_postcode', t('Postal Code is required.'));
-    }
-    if (!is_numeric($edit['shipcalc_maxboxweight'])) {
-      form_set_error('shipcalc_maxboxweight', t('Please enter a numerical value for Maximum Weight Per Box'));
-    }
-    break;
-  case 'save':
-    if ($edit['shipcalc_state'] != 1) {
-      $edit['shipcalc_province'] = $edit['shipcalc_state'];
-    }
-    $variables = array(
-      'shipcalc_street',
-      'shipcalc_city',
-      'shipcalc_province',
-      'shipcalc_postcode',
-      'shipcalc_country',
-      'shipcalc_curency',
-      'shipcalc_units',
-      'shipcalc_maxboxweight',
-      'shipcalc_upslogin',
-      'shipcalc_upspass',
-      'shipcalc_upsxmlkey'
+  if ($may_cache) {
+    $items[] = array(
+      'path'     => 'admin/store/settings/shipcalc',
+      'title'    => t('shipcalc'),
+      'callback' => 'shipcalc_partners_form',
+      'access'   => user_access('administer store')
     );
-    foreach($variables as $variable) {
-      variable_set($variable, $edit[$variable]);
+
+    $partners = _shipcalc_partners();
+    foreach ($partners as $partner) {
+      $items[] = array(
+        'path'     => 'admin/store/settings/shipcalc/'. $partner->name,
+        'title'    => t($partner->name),
+        'callback' => 'shipcalc_partners_form',
+        'access'   => user_access('administer store')
+      );
     }
-    break;
-  case 'calculate':
-    // this is called at the beginning of the checkout... and only includes the items...
-    // we need more info, so we'll do our calculation in the checkoutapi
-    // this is where we'll include and calculate the shipping info...
   }
+
+  return $items;
 }
 
+/*** ecommerce hooks ***/
+
 /**
-  * Settings
-  *   These fields get displayed on the shipping settings page when shipcalc
-  *   is chosen as the shipping type
-  *
-  */
+ * Invoke _shipping_methods hooks from shipping partner .inc files.
+ * 
+ * @return
+ *  An array of shipping methods.
+ */
+function shipcalc_shipping_methods() {
+  $methods = array();
 
-function shipcalc_ship_settings() {
-  $edit = $_POST['edit'];
-  $group .= form_textfield(t('Street Address'), 'shipcalc_street', $edit['shipcalc_street'] ? $edit['shipcalc_street'] : variable_get('shipcalc_street', ''), 50, 90, '', NULL, TRUE);
-  $group .= form_textfield(t('City'), 'shipcalc_city', $edit['shipcalc_city'] ? $edit['shipcalc_city'] : variable_get('shipcalc_city', ''), 50, 100, '', NULL, TRUE);
-  $options = address_build_states();
-  // if it's not a state, then put it into the province field
-  if (array_key_exists(variable_get('shipcalc_province', ''), $options)) {
-    $state = variable_get('shipcalc_province', '');
-  }
-  else {
-    $province = variable_get('shipcalc_province', '');
-    $state = 1;
+  $partners = _shipcalc_partners();
+  foreach ($partners as $partner) {
+    $shipping_methods = $partner->name .'_shipping_methods';
+    if (function_exists($shipping_methods)) {
+      $methods = array_merge($methods, $shipping_methods($form));
+    }
   }
-  $group .= form_select(t('State'), 'shipcalc_state', $edit['shipcalc_state'] ? $edit['shipcalc_state'] : $state, $options, t('For addresses within the US.'));
-  $group .= form_textfield(t('Province'), 'shipcalc_province', $edit['shipcalc_province'] ? $edit['shipcalc_province'] : $province, 20, 80, t('For addresses outsite U.S. Use 2 letter abbreviation if possible.'));
-  $group .= form_textfield(t('Zip/Postal Code'), 'shipcalc_postcode', $edit['shipcalc_postcode'] ? $edit['shipcalc_postcode'] : variable_get('shipcalc_postcode', ''), 30, 40, '', array(), TRUE);
-  $options = address_build_countries();
-  $group .= form_select(t('Country'), 'shipcalc_country', $edit['shipcalc_country'] ? $edit['shipcalc_country'] : variable_get('shipcalc_country', 'us'), $options, '', 0, FALSE, TRUE);
-  $fields .= form_group(t('Address of sender'), $group);
-  $fields .=  form_select(t('Currency Units'), 'shipcalc_currency', $edit['shipcalc_currency'] ? $edit['shipcalc_currency'] : variable_get('shipcalc_curency', 'USD'), shipcalc_currency_select(), t('This should match the price formatting set on the <a href="%url">payment settings page</a>.', array('%url' => url('admin/settings/payment'))));
-  $fields .=  form_select(t('Weight Units'), 'shipcalc_units', $edit['shipcalc_units'] ? $edit['shipcalc_units'] : variable_get('shipcalc_units', 'LBS'), array('LBS' => t('pounds'), 'KGS' => t('kilograms')));
-
-  // maximum weight per box
-  $fields .= form_textfield(t('Maximum Weight Per Box'), 'shipcalc_maxboxweight', $edit['shipcalc_maxboxweight'] ? $edit['shipcalc_maxboxweight'] : variable_get('shipcalc_maxboxweight', 20), 4, 8, t('This value is used to estimate the number of boxes (packages) that will need to be used to ship an order. Any idividual items that are over this weight will be assumed to be shipped in their own box. While items under this weight will be added together in the same box until this box exceeds this weight. Further items will be added to the next box.'));
-
-  $fields .= form_textfield(t('International Fallback'), 'shipcalc_fallback', $edit['shipcalc_fallback'] ? $edit['shipcalc_fallback'] : variable_get('shipcalc_fallback', '5'), 10, 15, t('Occassionally shippers will not be able to return information for international addresses. If that happens, we will charge the following amount per unit (pounds, or kgs) of shipping weight'));
-
-  $group = '<div>'.t('UPS requires that you <a href="https://www.ups.com/servlet/registration?returnto=%thisurl">register</a> in order to use their web services. <strong>Be sure that your registration address matches the one above.</strong><br />Enter your UPS login and password below.', array('%thisurl' => url('admin/store/settings/shipping', NULL, NULL, TRUE))).'</div>';
-  $group .= form_textfield(t('UPS Login'), 'shipcalc_upslogin', variable_get('shipcalc_upslogin', ''), 20, 60);
-  $group .= form_password(t('UPS Password'), 'shipcalc_upspass', variable_get('shipcalc_upspass', ''), 20, 60);
-  $group .= '<div>'.t('Once you have registered with UPS, you will need to establish a <a href="https://www.ups.com/account/us/start?returnto=%thisurl">UPS shipping account</a>, a developer account, and finally an <a href="http://www.ups.com/e_comm_access/laServ?loc=en_US&CURRENT_PAGE=WELCOME&OPTION=TOOL_DOC&TOOL_ID=RateXML">XML Access Key</a> -- good luck!', array('%thisurl' => url('admin/store/settings/shipping', NULL, NULL, TRUE))).'</div>';
-  $group .= form_textfield(t('UPS XML Access Key'), 'shipcalc_upsxmlkey', variable_get('shipcalc_upsxmlkey', ''), 20, 60);
-  $fields .= form_group(t('UPS Information'), $group);
-  $fields .= $output .= str_replace(array('$RCSf'.'ile:', ',v', '$Re'.'vision: ', '$Da'.'te: ', '$'), '', '<p style="font-size:x-small">$RCSfile: shipcalc.module,v $ version: <b>$Revision: 1.3 $</b>, $Date: 2005/11/23 19:30:57 $</p>');
-  // weight units
-  return $fields;
+
+  return $methods;
 }
 
-function shipcalc_product_save($node) {
-  if ($node->per_product_shipping) {
-    db_query('DELETE FROM {ec_product_shipinfo} WHERE nid = %d', $node->nid);
-    db_query('INSERT INTO {ec_product_shipinfo} (nid, weight) VALUES (%d, %f)', $node->nid, $node->product_weight);
+/**
+ * Invoke _product_form hooks from shipping partner .inc files.
+ *
+ * This hook is called by shipping_form_alter() to allow shipping modules
+ * to add shipping-specific fields to node forms.
+ *
+ * @param &$form
+ *   The form array.
+ * @param $methods
+ *   The subset of this module's shipping methods that are currently assigned
+ *   to the product type being edited.  These are currently ignored by shipcalc.
+ */
+function shipcalc_shipping_product_form(&$form, $methods) {
+
+  $partners = _shipcalc_partners();
+  foreach ($partners as $partner) {
+    $get_form = $partner->name .'_product_form';
+    if (function_exists($get_form)) {
+      $get_form($form);
+    }
   }
 }
 
 /**
-  * Implementation of ecommerce shippingapi
-  *
-  */
-
+ * Use checkoutapi to actually calculate shipping costs.
+ */
 function shipcalc_checkoutapi(&$txn, $op, $arg3 = NULL, $arg4 = NULL) {
   switch ($op) {
     case 'form':
-      $args = func_get_args();
-        if ($txn == 'shipcalc') {
-          // if we're just being 'pinged' don't do much... just say "here!"
-          return TRUE;
-        }
-        else {
-          $shippable = FALSE;
-          foreach($txn->items as $item){
-            if ($item->shippable){
-              $shippable = TRUE;
-              break;
-            }
-          }
-          //if ($shippable) {
-
-          // Need to check in with Matt
-          // and find out how to increment screen
-          // without displaying form
-
-          //if (!$txn->shippable){
-            // if it's not shippable, go to the next screen
-            //$txn->screen++;
-            // more here...
-
-          //}
-          //else {
-            drupal_set_title(t('Choose Shipping Method'));
-            // send off the transaction object and get back a list of options and prices
-            // format the array as a table with radio buttons to select rate...
-            $opsarray = shipcalc_get_options($txn);
-            list($firstkey) = array_keys($opsarray);
-
-            // was there an error?
-            if ($firstkey == 'xx' && $opsarray[$firstkey]['total_cost'] != 0){
-              $output .= t('<p><strong>PLEASE NOTE:</strong> We were unable to get an accurate shipping rate for your shipping address. This amount is an estimate and may be subject to change.</p>');
-            }
-
-            // we should probably be themeing this...
-            foreach((array)$opsarray as $key => $valarray) {
-              // output the radio button, selected if it's the first entry...
-              $rows[$key]['button'] = form_radio('', 'ship][type', $key, $key == $firstkey);
-              $rows[$key]['info'] = "
-                <div>$valarray[service_type]<div>
-                <div><strong>".payment_format($valarray[total_cost])."</strong>";
-              $rows[$key]['info'] .= form_hidden('ship]['.$key.'][service_type', $valarray['service_type']);
-              $rows[$key]['info'] .= form_hidden('ship]['.$key.'][total_cost', $valarray['total_cost']);
-            }
-            $header = array('', '');
-            $output .= theme('table', $header, $rows);
-            $output .= form_submit(t('Continue'));
-            return $output;
-          //}
-        }
+      if ($txn == 'shipcalc') {
+        return TRUE;
+      }
+      return shipcalc_checkout_form($txn);
     case 'validate':
-      if (!$txn->ship['type']) {
-        form_set_error('ship][type', t('Please select a shipping method.'));
+      if (!$txn->shipping_methods) {
+        form_set_error('', t('Please select a shipping method.'));
       }
       break;
     case 'save':
-      // clean up $txn->ship
-      $type = $txn->ship['type'];
-      $service_type = $txn->ship[$type]['service_type'];
-      $total_cost = (float)$txn->ship[$type]['total_cost'];
-      unset($txn->ship);
-      $txn->ship['type'] = $type;
-      $txn->ship['service_type'] = $service_type;
-      $txn->ship['total_cost'] = $total_cost;
-
-      //go to the next screen
+      // TODO: update txn with shipping costs.
       $txn->screen++;
       break;
     case 'review':
-      // if intl_ship is turned on...
-      if (variable_get('intl_ship_enable', 0)) {
-        //add cost to shipping and gross values
-        $txn->gross += $txn->ship['total_cost'];
-        $txn->shipping_cost += $txn->ship['total_cost'];
-
-        $box['subject'] = t('Shipping');
-        $box['content'] = t('<div>Your order will be shipped via <strong>%method</strong> for %price.</div>', array('%method' => $txn->ship['service_type'], '%price' => payment_format($txn->ship['total_cost'])));
-        if ($txn->ship['service_type'] == "Undefined Shipping"){
-          $box['content'] .= t('<p><strong>PLEASE NOTE:</strong> We were unable to get an accurate shipping rate for your shipping address. This amount is an estimate and may be subject to change.</p>');
-        }
-      }
-      return $box;
+      // TODO: display selected shipping option on review page.
   }
 }
 
 /**
- * Implementation of hook_ec_transactionapi().
+ * Implementation of hook_nodeapi().
  */
-function shipcalc_ec_transactionapi(&$txn, $op, $a3 = NULL, $a4 = NULL) {
+function shipcalc_nodeapi(&$node, $op, $teaser) {
   switch ($op) {
     case 'load':
-      $txn->ship = db_fetch_object(db_query("SELECT * FROM {ec_shipcalc} WHERE txnid = %d", $txn->txnid));
+      $fields = shipcalc_product_form_fields();
+      foreach ($fields as $field) {
+        $node->$field = db_result(db_query("SELECT value FROM {ec_shipcalc_product} WHERE vid = %d AND nid = %d AND field = '%s'", $node->vid, $node->nid, $field));
+      }
       break;
-    case 'insert':
     case 'update':
-      shipcalc_save($txn);
+      $fields = shipcalc_product_form_fields();
+      foreach ($fields as $field) {
+        db_query("DELETE FROM {ec_shipcalc_product} WHERE vid = %d AND nid = %d", $node->vid, $node->nid);
+      }
+      // Fall through and insert the updated node data back into the table.
+    case 'insert':
+      $fields = shipcalc_product_form_fields();
+      foreach ($fields as $field) {
+        if ($node->$field) {
+          db_query("INSERT INTO {ec_shipcalc_product} (vid, nid, field, value) VALUES (%d, %d, '%s', '%s')", $node->vid, $node->nid, $field, $node->$field);
+        }
+      }
       break;
     case 'delete':
-      return db_query('DELETE FROM {ec_shipcalc} WHERE txnid = %d', $txn->txnid);
+      db_query("DELETE FROM {ec_shipcalc_product} WHERE nid = %d", $node->nid);
+      break;
+    case 'delete revision':
+      db_query("DELETE FROM {ec_shipcalc_product} WHERE nid = %d AND vid = %d", $node->nid, $node->vid);
+      break;
+  }
+}
+
+/*** helper functions ***/
+
+/**
+ * Return an array of fields defined by each shipping partner.
+ */
+function shipcalc_product_form_fields() {
+  static $fields = array();
+  if ($fields == array()) {
+    $partners = _shipcalc_partners();
+    foreach ($partners as $partner) {
+      $get_form = $partner->name .'_product_form';
+      if (function_exists($get_form)) {
+        $get_form($fields);
+      }
+    }
+    $fields = array_keys($fields['shipping_data']);
   }
+  return $fields;
 }
 
-function shipcalc_save($txn) {
-  if (is_array($txn->ship)) {
-    if ($txn->txnid > 0 && db_result(db_query('SELECT COUNT(txnid) FROM {ec_shipcalc} WHERE txnid = %d', $txn->txnid))) {
-      db_query("UPDATE {ec_shipcalc} SET type = '%s', service_type = '%s', total_cost = %f WHERE txnid = %d", $txn->ship['type'], $txn->ship['service_type'], $txn->ship['total_cost'], $txn->txnid);
+/**
+ * Allow individual configuration of each shipping partner.
+ */
+function shipcalc_partners_form() {
+  $edit = $_POST['edit'];
+
+  $form = array();
+  $partners = _shipcalc_partners();
+
+  $form['shipcalc_partners'] = array(
+    '#type' => 'hidden',
+    '#value' => sizeof($partners)
+  );
+
+  $partner = arg(4);
+  if (isset($partner) && file_exists($partners[$partner]->filename)) {
+    $settings = $partners[$partner]->name .'_settings_form';
+    if (function_exists($settings)) {
+      $settings($form);
     }
-    else {
-      db_query("INSERT INTO {ec_shipcalc} (txnid, type, service_type, total_cost) VALUES (%d, '%s', '%s', %f)", $txn->txnid, $txn->ship['type'], $txn->ship['service_type'], $txn->ship['total_cost']);
+ 
+    $form['shipping_partner'] = array(
+      '#type' => 'hidden',
+      '#value' => $partner
+    );
+
+    $form['submit'] = array(
+      '#type' => 'submit',
+      '#value' => t('Save %partner settings', array('%partner' => $partner))
+    );
+
+    return drupal_get_form('shipcalc_partners_form', $form);
+  }
+  else {
+    $header = array(t('Shipping partner'), t('Operations'));
+    $rows = array();
+    foreach ($partners as $partner) {
+      $rows[] = array($partner->name, l(t('configure'), 'admin/store/settings/shipcalc/'. $partner->name));
     }
+    return theme('table', $header, $rows);
+  }
+}
+
+/**
+ * Invoke _settings_form_validate in shipping partner .inc files.
+ *
+ * @param &$form
+ */
+function shipcalc_partners_form_validate(&$form) {
+  $partners = _shipcalc_partners();
+  foreach ($partners as $partner) {
+    $settings_form_validate = $partner->name .'_settings_form_validate';
+    if (function_exists($settings_form_validate)) {
+      $settings_form_validate($form);
+    }
+  }
+}
+
+/**
+ * Invoke _settings_form_submit in shipping partner .inc files.
+ *
+ * @param &$form
+ *  Unused.  We get form info from the $form_values global.
+ */
+function shipcalc_partners_form_submit(&$form) {
+  $partners = _shipcalc_partners();
+  foreach ($partners as $partner) {
+    $settings_form_submit = $partner->name .'_settings_form_submit';
+    if (function_exists($settings_form_submit)) {
+      $settings_form_submit($form);
+    }
+  }
+}
+
+/**
+ * These form fields are displayed at administer >> store >> shipping when
+ * "shipping costs are received directly from the shipping partner during 
+ * checkout" is selected as the shipping method.
+ */
+function shipcalc_shipping_form($edit) {
+  $form = array();
+
+  if (!$edit['province']) {
+    $edit['province'] = $edit['state'];
   }
+
+  $form['sender'] = array( 
+    '#type' => 'fieldset',
+    '#title' => t('Address of sender'));
+  $form['sender']['shipcalc_street'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Street address'));
+  $form['sender']['shipcalc_city'] = array( 
+    '#type' => 'textfield',
+    '#title' => t('City'));
+  $form['sender']['shipcalc_state'] = array(
+    '#type' => 'select',
+    '#title' => t('State'),
+    '#default_value' => $edit['shipcalc_state'],
+    '#options' => address_build_states(),
+    '#description' => t('Specify a state if the address is within the United States.'));
+  $form['sender']['shipcalc_province'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Province / Region'),
+    '#default_value' => $edit['shipcalc_province'],
+    '#size' => 30,
+    '#maxlength' => 64);
+  $form['sender']['shipcalc_zip'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Zipcode / Postal code'),
+    '#default_value' => $edit['shipcalc_zip'],
+    '#size' => 20,
+    '#maxlength' => 20);
+  $form['sender']['shipcalc_country'] = array(
+    '#type' => 'select',
+    '#title' => t('Country'),
+    '#default_value' => ($edit['country'] ? $edit['country'] : variable_get('ec_country', '')),
+    '#options' => store_build_countries(),
+    '#attributes' => array('onChange' => 'provORstate(this.options[this.selectedIndex].value)'));
+
+  return $form;
 }
 
-function shipcalc_get_options($txn) {
-  require_once('ups.class.php');
+/**
+ * Build the shipcalc checkout form which lists all available shipping options.
+ */
+function shipcalc_checkout_form($txn) {
+  drupal_set_title(t('Choose shipping method'));
 
-  // Create an opject of type ups
-  $MyUPS=new ups();
+  $form = array();
+  $partners = _shipcalc_partners();
+  foreach ($partners as $partner) {
+    $rates = $partner->name .'_get_rates_form';
+    if (function_exists($rates)) {
+      $form = array_merge($form, $rates($txn));
+    }
+  }
 
-  // set shipper info
-  $MyUPS->SetShipper(variable_get('shipcalc_city', ''), strtoupper(variable_get('shipcalc_province', '')), variable_get('shipcalc_postcode', ''), strtoupper(variable_get('shipcalc_country', '')));
+  $form[] = array(
+    '#type' => 'submit',
+    '#default_value' => t('Continue')
+  );
 
-  $MyUPS->AccessLicenseNumber = variable_get('shipcalc_upsxmlkey', '');
-  $MyUPS->UserId = variable_get('shipcalc_upslogin', '');
-  $MyUPS->Password = variable_get('shipcalc_upspass', '');
-
-  // get ship-to address
-  $address = address_get_address($txn->shipping_address);
-
-  // Set the Ship To address.
-  $MyUPS->SetShipTo($address->city, $address->state, $address->zip, strtoupper($address->country), 1);
-
-  // get weight and box count
-  $maxboxweight = variable_get('shipcalc_maxboxweight', 20);
-  $units = variable_get('shipcalc_units', 20);
-  $currency =  variable_get('shipcalc_curency', 'USD');
-
-  $x = 0;
-  $boxweight = 0;
-  $totalweight = 0;
-  foreach((array)$txn->items as $item) {
-    if (product_is_shippable($item->nid)) {
-      // deal with multiple quantities of the same item
-      for ($i = 0; $i < $item->qty; $i++) {
-        // should we start a new box?
-        if ($boxweight != 0 && (($boxweight + $item->weight) > $maxboxweight)) {
-          // add it as a package
-          $pkg = $MyUPS->AddPackage('00','Package '.++$x, $boxweight, $boxvalue, $units, $currency);
-          // start a new box
-          $boxweight = 0;
-          $boxvalue = 0;
+  return $form;
+}
+
+/**
+ * Returns an array of shipcalc partners.
+ */
+function _shipcalc_partners() {
+  // Locate the subdirectory holding partner include files.
+  $partner_dir = _find_dir('modules', '^partners$');
+  // Locate all partner include files.
+  $files = file_scan_directory("$partner_dir", '\.inc$');
+
+  $partners = array();
+  foreach ($files as $partner) {
+    include_once($partner->filename);
+    $partners[$partner->name] = $partner;
+  }
+
+  return $partners;
+}
+
+/**
+ * Minimal replacement for file_scan_directory() to find first matching 
+ * directory.
+ */
+function _find_dir($parent, $mask, $nomask = array('.', '..', 'CVS')) {
+  if (is_dir($parent) && $handle = opendir($parent)) {
+    while ($file = readdir($handle)) {
+      if (!in_array($file, $nomask)) {
+        if (is_dir("$parent/$file")) {
+          if (ereg($mask, $file)) {
+            return "$parent/$file";
+          }
+          else {
+            if ($match = _find_dir("$parent/$file", $mask, $nomask)) {
+              return $match;
+            }
+          }
         }
-        $boxweight += $item->weight;
-        $totalweight += $item->weight;
-        $boxvalue += $item->price;
       }
     }
   }
-  // sweep up any remaining items...
-  $pkg = $MyUPS->AddPackage('00','Package '.++$x, $boxweight, $boxvalue, $units, $currency);
-
-  // okay, let's do it!
-  $options = $MyUPS->ModeRateShopArray();
+}
 
-  //if there was a problem, use fallback
-  if (!is_array($options)) {
-    $options = array('xx' => array('service' => 'xx', 'service_type' => t('Undefined Shipping'), 'total_cost' => $totalweight * variable_get('shipcalc_fallback', 5)));
-  }
-
-  // Lost and confused?
-  // Uncomment this next line:
-  // $MyUPS->Debug();
-  return $options;
-}
-
-function shipcalc_currency_select() {
-// ISO 4217 currency codes gleened from http://en.wikipedia.org/wiki/ISO_4217
-  return array(
-  "AED" => "AED United Arab Emirates dirham",
-  "AFN" => "AFN Afghan afghani",
-  "ALL" => "ALL Albanian lek",
-  "AMD" => "AMD Armenian dram",
-  "ANG" => "ANG Netherlands Antillian guilder",
-  "AOA" => "AOA Angolan kwanza",
-  "ARS" => "ARS Argentine peso",
-  "AUD" => "AUD Australian dollar",
-  "AWG" => "AWG Aruban guilder",
-  "AZM" => "AZM Azerbaijani manat",
-  "BAM" => "BAM Bosnia-Herzegovina convertible mark",
-  "BBD" => "BBD Barbadian dollar",
-  "BDT" => "BDT Bangladeshi taka",
-  "BGN" => "BGN Bulgarian lev (since 1999-07-05)",
-  "BHD" => "BHD Bahraini dinar",
-  "BIF" => "BIF Burundi franc",
-  "BMD" => "BMD Bermuda dollar",
-  "BND" => "BND Brunei dollar",
-  "BOB" => "BOB Bolivian boliviano",
-  "BOV" => "BOV Bolivian Mvdol (Funds code)",
-  "BRL" => "BRL Brazilian real",
-  "BSD" => "BSD Bahamian dollar",
-  "BTN" => "BTN Bhutan ngultrum",
-  "BWP" => "BWP Botswana pula",
-  "BYR" => "BYR Belarusian ruble",
-  "BZD" => "BZD Belize dollar",
-  "CAD" => "CAD Canadian dollar",
-  "CDF" => "CDF Congolese franc",
-  "CHF" => "CHF Swiss franc",
-  "CLP" => "CLP Chilean peso",
-  "CNY" => "CNY Yuan renminbi (PR China)",
-  "COP" => "COP Colombian peso",
-  "COU" => "COU Colombian unidad de valor real",
-  "CRC" => "CRC Costa Rican col—n",
-  "CSD" => "CSD Serbian dinar",
-  "CUC" => "CUC Cuban convertible peso",
-  "CUP" => "CUP Cuban peso",
-  "CVE" => "CVE Cape Verde escudo",
-  "CYP" => "CYP Cyprus pound",
-  "CZK" => "CZK Czech koruna",
-  "DJF" => "DJF Djibouti franc",
-  "DKK" => "DKK Danish krone",
-  "DOP" => "DOP Dominican peso",
-  "DZD" => "DZD Algerian dinar",
-  "EEK" => "EEK Estonian kroon",
-  "EGP" => "EGP Egyptian pound",
-  "ERN" => "ERN Eritrea nakfa",
-  "ETB" => "ETB Ethiopian birr",
-  "EUR" => "EUR European Union euro",
-  "FJD" => "FJD Fijian dollar",
-  "FKP" => "FKP Falkland Islands pound",
-  "GBP" => "GBP Great British Pound",
-  "GEL" => "GEL Georgian lari",
-  "GHC" => "GHC Ghana cedi",
-  "GIP" => "GIP Gibraltar pound",
-  "GMD" => "GMD Gambian dalasi",
-  "GNF" => "GNF Guinea franc",
-  "GTQ" => "GTQ Guatemalan quetzal",
-  "GYD" => "GYD Guyanese dollar",
-  "HKD" => "HKD Hong Kong dollar",
-  "HNL" => "HNL Honduran lempira",
-  "HRK" => "HRK Croatian kuna",
-  "HTG" => "HTG Haitian gourde",
-  "HUF" => "HUF Hungarian forint",
-  "IDR" => "IDR Indonesian rupiah",
-  "ILS" => "ILS New Israeli shekel",
-  "INR" => "INR Indian rupee",
-  "IQD" => "IQD Iraqi dinar",
-  "IRR" => "IRR Iranian Rial",
-  "ISK" => "ISK Icelandic kr—na",
-  "JMD" => "JMD Jamaican dollar",
-  "JOD" => "JOD Jordanian dinar",
-  "JPY" => "JPY Japanese yen",
-  "KES" => "KES Kenyan shilling",
-  "KGS" => "KGS Kyrgyzstan som",
-  "KHR" => "KHR Cambodian riel",
-  "KMF" => "KMF Comorian franc",
-  "KPW" => "KPW North Korean won",
-  "KRW" => "KRW South Korean won",
-  "KWD" => "KWD Kuwaiti dinar",
-  "KYD" => "KYD Cayman Islands dollar",
-  "KZT" => "KZT Kazakhstan tenge",
-  "LAK" => "LAK Lao kip",
-  "LBP" => "LBP Lebanese pound",
-  "LKR" => "LKR Sri Lankan rupee",
-  "LRD" => "LRD Liberian dollar",
-  "LSL" => "LSL Lesotho loti",
-  "LTL" => "LTL Lithuanian litas",
-  "LVL" => "LVL Latvian lat",
-  "LYD" => "LYD Libyan dinar",
-  "MAD" => "MAD Moroccan dirham",
-  "MDL" => "MDL Moldovan leu",
-  "MGA" => "MGA Malagasy ariary",
-  "MKD" => "MKD Macedonian denar",
-  "MMK" => "MMK Myanmar kyat",
-  "MNT" => "MNT Mongolian tugrik",
-  "MOP" => "MOP Macau pataca",
-  "MRO" => "MRO Mauritanian ouguiya",
-  "MTL" => "MTL Maltese lira",
-  "MUR" => "MUR Mauritius rupee",
-  "MVR" => "MVR Maldives rufiyaa",
-  "MWK" => "MWK Malawi kwacha",
-  "MXN" => "MXN Mexican peso",
-  "MYR" => "MYR Malaysian ringgit",
-  "MZM" => "MZM Mozambique metical",
-  "NAD" => "NAD Namibian dollar",
-  "NGN" => "NGN Nigerian naira",
-  "NIO" => "NIO Nicaraguan c—rdoba",
-  "NOK" => "NOK Norwegian krone",
-  "NPR" => "NPR Nepalese rupee",
-  "NZD" => "NZD New Zealand dollar",
-  "OMR" => "OMR Omani rial",
-  "PAB" => "PAB Panamanian balboa",
-  "PEN" => "PEN Peruvian nuevo sol",
-  "PGK" => "PGK Papua New Guinea kina",
-  "PHP" => "PHP Philippine peso",
-  "PKR" => "PKR Pakistani rupee",
-  "PLN" => "PLN Polish zoty",
-  "PYG" => "PYG Paraguayan guaran’",
-  "QAR" => "QAR Qatari rial",
-  "RON" => "RON Romanian leu",
-  "RUB" => "RUB Russian ruble",
-  "RWF" => "RWF Rwandan franc",
-  "SAR" => "SAR Saudi Arabian riyal",
-  "SBD" => "SBD Solomon Islands dollar",
-  "SCR" => "SCR Seychelles rupee",
-  "SDD" => "SDD Sudanese dinar",
-  "SEK" => "SEK Swedish krona",
-  "SGD" => "SGD Singapore dollar",
-  "SHP" => "SHP Saint Helena pound",
-  "SIT" => "SIT Slovene tolar",
-  "SKK" => "SKK Slovak koruna",
-  "SLL" => "SLL Sierra Leonean leone",
-  "SOS" => "SOS Somali shilling",
-  "SRD" => "SRD Suriname dollar",
-  "STD" => "STD S‹o TomŽ and Pr’ncipe dobra",
-  "SYP" => "SYP Syrian pound",
-  "SZL" => "SZL Swaziland lilangeni",
-  "THB" => "THB Thai baht",
-  "TJS" => "TJS Tajikistani somoni",
-  "TMM" => "TMM Turkmen manat",
-  "TND" => "TND Tunisian dinar",
-  "TOP" => "TOP Tongan Pa'anga",
-  "TRY" => "TRY New Turkish lira",
-  "TTD" => "TTD Trinidad and Tobago dollar",
-  "TWD" => "TWD New Taiwan dollar",
-  "TZS" => "TZS Tanzanian shilling",
-  "UAH" => "UAH Ukrainian hryvnia",
-  "UGX" => "UGX Ugandan shilling",
-  "USD" => "USD United States dollar",
-  "UYU" => "UYU Uruguayan peso",
-  "UZS" => "UZS Uzbekistani som",
-  "VEB" => "VEB Venezuelan bol’var",
-  "VND" => "VND Viet Nam dong",
-  "VUV" => "VUV Vanuatu vatu",
-  "WST" => "WST Samoa Tala",
-  "XAF" => "XAF CFA franc BEAC",
-  "XAG" => "XAG Silver ounce",
-  "XAU" => "XAU Gold ounce",
-  "XCD" => "XCD East Caribbean dollar",
-  "XOF" => "XOF CFA franc BCEAO",
-  "XPD" => "XPD Palladium ounce",
-  "XPF" => "XPF CFP franc",
-  "XPT" => "XPT Platinum ounce",
-  "XXX" => "XXX No currency",
-  "YER" => "YER Yemeni rial",
-  "ZAR" => "ZAR South African rand",
-  "ZMK" => "ZMK Zambian kwacha",
-  "ZWD" => "ZWD Zimbabwe dollar");
+/**
+ * A simple xml parsing function.
+ *
+ * @param  $xml        A text string that contains the xml to be parsed.
+ * @param  $open_tag   The opening xml tag to search for.
+ * @return string      The string between $open_tag and its close tag.
+ */
+function _parse_xml($xml, $open_tag) {
+  $close_tag = '</'. substr($open_tag, 1, strlen($open_tag));
+  $pos1 = strpos($xml, $open_tag);
+  $pos2 = strpos($xml, $close_tag);
+  return substr($xml, $pos1 + strlen($open_tag), $pos2 - ($pos1 + strlen($open_tag)));
 }
 
-?>
\ No newline at end of file
+?>
--- ecommerce/contrib/shipcalc/shipcalc.mysql.orig	2005-11-15 02:14:34.000000000 -0900
+++ ecommerce/contrib/shipcalc/shipcalc.mysql	2006-05-16 14:38:15.000000000 -0800
@@ -1,26 +1,14 @@
--- --------------------------------------------------------
 
 --
--- Table structure for table `ec_shipcalc`
+-- Table structure for table `ec_shipcalc_product`
 --
 
-CREATE TABLE ec_shipcalc (
-  txnid int(10) unsigned NOT NULL default '0',
-  `type` varchar(10) NOT NULL default '0',
-  service_type varchar(128) NOT NULL default '',
-  total_cost decimal(10,2) unsigned NOT NULL default '0.00',
-  PRIMARY KEY  (txnid)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Table structure for table `ec_product_shipinfo`
---
-
-CREATE TABLE ec_product_shipinfo (
-  nid int(10) NOT NULL default '0',
-  weight float NOT NULL default '0',
-  width float NOT NULL default '0',
-  height float NOT NULL default '0',
-  depth float NOT NULL default '0',
+CREATE TABLE ec_shipcalc_product (
+  vid int(10) UNSIGNED NOT NULL DEFAULT '0',
+  nid int(10) UNSIGNED NOT NULL DEFAULT '0',
+  field varchar(255) NOT NULL DEFAULT '',
+  value varchar(255) NOT NULL DEFAULT '',
+  UNIQUE KEY field (field),
+  KEY vid (vid),
   KEY nid (nid)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
\ No newline at end of file
+) TYPE=MyISAM;
--- ecommerce/contrib/shipcalc/ups.class.php.orig	2005-11-06 07:44:04.000000000 -0900
+++ ecommerce/contrib/shipcalc/ups.class.php	1969-12-31 14:00:00.000000000 -1000
@@ -1,1180 +0,0 @@
-<?
-////////////////////////////////////////////////////////////////////////////////
-//
-// Modified by Jeff Robbins for Drupal ecommerce package...
-// robbins /at\ jjeff /d0t\ com
-//
-// AaronUPS Version 0.1: (PHP/cURL-XML)
-// aaronups@shadowguarddev.com
-//
-// UPS Rate and Rate Shopping Script.
-//
-// This code is released without any warranty, even the implied warranty of 
-// fitness for a particular purpose.  So, USE AT YOUR OWN RISK.
-// 
-// To use it, you MUST compile PHP with cURL (http://curl.haxx.se) support,
-// and cURL must be compiled with SSL support.
-//
-// I will try to answer any questions you have when using it, addressed to 
-// aaronups@shadowguarddev.com.
-//
-//
-// To use these tools, you have to register at UPS.  When I did it, it was here:
-//
-//   https://www.ups.com/servlet/registration?loc=en_US_EC&returnto=http://www.ec.ups.com/ecommerce/gettools/gtools_intro.html
-//
-// If this doesn't seem to work, just go to UPS.com and start looking for online tools, 
-// and how to register for your developers key and get an XML key, etc..
-//
-//
-// Based on the SurePay script by rachael@kreisler.org, version .07
-// Find it at http://www.kreisler.org/surepay/index.php
-//
-////////////////////////////////////////////////////////////////////////////////
-
-###########################################################################################
-## Sample Code (simple) using this script
-###########################################################################################
-#
-# This script should be pretty self explainitory
-#
-/*
-<?
-	// include the UPS Script.
-	require_once('aaronups.php');
-
-
-	// Create an opject of type ups
-	$MyUPS=new ups();
-
-	// set shipper info
-	$MyUPS->SetShipper('Springfield','MO','65807','US');
-	
-	// uncomment this if you ship from somewhere other than the address you 
-	// registered your key to.
-	//$MyUPS->SetShipFrom('Springfield','MO','65807','US');  
-
-	// Set the Ship To address.  This will probably be gleaned from the user
-	$MyUPS->SetShipTo('Cassville','MO','65625','US',1);
-	
-	// Add a package.  Note that I saved the package number for use in the following functions
-	$pkg=$MyUPS->AddPackage('02','First Package',33);
-	$MyUPS->SetPackageValue($pkg,87.53);	// Adding an insured value
-	$MyUPS->SetPackageSize($pkg,108,2,2);	// Adding a size to the box
-
-	// adding another package (with an insured value)
-	$pkg=$MyUPS->AddPackage('02','Second Package',113,25.50);
-	
-	// Get the list of rates for my current settings.
-	$selopt=$MyUPS->ModeRateShop();
-
-	// I debuged here to see that everything was happy =)
-//	$MyUPS->Debug();
-
-
-	// her I'm getting the cost of service '03' (ground).  usually this would be on the next page
-	// after the user selected something from the options of ModeRateShop
-	$MyRate=$MyUPS->ModeGetRate('03');
-
-
-// used my values I got back.
-echo <<<__FOO__
-
-<select name="foo">
-	$selopt
-</select>
-
-
-<br><br>
-Cost is $MyRate.
-__FOO__;
-
-?>
-*/
-#
-#
-###########################################################################################
-
-#######################################################################################################################
-## Function List
-#######################################################################################################################
-#
-# Constructors - Look here for some default arrays, also, if UPS adds new service options you need to change one of them
-#   ups()
-#
-# These functions probably won't be used by most people.  You will want to set the variables staticly for most cases
-#   SetPostURL($url)
-#   SetAccountInfo($ALN,$UID,$Pass)
-#   SetPickupType($Code)
-#   SetCustomerContext($context)
-#   SetShipper($city,$state,$zip,$country)
-#   SetShipFrom($city,$state,$zip,$country)
-#
-# Set the ship to address (isres is to set wether or not you are shipping to a residential area)
-#   SetShipTo($city,$state,$zip,$country,$isres=0)
-#
-# Modes of operation 
-#   ModeRateShop()				// use to get a list of rates for services.  Returns 0 on fail, or the same as GetRateListShort()
-#   ModeGetRate($ServiceCode) // returns the price for the selected rate.  Usually you want to use the above function to find the method
-#
-# Rate List Functions
-#   GetRateListShort()	// returns a list of <option> blocks for selecting the service.  format: 'price - service'
-#
-# Package Functions
-#   AddPackage($PackageType,$Description,$Weight,$Value=0.0,$WeightUnit='LBS',$CurrencyUnit='USD')
-#   SetPackageSize($PackageNum,$Length,$Width,$Height,$Unit='IN') // use for odd shaped packages.  $PackageNum is returned by AddPackage
-#   SetPackageValue($PackageNum,$Value,$CurrencyUnit='USD') // use for insured packages (or the options in AddPackage
-#
-# Error Functions
-#   GetErrorSeverity() // Hard for a real problem, Transient(?) if you need to retry, Warning if there is just something weird you should know
-#   GetErrorCode()	  // this is the error code as defined by UPS.  Ranges [01xxxx - XML Error],[02xxxx - Architecture error],[11xxxx -Rate & Service specific]
-#   GetErrorDescription() // Description of the error
-#   GetErrorRetry()    // seconds to wait before you retry.  only set if it's a 'Transient'(?) error
-#
-# YOU DON'T NEED TO RUN THESE AND WILL PROBABLY CAUSE YOURSELF HEADACHES IF YOU DO
-#   CreateRequest()	  // Makes the XML request
-#   XMLParser($simple) // parses the XML response into a useful format (array)
-#   Process()				// sends the request to UPS, parses the response into a useuful format (condensed array)
-#
-#
-# These functions show you a bunch of stuff you probably don't want to see, but feel free to look.  There is alot of data passed around that might be handy,
-# espcially if you want to write your own Rate List Function.
-#   Debug()
-#   Debug2()
-#
-# This function is not really in the class, it's at the end of the file.  I wrote it to display arrays, like $HTTP_POST_VARS while debugging. 
-# It recursively calls itself for nested arrays, and staticly numbers the arrays.  It is only used in the two Debug functions of UPS, and can safely
-# be deleted to clear namespace, if you don't plan on running the Debug functions.
-#   buildarray($array,$arraylabel)
-#
-#######################################################################################################################
-
-
-class ups
-{
-
-
-
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-///// VARIABLE DATA     //////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
-##########################################################################
-###### YOU MAY WISH TO SET THESE STATICLY ################################
-##########################################################################
-	
-	// URL to send request to
-	var $postURL='https://www.ups.com/ups.app/xml/Rate';
-
-	// Access Passwords
-	var $AccessLicenseNumber='';
-	var $UserId='';
-	var $Password='';
-
-	// Pickup Service You have
-	var $UPSPickupTypeCode='03';
-
-	// CustomerContext can contain XML you want Posted Back
-	var $CustomerContext='shipcalc.module for Drupal: (PHP/cURL-XML)';
-
-
-	// Address of Shipper.  should match info givin to ups
-	var $ShipperCity='';
-	var $ShipperState='';
-	var $ShipperPostalCode='';
-	var $ShipperCountry='';
-
-	// Address package is shipped from, use if different than above
-	var $ShipFromCity='';
-	var $ShipFromState='';
-	var $ShipFromPostalCode='';
-	var $ShipFromCountry='';
-
-###############################################################################################
-## These variables are usually set with functions, so you probably don't want to edit them.
-###############################################################################################
-
-		
-	// UPS Service Data Options
-	var $UPSRequestAction;
-	var $UPSRequestOption;
-	var $UPSServiceCode;
-
-	// Address that is recieving the package 
-	var $ShipToCity;
-	var $ShipToState;
-	var $ShipToPostalCode;
-	var $ShipToCountry;
-	var $ShipToResidential='';
-
-	// used if you don't use packages (NOT IMPLEMENTED - Use Packages)
-	var $PackageWeight;
-	var $UPSPackageType;
-
-	// Arrays to hold various default data
-	var $ARRAY_PickupTypes;
-	var $ARRAY_ServiceCodes;
-	var $ARRAY_PackageTypes;
-	var $ARRAY_Packages;
-
-	// cURL return info.  Interesting for debug.
-	var $curl_array;
-
-	// Variables to hold the communication with UPS.  Saved for debug.
-	var $request;
-	var $response;
-
-###############################################################################################
-
-
-
-
-
-
-#################################################################################################
-## Constructor Function
-#################################################################################################
-
-	function ups()
-	{
-
-		// These are the pickup types from UPS at the time of this writing.  Most businesses will
-		// be '01', most individuals will be '03'.  
-		$this->ARRAY_PickupTypes=array(
-						 1 => array( '01', 'Daily Pickup'	),
-						 3 => array( '03', 'Customer Counter'	),
-						 6 => array( '06', 'One Time Pickup'	),
-						 7 => array( '07', 'On Call Air'	),
-						19 => array( '19', 'Letter Center'	),
-						20 => array( '20', 'Air Service Center'	)
-					);
-
-
-		// This is the service Type that you are shipping with.  
-		// If UPS starts offering other services (and you get empty drop boxes) fill them in here
-		// Make sure the array index matches the service code
-		$this->ARRAY_ServiceCodes=array(
-						 1 => array( '01', 'UPS Next Day Air'		),
-						 2 => array( '02', 'UPS 2nd Day Air'		),
-						 3 => array( '03', 'UPS Ground'			),
-						 7 => array( '07', 'UPS Worldwide Express'		),
-						 8 => array( '08', 'UPS Worldwide Expendited'	),
-						11 => array( '11', 'UPS Standard'			),
-						12 => array( '12', 'UPS 3-Day Select'		),
-						13 => array( '13', 'UPS Next Day Air Saver'		),
-						14 => array( '14', 'UPS Next Day Air Early AM'	),
-						54 => array( '54', 'UPS Worldwide Express Plus'	),
-						59 => array( '59', 'UPS 2nd Day Air AM'		),
-						65 => array( '65', 'UPS Express Saver'		)
-					);
-
-
-		// Array of Package Types.  Usually '02' Package is used, but the rest are useful
-		$this->ARRAY_PackageTypes=array(
-						 0 => array( '00', 'Unknown'		),
-						 1 => array( '01', 'UPS letter' 	),
-						 2 => array( '02', 'Package'		),
-						 3 => array( '03', 'UPS Tube'		),
-						 4 => array( '04', 'UPS Pak'		),
-						21 => array( '21', 'UPS Express Box'	),
-						24 => array( '24', 'UPS 25KG Box'	),
-						25 => array( '25', 'UPS 10KG Box'	)
-					);
-
-	} // end ups()
-	
-##############################################################################################################
-
-
-
-
-
-##############################################################################################################
-## Set Functions you probably won't need.  Usually these things are set staticly
-##############################################################################################################
-
-	// URL to send request to
-	function SetPostURL($url)
-	{
-		$this->postURL=$url;
-	}
-
-	function SetAccountInfo($ALN,$UID,$Pass)
-	{
-		$this->AccessLicenseNumber=$ALN;
-		$this->UserId=$UID;
-		$this->Password=$Pass;
-	}
-
-	function SetPickupType($Code)
-	{
-		$this->UPSPickupTypeCode=$Code;	
-	}
-
-	// CustomerContext can contain XML you want Posted Back
-	function SetCustomerContext($context)
-	{
-		$this->CustomerContext=$context;
-	}
-	
-##############################################################################################################
-
-
-
-
-
-##############################################################################################################
-## Address Functions
-##############################################################################################################
-
-	function SetShipper($city,$state,$zip,$country)
-	{
-
-		$this->ShipperCity=$city;
-		$this->ShipperState=$state;
-		$this->ShipperPostalCode=$zip;
-		$this->ShipperCountry=$country;
-	}
-
-
-	function SetShipFrom($city,$state,$zip,$country)
-	{
-
-		$this->ShipFromCity=$city;
-		$this->ShipFromState=$state;
-		$this->ShipFromPostalCode=$zip;
-		$this->ShipFromCountry=$country;
-	}
-
-
-	function SetShipTo($city,$state,$zip,$country,$isres=0)
-	{
-
-		$this->ShipToCity=$city;
-		$this->ShipToState=$state;
-		$this->ShipToPostalCode=$zip;
-		$this->ShipToCountry=$country;
-		if($isres)
-		{
-			$this->ShipToResidential='<ResidentialAddress/>';
-		}
-	}
-
-##############################################################################################################
-
-
-
-
-##############################################################################################################
-## Mode Functions
-##############################################################################################################
-
-	// get an <option> block list of all the rates for the set packages.
-	function ModeRateShop()
-	{
-			$this->UPSRequestAction='Rate';
-			$this->UPSRequestOption='shop';
-
-			// Create the request and then send and process it.
-			$this->CreateRequest();
-			$this->Process();
-
-
-
-			return $this->GetRateListShort();
-	}
-
-	// get an <option> block list of all the rates for the set packages.
-	function ModeRateShopArray()
-	{
-			$this->UPSRequestAction='Rate';
-			$this->UPSRequestOption='shop';
-
-			// Create the request and then send and process it.
-			$this->CreateRequest();
-			$this->Process();
-			return $this->GetRateListArray();
-	}
-
-
-	// get the cost of the selected rate
-	function ModeGetRate($ServiceCode)
-	{
-			// set the action from ups to Rate and rate.
-			// this will get us one rate, the one we chose
-			$this->UPSRequestAction='Rate';	
-			$this->UPSRequestOption='rate';	
-			$this->UPSServiceCode=$ServiceCode;
-			
-			// Create the request and then send and process it.
-			$this->CreateRequest();
-			$this->Process();
-
-			// turn the details into a total cost for shipping and return it (float)
-			// if the request was not successful, return 0;  (shipping is never free, hopefully)
-			if($this->ResponseDistilled['Success'])
-			{
-						$retval=$this->ResponseDistilled["RateOption_0"]['TotalCost'];
-			}
-			else
-			{
-				$retval=0;
-			}
-
-			return $retval;
-	}
-	
-
-##############################################################################################################
-
-
-##############################################################################################################
-## Rate List Functions
-##############################################################################################################
-
-	function GetRateListShort()
-	{
-			// turn the details into <option> blocks and return them.
-			// if the request was not successful, return 0;
-			if($this->ResponseDistilled['Success'])
-			{
-				$retval='';
-				for($i=0;$i<$this->ResponseDistilled['RateOptions'];$i++)
-				{
-						$service=$this->ResponseDistilled["RateOption_$i"]['Service'];
-						$serviceType=$this->ResponseDistilled["RateOption_$i"]['ServiceType'];
-						$totalCost=$this->ResponseDistilled["RateOption_$i"]['TotalCost'];
-						
-					$retval.=<<<__RETVAL__
-						<option value='$service'>$$totalCost - $serviceType </option>
-__RETVAL__;
-				}
-			}
-			else
-			{
-				$retval=0;
-			}
-
-			return $retval;
-	}
-
-
-	function GetRateListArray()
-	{
-			// turn the details into <option> blocks and return them.
-			// if the request was not successful, return 0;
-			if($this->ResponseDistilled['Success'])
-			{
-				$retval='';
-				for($i=0;$i<$this->ResponseDistilled['RateOptions'];$i++)
-				{
-						$service=$this->ResponseDistilled["RateOption_$i"]['Service'];
-						$serviceType=$this->ResponseDistilled["RateOption_$i"]['ServiceType'];
-						$totalCost=$this->ResponseDistilled["RateOption_$i"]['TotalCost'];
-						
-					$array[$service] = array('service' => $service, 'service_type' => $serviceType, 'total_cost' => $totalCost);
-				}
-			}
-			else
-			{
-				$array = 0;
-			}
-
-			return $array;
-	}
-
-	
-##############################################################################################################
-
-	
-##############################################################################################################
-## Package Handling Functions
-##############################################################################################################
-
-	function AddPackage($PackageType,$Description,$Weight,$Value=0.0,$WeightUnit='LBS',$CurrencyUnit='USD')
-	{
-		$this->ARRAY_Packages[]=array($PackageType,$Description,'',$Weight,$WeightUnit,$Value,$CurrencyUnit);
-		return (count($this->ARRAY_Packages));
-	}
-
-	function SetPackageSize($PackageNum,$Length,$Width,$Height,$Unit='IN')
-	{
-		$this->ARRAY_Packages[$PackageNum-1][2]=array($Unit,$Length,$Width,$Height);
-		return $PackageNum;
-	}
-	
-	function SetPackageValue($PackageNum,$Value,$CurrencyUnit='USD')
-	{
-		$this->ARRAY_Packages[$PackageNum-1][5]=$Value;
-		$this->ARRAY_Packages[$PackageNum-1][6]=$CurrencyUnit;
-		return $PackageNum;
-	}
-
-##############################################################################################################
-
-
-
-
-######################################################################################
-## Error Functions
-######################################################################################
-
-	function GetErrorSeverity()
-	{
-		$retval=0;
-		if(!($this->ResponseDistilled['Success']))
-		{
-			$retval=$this->ResponseDistilled['Error']['Description'];
-		}
-		return $retval;
-	}
-
-	function GetErrorCode()
-	{
-		$retval=0;
-		if(!($this->ResponseDistilled['Success']))
-		{
-			$retval=$this->ResponseDistilled['Error']['Code'];
-		}
-		return $retval;
-	}
-	
-	function GetErrorDescription()
-	{
-		$retval=0;
-		if(!($this->ResponseDistilled['Success']))
-		{
-			$retval=$this->ResponseDistilled['Error']['Description'];
-		}
-		return $retval;
-	}
-
-	function GetErrorRetry()
-	{
-		$retval=0;
-		if(!($this->ResponseDistilled['Success']))
-		{
-			$retval=$this->ResponseDistilled['Error']['MinimumRetrySeconds'];
-		}
-		return $retval;
-	}
-
-######################################################################################
-
-
-
-#################################################################################################
-## CreateRequest - assemples the XML request
-#################################################################################################
-
-	function CreateRequest()
-	{
-		$this->Request='';
-
-		// CREATE SHIPFROM ADDRESS BLOCK
-		$ShipFromAddress='';
-		if(!empty($this->ShipFromCity) || !empty($this->ShipFromState) || !empty($this->ShipFromPostalCode) || !empty($this->ShipFromCountry))
-		{
-			$ShipFromAddress=<<<__SHIPFROMADDRESS__
-
-    <ShipFrom>
-      <Address>
-        <City>$this->ShipFromCity</City>
-        <StateProvinceCode>$this->ShipFromState</StateProvinceCode>
-        <PostalCode>$this->ShipFromPostalCode</PostalCode>
-        <CountryCode>$this->ShipFromCountry</CountryCode>
-      </Address>
-    </ShipFrom>
-			 
-__SHIPFROMADDRESS__;
-
-		}
-
-		// CREATE PACKAGELIST BLOCK
-		$PackageList='';
-		reset($this->ARRAY_Packages);
-		while(list($key,$val)=each($this->ARRAY_Packages))
-		{
-			$Dimensions='';
-			$InSure='';
-			$pcode=$val[0];
-			
-			if(!empty($val[2]))
-			{
-				list($c,$l,$w,$h)=$val[2];
-
-				$Dimensions=<<<__DIM__
-    <Dimensions>
-      <UnitOfMeasurement>
-        <Code>$c</Code>
-      </UnitOfMeasurement>
-      <Length>$l</Length>
-      <Width>$w</Width>
-      <Height>$h</Height>
-    </Dimensions>
-__DIM__;
-			}
-
-			if(!empty($val[5]))
-			{
-				$InSure=<<<__INS__
-    <PackageServiceOptions>
-      <InsuredValue>
-        <CurrencyCode>$val[6]</CurrencyCode>
-        <MonetaryValue>$val[5]</MonetaryValue>
-      </InsuredValue>
-    </PackageServiceOptions>
-__INS__;
-				
-			}
-
-			$pdesc=$this->ARRAY_PackageTypes[intval($val[0])][1];
-
-			$PackageList.=<<<__PACKAGE__
-  <Package>
-    <PackagingType>
-      <Code>$val[0]</Code>
-      <Description>$pdesc</Description>
-    </PackagingType>
-    <Description>$val[1]</Description>
-$Dimensions
-    <PackageWeight>
-      <Weight>$val[3]</Weight>
-      <UnitOfMeasurement>
-        <Code>$val[4]</Code>
-      </UnitOfMeasurement>
-    </PackageWeight>
-$InSure
-  </Package>
-
-__PACKAGE__;
-
-		}
-
-
-		// write code for this to be filled in..
-		$ShipmentWeight='';
-
-
-
-		// CREATE REQUEST BLOCK
-		$this->request=<<<__REQUEST__
-
-<?xml version="1.0"?>
-<AccessRequest xml:lang="en-US">
-  <AccessLicenseNumber>$this->AccessLicenseNumber</AccessLicenseNumber>
-  <UserId>$this->UserId</UserId>
-  <Password>$this->Password</Password>
-</AccessRequest>
-
-<?xml version="1.0"?>
-<RatingServiceSelectionRequest xml:lang="en-US">
-  <Request>
-   <TransactionReference>
-    <CustomerContext>$this->CustomerContext</CustomerContext>
-    <XpciVersion>1.0001</XpciVersion>
-   </TransactionReference>
-   <RequestAction>$this->UPSRequestAction</RequestAction>
-   <RequestOption>$this->UPSRequestOption</RequestOption>
-  </Request>
-
-  <PickupType>
-   <Code>$this->UPSPickupTypeCode</Code>
-  </PickupType>
-
-  <Shipment>
-   <Shipper>
-    <Address>
-      <City>$this->ShipperCity</City>
-      <StateProvinceCode>$this->ShipperState</StateProvinceCode>
-      <PostalCode>$this->ShipperPostalCode</PostalCode>
-      <CountryCode>$this->ShipperCountry</CountryCode>
-    </Address>
-   </Shipper>
-
-   <ShipTo>
-    <Address>
-      <City>$this->ShipToCity</City>
-      <StateProvinceCode>$this->ShipToState</StateProvinceCode>
-      <PostalCode>$this->ShipToPostalCode</PostalCode>
-      <CountryCode>$this->ShipToCountry</CountryCode>
-      $this->ShipToResidential
-    </Address>
-   </ShipTo>
-  
-   $ShipFromAddress
-
-   <Service>
-    <Code>$this->UPSServiceCode</Code>
-   </Service>
-
-  $ShipmentWeight
-
-  $PackageList
-
-  </Shipment>
-</RatingServiceSelectionRequest>
-
-
-__REQUEST__;
-
-
-	} // END CreateRequest()
-
-
-
-
-###############################################################################################
-## XMLParser to put all the values from response into an array
-###############################################################################################
-
-	function XMLParser($simple) 
-	{
-		$p = xml_parser_create();
-		xml_parser_set_option($p,XML_OPTION_CASE_FOLDING,0);
-		xml_parser_set_option($p,XML_OPTION_SKIP_WHITE,1);
-		xml_parse_into_struct($p,$simple,$vals,$index);
-		xml_parser_free($p);
-
-		return $vals;
-	}
-
-
-###############################################################################################
-## Process the current settings
-###############################################################################################
-
-
-	function Process()
-	{
-		// clear out our variables
-		unset($this->ResponseDistilled);
-		$this->Response='';
-
-		//******************************************************************************
-		// INITIALIZE cURL SESSION AND SET OPTIONS.  SEE PHP MANUAL FOR MORE DETAILS.
-		// http://www.php.net/manual/en/ref.curl.php
-		//******************************************************************************
-
-		// INITIALIZE 
-
-		$ch = curl_init ();
-
-		// TELL cURL WHERE TO POST THE REQUEST.  UNCOMMENT THE SECOND URL TO SEND A LIVE POST.
-
-		curl_setopt ($ch, CURLOPT_URL, $this->postURL);
-		//curl_setopt ($ch, CURLOPT_URL, "https://xml.surepay.com");
-
-		// TELL cURL TO DO A REGULAR HTTP POST.
-
-		curl_setopt ($ch, CURLOPT_POST, 1);
-
-		// PASS THE REQUEST STRING THAT WE BUILD ABOVE
-
-		curl_setopt ($ch, CURLOPT_POSTFIELDS, $this->request);
-
-		// TELL cURL TO USE strlen()  TO GET THE DATA SIZE.
-
-		curl_setopt ($ch, CURLOPT_POSTFIELDSIZE, 0);
-
-		// TELL cURL WHEN TO TIME OUT 
-		//IF YOU'RE TIMING OUT BEFORE GETTING A RESPONSE FROM SUREPAY, INCREASE THIS NUMBER 
-
-		curl_setopt ($ch, CURLOPT_TIMEOUT, 360); 
-						  
-		// TELL cURL TO INCLUDE THE HEADER IN THE OUTPUT 
-
-		curl_setopt ($ch, CURLOPT_HEADER, 0);
-
-		// TELL cURL TO USE SSL VERSION 3.
-
-		curl_setopt ($ch, CURLOPT_SSLVERSION, 3);
-		 
-		// TRANSFER THE SUREPAY RESPONSE INTO A VARIABLE.
-
-		curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
-
-
-		//******************************************************************************
-		// EXECUTE THE REQUEST
-		//******************************************************************************
-
-		$this->result = curl_exec ($ch);
-
-		// get stats for later use in debug, if nessesary.
-		$this->curl_array = curl_getinfo($ch);
-
-		// close curl connection
-		curl_close ($ch);
-		//******************************************************************************
-		// PARSE RESPONSE
-		//******************************************************************************
-
-
-
-		// CALL THE XML PARSING FUNCTION TO CREATE ARRAY OF RESULT
-
-		$attributes = $this->XMLParser($this->result);
-
-
-		$ShipRate=0;
-		$ShipPackage=0;
-		$MaxPackage=0;
-
-		reset($attributes);
-		while (list ($key, $val) = each ($attributes)) 
-		{
-
-			switch($val['tag'])
-			{
-				case 'ResponseStatusCode':
-					$this->ResponseDistilled['Success']=$val['value'];
-					break;
-
-				case 'Error':
-					while((list($key,$val)=each($attributes)) && ($val['tag']!='Error'))
-					{
-						if($val['tag']=='ErrorSeverity')
-						{
-							$this->ResponseDistilled['Error']['Severity']=$val['value'];
-						}
-
-						if($val['tag']=='ErrorCode')
-						{
-							$this->ResponseDistilled['Error']['Code']=$val['value'];
-						}
-						
-						if($val['tag']=='ErrorDescription')
-						{
-							$this->ResponseDistilled['Error']['Description']=$val['value'];
-						}
-						
-						if($val['tag']=='MinimumRetrySeconds')
-						{
-							$this->ResponseDistilled['Error']['MinimumRetrySeconds']=$val['value'];
-						}
-					
-					}
-					break;
-					
-
-				case 'RatedShipment':
-					while((list($key,$val)=each($attributes)) && ($val['tag']!='RatedShipment'))
-					{
-						switch($val['tag'])
-						{
-							case 'Service':
-								while((list($key,$val)=each($attributes)) && ($val['tag']!='Service'))
-								{
-									if($val['tag']=='Code')
-									{
-										$this->ResponseDistilled["RateOption_$ShipRate"]['Service']=$val['value'];
-										$this->ResponseDistilled["RateOption_$ShipRate"]['ServiceType']=$this->ARRAY_ServiceCodes[intval($val['value'])][1];
-									}
-								}
-								break;
-
-							case 'BillingWeight':
-								while((list($key,$val)=each($attributes)) && ($val['tag']!='BillingWeight'))
-								{
-									if($val['tag']=='Code')
-									{
-										$this->ResponseDistilled["RateOption_$ShipRate"]['Unit']=$val['value'];
-									}
-									if($val['tag']=='Weight')
-									{
-										$this->ResponseDistilled["RateOption_$ShipRate"]['Weight']=$val['value'];
-									}
-								}
-								break;
-
-							case 'TransportationCharges':
-								while((list($key,$val)=each($attributes)) && ($val['tag']!='TransportationCharges'))
-								{
-									if($val['tag']=='CurrencyCode')
-									{
-										$this->ResponseDistilled["RateOption_$ShipRate"]['Currency']=$val['value'];
-									}
-									if($val['tag']=='MonetaryValue')
-									{
-										$this->ResponseDistilled["RateOption_$ShipRate"]['TransportCost']=$val['value'];
-									}
-								}
-								break;
-
-							case 'ServiceOptionsCharges':
-								while((list($key,$val)=each($attributes)) && ($val['tag']!='ServiceOptionsCharges'))
-								{
-									if($val['tag']=='CurrencyCode')
-									{
-										$this->ResponseDistilled["RateOption_$ShipRate"]['Currency']=$val['value'];
-									}
-									if($val['tag']=='MonetaryValue')
-									{
-										$this->ResponseDistilled["RateOption_$ShipRate"]['ServiceCost']=$val['value'];
-									}
-								}
-								break;
-
-							case 'TotalCharges':
-								while((list($key,$val)=each($attributes)) && ($val['tag']!='TotalCharges'))
-								{
-									if($val['tag']=='CurrencyCode')
-									{
-										$this->ResponseDistilled["RateOption_$ShipRate"]['Currency']=$val['value'];
-									}
-									if($val['tag']=='MonetaryValue')
-									{
-										$this->ResponseDistilled["RateOption_$ShipRate"]['TotalCost']=$val['value'];
-									}
-								}
-								break;
-								
-							case 'GuaranteedDaysToDelivery':
-								$this->ResponseDistilled["RateOption_$ShipRate"]['Days']=$val['value'];
-								break;
-								
-							case 'ScheduledDeliveryTime':
-								$this->ResponseDistilled["RateOption_$ShipRate"]['DeliveryTime']=$val['value'];
-								break;
-
-							case 'RatedPackage':
-								while((list($key,$val)=each($attributes)) && ($val['tag']!='RatedPackage'))
-								{
-									switch($val['tag'])
-									{
-
-										case 'BillingWeight':
-											while((list($key,$val)=each($attributes)) && ($val['tag']!='BillingWeight'))
-											{
-												if($val['tag']=='Code')
-												{
-													$this->ResponseDistilled["RateOption_$ShipRate"]["Package_$ShipPackage"]['Unit']=$val['value'];
-												}
-												if($val['tag']=='Weight')
-												{
-													$this->ResponseDistilled["RateOption_$ShipRate"]["Package_$ShipPackage"]['Weight']=$val['value'];
-												}
-											}
-											break;
-
-										case 'TransportationCharges':
-											while((list($key,$val)=each($attributes)) && ($val['tag']!='TransportationCharges'))
-											{
-												if($val['tag']=='CurrencyCode')
-												{
-													$this->ResponseDistilled["RateOption_$ShipRate"]["Package_$ShipPackage"]['Currency']=$val['value'];
-												}
-												if($val['tag']=='MonetaryValue')
-												{
-													$this->ResponseDistilled["RateOption_$ShipRate"]["Package_$ShipPackage"]['TransportCost']=$val['value'];
-												}
-											}
-											break;
-
-										case 'ServiceOptionsCharges':
-											while((list($key,$val)=each($attributes)) && ($val['tag']!='ServiceOptionsCharges'))
-											{
-												if($val['tag']=='CurrencyCode')
-												{
-													$this->ResponseDistilled["RateOption_$ShipRate"]["Package_$ShipPackage"]['Currency']=$val['value'];
-												}
-												if($val['tag']=='MonetaryValue')
-												{
-													$this->ResponseDistilled["RateOption_$ShipRate"]["Package_$ShipPackage"]['ServiceCost']=$val['value'];
-												}
-											}
-											break;
-
-										case 'TotalCharges':
-											while((list($key,$val)=each($attributes)) && ($val['tag']!='TotalCharges'))
-											{
-												if($val['tag']=='CurrencyCode')
-												{
-													$this->ResponseDistilled["RateOption_$ShipRate"]["Package_$ShipPackage"]['Currency']=$val['value'];
-												}
-												if($val['tag']=='MonetaryValue')
-												{
-													$this->ResponseDistilled["RateOption_$ShipRate"]["Package_$ShipPackage"]['TotalCost']=$val['value'];
-												}
-											}
-											break;
-									}
-								}
-								$ShipPackage++;
-								break;
-								
-						}
-					}
-					$ShipRate++;
-					if($ShipPackage>$MaxPackage)
-					{
-						$MaxPackage=$ShipPackage;
-					}
-					$ShipPackage=0;
-					break;
-
-
-			}
-			
-		}
-
-		$this->ResponseDistilled['RateOptions']=$ShipRate;
-		$this->ResponseDistilled['Packages']=$MaxPackage;
-
-
-
-	} // end process();
-
-
-
-
-
-
-###################################################################################################
-## Debuging output of interest
-###################################################################################################
-	function Debug()
-	{
-
-		// format Request for display
-		$treq=htmlspecialchars($this->request);
-
-		// format Response for display
-		$tres=htmlspecialchars($this->result);
-
-		// format cURL info for display
-		$tcURL=buildarray($this->curl_array,'cURL Info');
-
-		// format distilled response for display
-		$tDist=buildarray($this->ResponseDistilled,'Distilled Response');
-
-		// build temp page
-		$TESTPAGE=<<<__TESTPAGE__
-		<html>
-		<head>
-		<title>Testing cURL with SurePay</title>
-		</head>
-
-		<body bgcolor="#999999">
-
-		<table border="1" width="100%" bgcolor="#ffffff">
-			<tr>
-				<td width="50%" bgcolor="#9999ff">
-					<b>Request to UPS:</b>
-				</td>
-				<td width="50%" bgcolor="#99ff99">
-					<b>Response from UPS:</b><br>
-				</td>
-			</tr>
-			<tr>
-				<td valign="top">
-					<font face="Verdana,Helvetica,Arial,sans-serif" size="2">
-						<pre>$treq</pre>
-					</font>
-				</td>
-				<td valign="top">
-					<font face="Verdana,Helvetica,Arial,sans-serif" size="2">
-						<pre>$tres</pre>
-					</font>
-				</td>
-			</tr>
-			<tr>
-				<td width="50%" bgcolor="#ff9999">
-					<b>cURL Info:</b>
-				</td>
-				<td width="50%" bgcolor="#99ffff">
-					<b>Parsed Response</b><br>
-				</td>
-			</tr>
-			<tr>
-				<td valign="top">
-					$tcURL
-				</td>
-				<td valign="top">
-					$tDist
-				</td>
-			</tr>
-
-		</table>
-
-		</body>
-		</html>
-__TESTPAGE__;
-
-
-		echo $TESTPAGE;
-		
-	} // end Debug();
-
-	function Debug2()
-	{
-		$tDist=buildarray($this->ResponseDistilled,'Distilled Response');
-		echo $tDist;
-	} // end Debug2();
-
-
-} // end class ups
-
-
-############################################################################################
-## Helper Function that changes an array into a series of nexted tables for easy display
-############################################################################################
-
-function buildarray($array,$arraylabel)
-{
-
-    // count table number
-    static $array_count_preinc;
-    $array_count_preinc++;
-
-    // gather statistics
-    $size=sizeof($array);
-    $foo=<<<__TABLE__
-    <table border="4" bgcolor="#ffffff">
-      <tr>
-	<td colspan="2" bgcolor="#ffaaaa">
-	  Array $array_count_preinc: $arraylabel<br>
-	  Entries: $size
-	</td>
-      </tr>
-      <tr bgcolor="#aaaaff">
-	<th>
-	  Key
-	</th>
-	<th>
-	  Value
-	</th>
-      </tr>
-__TABLE__;
-	
-	
-
-	if(is_array($array))
-	{
-		while (list ($key, $val) = each ($array))
-		{
-			$foo.= "<tr><td bgcolor=\"#aaffaa\" valign=\"top\"><b>$key</b></td><td>";
-			if(is_array($val))
-			{
-				$foo.=buildarray($val,"");
-			}
-			else
-			{
-				$foo.= $val;
-			}
-			$foo.= "</td></tr>";
-		}
-	}
-	$foo.= "</table>";
-
-	return $foo;
-}
-
-
-
-?>
--- ecommerce/contrib/shipcalc/partners/ups.inc.orig	1969-12-31 14:00:00.000000000 -1000
+++ ecommerce/contrib/shipcalc/partners/ups.inc	2006-05-16 14:37:54.000000000 -0800
@@ -0,0 +1,432 @@
+<?php
+// $Id: $
+
+/**
+ * @file
+ * Functions to communicate with UPS API.
+ *
+ * Derived from the UPS document titled:
+ *    UPS OnLine(r) Tools
+ *    Developer's Guide
+ *    Rates and Service Selection
+ *    HTML Tool
+ *    Version: 2004
+ * 
+ * And the document titled:
+ *    UPS Online Tools
+ *    Rates & Services Selection
+ *    Programming Information
+ *    (c) 2005
+ *
+ * Additional information:
+ *  http://www.ups.com/content/us/en/bussol/offering/technology/
+ *         automated_shipping/online_tools.html
+ */
+
+/**
+ * Shipcalc _shipping_methods hook.
+ *
+ * Define the UPS shipping methods.
+ */
+function ups_shipping_methods($type = 'domestic') {
+  // TODO: Add descriptions of various shipping methods.
+  $methods = array();
+
+  $methods['ups'] = array(
+    '#title' => t('UPS'),
+    '#description' => t('United Parcel Service of America, Inc.')
+  );
+  $methods['ups']['1DM'] = array(
+    '#title' => t('Next Day Air Early AM'),
+  );
+  $methods['ups']['1DA'] = array(
+    '#title' => t('Next Day Air'),
+  );
+  $methods['ups']['1DP'] = array(
+    '#title' => t('Next Day Air Saver'),
+  );
+  $methods['ups']['2DM'] = array(
+    '#title' => t('2nd Day Air AM'),
+  );
+  $methods['ups']['2DA'] = array(
+    '#title' => t('2nd Day Air'),
+  );
+  $methods['ups']['3DS'] = array(
+    '#title' => t('3 Day Select'),
+  );
+  $methods['ups']['GND'] = array(
+    '#title' => t('Ground'),
+  );
+  $methods['ups']['STD'] = array(
+    '#title' => t('Canada Standard'),
+  );
+  $methods['ups']['XPR'] = array(
+    '#title' => t('Worldwide Express'),
+  );
+  $methods['ups']['XDM'] = array(
+    '#title' => t('Worldwide Express Plus'),
+  );
+  $methods['ups']['XDP'] = array(
+    '#title' => t('Worldwide Expedited')
+  );
+
+  return $methods;
+}
+
+/**
+ * Shipcalc _settings_form hook.
+ *
+ * Create a form for UPS-specific configuration.
+ */
+function ups_settings_form(&$form) {
+  $form['ups'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('UPS settings')
+  );
+  $form['ups']['ups_accesskey'] = array(
+    '#type' => 'textfield',
+    '#title' => t('UPS Access Key'),
+    '#description' => t('Your unique UPS Access Key is provided when you %register for the UPS Online Tools.', array('%register' => l(t('register'), url('http://www.ups.com/content/us/en/bussol/offering/technology/automated_shipping/online_tools.html')))),
+    '#default_value' => variable_get('shipcalc_ups_accesskey', ''),
+    '#required' => TRUE
+  );
+  $form['ups']['ups_userid'] = array(
+    '#type' => 'textfield',
+    '#title' => t('UPS User ID'),
+    '#description' => t('Your unique UPS User ID is provided when you %register for the UPS Online Tools.', array('%register' => l(t('register'), url('http://www.ups.com/content/us/en/bussol/offering/technology/automated_shipping/online_tools.html')))),
+    '#default_value' => variable_get('shipcalc_ups_userid', ''),
+    '#required' => TRUE
+  );
+  $form['ups']['ups_password'] = array(
+    '#type' => 'textfield',
+    '#title' => t('UPS Password'),
+    '#description' => t('Your unique UPS password is provided when you %register for the UPS Online Tools.', array('%register' => l(t('register'), url('http://www.ups.com/content/us/en/bussol/offering/technology/automated_shipping/online_tools.html')))),
+    '#default_value' => variable_get('shipcalc_ups_password', ''),
+    '#required' => TRUE
+  );
+
+  $form['ups']['ups_url'] = array(
+    '#type' => 'textfield',
+    '#title' => t('UPS Server URL'),
+    '#description' => t('Enter the fully qualified URL of the UPS shipping rate server, as provided by UPS.'),
+    '#default_value' => (variable_get('shipcalc_ups_url', '') ? variable_get('shipcalc_ups_url', '') : 'https://www.ups.com/ups.app/xml/Rate'),
+    '#required' => TRUE
+  );
+
+  // TODO: Testing to help admin set up site.  Not fully implemented yet.
+  $form['ups']['test'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Testing'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE
+  );
+  $form['ups']['test']['ups_test_url'] = array(
+    '#type' => 'textfield',
+    '#title' => t('UPS Test Server URL'),
+    '#description' => t('UPS provides a Customer Integration Environment used to test your site configuration prior to launch.  Enter the fully qualified URL of the UPS Customer Integration Environment shipping rate server.  Clicking <em>Test configuration</em> below will use your Access Key, User ID and Password to test several transactions against the UPS Test Server URL.'),
+    '#default_value' => (variable_get('shipcalc_ups_test_url', '') ? variable_get('shipcalc_ups_test_url', '') : 'https://wwwcie.ups.com/ups.app/xml/Rate'),
+    '#required' => TRUE
+  );
+
+  $form['ups']['test']['submit'] = array(
+    '#type' => 'submit',
+    '#value' => t('Test configuration')
+  );
+}
+
+/**
+ * Shipcalc _settings_form_submit hook.
+ *
+ * Save data from our UPS-specific configuration form.
+ */
+function ups_settings_form_submit(&$form) {
+  global $form_values;
+  $op = $_POST['op'];
+
+  if ($form_values['shipping_partner'] == 'ups') {
+    variable_set('shipcalc_ups_accesskey', $form_values['ups_accesskey']);
+    variable_set('shipcalc_ups_userid', $form_values['ups_userid']);
+    variable_set('shipcalc_ups_password', $form_values['ups_password']);
+    variable_set('shipcalc_ups_url', $form_values['ups_url']);
+    variable_set('shipcalc_ups_test_url', $form_values['ups_test_url']);
+  }
+
+  if ($op == t('Test configuration')) {
+    // TODO: populate a fake transfer
+    $txn->address['shipping']->zip = 33068;
+    $txn->address['shipping']->country = 'US';
+    ups_get_rates_form($txn, 'https://wwwcie.ups.com/ups.app/xml/Rate');
+  }
+}
+
+/**
+ * Shipcalc _product_form hook.
+ *
+ * Update the product form with fields that we need.  It is possible for 
+ * multiple carriers to define the same field -- that is fine.  So long as
+ * the field as the same name (ie 'product_weight'), it will only be displayed
+ * once, and the data will be saved and restored for use by all shipping
+ * partners that define it.
+ */
+function ups_product_form(&$form) {
+  $form['shipping_data']['product_weight'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Product weight'),
+    '#description' => t('The weight of the product (in %unit)', array('%unit'=> (variable_get('shipcalc_units', 'LBS')) ? t('pounds') : t('kilograms'))),
+    '#default_value' => $form['#node']->product_weight
+  );
+}
+
+/**
+ * Shipcalc _get_rates_form hook.
+ *
+ * Request rates from UPS for the current transaction.  Return a form of all
+ * shipping options that the shipcalc module will display during the checkout 
+ * process.
+ */
+function ups_get_rates_form($txn, $url = 'DEFAULT') {
+  if ($url == 'DEFAULT') {
+    $url = variable_get('shipcalc_ups_url', 'https://www.ups.com/ups.app/xml/Rate');
+  }
+
+  $xml = ups_AccessRequest();
+  $xml .= ups_RatingServiceSelectionRequest($txn);
+
+  // We're doing a POST, so no need for libcurl.
+  $result = drupal_http_request($url, array('Content-type' => 'text/xml'), 'POST', $xml);
+
+  /**
+   * Ugly hack to work around PHP bug, details here:
+   *   http://bugs.php.net/bug.php?id=23220
+   * We strip out errors that look something like:
+   *  warning: fread() [function.fread]: SSL fatal protocol error in...
+   */
+  $messages = drupal_set_message();
+  $errors = $messages['error'];
+  $count = 0;
+  for ($i = 0; $i <= sizeof($errors); $i++) {
+    if (strpos($errors[$i], 'SSL: fatal protocol error in')) {
+      unset($errors[$i]);
+      unset($_SESSION['messages']['error'][$i]);
+    }
+    else {
+      $count++;
+    }
+  }
+  if (!$count) {
+    unset($_SESSION['messages']['error']);
+  }
+  // End of ugly hack.
+
+  $response = _parse_xml($result->data, '<Response>');
+  $code = _parse_xml($response, '<ResponseStatusCode>');
+  if ($code == 0) { // failed request 
+    $error = _parse_xml($response, '<Error>');
+    $error_severity = _parse_xml($error, '<ErrorSeverity>');
+    $error_code = _parse_xml($error, '<ErrorCode>');
+    $error_description = _parse_xml($error, '<ErrorDescription>');
+    drupal_set_message(t('%description (%severity error %code)', array('%severity' => $error_severity, '%code' => $error_code, '%description' => $error_description)), 'error');
+    // Try and offer a helpful error, useful for initial configuration.
+    $location = split('/', _parse_xml($error, '<ErrorLocationElementName>'));
+    if ($location[0] == 'AccessRequest') {
+      switch ($location[1]) {
+        case 'UserId':
+          drupal_set_message(t('There is an error with your <em>User ID</em>, please verify that you have entered it correctly and try again.'), 'error');
+          break;
+        case 'Password':
+          drupal_set_message(t('There is an error with your <em>Password</em>, please verify that you have entered it correctly and try again.'), 'error');
+          break;
+      }
+    }
+    $charges = -1; // negative charges indicates an error
+  }
+  else { // success, build form
+    $xml = $result->data;
+    $loop = TRUE;
+    $options = array();
+    while ($loop == TRUE) {
+      if (strpos($xml, '<RatedShipment>')) {
+        $rate = _parse_xml($xml, '<RatedShipment>');
+
+        // See if this is a supported shipping method.
+        $service = _parse_xml($rate, '<Service>');
+        $service_code = _parse_xml($service, '<Code>');
+        if ($method = _ups_valid_service_code($service_code, $txn)) {
+          $total = _parse_xml($rate, '<TotalCharges>');
+          $currency = _parse_xml($total, '<CurrencyCode>');
+          $value = _parse_xml($total, '<MonetaryValue>');
+
+          $options[key($method)] = t('$%price %currency - %method', array('%price' => $value, '%currency' => $currency, '%method' => current($method)));
+        }
+        $xml = substr($xml, strpos($xml, '</RatedShipment>') + 1);
+      }
+      else {
+        $loop = FALSE;
+      }
+    }
+    $form['ups'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('UPS')
+    );
+
+    $form['ups']['shipping_methods'] = array(
+      '#type' => 'radios',
+      '#options' => $options
+    );
+  }
+
+  return $form;
+}
+
+/**
+ * Build the XML AccessRequest used to login to the UPS shipping server.
+ */
+function ups_AccessRequest() {
+  $xml = "<?xml version=\"1.0\"?>\n";
+  $xml .= "<AccessRequest xml:lang=\"en-US\">\n";
+  $xml .= "  <AccessLicenseNumber>". variable_get('shipcalc_ups_accesskey', '') ."</AccessLicenseNumber>\n";
+  $xml .= "  <UserId>". variable_get('shipcalc_ups_userid', '') ."</UserId>\n";
+  $xml .= "  <Password>". variable_get('shipcalc_ups_password', '') ."</Password>\n";
+  $xml .= "</AccessRequest>\n";
+  return $xml;
+}
+
+/**
+ * Build the XML RatingServiceSelectionRequest used to make a request from the
+ * UPS shipping server.
+ */
+function ups_RatingServiceSelectionRequest($txn) {
+  $xml = "<?xml version=\"1.0\"?>\n";
+  $xml .= "<RatingServiceSelectionRequest xml:lang=\"en-US\">\n";
+  $xml .= "  <Request>\n";
+  $xml .= "    <TransactionReference>\n";
+  $xml .= "      <CustomerContext>Shipcalc Request</CustomerContext>\n";
+  $xml .= "      <XpciVersion>1.0001</XpciVersion>\n";
+  $xml .= "    </TransactionReference>\n";
+  $xml .= "    <RequestAction>Rate</RequestAction>\n";
+  //$xml .= "    <RequestOption>Rate</RequestOption>\n";
+  $xml .= "    <RequestOption>shop</RequestOption>\n";
+  $xml .= "  </Request>\n";
+  $xml .= "  <PickupType>\n";
+  // TODO: Make Pickup Type Code configurable.
+/*
+  Default value is 01. Valid values are:
+    01 - Daily Pickup
+    03 - Customer Counter
+    06 - One Time Pickup
+    07 - On Call Air
+    11 - Suggested Retail Rates
+    19 - Letter Center
+    20 - Air Service Center
+*/
+  $xml .= "    <Code>01</Code>\n";
+  $xml .= "  </PickupType>\n";
+  // TODO: Optionally support CustomerClassification/Code (for now use defaults)
+  $xml .= "  <Shipment>\n";
+  $xml .= "    <Shipper>\n";
+  $xml .= "      <Address>\n";
+  $xml .= "        <City>". /*TODO*/'' ."Margate</City>\n";
+  $xml .= "        <StateProvinceCode>". /*TODO*/'' ."FL</StateProvinceCode>\n";
+  $xml .= "        <PostalCode>". /*TODO*/'' ."33068</PostalCode>\n";
+  $xml .= "        <CountryCode>". /*TODO*/'' ."US</CountryCode>\n";
+  $xml .= "      </Address>\n";
+  $xml .= "    </Shipper>\n";
+  $xml .= "    <ShipTo>\n";
+  $xml .= "      <Address>\n";
+  if ($txn->address['shipping']->zip) {
+    $xml .= "        <PostalCode>". $txn->address['shipping']->zip ."</PostalCode>\n";
+    $xml .= "        <CountryCode>". strtoupper($txn->address['shipping']->country) ."</CountryCode>\n";
+  }
+  else {
+    $xml .= "        <City>". $txn->address['shipping']->city ."</City>\n";
+    $xml .= "        <StateProvinceCode>". $txn->address['shipping']->state ."</StateProvinceCode>\n";
+    $xml .= "        <CountryCode>". $txn->address['shipping']->country ."</CountryCode>\n";
+  }
+  //$xml .= "        <ResidentialAddressIndicator></ResidentialAddressIndicator>\n"; // TODO:  true if exists, false if doesn't exist
+  $xml .= "      </Address>\n";
+  $xml .= "    </ShipTo>\n";
+  $xml .= "    <Service>\n";
+  $xml .= "      <Code>". /*TODO, see Appendix C*/'01' ."</Code>\n";
+  $xml .= "    </Service>\n";
+  // TODO:  Handle multiple packages -- currently we assume everything fits in
+  //        the same package.  We could loop here and have up to 200 <Package>
+  //        elements.
+  $weight = 0;
+  if (is_array($items) && $items != array()) {
+    foreach ($items as $item) {
+      if ($item->product_weight) {
+        $weight += $item->product_weight;
+      }
+    }
+  }
+  else {
+    // This shouldn't happen, but if so assume minimum weight.
+    $weight = 0.1;
+  }
+  $xml .= "    <Package>\n";
+  $xml .= "      <PackagingType>\n";
+  $xml .= "        <Code>". /*TODO, see Appendix C*/'02' ."</Code>\n";
+  $xml .= "      </PackagingType>\n";
+  $xml .= "      <PackageWeight>\n";
+  $xml .= "        <UnitOfMeasurement>\n";
+  $xml .= "          <Code>". variable_get('shipcalc_units', 'LBS') ."</Code>\n";
+  $xml .= "        </UnitOfMeasurement>\n";
+  $xml .= "        <Weight>". $weight ."</Weight>\n";
+  $xml .= "      </PackageWeight>\n";
+  $xml .= "    </Package>\n";
+  $xml .= "  </Shipment>\n";
+  $xml .= "</RatingServiceSelectionRequest>\n";
+  return $xml;
+}
+
+/**
+ * Internal helper function, not yet complete.  UPS returns an array of all
+ * possible shipping methods.  We need to only return the ones that are 
+ * configured for use with the current item.
+ *
+ * TODO: These names are valid for US, are different when shipping from 
+ *       Europe or Canda.
+ */
+function _ups_valid_service_code($code, $txn) {
+  switch ($code) {
+    case 1:
+      $method = array('1DA' => t('Next Day Air'));
+      break;
+    case 2:
+      $method = array('2DA' => t('2nd Day Air'));
+      break;
+    case 3:
+      $method = array('GND' => t('Ground'));
+      break;
+    case 7:
+      $method = array('XPR' => t('Worldwide Express'));
+      break;
+    case 8:
+      $method = array('XDP' => t('Worldwide Expedited'));
+      break;
+    case 11:
+      $method = array('STD' => t('Standard'));
+      break;
+    case 12:
+      $method = array('3DS' => t('3 Day Select'));
+      break;
+    case 13:
+      $method = array('1DP' => t('Next Day Air Saver'));
+      break;
+    case 14:
+      $method = array('1DM' => t('Next Day Air, Early AM'));
+      break;
+    case 54:
+      $method = array('XDM' => t('Worldwide Express Plus'));
+      break;
+    case 59:
+      $method = array('2DM' => t('2nd Day Air, AM'));
+      break;
+  }
+
+  // TODO: we need to validate these codes against the txn...
+  // if valid, return it, if not return NULL
+  return $method;
+}
+
+?>
--- ecommerce/contrib/shipcalc/partners/usps.inc.orig	1969-12-31 14:00:00.000000000 -1000
+++ ecommerce/contrib/shipcalc/partners/usps.inc	2006-05-16 14:37:54.000000000 -0800
@@ -0,0 +1,172 @@
+<?php
+// $Id: $
+
+/**
+ * @file
+ * Functions to communicate with USPS API.
+ *
+ * Derived from the USPS document titled:
+ *    Rates Calculators
+ *    USPS Web Tools(TM)
+ *    Application Programming Interface
+ *    User's Guide
+ *    Document Version 1.0 (11/8/04)
+ *
+ * Additional information:
+ *  http://www.usps.com/webtools/
+ */
+
+/**
+ * Shipcalc _shipping_methods hook.
+ *
+ * Define the USPS shipping methods.
+ */
+function usps_shipping_methods($type = 'domestic') {
+  // TODO: Add descriptions of various shipping methods.
+  $methods = array();
+
+  $methods['usps'] = array(
+    '#title' => t('USPS'),
+    '#description' => t('United States Postal Service.'),
+    '#product_attributes' => array('weight')
+  );
+
+  switch ($type) {
+    case 'domestic':
+    default:
+      $methods['usps']['Express'] = array(
+        '#title' => t('Express'),
+      );
+      $methods['usps']['First Class'] = array(
+        '#title' => t('First Class'),
+      );
+      $methods['usps']['Priority'] = array(
+        '#title' => t('Priority'),
+      );
+      $methods['usps']['Parcel'] = array(
+        '#title' => t('Parcel Post'),
+      );
+      $methods['usps']['BPM'] = array(
+        '#title' => t('Bound Printed Matter'),
+      );
+      $methods['usps']['Media'] = array(
+        '#title' => t('Media Mail'),
+      );
+      $methods['usps']['Library'] = array(
+        '#title' => t('Library Mail')
+      );
+      break;
+    case 'international':
+      $methods['usps']['GXG Document'] = array(
+        '#title' => t('Global Express Guaranteed Document Service'),
+      );
+      $methods['usps']['GXG Non-Document'] = array(
+        '#title' => t('Global Express Guaranteed Non-Document Service'),
+      );
+      $methods['usps']['Priority Lg'] = array(
+        '#title' => t('Global Priority Mail, Flat-rate Large Envelope'),
+      );
+      $methods['usps']['Priority Sm'] = array(
+        '#title' => t('Global Priority Mail, Flat-rate Small Envelope'),
+      );
+      $methods['usps']['Priority Var'] = array(
+        '#title' => t('Global Priority Mail, Variable Rate'),
+      );
+      $methods['usps']['Express'] = array(
+        '#title' => t('Global Express Mail'),
+      );
+      $methods['usps']['Airmail Letter'] = array(
+        '#title' => t('Airmail Letter Post'),
+      );
+      $methods['usps']['Airmail Parcel'] = array(
+        '#title' => t('Airmail Parcel Post'),
+      );
+      $methods['usps']['Surface Letter'] = array(
+        '#title' => t('Economy Mail, Letter Post')
+      );
+      $methods['usps']['Surface Parcel'] = array(
+        '#title' => t('Economy Mail, Parcel Post')
+      );
+  }
+
+  return $methods;
+}
+
+/**
+ * Shipcalc _settings_form hook.
+ *
+ * Create a form for USPS-specific configuration.
+ */
+function usps_settings_form(&$form) {
+  $form['usps'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('USPS settings')
+  );
+  $form['usps']['usps_userid'] = array(
+    '#type' => 'textfield',
+    '#title' => t('USPS User ID'),
+    '#description' => t('Your unique USPS User ID is provided when you %register for the USPS Web Tools.', array('%register' => l(t('register'), url('https://secure.shippingapis.com/Registration/')))),
+    '#default_value' => variable_get('shipcalc_usps_userid', ''),
+    '#required' => TRUE
+  );
+  $form['usps']['usps_password'] = array(
+    '#type' => 'password',
+    '#title' => t('USPS Password'),
+    '#description' => t('Your unique USPS password is provided when you %register for the USPS Web Tools.', array('%register' => l(t('register'), url('https://secure.shippingapis.com/Registration/')))),
+    '#default_value' => variable_get('shipcalc_usps_password', ''),
+    '#required' => FALSE // Not required during testing.
+  );
+
+  $form['usps']['usps_url'] = array(
+    '#type' => 'textfield',
+    '#title' => t('USPS Server URL'),
+    '#description' => t('Enter the fully qualified URL and of the USPS shipping rate server, including the API DLL, as provided by USPS.  For testing, you generally use <em>http://testing.shippingapis.com/ShippingAPITest.dll</em> or <em>https://secure.shippingapis.com/ShippingAPITest.dll</em>.  For production, you generally use <em>http://production.shippingapis.com/shippingapi.dll</em>.'),
+    '#default_value' => (variable_get('shipcalc_usps_url', '') ? variable_get('shipcalc_usps_url', '') : 'http://testing.shippingapis.com/ShippingAPITest.dll'),
+    '#required' => TRUE
+  );
+
+  return $form;
+}
+
+/**
+ * Shipcalc _settings_form_submit hook.
+ *
+ * Save data from our USPS-specific configuration form.
+ */
+function usps_settings_form_submit(&$form) {
+  global $form_values;
+
+  if ($form_values['shipping_partner'] == 'usps') {
+    variable_set('shipcalc_usps_userid', $form_values['usps_userid']);
+    variable_set('shipcalc_usps_password', $form_values['usps_password']);
+    variable_set('shipcalc_usps_url', $form_values['usps_url']);
+  }
+}
+
+/**
+ * Shipcalc _product_form hook.
+ *
+ * Update the product form with fields that we need.  It is possible for 
+ * multiple carriers to define the same field -- that is fine.  So long as
+ * the field as the same name (ie 'product_weight'), it will only be displayed
+ * once, and the data will be saved and restored for use by all shipping
+ * partners that define it.
+ */
+function usps_product_form(&$form) {
+  $form['shipping_data']['product_weight'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Product weight'),
+    '#description' => t('The weight of the product (in %unit)', array('%unit'=> (variable_get('shipcalc_units', 'LBS')) ? t('pounds') : t('kilograms'))),
+    '#default_value' => $form['#node']->product_weight
+  );
+}
+
+/**
+ * Shipcalc _get_rates_form hook.
+ *
+ * TODO:  Request rates from USPS for the current transaction.
+ */
+function usps_get_rates_form($txn, $url = 'DEFAULT') {
+}
+
+?>