--- loncom/interface/lonuserutils.pm	2015/06/09 21:22:57	1.170
+++ loncom/interface/lonuserutils.pm	2016/07/24 14:34:59	1.174
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.170 2015/06/09 21:22:57 damieng Exp $
+# $Id: lonuserutils.pm,v 1.174 2016/07/24 14:34:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,7 @@ use Apache::loncommon();
 use Apache::lonhtmlcommon;
 use Apache::lonlocal;
 use Apache::longroup;
+use HTML::Entities;
 use LONCAPA qw(:DEFAULT :match);
 
 ###############################################################
@@ -2413,6 +2414,7 @@ sub make_keylist_array {
     $index->{'photo'} = &Apache::loncoursedata::CL_PHOTO();
     $index->{'thumbnail'} = &Apache::loncoursedata::CL_THUMBNAIL();
     $index->{'credits'} = &Apache::loncoursedata::CL_CREDITS();
+    $index->{'instsec'} = &Apache::loncoursedata::CL_INSTSEC();
     $index->{'authorquota'} = &Apache::loncoursedata::CL_AUTHORQUOTA();
     $index->{'authorusage'} = &Apache::loncoursedata::CL_AUTHORUSAGE();
     foreach my $key (keys(%{$index})) {
@@ -3056,13 +3058,14 @@ END
                                 if ($role eq 'st') {
                                     $checkval .= ':'.$in{'type'}.':'.
                                                  $in{'lockedtype'}.':'.
-                                                 $in{'credits'};
+                                                 $in{'credits'}.':'.
+                                                 &escape($in{'instsec'});
                                 }
                              }
                         }
                         if ($showcheckbox) {
                             $r->print('<td><input type="checkbox" name="'.
-                                      'actionlist" value="'.$checkval.'" /></td>');
+                                      'actionlist" value="'.&HTML::Entities::encode($checkval,'&<>"').'" /></td>');
                         } else {
                             $r->print('<td>&nbsp;</td>');
                         }
