--- C:/Documents and Settings/appel/Desktop/user_import.old.module	Mon Jul 23 23:49:45 2007
+++ C:/Documents and Settings/appel/Desktop/user_import.new.module	Thu Nov 22 16:19:14 2007
@@ -849,6 +849,13 @@
         '#default_value' => $import['username_space'],
         '#description' => t("Include spaces in usernames, e.g. 'John' + 'Smith' => 'John Smith'."),
     );
+
+    $form['optional']['username_lowercase'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Username lowercase'),
+        '#default_value' => $import['username_lowercase'],
+        '#description' => t("Change username characters to lowercase, e.g. 'John Smith' => 'johnsmith'."),
+    );
     
     $form['optional']['activate'] = array(
         '#type' => 'checkbox',
@@ -1142,19 +1149,20 @@
     return;
 }
   
-function _user_import_create_username($order, $data, $abbreviate, $username_space) {
+function _user_import_create_username($order, $data, $abbreviate, $username_space, $username_lowercase) {
     
     asort($order);
     reset($order);
 
     while (list ($file_column, $sequence) = each ($order)) {
         
-        if (!empty($username) && !empty($username_space)) $username .= ' ';
+		if (!empty($username) && !empty($username_space)) $username .= ' ';
         $username .= ($abbreviate[$file_column] == 1) ? trim(drupal_strtoupper(chr(ord($data[$file_column])))) : trim($data[$file_column]);
     }
     
     if (empty($username)) $username = _user_import_random_username();
-    
+    if (!empty($username_lowercase)) $username = strtolower($username);
+
     _user_import_sanitise_username($username);
     
     return $username;
@@ -1382,18 +1390,18 @@
     if ($settings['import_id']) {
     
         db_query("UPDATE {user_import} 
-            SET name = '%s', filename = '%s', oldfilename = '%s', filepath = '%s', pointer = %d, processed = %d, valid= %d, first_line_skip = %d, contact = %d, username_space = %d, send_email = %d, field_match = '%s', roles = '%s', options = '%s', setting = '%s' 
+            SET name = '%s', filename = '%s', oldfilename = '%s', filepath = '%s', pointer = %d, processed = %d, valid= %d, first_line_skip = %d, contact = %d, username_space = %d, username_lowercase = %d, send_email = %d, field_match = '%s', roles = '%s', options = '%s', setting = '%s' 
             WHERE import_id = %d
-            ", trim($settings['name']), $settings['filename'], $settings['oldfilename'], $settings['filepath'], $settings['pointer'], $settings['processed'], $settings['valid'], $settings['first_line_skip'], $settings['contact'], $settings['username_space'], $settings['send_email'], serialize($settings['field_match']), serialize($settings['roles']), serialize($settings['options']), $settings['setting'], $settings['import_id']);
+            ", trim($settings['name']), $settings['filename'], $settings['oldfilename'], $settings['filepath'], $settings['pointer'], $settings['processed'], $settings['valid'], $settings['first_line_skip'], $settings['contact'], $settings['username_space'], $settings['username_lowercase'], $settings['send_email'], serialize($settings['field_match']), serialize($settings['roles']), serialize($settings['options']), $settings['setting'], $settings['import_id']);
         
         // Save settings for new import
     } 
     else {
     
         db_query("INSERT INTO {user_import} 
-            (name, filename, oldfilename, filepath, started, pointer, processed, valid, first_line_skip, contact, username_space, send_email, field_match, roles, options, setting) 
-            VALUES ('%s', '%s', '%s', '%s', %d, %d, %d, %d, %d, %d, %d, %d, '%s', '%s', '%s', '%s')
-            ", trim($settings['name']), $settings['filename'], $settings['oldfilename'], $settings['filepath'], time(), $settings['pointer'], $settings['processed'], $settings['valid'], $settings['first_line_skip'], $settings['contact'], $settings['username_space'], $settings['send_email'], serialize($settings['field_match']), serialize($settings['roles']), serialize($settings['options']), $settings['setting']);
+            (name, filename, oldfilename, filepath, started, pointer, processed, valid, first_line_skip, contact, username_space, username_lowercase, send_email, field_match, roles, options, setting) 
+            VALUES ('%s', '%s', '%s', '%s', %d, %d, %d, %d, %d, %d, %d, %d, %d, '%s', '%s', '%s', '%s')
+            ", trim($settings['name']), $settings['filename'], $settings['oldfilename'], $settings['filepath'], time(), $settings['pointer'], $settings['processed'], $settings['valid'], $settings['first_line_skip'], $settings['contact'], $settings['username_space'], $settings['username_lowercase'], $settings['send_email'], serialize($settings['field_match']), serialize($settings['roles']), serialize($settings['options']), $settings['setting']);
             
         $settings['import_id'] = db_result(db_query("SELECT LAST_INSERT_ID()"));
     }
@@ -1557,7 +1565,7 @@
                     
                     if ($settings['setting'] == 'import') {
                         
-                        $username = _user_import_create_username($username_order, $username_data, $username_abbreviate, $settings['username_space']);
+                        $username = _user_import_create_username($username_order, $username_data, $username_abbreviate, $settings['username_space'], $settings['username_lowercase']);
                         
                         if (empty($password)) $password = user_password();
                         if ($settings['contact'] == 1) $contact = 1;
--- C:/Documents and Settings/appel/Desktop/user_import.old.install	Thu Nov 22 16:22:14 2007
+++ C:/Documents and Settings/appel/Desktop/user_import.new.install	Thu Nov 22 16:08:12 2007
@@ -28,6 +28,7 @@
                         first_line_skip int(1) NOT NULL default '0',
                         contact int(1) NOT NULL default '0',
                         username_space int(1) NOT NULL default '0',
+                        username_lowercase int(1) NOT NULL default '0',
                         send_email int(1) NOT NULL default '0',
                         field_match longtext NOT NULL,
                         roles varchar(255) NOT NULL default '',