? user_import_domain-756668.patch
? user_import_domain.patch
Index: user_import_domain.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_import_domain/user_import_domain.module,v
retrieving revision 1.1
diff -u -p -r1.1 user_import_domain.module
--- user_import_domain.module	12 Feb 2010 07:12:25 -0000	1.1
+++ user_import_domain.module	29 Mar 2010 21:20:11 -0000
@@ -39,7 +39,7 @@ function user_import_domain_form_alter(&
         'select' => t('Select domains'),
       ),
       '#default_value' => variable_get('user_import_domain_import_domain', 'current'),
-      '#description' => t('If using Current domain, users will all be assigned to the current domain.') . '<br />' . 
+      '#description' => t('If using Current domain, users will all be assigned to the current domain.') . '<br />' .
                         t('If using Select domains, domains can be chosen for all users on the import settings and they can be imported from the csv file on a per user basis.') . '<br />' .
                         t("If the user doing the import doesn't have the 'import to any domain' permission then the import will only allow users to be assigned to domains the importing user is a member of."),
     );
@@ -97,7 +97,7 @@ function domain_user_import_form_fieldse
   );
 
   $form['domain_selection']['domains'] = array(
-    '#title' => t('Assign Domain(s) to all users'), 
+    '#title' => t('Assign Domain(s) to all users'),
     '#type' => 'checkboxes',
     '#options' => $domain_options,
     '#default_value' => $import['domains'] ? $import['domains'] : array(),
@@ -160,10 +160,28 @@ function domain_user_import_domains_data
       $domain = trim($domain);
       $found = FALSE;
       foreach ($existing_domains as $did => $existing_domain) {
-        if (strtolower($domain) == strtolower($existing_domain['sitename']) &&
-           (user_access('import to any domain') || in_array($did, $user_domains))) {
-          $found = TRUE;
-          $domains[$did] = $did;
+        if (user_access('import to any domain') || in_array($did, $user_domains)) {
+          // Check by domain ID
+          if (is_numeric($domain) && $domain == $existing_domain['domain_id']) {
+            $found = TRUE;
+          }
+          // Check by path
+          elseif (stristr($domain, 'http://') !== FALSE && strtolower($domain) == strtolower(trim($existing_domain['path']))) {
+            $found = TRUE;
+          }
+          // Check by sitename
+          elseif (strtolower($domain) == strtolower(trim($existing_domain['sitename']))) {
+            $found = TRUE;
+          }
+          // Check by subdomain
+          elseif (strtolower($domain) == strtolower(trim($existing_domain['subdomain']))) {
+            $found = TRUE;
+          }
+
+          // Set domains
+          if ($found) {
+            $domains[$did] = $did;
+          }
         }
       }
       if (!$found) {