@@ -3077,7 +3080,7 @@ END
                 if ($item eq 'username') {
                     $r->print('<td>'.&print_username_link($mode,\%in).'</td>');
                 } elsif (($item eq 'start' || $item eq 'end') && ($actionselect)) {
-                    $r->print('<td>'.$in{$item}.'<input type="hidden" name="'.$checkval.'_'.$item.'" value="'.$sdata->[$index{$item}].'" /></td>'."\n");
+                    $r->print('<td>'.$in{$item}.'<input type="hidden" name="'.&HTML::Entities::encode($checkval.'_'.$item.'" value="'.$sdata->[$index{$item}],'&<>"').'" /></td>'."\n");
                 } elsif ($item eq 'status') {
                     my $showitem = $in{$item};
                     if (defined($ltstatus{$in{$item}})) {
@@ -4297,7 +4300,10 @@ sub upfile_drop_add {
         my $newuserdom = $env{'request.role.domain'};
         map { $cancreate{$_} = &can_create_user($newuserdom,$context,$_); } keys(%longtypes);
         # Get new users list
+        my (%existinguser,%userinfo,%disallow,%rulematch,%inst_results,%alerts,%checkuname);
+        my $counter = -1;
         foreach my $line (@userdata) {
+            $counter ++;
             my @secs;
             my %entries=&Apache::loncommon::record_sep($line);
             # Determine user name
@@ -4329,23 +4335,20 @@ sub upfile_drop_add {
                     if ($entries{$fields{'username'}} =~ /\s/) {
                         $nowhitespace = ' - '.&mt('usernames may not contain spaces.');
                     }
-                    $r->print(
-                        '<br />'.
+                    $disallow{$counter} =
                         &mt('Unacceptable username [_1] for user [_2] [_3] [_4] [_5]',
-                                '"<b>'.$entries{$fields{'username'}}.'</b>"',
-                                $fname,$mname,$lname,$gen).
-                        $nowhitespace);
+                            '"<b>'.$entries{$fields{'username'}}.'</b>"',
+                            $fname,$mname,$lname,$gen).$nowhitespace;
                     next;
                 } else {
                     $entries{$fields{'domain'}} =~ s/^\s+|\s+$//g;
                     if ($entries{$fields{'domain'}} 
                         ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) {
-                        $r->print(
-                            '<br />'.
+                        $disallow{$counter} =
                             &mt('Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]',
-                                   '"<b>'.$entries{$fields{'domain'}}.'</b>"',
-                                    $fname,$mname,$lname,$gen));
-                    next;
+                                '"<b>'.$entries{$fields{'domain'}}.'</b>"',
+                                $fname,$mname,$lname,$gen);
+                        next;
                     }
                     my $username = $entries{$fields{'username'}};
                     my $userdomain = $entries{$fields{'domain'}};
@@ -4357,10 +4360,15 @@ sub upfile_drop_add {
                             $entries{$fields{'sec'}} =~ s/\W//g;
                             my $item = $entries{$fields{'sec'}};
                             if ($item eq "none" || $item eq 'all') {
-                                $r->print('<br />'.&mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a reserved word.','<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$item));
+                                $disallow{$counter} =
+                                    &mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a reserved word.',
+                                        '<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$item);
                                 next;
                             } elsif (exists($curr_groups{$item})) {
-                                $r->print('<br />'.&mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a course group.','<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$item).' '.&mt('Section names and group names must be distinct.'));
+                                $disallow{$counter} =
+                                    &mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a course group.',
+                                        '<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$item).' '.
+                                    &mt('Section names and group names must be distinct.');
                                 next;
                             } else {
                                 push(@secs,$item);
@@ -4372,14 +4380,21 @@ sub upfile_drop_add {
                         if (ref($userlist{$username.':'.$userdomain}) eq 'ARRAY') {
                             my $currsec = $userlist{$username.':'.$userdomain}[$secidx];
                             if ($currsec ne $env{'request.course.sec'}) {
-                                $r->print('<br />'.&mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]".','<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$secs[0]).'<br />');
+                                $disallow{$counter} =
+                                    &mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]".',
+                                        '<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$secs[0]);
                                 if ($currsec eq '') {
-                                    $r->print(&mt('This user already has an active/future student role in the course, unaffiliated to any section.'));
+                                    $disallow{$counter} .=
+                                        &mt('This user already has an active/future student role in the course, unaffiliated to any section.');
 
                                 } else {
-                                    $r->print(&mt('This user already has an active/future role in section "[_1]" of the course.',$currsec));
+                                    $disallow{$counter} .=
+                                        &mt('This user already has an active/future role in section "[_1]" of the course.',$currsec);
                                 }
-                                $r->print('<br />'.&mt('Although your current role has privileges to add students to section "[_1]", you do not have privileges to modify existing enrollments in other sections.',$secs[0]).'<br />');
+                                $disallow{$counter} .=
+                                    '<br />'.
+                                    &mt('Although your current role has privileges to add students to section "[_1]", you do not have privileges to modify existing enrollments in other sections.',
+                                        $secs[0]);
                                 next;
                             }
                         }
@@ -4431,13 +4446,12 @@ sub upfile_drop_add {
                             }
                             if ($role eq '') {
                                 my $rolestr = join(', ',@permitted_roles);
-                                $r->print('<br />'
-                                         .&mt('[_1]: You do not have permission to add the requested role [_2] for the user.'
-                                             ,'<b>'.$entries{$fields{'username'}}.'</b>'
-                                             ,$entries{$fields{'role'}})
-                                         .'<br />'
-                                         .&mt('Allowable role(s) is/are: [_1].',$rolestr)."\n"
-                                );
+                                $disallow{$counter} =
+                                    &mt('[_1]: You do not have permission to add the requested role [_2] for the user.'
+                                        ,'<b>'.$entries{$fields{'username'}}.'</b>'
+                                        ,$entries{$fields{'role'}})
+                                        .'<br />'
+                                        .&mt('Allowable role(s) is/are: [_1].',$rolestr);
                                 next;
                             }
                         }
@@ -4467,55 +4481,36 @@ sub upfile_drop_add {
                     # check against rules
                     my $checkid = 0;
                     my $newuser = 0;
-                    my (%rulematch,%inst_results,%idinst_results);
                     my $uhome=&Apache::lonnet::homeserver($username,$userdomain);
                     if ($uhome eq 'no_host') {
                         if ($userdomain ne $newuserdom) {
                             if ($context eq 'course') {
-                                $r->print('<br />'.
-                                          &mt('[_1]: The domain specified ([_2]) is different to that of the course.',
-                                          '<b>'.$username.'</b>',$userdomain).'<br />');
+                                $disallow{$counter} =
+                                    &mt('[_1]: The domain specified ([_2]) is different to that of the course.',
+                                       '<b>'.$username.'</b>',$userdomain);
                             } elsif ($context eq 'author') {
-                                $r->print(&mt('[_1]: The domain specified ([_2]) is different to that of the author.',
-                                        '<b>'.$username.'</b>',$userdomain).'<br />'); 
+                                $disallow{$counter} =
+                                    &mt('[_1]: The domain specified ([_2]) is different to that of the author.',
+                                        '<b>'.$username.'</b>',$userdomain); 
                             } else {
-                                $r->print(&mt('[_1]: The domain specified ([_2]) is different to that of your current role.',
-                                        '<b>'.$username.'</b>',$userdomain).'<br />');
+                                $disallow{$counter} =
+                                    &mt('[_1]: The domain specified ([_2]) is different to that of your current role.',
+                                        '<b>'.$username.'</b>',$userdomain);
                             }
-                            $r->print(&mt('The user does not already exist, and you may not create a new user in a different domain.'));
+                            $disallow{$counter} .=
+                                &mt('The user does not already exist, and you may not create a new user in a different domain.');
                             next;
+                        } else {
+                            unless ($password || $env{'form.login'} eq 'loc') {
+                                $disallow{$counter} =
+                                    &mt('[_1]: This is a new user but no default password was provided, and the authentication type requires one.',
+                                        '<b>'.$username.'</b>');
+                                next;
+                            }
                         }
                         $checkid = 1;
                         $newuser = 1;
-                        my $user = $username.':'.$newuserdom;
-                        my $checkhash;
-                        my $checks = { 'username' => 1 };
-                        $checkhash->{$username.':'.$newuserdom} = { 'newuser' => 1, };
-                        &Apache::loncommon::user_rule_check($checkhash,$checks,
-                            \%alerts,\%rulematch,\%inst_results,\%curr_rules,
-                            \%got_rules);
-                        if (ref($alerts{'username'}) eq 'HASH') {
-                            if (ref($alerts{'username'}{$newuserdom}) eq 'HASH') {
-                                if ($alerts{'username'}{$newuserdom}{$username}) {
-                                    $r->print('<br />'.
-                                              &mt('[_1]: matches the username format at your institution, but is not known to your directory service.','<b>'.$username.'</b>').'<br />'.
-                                              &mt('Consequently, the user was not created.'));
-                                    next;
-                                }
-                            }
-                        }
-                        my $usertype = 'unofficial';
-                        if (ref($rulematch{$user}) eq 'HASH') {
-                            if ($rulematch{$user}{'username'}) {
-                                $usertype = 'official';
-                            }
-                        }
-                        unless ($cancreate{$usertype}) {
-                            my $showtype = $longtypes{$usertype};
-                            $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;
-                        }
+                        $checkuname{$username.':'.$newuserdom} = { 'newuser' => $newuser, 'id' => $id };
                     } else {
                         if ($context eq 'course' || $context eq 'author') {
                             if ($userdomain eq $domain ) {
@@ -4548,77 +4543,205 @@ sub upfile_drop_add {
                                 }
                             }
                         }
+                        if ($id) {
+                            $existinguser{$userdomain}{$username} = $id;
+                        }
+                    }
+                    $userinfo{$counter} = {
+                                          username   => $username,
+                                          domain     => $userdomain,
+                                          fname      => $fname,
+                                          mname      => $mname,
+                                          lname      => $lname,
+                                          gen        => $gen,
+                                          email      => $email,
+                                          id         => $id, 
+                                          password   => $password,
+                                          inststatus => $inststatus,
+                                          role       => $role,
+                                          sections   => \@secs,
+                                          credits    => $credits,
+                                          newuser    => $newuser,
+                                          checkid    => $checkid,
+                                        };
+                }
+            }
+        } # end of foreach (@userdata)
+        if ($counter > -1) {
+            my $total = $counter + 1;
+            my %checkids;
+            if ((keys(%existinguser)) || (keys(%checkuname))) {
+                $r->print(&mt('Please be patient -- checking for institutional data ...'));
+                $r->rflush();
+                if (keys(%existinguser)) {
+                    foreach my $dom (keys(%existinguser)) {
+                        if (ref($existinguser{$dom}) eq 'HASH') {
+                            my %idhash = &Apache::lonnet::idrget($dom,keys(%{$existinguser{$dom}}));
+                            foreach my $username (keys(%{$existinguser{$dom}})) {
+                                if ($idhash{$username} ne $existinguser{$dom}{$username}) {
+                                    $checkids{$username.':'.$dom} = {
+                                                                    'id' => $existinguser{$dom}{$username},
+                                                                    };
+                                }
+                            }
+                            if (keys(%checkids)) {
+                                &Apache::loncommon::user_rule_check(\%checkids,{ 'id' => 1 },
+                                                                    \%alerts,\%rulematch,
+                                                                    \%inst_results,\%curr_rules,
+                                                                    \%got_rules);
+                            }
+                        }
                     }
-                    if ($id ne '') {
-                        if (!$newuser) {
-                            my %idhash = &Apache::lonnet::idrget($userdomain,($username));
-                            if ($idhash{$username} ne $id) {
-                                $checkid = 1;
+                }
+                if (keys(%checkuname)) {
+                    &Apache::loncommon::user_rule_check(\%checkuname,{ 'username' => 1, 'id' => 1, },
+                                                        \%alerts,\%rulematch,\%inst_results,
+                                                        \%curr_rules,\%got_rules);
+                }
+                $r->print(' '.&mt('done').'<br /><br />');
+                $r->rflush();
+            }
+            my %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,$total);
+            $r->print('<ul>');
+            for (my $i=0; $i<=$counter; $i++) {
+                if ($disallow{$i}) {
+                    $r->print('<li>'.$disallow{$i}.'</li>');
+                } elsif (ref($userinfo{$i}) eq 'HASH') {
+                    my $password = $userinfo{$i}{'password'}; 
+                    my $newuser = $userinfo{$i}{'newuser'};
+                    my $checkid = $userinfo{$i}{'checkid'};
+                    my $id = $userinfo{$i}{'id'};
+                    my $role = $userinfo{$i}{'role'};
+                    my @secs;
+                    if (ref($userinfo{$i}{'sections'}) eq 'ARRAY') {
+                        @secs = @{$userinfo{$i}{'sections'}};
+                    }
+                    my $fname = $userinfo{$i}{'fname'};
+                    my $mname = $userinfo{$i}{'mname'}; 
+                    my $lname = $userinfo{$i}{'lname'};
+                    my $gen = $userinfo{$i}{'gen'};
+                    my $email = $userinfo{$i}{'email'};
+                    my $inststatus = $userinfo{$i}{'inststatus'};
+                    my $credits = $userinfo{$i}{'credits'};
+                    my $username = $userinfo{$i}{'username'};
+                    my $userdomain = $userinfo{$i}{'domain'};
+                    my $user = $username.':'.$userdomain;
+                    if ($newuser) {
+                        if (ref($alerts{'username'}) eq 'HASH') {
+                            if (ref($alerts{'username'}{$userdomain}) eq 'HASH') {
+                                if ($alerts{'username'}{$userdomain}{$username}) {
+                                    $r->print('<li>'.
+                                              &mt('[_1]: matches the username format at your institution, but is not known to your directory service.','<b>'.$username.'</b>').'<br />'.
+                                              &mt('Consequently, the user was not created.').'</li>');
+                                    next;
+                                }
+                            }
+                        }
+                        if (ref($inst_results{$user}) eq 'HASH') {
+                            if ($inst_results{$user}{'firstname'} ne '') {
+                                $fname = $inst_results{$user}{'firstname'};
+                            }
+                            if ($inst_results{$user}{'middlename'} ne '') {
+                                $mname = $inst_results{$user}{'middlename'};
+                            }
+                            if ($inst_results{$user}{'lasttname'} ne '') {
+                                $lname = $inst_results{$user}{'lastname'};
+                            }
+                            if ($inst_results{$user}{'permanentemail'} ne '') {
+                                $email = $inst_results{$user}{'permanentemail'};
+                            }
+                            if ($inst_results{$user}{'id'} ne '') {
+                                $id = $inst_results{$user}{'id'};
+                                $checkid = 0;
+                            }
+                            if (ref($inst_results{$user}{'inststatus'}) eq 'ARRAY') {
+                                $inststatus = join(':',@{$inst_results{$user}{'inststatus'}});
                             }
                         }
-                        if ($checkid) {
-                            my $checkhash;
-                            my $checks = { 'id' => 1 };
-                            $checkhash->{$username.':'.$userdomain} = { 'newuser' => $newuser,
-                                                                    'id'  => $id };
-                            &Apache::loncommon::user_rule_check($checkhash,$checks,
-                                \%alerts,\%rulematch,\%idinst_results,\%curr_rules,
-                                \%got_rules);
+                        if (($checkid) && ($id ne '')) {
                             if (ref($alerts{'id'}) eq 'HASH') {
                                 if (ref($alerts{'id'}{$userdomain}) eq 'HASH') {
-                                    if ($alerts{'id'}{$userdomain}{$id}) {
-                                        $r->print(&mt('[_1]: has a student/employee ID matching the format at your institution, but the ID is found by your directory service.',
+                                    if ($alerts{'id'}{$userdomain}{$username}) {
+                                        $r->print('<li>'.
+                                                  &mt('[_1]: has a student/employee ID matching the format at your institution, but the ID is not found by your directory service.',
                                                   '<b>'.$username.'</b>').'<br />'.
-                                                  &mt('Consequently, the user was not created.'));
+                                                  &mt('Consequently, the user was not created.').'</li>');
                                         next;
                                     }
                                 }
                             }
                         }
+                        my $usertype = 'unofficial';
+                        if (ref($rulematch{$user}) eq 'HASH') {
+                            if ($rulematch{$user}{'username'}) {
+                                $usertype = 'official';
+                            }
+                        }
+                        unless ($cancreate{$usertype}) {
+                            my $showtype = $longtypes{$usertype};
+                            $r->print('<li>'.
+                                      &mt('[_1]: The user does not exist, and you are not permitted to create users of type: [_2].','<b>'.$username.'</b>',$showtype).'</li>');
+                            next;
+                        }
+                    } elsif ($id ne '') {
+                        if (exists($checkids{$user})) {
+                            $checkid = 1; 
+                            if (ref($alerts{'id'}) eq 'HASH') {
+                                if (ref($alerts{'id'}{$userdomain}) eq 'HASH') {
+                                    if ($alerts{'id'}{$userdomain}{$username}) {
+                                        $r->print('<li>'.
+                                                  &mt('[_1]: has a student/employee ID matching the format at your institution, but the ID is not found by your directory service.',
+                                                  '<b>'.$username.'</b>').'<br />'.
+                                                  &mt('Consequently, the ID was not changed.').'</li>');
+                                        $id = '';
+                                    }
+                                }
+                            }
+                        }
                     }
-                    if ($password || $env{'form.login'} eq 'loc') {
-                        my $multiple = 0;
-                        my ($userresult,$authresult,$roleresult,$idresult);
-                        my (%userres,%authres,%roleres,%idres);
-                        my $singlesec = '';
-                        if ($role eq 'st') {
-                            my $sec;
+                    my $multiple = 0;
+                    my ($userresult,$authresult,$roleresult,$idresult);
+                    my (%userres,%authres,%roleres,%idres);
+                    my $singlesec = '';
+                    if ($role eq 'st') {
+                        my $sec;
+                        if (ref($userinfo{$i}{'sections'}) eq 'ARRAY') {
                             if (@secs > 0) {
                                 $sec = $secs[0];
                             }
-                            &modifystudent($userdomain,$username,$cid,$sec,
-                                           $desiredhost,$context);
-                            $roleresult =
-                                &Apache::lonnet::modifystudent
-                                    ($userdomain,$username,$id,$amode,$password,
-                                     $fname,$mname,$lname,$gen,$sec,$enddate,
-                                     $startdate,$env{'form.forceid'},
-                                     $desiredhost,$email,'manual','',$cid,
-                                     '',$context,$inststatus,$credits);
-                            $userresult = $roleresult;
-                        } else {
-                            if ($role ne '') { 
-                                if ($context eq 'course' || $setting eq 'course') {
-                                    if ($customroles{$role}) {
-                                        $role = 'cr_'.$env{'user.domain'}.'_'.
-                                                $env{'user.name'}.'_'.$role;
-                                    }
-                                    if (($role ne 'cc') && ($role ne 'co')) { 
-                                        if (@secs > 1) {
-                                            $multiple = 1;
-                                            foreach my $sec (@secs) {
-                                                ($userres{$sec},$authres{$sec},$roleres{$sec},$idres{$sec}) =
-                                                &modifyuserrole($context,$setting,
-                                                    $changeauth,$cid,$userdomain,$username,
-                                                    $id,$amode,$password,$fname,
-                                                    $mname,$lname,$gen,$sec,
-                                                    $env{'form.forceid'},$desiredhost,
-                                                    $email,$role,$enddate,
-                                                    $startdate,$checkid,$inststatus);
-                                            }
-                                        } elsif (@secs > 0) {
-                                            $singlesec = $secs[0];
+                        }
+                        &modifystudent($userdomain,$username,$cid,$sec,
+                                       $desiredhost,$context);
+                        $roleresult =
+                            &Apache::lonnet::modifystudent
+                                ($userdomain,$username,$id,$amode,$password,
+                                 $fname,$mname,$lname,$gen,$sec,$enddate,
+                                 $startdate,$env{'form.forceid'},
+                                 $desiredhost,$email,'manual','',$cid,
+                                 '',$context,$inststatus,$credits);
+                        $userresult = $roleresult;
+                    } else {
+                        if ($role ne '') { 
+                            if ($context eq 'course' || $setting eq 'course') {
+                                if ($customroles{$role}) {
+                                    $role = 'cr_'.$env{'user.domain'}.'_'.
+                                            $env{'user.name'}.'_'.$role;
+                                }
+                                if (($role ne 'cc') && ($role ne 'co')) { 
+                                   if (@secs > 1) {
+                                        $multiple = 1;
+                                        foreach my $sec (@secs) {
+                                            ($userres{$sec},$authres{$sec},$roleres{$sec},$idres{$sec}) =
+                                            &modifyuserrole($context,$setting,
+                                                $changeauth,$cid,$userdomain,$username,
+                                                $id,$amode,$password,$fname,
+                                                $mname,$lname,$gen,$sec,
+                                                $env{'form.forceid'},$desiredhost,
+                                                $email,$role,$enddate,
+                                                $startdate,$checkid,$inststatus);
                                         }
+                                    } elsif (@secs > 0) {
+                                        $singlesec = $secs[0];
                                     }
                                 }
                             }
@@ -4633,38 +4756,27 @@ sub upfile_drop_add {
                                                     $checkid,$inststatus);
                             }
                         }
-                        if ($multiple) {
-                            foreach my $sec (sort(keys(%userres))) {
-                                $flushc =
+                    }
+                    if ($multiple) {
+                        foreach my $sec (sort(keys(%userres))) {
+                            $flushc =
                                 &user_change_result($r,$userres{$sec},$authres{$sec},
                                                     $roleres{$sec},$idres{$sec},\%counts,$flushc,
                                                     $username,$userdomain,\%userchg);
 
-                            }
-                        } else {
-                            $flushc = 
-                                &user_change_result($r,$userresult,$authresult,
-                                                    $roleresult,$idresult,\%counts,$flushc,
-                                                    $username,$userdomain,\%userchg);
                         }
                     } else {
-                        if ($context eq 'course') {
-                            $r->print('<br />'. 
-      &mt('[_1]: Unable to enroll. No password specified.','<b>'.$username.'</b>')
-                                     );
-                        } elsif ($context eq 'author') {
-                            $r->print('<br />'.
-      &mt('[_1]: Unable to add co-author. No password specified.','<b>'.$username.'</b>')
-                                     );
-                        } else {
-                            $r->print('<br />'.
-      &mt('[_1]: Unable to add user. No password specified.','<b>'.$username.'</b>')
-                                     );
-                        }
+                        $flushc = 
+                            &user_change_result($r,$userresult,$authresult,
+                                                $roleresult,$idresult,\%counts,$flushc,
+                                                $username,$userdomain,\%userchg);
                     }
                 }
-            }
-        } # end of foreach (@userdata)
+                &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last user');
+            } # end of loop
+            $r->print('</ul>');
+            &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+        }
         # Flush the course logs so reverse user roles immediately updated
         $r->register_cleanup(\&Apache::lonnet::flushcourselogs);
         $r->print("</p>\n<p>\n".&mt('Processed [quant,_1,user].',$counts{'user'}).
@@ -4757,11 +4869,12 @@ sub user_change_result {
     my ($r,$userresult,$authresult,$roleresult,$idresult,$counts,$flushc,
         $username,$userdomain,$userchg) = @_;
     my $okresult = 0;
+    my @status;
     if ($userresult ne 'ok') {
         if ($userresult =~ /^error:(.+)$/) {
             my $error = $1;
-            $r->print('<br />'.
-                  &mt('[_1]: Unable to add/modify: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
+            push(@status,
+                 &mt('[_1]: Unable to add/modify: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
         }
     } else {
         $counts->{'user'} ++;
@@ -4770,8 +4883,8 @@ sub user_change_result {
     if ($authresult ne 'ok') {
         if ($authresult =~ /^error:(.+)$/) {
             my $error = $1;
-            $r->print('<br />'.
-                  &mt('[_1]: Unable to modify authentication: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
+            push(@status, 
+                 &mt('[_1]: Unable to modify authentication: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
         } 
     } else {
         $counts->{'auth'} ++;
@@ -4780,8 +4893,8 @@ sub user_change_result {
     if ($roleresult ne 'ok') {
         if ($roleresult =~ /^error:(.+)$/) {
             my $error = $1;
-            $r->print('<br />'.
-                  &mt('[_1]: Unable to add role: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
+            push(@status,
+                 &mt('[_1]: Unable to add role: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
         }
     } else {
         $counts->{'role'} ++;
@@ -4790,14 +4903,16 @@ sub user_change_result {
     if ($okresult) {
         $flushc++;
         $userchg->{$username.':'.$userdomain}=1;
-        $r->print('. ');
         if ($flushc>15) {
             $r->rflush;
             $flushc=0;
         }
     }
     if ($idresult) {
-        $r->print($idresult);
+        push(@status,$idresult);
+    }
+    if (@status) {
+        $r->print('<li>'.join('<br />',@status).'</li>');
     }
     return $flushc;
 }
@@ -4868,7 +4983,7 @@ sub update_user_list {
     foreach my $item (@changelist) {
         my ($role,$uname,$udom,$cid,$sec,$scope,$result,$type,$locktype,
             @sections,$scopestem,$singlesec,$showsecs,$warn_singlesec,
-            $nothingtodo,$keepnosection,$credits);
+            $nothingtodo,$keepnosection,$credits,$instsec);
         if ($choice eq 'drop') {
             ($uname,$udom,$sec) = split(/:/,$item,-1);
             $role = 'st';
@@ -4881,8 +4996,9 @@ sub update_user_list {
                 $scope = $scopestem.'/'.$sec;
             }
         } elsif ($context eq 'course') {
-            ($uname,$udom,$role,$sec,$type,$locktype,$credits) =
-                split(/\:/,$item);
+            ($uname,$udom,$role,$sec,$type,$locktype,$credits,$instsec) =
+                split(/\:/,$item,8);
+            $instsec = &unescape($instsec);
             $cid = $env{'request.course.id'};
             $scopestem = '/'.$cid;
             $scopestem =~s/\_/\//g;
@@ -4901,8 +5017,9 @@ sub update_user_list {
             } elsif ($setting eq 'author') { 
                 ($uname,$udom,$role,$scope) = split(/\:/,$item);
             } elsif ($setting eq 'course') {
-                ($uname,$udom,$role,$cid,$sec,$type,$locktype,$credits) = 
-                    split(/\:/,$item);
+                ($uname,$udom,$role,$cid,$sec,$type,$locktype,$credits,$instsec) = 
+                    split(/\:/,$item,9);
+                $instsec = &unescape($instsec);
                 $scope = '/'.$cid;
                 $scope =~s/\_/\//g;
                 if ($sec ne '') {
@@ -4924,7 +5041,7 @@ sub update_user_list {
             $end = $now; 
             if ($role eq 'st') {
                 $result = 
-                    &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits);
+                    &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits,$instsec);
             } else {
                 $result = 
                     &Apache::lonnet::revokerole($udom,$uname,$scope,$role,
@@ -4932,7 +5049,7 @@ sub update_user_list {
             }
         } elsif ($choice eq 'delete') {
             if ($role eq 'st') {
-                &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$now,$start,$type,$locktype,$cid,'',$context,$credits);
+                &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$now,$start,$type,$locktype,$cid,'',$context,$credits,$instsec);
             }
             $result =
                 &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$now,
@@ -4945,7 +5062,7 @@ sub update_user_list {
             }
             if ($choice eq 'reenable') {
                 if ($role eq 'st') {
-                    $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits);
+                    $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits,$instsec);
                 } else {
                     $result = 
                         &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end,
@@ -4953,14 +5070,14 @@ sub update_user_list {
                 }
             } elsif ($choice eq 'activate') {
                 if ($role eq 'st') {
-                    $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits);
+                    $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits,$instsec);
                 } else {
                     $result = &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end,
                                             $now,'','',$context);
                 }
             } elsif ($choice eq 'chgdates') {
                 if ($role eq 'st') {
-                    $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits);
+                    $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits,$instsec);
                 } else {
                     $result = &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end,
                                                 $start,'','',$context);
@@ -5030,7 +5147,7 @@ sub update_user_list {
                     } else {
                         if ($role eq 'st') {
                             $result = 
-                                &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$end,$start,$type,$locktype,$cid,'',$context,$credits);
+                                &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$end,$start,$type,$locktype,$cid,'',$context,$credits,$instsec);
                         } else {
                             my $newscope = $scopestem;
                             $result = &Apache::lonnet::assignrole($udom,$uname,$newscope,$role,$end,$start,'','',$context);
@@ -5044,7 +5161,7 @@ sub update_user_list {
                     foreach my $newsec (@newsecs) {
                         if (!grep(/^\Q$newsec\E$/,@retained)) {
                             if ($role eq 'st') {
-                                $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$newsec,$end,$start,$type,$locktype,$cid,'',$context,$credits);
+                                $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$newsec,$end,$start,$type,$locktype,$cid,'',$context,$credits,$instsec);
                                 if (@newsecs > 1) {
                                     my $showsingle; 
                                     if ($newsec eq '') {
@@ -6130,6 +6247,8 @@ sub get_extended_type {
     }
     if ($crstype eq 'Community') {
         $type = 'community';
+    } elsif ($crstype eq 'Placement') {
+        $type = 'placement';
     } elsif ($settings{'internal.coursecode'}) {
         $type = 'official';
     } elsif ($settings{'internal.textbook'}) {