--- user_import.module	2006-11-02 19:40:26.000000000 -0500
+++ user_import.module.new	2006-11-02 19:36:01.000000000 -0500
@@ -407,6 +407,7 @@
         '#description' => t("Include spaces in usernames, e.g. 'John' + 'Smith' => 'John Smith'."),
     );
   
+
     $handle = _user_import_file_open($file);
     $data_row = _user_import_file_row($file, $handle);
     $profile_fields = _user_import_profile('fid', 'title');
@@ -415,6 +416,7 @@
     $profile_fields[0] = '-------------';
     $profile_fields['email'] = t('Email Address') . '*';
     $profile_fields['password'] = t('Password');
+    if (module_exist('og')) $profile_fields['organic_groups'] = t('Organic Groups');
     asort($profile_fields);  
     
     $row = 0;
@@ -1105,6 +1107,8 @@
                 }
                 
                 if ($column_settings['field_match'] == 'password') $password = trim($data[$file_column]);
+                
+                if ($column_settings['field_match'] == 'organic_groups') $organic_groups = trim($data[$file_column]);
         
                 if ($column_settings['field_match'] != 0 && $column_settings['field_match'] != 'email' && $column_settings['field_match'] != 'password') $fields[$column_settings['field_match']] = $data[$file_column];
                 
@@ -1144,6 +1148,9 @@
                         }
                     }      
                     
+                    //assign organic groups
+                    if (module_exist('og')) _user_import_organic_groups($account, $organic_groups);
+                    
                     if ($settings['options']['send_email'] == 1 || $settings['send_email'] == 1) _user_import_send_email($account, $password, $fields);
                     $send_counter++;
 
@@ -1387,4 +1394,11 @@
   return;
 }
 
+function _user_import_organic_groups($account, $organic_groups) {
+  $organic_groups = explode(";", $organic_groups);
+  foreach($organic_groups as $gid) {
+    og_subscribe_user($gid, $account);
+  }
+}
+
 ?>
\ No newline at end of file