Index: user_import.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_import/user_import.module,v
retrieving revision 1.26
diff -u -p -r1.26 user_import.module
--- user_import.module	20 Sep 2009 11:58:10 -0000	1.26
+++ user_import.module	16 Aug 2010 06:31:28 -0000
@@ -1174,6 +1174,15 @@ function _user_import_profile($key = 'fi
     } 
     else {
         foreach ($fields_static as $field) {
+          if ($field->type == 'selection' && module_exists('profile_checkboxes')) {
+            $checkboxes = db_result(db_query("SELECT checkboxes FROM {profile_checkboxes} WHERE fid = %d", $field->fid));
+            if ($checkboxes == 1) {
+              $options = explode("\n", $field->options);
+              foreach ($options as $i => $option) {
+                $fields[$field->{$key} .'-'. $i] = $field->{$return_value} .': '. $option;
+              }
+            }
+          }
             $fields[$field->{$key}] = $field->{$return_value};
         }
     }
Index: supported/profile.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_import/supported/profile.inc,v
retrieving revision 1.6
diff -u -p -r1.6 profile.inc
--- supported/profile.inc	4 Apr 2009 16:24:18 -0000	1.6
+++ supported/profile.inc	16 Aug 2010 06:31:28 -0000
@@ -38,6 +38,24 @@ function profile_user_import_after_save(
   $data = $old_data = unserialize($account->data);
 
   foreach ($profile_fields as $field) {
+    // Allow mapping of columns to selection field values
+    if ($field->type == 'selection' && module_exists('profile_checkboxes')) {
+      $checkboxes = db_result(db_query("SELECT checkboxes FROM {profile_checkboxes} WHERE fid = %d", $field->fid));
+      if ($checkboxes == 1) {
+        $options = explode("\n", str_replace("\r", '', $field->options));
+        $selected_options = explode(", ", $fields['profile'][$field->fid][0]); 
+        foreach ($options as $i => $option) {
+          if (isset($fields['profile'][$field->fid .'-'. $i][0])) {
+            if ($fields['profile'][$field->fid .'-'. $i][0]) {
+              if (!in_array($option, $selected_options)) {
+                $selected_options[] = $option;
+              }
+            }
+          }
+        }
+        $fields['profile'][$field->fid][0] = implode(', ', array_filter($selected_options));
+      }
+    }
     profile_user_import_save_profile($field, $account->uid, $fields['profile'][$field->fid][0], $updated, $update_setting_per_module['profile'], $data);
   }
   