--- mailbuild.a/mailbuild.module	2008-05-16 08:18:58.000000000 +1000
+++ mailbuild/mailbuild.module	2008-06-25 09:57:46.000000000 +1000
@@ -164,8 +164,29 @@ function mailbuild_block_view_form_submi
     'Email' => $form_values['email'],
     'Name' => $form_values['name'],
   );
-  $result = mailbuild_soap_call('AddSubscriber', $params);
-  if ($result['Subscriber.AddResult']['Code'] === '0') {
+  $type = 'AddSubscriber';
+  $return = 'Subscriber.AddResult';
+  if (!empty($form_values['custom_fields'])) {
+    $custom = explode(',', $form_values['custom_fields']);
+    $array = array();
+    foreach ($custom as $key) {
+      if (is_array($form_values[$key])) {
+        foreach (array_filter($form_values[$key]) as $value) {
+          $array[] = array('Key' => $key, 'Value' => $value);
+        }
+      }
+      elseif (!empty($form_values[$key])) {
+        $array[$key] = array('Key' => $key, 'Value' => $form_values[$key]);
+      }
+    }
+    if (!empty($array)) {
+      $type = 'AddSubscriberWithCustomFields';
+      $return = 'Subscriber.AddWithCustomFieldsResult';
+      $params['CustomFields']['SubscriberCustomField'] = $array;
+    }
+  }
+  $result = mailbuild_soap_call($type, $params);
+  if ($result[$return]['Code'] === '0') {
     $msg = 'Thank you for subscribing to our list.';
     if ($list['optin'] == 'double') {
       $msg .= ' A confirmation link has been sent to your email address.';
@@ -173,7 +194,7 @@ function mailbuild_block_view_form_submi
     drupal_set_message($msg);
   }
   else {
-    $error = $result['Subscriber.AddResult']['Message'];
+    $error = $result[$return]['Message'];
     if (!strlen($error)) {
       $error = 'NuSOAP library error';
     }
