--- loncom/interface/lonuserutils.pm	2012/02/09 22:06:16	1.136.6.3
+++ loncom/interface/lonuserutils.pm	2012/08/19 00:18:16	1.139
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.136.6.3 2012/02/09 22:06:16 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.139 2012/08/19 00:18:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -47,8 +47,7 @@ sub modifystudent {
     # this one.  If $csec is defined, drop them from all other sections of
     # this course and add them to section $csec
     my ($cnum,$cdom) = &get_course_identity($courseid);
-    my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1});
-    my %roles = &Apache::lonnet::dump('roles',$udom,$unam,'.',undef,$extra);
+    my %roles = &Apache::lonnet::dump('roles',$udom,$unam);
     my ($tmp) = keys(%roles);
     # Bail out if we were unable to get the students roles
     return "$1" if ($tmp =~ /^(con_lost|error|no_such_host)/i);
@@ -342,8 +341,7 @@ sub print_upload_manager_header {
              ."</p>\n");
     $r->print('<div class="LC_left_float"><h3>'.
               &mt('Identify fields in uploaded list')."</h3>\n");
-    $r->print(&mt('Enter as many fields as you can.').'<br />'.
-             &mt('The system will inform you and bring you back to this page, [_1]if the data selected are insufficient to add users.','<br />')."<br />\n");
+    $r->print(&mt('Enter as many fields as you can.<br /> The system will inform you and bring you back to this page, <br /> if the data selected are insufficient to add users.')."<br />\n");
     $r->print(&hidden_input('action','upload').
               &hidden_input('state','got_file').
               &hidden_input('associate','').
@@ -1423,6 +1421,7 @@ sub curr_role_permissions {
 sub my_custom_roles {
     my ($crstype) = @_;
     my %returnhash=();
+    my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1});
     my %rolehash=&Apache::lonnet::dump('roles');
     foreach my $key (keys(%rolehash)) {
         if ($key=~/^rolesdef\_(\w+)$/) {
@@ -2322,7 +2321,7 @@ END
                        'type'       => "enroll type/action",
                        'email'      => "e-mail address",
                        'photo'      => "photo",
-                       'lastlogin'  => "last login",
+                       'lastlogin'  => "last login", 
                        'extent'     => "extent",
                        'pr'         => "Proceed",
                        'ca'         => "check all",
@@ -4181,32 +4180,10 @@ sub upfile_drop_add {
                         }
                         $checkid = 1;
                         $newuser = 1;
-                        if ($username =~/^[^\@]+\@[^\@]+$/) {
-                            if ($email eq '') {
-                                $email = $username;
-                            }
-                            my $lc_email;
-                            if ($username eq $email) {
-                                $lc_email = lc($email);
-                            }
-                            my $lc_username = lc($username);
-                            if ($lc_username ne $username) {
-                                if ($username eq $email) {
-                                    $email = $lc_username;
-                                }
-                                $username = $lc_username;
-                                $uhome=&Apache::lonnet::homeserver($username,$userdomain);
-                                if ($uhome ne 'no_host') {
-                                    $newuser = 0;
-                                }
-                            }
-                        }
-                    }
-                    my $user = $username.':'.$newuserdom;
-                    if ($newuser) {
+                        my $user = $username.':'.$newuserdom;
                         my $checkhash;
                         my $checks = { 'username' => 1 };
-                        $checkhash->{$user} = { 'newuser' => 1, };
+                        $checkhash->{$username.':'.$newuserdom} = { 'newuser' => 1, };
                         &Apache::loncommon::user_rule_check($checkhash,$checks,
                             \%alerts,\%rulematch,\%inst_results,\%curr_rules,
                             \%got_rules);
@@ -4228,13 +4205,8 @@ sub upfile_drop_add {
                         }
                         unless ($cancreate{$usertype}) {
                             my $showtype = $longtypes{$usertype};
-                            if ($usertype eq 'unofficial') {
-                                $r->print('<br />'.
-                                          &mt("[_1]: The user does not exist, and the new user's username must be an e-mail address.",'<b>'.$username.'</b>'));
-                            } else {
-                                $r->print('<br />'.
-                                          &mt("[_1]: The user does not exist, and you are not permitted to create users of type: [_2].",'<b>'.$username.'</b>',$showtype));
-                            }
+                            $r->print('<br />'.
+                                      &mt('[_1]: The user does not exist, and you are not permitted to create users of type: [_2].','<b>'.$username.'</b>',$showtype));
                             next;
                         }
                     } else {