--- loncom/interface/lonuserutils.pm	2007/12/22 00:39:52	1.22
+++ loncom/interface/lonuserutils.pm	2008/01/05 18:36:26	1.44
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.22 2007/12/22 00:39:52 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.44 2008/01/05 18:36:26 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -76,7 +76,7 @@ sub modifystudent {
         }
     }
     if ($result eq '') {
-        $result = 'Unable to find section for this student';
+        $result = &mt('Unable to find section for this student');
     } else {
         $result =~ s/(ok:)+/ok/g;
     }
@@ -304,7 +304,7 @@ sub print_upload_manager_header {
     my $javascript_validations =
         &javascript_validations('upload',$krbdefdom,$password_choice,undef,
                                 $env{'request.role.domain'},$context,
-                                $permission,$groupslist);
+                                $groupslist);
     my $checked=(($env{'form.noFirstLine'})?' checked="checked" ':'');
     $r->print(&mt('Total number of records found in file: <b>[_1]</b>.',$distotal).
               "<br />\n");
@@ -332,18 +332,13 @@ sub print_upload_manager_header {
 ###############################################################
 sub javascript_validations {
     my ($mode,$krbdefdom,$curr_authtype,$curr_authfield,$domain,
-        $context,$permission,$groupslist)=@_;
-
+        $context,$groupslist)=@_;
     my %param = (
                   kerb_def_dom => $krbdefdom,
                   curr_authtype => $curr_authtype,
                 );
-    if ($mode eq 'createuser') {
-        $param{'formname'} = 'cu';
-    } elsif ($mode eq 'upload') {
+    if ($mode eq 'upload') {
         $param{'formname'} = 'studentform';
-    } elsif ($mode eq 'singlestudent') {
-        $param{'formname'} = 'cu';
     } elsif ($mode eq 'createcourse') {
         $param{'formname'} = 'ccrs';
     } elsif ($mode eq 'modifycourse') {
@@ -367,7 +362,7 @@ sub javascript_validations {
                 }
             } elsif ($context eq 'domain') {
                 $setsection_call = 'setCourse()';
-                $setsections_js = &dc_setcourse_js($param{'formname'},$mode);
+                $setsections_js = &dc_setcourse_js($param{'formname'},$mode,$context);
             }
             $finish = "  var checkSec = $setsection_call\n".
                       "  if (checkSec == 'ok') {\n".
@@ -389,8 +384,7 @@ sub javascript_validations {
          role     => 'The optional role field was not specified.',
          continue => 'Continue adding users?',
          );
-
-    my $function_name =(<<END);
+    my $function_name = <<"END";
 $setsections_js
 
 function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) {
@@ -456,7 +450,7 @@ END
     foundatype=1;
     if (current.argfield == null || current.argfield == '') {
         var alertmsg = '';
-        switch (current.value) {
+        switch (current.radiovalue) {
             case 'krb':
                 alertmsg = '$alert{'krb'}';
                 break;
@@ -521,14 +515,8 @@ END
 }
 END
     }
-    my $result = $function_name;
-    if ( ($mode eq 'upload') || ($mode eq 'createcourse') || ($mode eq 'modifycourse')  ) {
-        $result .= $auth_checks;
-    }
-    $result .= $optional_checks."\n".$section_checks;
-    if ( ($mode eq 'upload') || ($mode eq 'createcourse') || ($mode eq 'modifycourse')  ) {
-        $result .= $authheader;
-    }
+    my $result = $function_name.$auth_checks.$optional_checks."\n".
+                 $section_checks.$authheader;
     return $result;
 }
 ###############################################################
@@ -738,13 +726,13 @@ sub print_upload_manager_footer {
     }
     if ($context eq 'author') {
         $Str .= '<h3>'.&mt('Default role')."</h3>\n".
-                &mt('Choose the role to assign to users without one specified in the uploaded file');
+                &mt('Choose the role to assign to users without a value specified in the uploaded file');
     } elsif ($context eq 'course') {
         $Str .= '<h3>'.&mt('Default role and section')."</h3>\n".
-                &mt('Choose the role and/or section to assign to users without one specified in the uploaded file');
+                &mt('Choose the role and/or section(s) to assign to users without values specified in the uploaded file');
     } else {
-        $Str .= '<br /><br /><b>'.&mt('Default role and/or section')."</b><br />\n".
-                &mt('Role and/or section for users without one in the uploaded file.');
+        $Str .= '<br /><br /><b>'.&mt('Default role and/or section(s)')."</b><br />\n".
+                &mt('Role and/or section(s) for users without values specified in the uploaded file.');
     }
     $Str .= '<br />';
     if (($context eq 'domain') || ($context eq 'author')) {
@@ -761,8 +749,7 @@ sub print_upload_manager_footer {
                                      $permission,$context,'upload');
         $Str .= $secbox."<h3>".&mt('Full Update')."</h3>\n".
                 '<p><label><input type="checkbox" name="fullup" value="yes">'.
-                ' '.&mt('Display students with current/future access, who are  not in the uploaded file.').'<br />'.&mt('Students selected from this list can be dropped.');
-                "</label></p>\n";
+                ' '.&mt('Display students with current/future access who are not in the uploaded file.').'</label><br />'.&mt('Students selected from this list can be dropped.').'</p>'."\n";
     }
     if ($context eq 'course' || $context eq 'domain') {
         $Str .= &forceid_change($context);
@@ -786,13 +773,14 @@ sub forceid_change {
         "<p>\n".'<label><input type="checkbox" name="forceid" value="yes">'.
         &mt('Disable ID/Student Number Safeguard and Force Change '.
         'of Conflicting IDs').'</label><br />'."\n".
-        &mt('(only do if you know what you are doing.)')."</br><br />\n";
+        &mt('(only do if you know what you are doing.)')."\n";
     if ($context eq 'domain') {
-        $output .= '<label><input type="checkbox" name="recurseid"'.
+        $output .= '<br /><label><input type="checkbox" name="recurseid"'.
                    ' value="yes">'. 
   &mt('Update ID/Student Number in courses in which user is Active/Future student,<br />(if forcing change).').
-                   '</label></p>'."\n";
+                   '</label>'."\n";
     }
+    $output .= '</p>';
     return $output;
 }
 
@@ -962,7 +950,7 @@ sub date_setting_table {
             ($env{'form.action'} eq 'upload')) {
             if ($env{'request.course.sec'} eq '') {
                 $dateDefault = '<span class="LC_nobreak">'.
-                    '<label><input type="checkbox" name="makedatesdefault" /> '.
+                    '<label><input type="checkbox" name="makedatesdefault" value="1" /> '.
                     &mt('make these dates the default access dates for future student enrollment').
                     '</label></span>';
             }
@@ -1001,14 +989,14 @@ sub make_dates_default {
                 {'default_enrollment_start_date'=>$startdate,
                  'default_enrollment_end_date'  =>$enddate},$cdom,$cnum);
         if ($put_result eq 'ok') {
-            $result .= &mt('Set default start and end dates for course').
+            $result .= &mt('Set default start and end access dates for course.').
                        '<br />'."\n";
             #
             # Refresh the course environment
             &Apache::lonnet::coursedescription($env{'request.course.id'},
                                                {'freshen_cache' => 1});
         } else {
-            $result .= &mt('Unable to set default dates for course').":".$put_result.
+            $result .= &mt('Unable to set default access dates for course.').":".$put_result.
                        '<br />';
         }
     }
@@ -1263,7 +1251,7 @@ sub print_userlist {
     if ($env{'form.showrole'} eq 'Any') {
        $roleselected = ' selected="selected" '; 
     }
-    my $role_select;
+    my ($role_select,$cnum,$cdom);
     if ($context eq 'domain') {
         $role_select = &domain_roles_select();
         $r->print('<label>'.&mt('Role Type: [_1]',$role_select).'</label>');
@@ -1287,9 +1275,14 @@ sub print_userlist {
         }
         $role_select .= '</select>';
         $r->print('<label>'.&mt('Role: [_1]',$role_select).'</label>');
+        if ($context eq 'course') {
+            ($cnum,$cdom) = &get_course_identity();
+            $r->print(&section_group_filter($cnum,$cdom));
+        }
     }
     if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) {
-        $r->print(&list_submit_button(&mt('Update Display'))."\n</p>\n");
+        $r->print('&nbsp;'.&list_submit_button(&mt('Update Display')).
+                  "\n</p>\n");
     }
     my ($indexhash,$keylist) = &make_keylist_array();
     my (%userlist,%userinfo);
@@ -1305,7 +1298,7 @@ sub print_userlist {
                   &Apache::lonhtmlcommon::row_closure(1).
                   &Apache::lonhtmlcommon::end_pick_box().'</p>'.
                   '<p>'.&list_submit_button(&mt('Update Display')).
-                  "\n</p>\n");
+                  "\n".'</p><span class="LC_warning">'.&mt('Warning: data retrieval for multiple courses can take considerable time, as this operation is not currently optimized.').'</span>'."\n");
         if ($env{'form.coursepick'}) {
             $r->print('<hr />'.&mt('Searching').' ...<br />&nbsp;<br />');
         }
@@ -1315,33 +1308,21 @@ sub print_userlist {
     $r->rflush();
     if ($context eq 'course') {
         my $classlist = &Apache::loncoursedata::get_classlist();
-        my $secidx = &Apache::loncoursedata::CL_SECTION();
-        my $viewablesec = &viewable_section($permission);
-        foreach my $student (keys(%{$classlist})) {
-            my $section = $classlist->{$student}[$secidx];
-            if ($viewablesec ne '') {
-                if ($section ne $viewablesec) {
-                    next;
-                } else {
-                    $userlist{$student} = $classlist->{$student};
-                }
+        %userlist = %{$classlist};
+        if ($env{'form.showrole'} ne 'st') {
+            my $showroles;
+            if ($env{'form.showrole'} ne 'Any') {
+                $showroles = [$env{'form.showrole'}];
             } else {
-                $userlist{$student} = $classlist->{$student};
+                $showroles = undef;
             }
+            my $withsec = 1;
+            my $hidepriv = 1;
+            my %advrolehash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef,
+                              \@statuses,$showroles,undef,$withsec,$hidepriv);
+            &gather_userinfo($context,$format,\%userlist,$indexhash,\%userinfo,
+                             \%advrolehash,$permission);
         }
-        my $cid = $env{'request.course.id'};
-        my ($cnum,$cdom) = &get_course_identity($cid);
-        my $showroles;
-        if ($env{'form.showrole'} ne 'Any') {
-            $showroles = [$env{'form.showrole'}];
-        } else {
-            $showroles = undef;
-        }
-        my $withsec = 1;
-        my %advrolehash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef,
-                                    \@statuses,$showroles,undef,$withsec);
-        &gather_userinfo($context,$format,\%userlist,$indexhash,\%userinfo,
-                         \%advrolehash,$permission);
     } else {
         my (%cstr_roles,%dom_roles);
         if ($context eq 'author') {
@@ -1390,7 +1371,8 @@ sub print_userlist {
             } elsif ($env{'form.roletype'} eq 'course') {
                 if ($env{'form.coursepick'}) {
                     my %courses = &process_coursepick();
-                    my %allusers; 
+                    my %allusers;
+                    my $hidepriv = 1;
                     foreach my $cid (keys(%courses)) {
                         my ($cnum,$cdom,$cdesc) = &get_course_identity($cid);
                         next if ($cnum eq '' || $cdom eq '');
@@ -1408,7 +1390,7 @@ sub print_userlist {
                         foreach my $type (@statuses) {
                             $access{$type} = $type;
                         }
-                        &Apache::loncommon::get_course_users($cdom,$cnum,\%access,\@roles,\@sections,\%users,\%userdata,\%statushash);
+                        &Apache::loncommon::get_course_users($cdom,$cnum,\%access,\@roles,\@sections,\%users,\%userdata,\%statushash,$hidepriv);
                         foreach my $user (keys(%userdata)) {
                             next if (ref($userinfo{$user}) eq 'HASH');
                             foreach my $item ('fullname','id') {
@@ -1466,6 +1448,62 @@ sub print_userlist {
               $env{'form.phase'}.'" /></form>');
 }
 
+sub section_group_filter {
+    my ($cnum,$cdom) = @_;
+    my @filters;
+    if ($env{'request.course.sec'} eq '') {
+        @filters = ('sec');
+    }
+    push(@filters,'grp');
+    my %name = (
+                 sec => 'secfilter',
+                 grp => 'grpfilter',
+               );
+    my %title = &Apache::lonlocal::texthash (
+                                              sec  => 'Section(s)',
+                                              grp  => 'Group(s)',
+                                              all  => 'all',
+                                              none => 'none',
+                                            );
+    my ($output,@options);
+    foreach my $item (@filters) {
+        my $markup; 
+        if ($env{'form.'.$name{$item}} eq '') {
+            $env{'form.'.$name{$item}} = 'all';
+        }
+        if ($item eq 'sec') {
+            if ($env{'form.showrole'} eq 'cc') {
+                $env{'form.'.$name{$item}} = 'none';
+            }
+            my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
+            @options = sort(keys(%sections_count));
+        } elsif ($item eq 'grp') {
+            my %curr_groups = &Apache::longroup::coursegroups();
+            @options = sort(keys(%curr_groups));
+        }
+        if (@options > 0) {
+            my $currsel;
+            $markup = '<select name="'.$name{$item}.'" />'."\n";
+            foreach my $option ('all','none',@options) { 
+                $currsel = '';
+                if ($env{'form.'.$name{$item}} eq $option) {
+                    $currsel = ' selected="selected" ';
+                }
+                $markup .= ' <option value="'.$option.'"'.$currsel.'>';
+                if (($option eq 'all') || ($option eq 'none')) {
+                    $markup .= $title{$option};
+                } else {
+                    $markup .= $option;
+                }   
+                $markup .= '</option>'."\n";
+            }
+            $markup .= '</select>'."\n";
+            $output .= ('&nbsp;'x3).'<label>'.$title{$item}.': '.$markup.'</label>';
+        }
+    }
+    return $output;
+}
+
 sub list_submit_button {
     my ($text) = @_;
     return '<input type="button" name="updatedisplay" value="'.$text.'" onclick="javascript:display_update()" />';
@@ -1479,7 +1517,8 @@ sub gather_userinfo {
             ($userdata{'username'},$userdata{'domain'},$userdata{'role'}) =
                 split(/:/,$item);
             ($userdata{'start'},$userdata{'end'})=split(/:/,$rolehash->{$item});
-            &build_user_record(\%userdata,$userinfo,$indexhash,$item,$userlist);
+            &build_user_record($context,\%userdata,$userinfo,$indexhash,
+                               $item,$userlist);
         } elsif ($context eq 'course') {
             my $viewablesec = &viewable_section($permission);
             ($userdata{'username'},$userdata{'domain'},$userdata{'role'},
@@ -1488,13 +1527,15 @@ sub gather_userinfo {
             if (($viewablesec ne '') && ($userdata{'section'} ne '')) {
                 next if ($viewablesec ne $userdata{'section'});
             }
-            &build_user_record(\%userdata,$userinfo,$indexhash,$item,$userlist);
+            &build_user_record($context,\%userdata,$userinfo,$indexhash,
+                               $item,$userlist);
         } elsif ($context eq 'domain') {
             if ($env{'form.roletype'} eq 'domain') {
                 ($userdata{'role'},$userdata{'username'},$userdata{'domain'}) =
                     split(/:/,$item);
                 ($userdata{'end'},$userdata{'start'})=split(/:/,$rolehash->{$item});
-                &build_user_record(\%userdata,$userinfo,$indexhash,$item,$userlist);
+                &build_user_record($context,\%userdata,$userinfo,$indexhash,
+                                   $item,$userlist);
             } elsif ($env{'form.roletype'} eq 'author') {
                 if (ref($rolehash->{$item}) eq 'HASH') {
                     $userdata{'extent'} = $item;
@@ -1503,7 +1544,8 @@ sub gather_userinfo {
                         ($userdata{'start'},$userdata{'end'}) = 
                             split(/:/,$rolehash->{$item}{$key});
                         my $uniqid = $key.':'.$item;
-                        &build_user_record(\%userdata,$userinfo,$indexhash,$uniqid,$userlist);
+                        &build_user_record($context,\%userdata,$userinfo,
+                                           $indexhash,$uniqid,$userlist);
                     }
                 }
             } elsif ($env{'form.roletype'} eq 'course') {
@@ -1518,13 +1560,14 @@ sub gather_userinfo {
                             my $space = ', ';
                             if ($format eq 'html' || $format eq 'view') {
                                 $spanstart = '<span class="LC_nobreak">';
-                                if ($permission->{'cusr'}) {
-                                    if ($numcids > 1) {
-                                        $spanstart .= '<input type="radio" name="'.$item.'" value="'.$cid.'" &nbsp; />';
-                                    } else {
-                                        $spanstart .= '<input type="hidden" name="'.$item.'" value="'.$cid.'" &nbsp; />';
-                                    }
-                                }
+                                # FIXME: actions on courses disabled for now
+#                                if ($permission->{'cusr'}) {
+#                                    if ($numcids > 1) {
+#                                        $spanstart .= '<input type="radio" name="'.$item.'" value="'.$cid.'" />&nbsp;';
+#                                    } else {
+#                                        $spanstart .= '<input type="hidden" name="'.$item.'" value="'.$cid.'" />&nbsp;';
+#                                    }
+#                                }
                                 $spanend = '</span><br />';
                                 $space = ',&nbsp;';
                             }
@@ -1532,13 +1575,20 @@ sub gather_userinfo {
                                     $rolehash->{$item}{$cid}{'desc'}.$space;
                             if (ref($rolehash->{$item}{$cid}{'secs'}) eq 'HASH') { 
                                 foreach my $sec (sort(keys(%{$rolehash->{$item}{$cid}{'secs'}}))) {
-                                    $userdata{'extent'} .= $sec.$space.$rolehash->{$item}{$cid}{'secs'}{$sec}.$spanend;
+                                    if (($env{'form.Status'} eq 'Any') ||
+                                        ($env{'form.Status'} eq $rolehash->{$item}{$cid}{'secs'}{$sec})) {
+                                        $userdata{'extent'} .= $sec.$space.$rolehash->{$item}{$cid}{'secs'}{$sec}.$spanend;
+                                        $userdata{'status'} = $rolehash->{$item}{$cid}{'secs'}{$sec};
+                                    }
                                 }
                             }
                         }
                     }
                 }
-                &build_user_record(\%userdata,$userinfo,$indexhash,$item,$userlist);
+                if ($userdata{'status'} ne '') {
+                    &build_user_record($context,\%userdata,$userinfo,
+                                       $indexhash,$item,$userlist);
+                }
             }
         }
     }
@@ -1546,14 +1596,15 @@ sub gather_userinfo {
 }
 
 sub build_user_record {
-    my ($userdata,$userinfo,$indexhash,$record_key,$userlist) = @_;
+    my ($context,$userdata,$userinfo,$indexhash,$record_key,$userlist) = @_;
     next if ($userdata->{'start'} eq '-1' && $userdata->{'end'} eq '-1');
-    &process_date_info($userdata);
+    if (!(($context eq 'domain') && ($env{'form.roletype'} eq 'course'))) {
+        &process_date_info($userdata);
+    }
     my $username = $userdata->{'username'};
     my $domain = $userdata->{'domain'};
     if (ref($userinfo->{$username.':'.$domain}) eq 'HASH') {
-        $userdata->{'fullname'} =
-        $userinfo->{$username.':'.$domain}{'fullname'};
+        $userdata->{'fullname'} = $userinfo->{$username.':'.$domain}{'fullname'};
         $userdata->{'id'} = $userinfo->{$username.':'.$domain}{'id'};
     } else {
         &aggregate_user_info($domain,$username,$userinfo);
@@ -1737,6 +1788,7 @@ sub make_keylist_array {
     $index->{'email'} = &Apache::loncoursedata::CL_PERMANENTEMAIL();
     $index->{'role'} = &Apache::loncoursedata::CL_ROLE();
     $index->{'extent'} = &Apache::loncoursedata::CL_EXTENT();
+    $index->{'photo'} = &Apache::loncoursedata::CL_PHOTO();
     foreach my $key (keys(%{$index})) {
         $keylist->[$index->{$key}] = $key;
     }
@@ -1843,9 +1895,21 @@ END
     if ($mode ne 'autoenroll') {
         my $check_uncheck_js = &Apache::loncommon::check_uncheck_jscript();
         my $alert = &mt("You must select at least one user by checking a user's 'Select' checkbox");
-        my $singconfirm = &mt(' for a single user');
-        my $multconfirm = &mt(' for multiple users');
-        my $date_sec_selector = &date_section_javascript($context,$setting,$statusmode); 
+        my $singconfirm = &mt(' for a single user?');
+        my $multconfirm = &mt(' for multiple users?');
+        my $date_sec_selector = &date_section_javascript($context,$setting,$statusmode);
+        my %lt = &Apache::lonlocal::texthash( 
+              acwi => 'Access will be set to start immediately',
+              asyo => 'as you did not select an end date in the pop-up window',
+              accw => 'Access will be set to continue indefinitely',
+              asyd => 'as you did not select an end date in the pop-up window',
+              sewi => "Sections will be switched to 'No section'",
+              ayes => "as you either selected the 'No section' option",
+              oryo => 'or you did not select a section in the pop-up window',
+              arol => 'A role with no section will be added',
+              swbs => 'Sections will be switched to:',
+              rwba => 'Roles will be added for section(s):',
+        );
         $r->print(<<END);
 
 <script type="text/javascript" language="Javascript">
@@ -1871,12 +1935,47 @@ function verify_action (field) {
     } 
     else {
         var message = document.studentform.bulkaction[document.studentform.bulkaction.selectedIndex].text;
+        var choice = document.studentform.bulkaction[document.studentform.bulkaction.selectedIndex].value;
         if (numchecked == 1) { 
             message += singconf;
         } 
         else {
             message += multconf; 
         }
+        if (choice == 'chgdates' || choice == 'reenable' || choice == 'activate') {
+            var datemsg = '';
+            if ((document.studentform.startdate_month.value == '') && 
+                (document.studentform.startdate_day.value  == '') &&
+                (document.studentform.startdate_year.value == '')) {
+                datemsg = "\\n$lt{'acwi'},\\n$lt{'asyo'}.\\n";
+            }
+            if ((document.studentform.enddate_month.value == '') &&
+                (document.studentform.enddate_day.value  == '') &&
+                (document.studentform.enddate_year.value == '')) {
+                datemsg += "\\n$lt{'accw'},\\n$lt{'asyd'}.\\n";
+            }
+            if (datemsg != '') {
+                message += "\\n"+datemsg;
+            }
+        }
+        if (choice == 'chgsec') {
+            var rolefilter = document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value;
+            var retained =  document.studentform.retainsec.value;
+            var secshow = document.studentform.newsecs.value;
+            if (secshow == '') {
+                if (rolefilter == 'st' || retained == 0 || retained == "") {
+                    message += "\\n\\n$lt{'sewi'},\\n$lt{'ayes'},\\n$lt{'oryo'}.\\n"; 
+                } else {
+                    message += "\\n\\n$lt{'arol'}\\n$lt{'ayes'},\\n$lt{'oryo'}.\\n";
+                }
+            } else {
+                if (rolefilter == 'st' || retained == 0 || retained == "") {
+                    message += "\\n\\n$lt{'swbs'} "+secshow+".\\n";
+                } else {
+                    message += "\\n\\n$lt{'rwba'} "+secshow+".\\n";
+                }
+            }
+        }
         if (confirm(message)) {
             document.studentform.phase.value = 'bulkchange';
             document.studentform.submit();
@@ -1927,6 +2026,7 @@ END
                        'clicker'    => "clicker id",
                        'photo'      => "photo",
                        'extent'     => "extent",
+                       'go'         => "go",
                        'pr'         => "Proceed",
                        'ca'         => "check all",
                        'ua'         => "uncheck all",
@@ -1972,10 +2072,10 @@ END
     my $results_description;
     if ($mode ne 'autoenroll') {
         $results_description = &results_header_row($rolefilter,$statusmode,
-                                                   $context,$permission);
+                                                   $context,$permission,$mode);
         $r->print('<b>'.$results_description.'</b><br />');
     }
-    my ($output,$actionselect);
+    my ($output,$actionselect,%canchange,%canchangesec);
     if ($mode eq 'html' || $mode eq 'view' || $mode eq 'autoenroll') {
         if ($mode ne 'autoenroll') {
             if ($permission->{'cusr'}) {
@@ -2009,11 +2109,50 @@ END
                 $output .= &mt("Click on a username to view the user's personal page.").'<br />';
             }
             if ($actionselect) {
-                $output .= <<"END"; 
-$lt{'ac'}:&nbsp;$actionselect <input type="button" value="$lt{'pr'}" onclick="javascript:verify_action(document.studentform.actionlist)" /></p>
+                $output .= <<"END";
+$lt{'ac'}:&nbsp;$actionselect <input type="button" value="$lt{'go'}" onclick="javascript:opendatebrowser(this.form,'studentform','go')" /></p>
 <p><input type="button" value="$lt{'ca'}" onclick="javascript:checkAll(document.studentform.actionlist)" /> &nbsp;
-<input type="button" value="$lt{'ua'}" onclick="javascript:uncheckAll(document.studentform.actionlist)" />
+<input type="button" value="$lt{'ua'}" onclick="javascript:uncheckAll(document.studentform.actionlist)" /><br /><br /><input type="button" value="$lt{'pr'}" onclick="javascript:verify_action(document.studentform.actionlist)" />
 END
+                my @allroles;
+                if ($env{'form.showrole'} eq 'Any') {
+                    my $custom = 1;
+                    if ($context eq 'domain') {
+                        @allroles = &roles_by_context($setting,$custom);
+                    } else {
+                        @allroles = &roles_by_context($context,$custom);
+                    }
+                } else {
+                    @allroles = ($env{'form.showrole'});
+                }
+                foreach my $role (@allroles) {
+                    if ($context eq 'domain') {
+                        if ($setting eq 'domain') {
+                            if (&Apache::lonnet::allowed('c'.$role,
+                                    $env{'request.role.domain'})) {
+                                $canchange{$role} = 1;
+                            }
+                        } elsif ($setting eq 'author') {
+                            if (&Apache::lonnet::allowed('c'.$role,
+                                    $env{'request.role.domain'})) {
+                                $canchange{$role} = 1;
+                            }
+                        }
+                    } elsif ($context eq 'author') {
+                        if (&Apache::lonnet::allowed('c'.$role,
+                            $env{'user.domain'}.'/'.$env{'user.name'})) {
+                            $canchange{$role} = 1;
+                        }
+                    } elsif ($context eq 'course') {
+                        if (&Apache::lonnet::allowed('c'.$role,$env{'request.course.id'})) {
+                            $canchange{$role} = 1;
+                        } elsif ($env{'request.course.sec'} ne '') {
+                            if (&Apache::lonnet::allowed('c'.$role,$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
+                                $canchangesec{$role} = $env{'request.course.sec'};
+                            }
+                        }
+                    }
+                }
             }
         }
         $output .= "\n<p>\n".
@@ -2109,9 +2248,24 @@ END
         $index{$idx} = $i++;
     }
     my $usercount = 0;
+    my ($secfilter,$grpfilter);
+    if ($context eq 'course') {
+        $secfilter = $env{'form.secfilter'};
+        $grpfilter = $env{'form.grpfilter'};
+        if ($secfilter eq '') {
+            $secfilter = 'all';
+        }
+        if ($grpfilter eq '') {
+            $grpfilter = 'all';
+        }
+    }
     # Get groups, role, permanent e-mail so we can sort on them if
     # necessary.
     foreach my $user (keys(%{$userlist})) {
+        if ($user eq '' ) {
+            delete($userlist->{$user});
+            next;
+        }
         if ($context eq 'domain' &&  $user eq $env{'request.role.domain'}.'-domainconfig:'.$env{'request.role.domain'}) {
             delete($userlist->{$user});
             next;
@@ -2146,11 +2300,54 @@ END
             delete($userlist->{$user});
             next;
         }
-        if (ref($classgroups) eq 'HASH') {
-            $groups = $classgroups->{$user};
-        }
-        if (ref($groups->{active}) eq 'HASH') {
-            $userlist->{$user}->[$index{'groups'}] = join(', ',keys(%{$groups->{'active'}}));
+        if ($context eq 'course') {
+            my @ac_groups;
+            if (ref($classgroups) eq 'HASH') {
+                $groups = $classgroups->{$user};
+            }
+            if (ref($groups->{'active'}) eq 'HASH') {
+                @ac_groups = keys(%{$groups->{'active'}});
+                $userlist->{$user}->[$index{'groups'}] = join(', ',@ac_groups);
+            }
+            if ($mode ne 'autoenroll') {
+                my $section = $userlist->{$user}->[$index{'section'}];
+                if (($env{'request.course.sec'} ne '') && 
+                    ($section ne $env{'request.course.sec'})) {
+                    if ($role eq 'st') {
+                        delete($userlist->{$user});
+                        next;
+                    }
+                }
+                if ($secfilter eq 'none') {
+                    if ($section ne '') {
+                        delete($userlist->{$user});
+                        next;
+                    }
+                } elsif ($secfilter ne 'all') {
+                    if ($section ne $secfilter) {
+                        delete($userlist->{$user});
+                        next;
+                    }
+                }
+                if ($grpfilter eq 'none') {
+                    if (@ac_groups > 0) {
+                        delete($userlist->{$user});
+                        next;
+                    }
+                } elsif ($grpfilter ne 'all') {
+                    if (!grep(/^\Q$grpfilter\E$/,@ac_groups)) {
+                        delete($userlist->{$user});
+                        next;
+                    }
+                }
+                if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
+                    if (($displayphotos eq 'on') && ($role eq 'st')) {
+                        $userlist->{$user}->[$index{'photo'}] =
+                            &Apache::lonnet::retrievestudentphoto($udom,$uname,
+                                                                'gif','thumbnail');
+                    }
+                }
+            }
         }
         my %emails   = &Apache::loncommon::getemails($uname,$udom);
         if ($emails{'permanentemail'} =~ /\S/) {
@@ -2225,20 +2422,39 @@ END
                 $r->print("<td>$cellentry</td>\n");
             } else {
                 $r->print("<td>$rowcount</td>\n");
-                $checkval;
                 if ($actionselect) {
-                    $checkval = $user; 
-                    if ($context eq 'course') {
-                        if ($role eq 'st') {
-                            $checkval .= ':st';
+                    my $showcheckbox;
+                    if ($role =~ /^cr\//) {
+                        $showcheckbox = $canchange{'cr'};
+                    } else {
+                        $showcheckbox = $canchange{$role};
+                    }
+                    if (!$showcheckbox) {
+                        if ($context eq 'course') {
+                            if ($canchangesec{$role} ne '') {
+                                if ($canchangesec{$role} eq $in{'section'}) {
+                                    $showcheckbox = 1;
+                                }
+                            }
                         }
-                        $checkval .= ':'.$in{'section'};
-                        if ($role eq 'st') {
-                            $checkval .= ':'.$in{'type'}.':'.$in{'lockedtype'};
+                    }
+                    if ($showcheckbox) {
+                        $checkval = $user; 
+                        if ($context eq 'course') {
+                            if ($role eq 'st') {
+                                $checkval .= ':st';
+                            }
+                            $checkval .= ':'.$in{'section'};
+                            if ($role eq 'st') {
+                                $checkval .= ':'.$in{'type'}.':'.
+                                             $in{'lockedtype'};
+                            }
                         }
+                        $r->print('<td><input type="checkbox" name="'.
+                                  'actionlist" value="'.$checkval.'"></td>');
+                    } else {
+                        $r->print('<td>&nbsp;</td>');
                     }
-                    $r->print('<td><input type="checkbox" name="actionlist" value="'.
-                              $checkval.'"></td>');
                 }
             }
             foreach my $item (@cols) {
@@ -2262,11 +2478,8 @@ END
                         $r->print('    <td>&nbsp;</td>  ');
                     }
                     if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
-                        if ($displayphotos eq 'on' && $sdata->[$index{'role'}] eq 'st') {
-                            my $imgurl =
-                        &Apache::lonnet::retrievestudentphoto($in{'domain'},$in{'username'},
-                                                          'gif','thumbnail');
-                            $r->print('    <td align="right"><a href="javascript:photowindow('."'".&Apache::lonnet::studentphoto($in{'domain'},$in{'username'},'jpg')."'".')"><img src="'.$imgurl.'" border="1"></a></td>');
+                        if ($displayphotos eq 'on' && $role eq 'st' && $in{'photo'} ne '') {
+                            $r->print('    <td align="right"><a href="javascript:photowindow('."'".&Apache::lonnet::studentphoto($in{'domain'},$in{'username'},'jpg')."'".')"><img src="'.$in{'photo'}.'" border="1"></a></td>');
                         } else {
                             $r->print('    <td>&nbsp;</td>  ');
                         }
@@ -2367,6 +2580,24 @@ sub select_actions {
                 chgsec   => "Change section associated with user roles",
     );
     my ($output,$options,%choices);
+    # FIXME Disable actions for now for roletype=course in domain context
+    if ($context eq 'domain' && $setting eq 'course') {
+        return;
+    }
+    if ($context eq 'course') {
+        if ($env{'form.showrole'} ne 'Any') {
+             if (!&Apache::lonnet::allowed('c'.$env{'form.showrole'},
+                                           $env{'request.course.id'})) {
+                 if ($env{'request.course.sec'} eq '') {
+                     return;
+                 } else {
+                     if (!&Apache::lonnet::allowed('c'.$env{'form.showrole'},$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
+                         return;
+                     }
+                 }
+            }
+        }
+    }
     if ($statusmode eq 'Any') {
         $options .= '
 <option value="chgdates">'.$lt{'chgdates'}.'</option>';
@@ -2393,14 +2624,14 @@ sub select_actions {
 <option value="delete">'.$lt{'delete'}.'</option>';
     }
     if (($context eq 'course') || ($context eq 'domain' && $setting eq 'course')) {
-        if ($statusmode ne 'Expired') {
+        if (($statusmode ne 'Expired') && ($env{'request.course.sec'} eq '')) {
             $options .= '
 <option value="chgsec">'.$lt{'chgsec'}.'</option>';
             $choices{'sections'} = 1;
         }
     }
     if ($options) {
-        $output = '<select name="bulkaction" onchange="javascript:opendatebrowser(this.form,'."'studentform'".')" />'."\n".
+        $output = '<select name="bulkaction" onchange="javascript:opendatebrowser(this.form,'."'studentform','change'".')" />'."\n".
                   '<option value="" selected="selected">'.
                   &mt('Please select').'</option>'."\n".$options."\n".'</select>';
         if ($choices{'dates'}) {
@@ -2437,13 +2668,29 @@ sub date_section_javascript {
     } else {
         $title = &mt('Date selector');
     }
+    my %nopopup = &Apache::lonlocal::texthash (
+        revoke => "Check the boxes for any users for whom roles are to be revoked, and click 'Proceed'",
+        delete => "Check the boxes for any users for whom roles are to be deleted, and click 'Proceed'",
+        none   => "Choose an action to take for selected users",
+    );  
     my $output = '
 <script type="text/javascript">
     var stdeditbrowser;'."\n";
     $output .= <<"ENDONE";
-    function opendatebrowser(callingform,formname) {
+    function opendatebrowser(callingform,formname,calledby) {
         var bulkaction = callingform.bulkaction.options[callingform.bulkaction.selectedIndex].value;
         if (bulkaction == 'revoke' || bulkaction == 'delete' || bulkaction == '') {
+            if (calledby == 'go') {
+                if (bulkaction == 'revoke') {
+                    alert("$nopopup{'revoke'}");
+                }
+                if (bulkaction == 'delete') {
+                    alert("$nopopup{'delete'}"); 
+                }
+                if (bulkaction == '') {
+                    alert("$nopopup{'none'}");
+                }
+            }
             return;
         }
         var url = '/adm/createuser?';
@@ -2487,7 +2734,15 @@ function saveselections(formname) {
 END
     if ($env{'form.bulkaction'} eq 'chgsec') {
         $output .= <<"END";
-        opener.document.$callingform.retainsec.value = formname.retainsec.value;
+        if (formname.retainsec.length > 1) {  
+            for (var i=0; i<formname.retainsec.length; i++) {
+                if (formname.retainsec[i].checked == true) {
+                    opener.document.$callingform.retainsec.value = formname.retainsec[i].value;
+                }
+            }
+        } else {
+            opener.document.$callingform.retainsec.value = formname.retainsec.value;
+        }
         setSections(formname);
         if (seccheck == 'ok') {
             opener.document.$callingform.newsecs.value = formname.sections.value;
@@ -2500,7 +2755,8 @@ END
             if (($env{'form.bulkaction'} eq 'reenable') || 
                 ($env{'form.bulkaction'} eq 'activate') || 
                 ($env{'form.bulkaction'} eq 'chgdates')) {
-                $output .= <<"END";
+                if ($env{'request.course.sec'} eq '') {
+                    $output .= <<"END";
  
         if (formname.makedatesdefault.checked == true) {
             opener.document.$callingform.makedatesdefault.value = 1;
@@ -2510,6 +2766,7 @@ END
         }
 
 END
+                }
             }
         }
         $output .= <<"END";
@@ -2559,12 +2816,10 @@ END
                 $date_items;
     if ($context eq 'course' && $env{'form.bulkaction'} eq 'chgsec') {
         my ($cnum,$cdom) = &get_course_identity();
-        my %sections_count =
-            &Apache::loncommon::get_sections($cdom,$cnum);
         my $info;
         if ($env{'form.showrole'} eq 'st') {
             $output .= '<p>'.$lt{'fors'}.'</p>'; 
-        } elsif ($env{'form.shorole'} eq 'Any') {
+        } elsif ($env{'form.showrole'} eq 'Any') {
             $output .= '<p>'.$lt{'fors'}.'</p>'.
                        '<p>'.$lt{'forn'}.'&nbsp;';
             $info = $lt{'reta'};
@@ -2585,7 +2840,6 @@ END
         } else {
             $info = '<input type="hidden" name="retainsec" value="0" />'; 
         }
-        my $sections_select .= &course_sections(\%sections_count,$env{'form.showrole'});
         my $rowtitle = &mt('New section to assign');
         my $secbox = &section_picker($cdom,$cnum,$env{'form.showrole'},$rowtitle,$permission,$context);
         $output .= $info.$secbox;
@@ -2628,13 +2882,15 @@ sub section_picker {
 }
 
 sub results_header_row {
-    my ($rolefilter,$statusmode,$context,$permission) = @_;
+    my ($rolefilter,$statusmode,$context,$permission,$mode) = @_;
     my ($description,$showfilter);
     if ($rolefilter ne 'Any') {
         $showfilter = $rolefilter;
     }
     if ($context eq 'course') {
-        $description = &mt('Course - ').$env{'course.'.$env{'request.course.id'}.'.description'}.': ';
+        if ($mode eq 'csv' || $mode eq 'excel') {
+            $description = &mt('Course - ').$env{'course.'.$env{'request.course.id'}.'.description'}.': ';
+        }
         if ($statusmode eq 'Expired') {
             $description .= &mt('Users in course with expired [_1] roles',$showfilter);
         } elsif ($statusmode eq 'Future') {
@@ -2648,13 +2904,48 @@ sub results_header_row {
                 $description .= &mt('All users in course with [_1] roles',$rolefilter);
             }
         }
-        if (exists($permission->{'view_section'})) {
+        my $constraint;
+        my $viewablesec = &viewable_section($permission);
+        if ($viewablesec ne '') {
             if ($env{'form.showrole'} eq 'st') {
-                $description .= ' '.&mt('(section [_1] only)',$permission->{'view_section'});
-            } elsif ($env{'form.showrole'} eq 'any') {
-                $description .= ' '.&mt('(section [_1] only)',$permission->{'view_section'});
+                $constraint = &mt('only users in section "[_1]"',$viewablesec);
+            } elsif ($env{'form.showrole'} ne 'cc') {
+                $constraint = &mt('only users affiliated with no section or section "[_1]"',$viewablesec);
+            }
+            if (($env{'form.grpfilter'} ne 'all') && ($env{'form.grpfilter'} ne '')) {
+                if ($env{'form.grpfilter'} eq 'none') {
+                    $constraint .= &mt(' and not in any group');
+                } else {
+                    $constraint .= &mt(' and members of group: "[_1]"',$env{'form.grpfilter'});
+                }
+            }
+        } else {
+            if (($env{'form.secfilter'} ne 'all') && ($env{'form.secfilter'} ne '')) {
+                if ($env{'form.secfilter'} eq 'none') {
+                    $constraint = &mt('only users affiliated with no section');
+                } else {
+                    $constraint = &mt('only users affiliated with section "[_1]"',$env{'form.secfilter'});
+                }
+            }
+            if (($env{'form.grpfilter'} ne 'all') && ($env{'form.grpfilter'} ne '')) {
+                if ($env{'form.grpfilter'} eq 'none') {
+                    if ($constraint eq '') {
+                        $constraint = &mt('only users not in any group');
+                    } else {
+                        $constraint .= &mt(' and also not in any group'); 
+                    }
+                } else {
+                    if ($constraint eq '') {
+                        $constraint = &mt('only members of group: "[_1]"',$env{'form.grpfilter'});
+                    } else {
+                        $constraint .= &mt(' and also members of group: "[_1]"'.$env{'form.grpfilter'});
+                    }
+                }
             }
         }
+        if ($constraint ne '') {
+            $description .= ' ('.$constraint.')';
+        } 
     } elsif ($context eq 'author') {
         $description = 
             &mt('Author space for <span class="LC_cusr_emph">[_1]</span>',
@@ -2752,8 +3043,8 @@ sub viewable_section {
 #################################################
 #################################################
 sub show_drop_list {
-    my ($r,$classlist,$keylist,$nosort,$permission)=@_;
-    my $cid=$env{'request.course.id'};
+    my ($r,$classlist,$nosort,$permission) = @_;
+    my $cid = $env{'request.course.id'};
     my ($cnum,$cdom) = &get_course_identity($cid);
     if (! exists($env{'form.sortby'})) {
         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
@@ -2763,9 +3054,6 @@ sub show_drop_list {
     if ($sortby !~ /^(username|domain|section|groups|fullname|id|start|end)$/) {
         $sortby = 'username';
     }
-    my ($classgroups) = &Apache::loncoursedata::get_group_memberships(
-                                              $classlist,$keylist,$cdom,$cnum);
-    #
     my $action = "drop";
     my $check_uncheck_js = &Apache::loncommon::check_uncheck_jscript();
     $r->print(<<END);
@@ -2778,15 +3066,40 @@ $check_uncheck_js
 <p>
 <input type="hidden" name="phase" value="four">
 END
-
-my %lt=&Apache::lonlocal::texthash('usrn'   => "username",
-                                   'dom'    => "domain",
-                                   'sn'     => "student name",
-                                   'sec'    => "section",
-                                   'start'  => "start date",
-                                   'end'    => "end date",
-                                   'groups' => "active groups",
-                                   );
+    my ($indexhash,$keylist) = &make_keylist_array();
+    my $studentcount = 0;
+    if (ref($classlist) eq 'HASH') {
+        foreach my $student (keys(%{$classlist})) {
+            my $sdata = $classlist->{$student}; 
+            my $status = $sdata->[$indexhash->{'status'}];
+            my $section = $sdata->[$indexhash->{'section'}];
+            if ($status ne 'Active') {
+                delete($classlist->{$student});
+                next;
+            }
+            if ($env{'request.course.sec'} ne '') {
+                if ($section ne $env{'request.course.sec'}) {
+                    delete($classlist->{$student});
+                    next;
+                }
+            }
+            $studentcount ++;
+        }
+    }
+    if (!$studentcount) {
+        $r->print(&mt('There are no students to drop.'));
+        return;
+    }
+    my ($classgroups) = &Apache::loncoursedata::get_group_memberships(
+                                              $classlist,$keylist,$cdom,$cnum);
+    my %lt=&Apache::lonlocal::texthash('usrn'   => "username",
+                                       'dom'    => "domain",
+                                       'sn'     => "student name",
+                                       'sec'    => "section",
+                                       'start'  => "start date",
+                                       'end'    => "end date",
+                                       'groups' => "active groups",
+                                      );
     if ($nosort) {
         $r->print(&Apache::loncommon::start_data_table().
                   &Apache::loncommon::start_data_table_header_row());
@@ -2829,32 +3142,26 @@ END
     }
     #
     # Sort the students
-    my %index;
-    my $i;
-    foreach (@$keylist) {
-        $index{$_} = $i++;
-    }
-    $index{'groups'} = scalar(@$keylist);
-    my $index  = $index{$sortby};
-    my $second = $index{'username'};
-    my $third  = $index{'domain'};
+    my $index  = $indexhash->{$sortby};
+    my $second = $indexhash->{'username'};
+    my $third  = $indexhash->{'domain'};
     my @Sorted_Students = sort {
         lc($classlist->{$a}->[$index])  cmp lc($classlist->{$b}->[$index])
             ||
         lc($classlist->{$a}->[$second]) cmp lc($classlist->{$b}->[$second])
             ||
         lc($classlist->{$a}->[$third]) cmp lc($classlist->{$b}->[$third])
-        } (keys(%$classlist));
+        } (keys(%{$classlist}));
     foreach my $student (@Sorted_Students) {
         my $error;
         my $sdata = $classlist->{$student};
-        my $username = $sdata->[$index{'username'}];
-        my $domain   = $sdata->[$index{'domain'}];
-        my $section  = $sdata->[$index{'section'}];
-        my $name     = $sdata->[$index{'fullname'}];
-        my $id       = $sdata->[$index{'id'}];
-        my $start    = $sdata->[$index{'start'}];
-        my $end      = $sdata->[$index{'end'}];
+        my $username = $sdata->[$indexhash->{'username'}];
+        my $domain   = $sdata->[$indexhash->{'domain'}];
+        my $section  = $sdata->[$indexhash->{'section'}];
+        my $name     = $sdata->[$indexhash->{'fullname'}];
+        my $id       = $sdata->[$indexhash->{'id'}];
+        my $start    = $sdata->[$indexhash->{'start'}];
+        my $end      = $sdata->[$indexhash->{'end'}];
         my $groups = $classgroups->{$student};
         my $active_groups;
         if (ref($groups->{active}) eq 'HASH') {
@@ -2870,25 +3177,18 @@ END
         } else {
             $end = &Apache::lonlocal::locallocaltime($end);
         }
-        my $status   = $sdata->[$index{'status'}];
-        next if ($status ne 'Active');
-        if ($env{'request.course.sec'} ne '') {
-            if ($section ne $env{'request.course.sec'}) {
-                next;
-            }
-        }
         my $studentkey = $student.':'.$section;
-        my $startitem = '<input type="hidden" name="'.$studentkey.'_start" value="'.$sdata->[$index{'start'}].'" />';
+        my $startitem = '<input type="hidden" name="'.$studentkey.'_start" value="'.$sdata->[$indexhash->{'start'}].'" />';
         #
         $r->print(&Apache::loncommon::start_data_table_row());
         $r->print(<<"END");
-    <td><input type="checkbox" name="droplist" value="$student"></td>
+    <td><input type="checkbox" name="droplist" value="$studentkey"></td>
     <td>$username</td>
     <td>$domain</td>
     <td>$id</td>
     <td>$name</td>
     <td>$section</td>
-    <td>$start</td>
+    <td>$start $startitem</td>
     <td>$end</td>
     <td>$active_groups</td>
 END
@@ -2896,7 +3196,7 @@ END
     }
     $r->print(&Apache::loncommon::end_data_table().'<br />');
     %lt=&Apache::lonlocal::texthash(
-                       'dp'   => "Expire Users' Roles",
+                       'dp'   => "Drop Students",
                        'ca'   => "check all",
                        'ua'   => "uncheck all",
                                        );
@@ -2953,6 +3253,10 @@ sub upfile_drop_add {
             $fields{$env{'form.f'.$i}}=$keyfields[$i];
         }
     }
+    if ($env{'form.fullup'} ne 'yes') {
+        $r->print('<form name="studentform" method="post" action="/adm/createuser">'."\n".
+                  '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />');
+    }
     #
     # Store the field choices away
     foreach my $field (qw/username names
@@ -2974,7 +3278,7 @@ sub upfile_drop_add {
     #
     my ($startdate,$enddate) = &get_dates_from_form();
     if ($env{'form.makedatesdefault'}) {
-        $r->print(&make_dates_default($startdate,$enddate));
+        $r->print(&make_dates_default($startdate,$enddate,$context));
     }
     # Determine domain and desired host (home server)
     my $domain=$env{'request.role.domain'};
@@ -3027,22 +3331,59 @@ sub upfile_drop_add {
             $defaultrole = $env{'form.defaultrole'};
         } elsif ($setting eq 'course') {
             $defaultrole = $env{'form.courserole'};
+            $defaultsec = $env{'form.sections'};
         }  
     } elsif ($context eq 'author') {
         $defaultrole = $env{'form.defaultrole'};
-    }
-    if ($context eq 'domain' && $setting eq 'course') { 
-        if ($env{'form.newsec'} ne '') {
-            $defaultsec = $env{'form.newsec'};
-        } elsif ($env{'form.defaultsec'} ne '') {
-            $defaultsec = $env{'form.defaultsec'}
-        }
+    } elsif ($context eq 'course') {
+        $defaultrole = $env{'form.defaultrole'};
+        $defaultsec = $env{'form.sections'};
     }
     if ($env{'request.course.id'} ne '') {
         $cid = $env{'request.course.id'};
-    } elsif ($env{'form.defaultdomain'} ne '' && $env{'form.defaultcourse'} ne '') {
-        $cid = $env{'form.defaultdomain'}.'_'.
-               $env{'form.defaultcourse'};
+    } elsif ($setting eq 'course') {
+        if (&Apache::lonnet::is_course($env{'form.dcdomain'},$env{'form.dccourse'})) {
+            $cid = $env{'form.dcdomain'}.'_'.$env{'form.dccourse'};
+        }
+    }
+    # Check to see if user information can be changed
+    my @userinfo = ('firstname','middlename','lastname','generation',
+                    'permanentemail','id');
+    my %canmodify;
+    if (&Apache::lonnet::allowed('mau',$domain)) {
+        foreach my $field (@userinfo) {
+            $canmodify{$field} = 1;
+        }
+    }
+    my (%userlist,%modifiable_fields,@poss_roles);
+    my $secidx = &Apache::loncoursedata::CL_SECTION();
+    my @courseroles = &roles_by_context('course',1);
+    if (!&Apache::lonnet::allowed('mau',$domain)) {
+        if ($context eq 'course' || $context eq 'author') {
+            @poss_roles =  &curr_role_permissions($context);
+            my @statuses = ('active','future');
+            my ($indexhash,$keylist) = &make_keylist_array();
+            my %info;
+            foreach my $role (@poss_roles) {
+                %{$modifiable_fields{$role}} = &can_modify_userinfo($context,$domain,
+                                                        \@userinfo,[$role]);
+            }
+            if ($context eq 'course') {
+                my ($cnum,$cdom) = &get_course_identity();
+                my $roster = &Apache::loncoursedata::get_classlist();
+                %userlist = %{$roster};
+                my %advrolehash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef,
+                                                         \@statuses,\@poss_roles);
+                &gather_userinfo($context,'view',\%userlist,$indexhash,\%info,
+                                \%advrolehash,$permission);
+            } elsif ($context eq 'author') {
+                my %cstr_roles = &Apache::lonnet::get_my_roles(undef,undef,undef,
+                                                  \@statuses,\@poss_roles);
+                &gather_userinfo($context,'view',\%userlist,$indexhash,\%info,
+                             \%cstr_roles,$permission);
+
+            }
+        }
     }
     if ( $domain eq &LONCAPA::clean_domain($domain)
         && ($amode ne '')) {
@@ -3063,16 +3404,50 @@ sub upfile_drop_add {
                      );
         my $flushc=0;
         my %student=();
-        my %curr_groups;
+        my (%curr_groups,@sections,@cleansec,$defaultwarn,$groupwarn);
         my %userchg;
-        if ($context eq 'course') {
-            # Get information about course groups
-            %curr_groups = &Apache::longroup::coursegroups();
+        if ($context eq 'course' || $setting eq 'course') {
+            if ($context eq 'course') {
+                # Get information about course groups
+                %curr_groups = &Apache::longroup::coursegroups();
+            } elsif ($setting eq 'course') {
+                if ($cid) {
+                    %curr_groups =
+                        &Apache::longroup::coursegroups($env{'form.dcdomain'},
+                                                        $env{'form.dccourse'});
+                }
+            }
+            # determine section number
+            if ($defaultsec =~ /,/) {
+                push(@sections,split(/,/,$defaultsec));
+            } else {
+                push(@sections,$defaultsec);
+            }
+            # remove non alphanumeric values from section
+            foreach my $item (@sections) {
+                $item =~ s/\W//g;
+                if ($item eq "none" || $item eq 'all') {
+                    $defaultwarn = &mt('Default section name [_1] could not be used as it is a reserved word.',$item);
+                } elsif ($item ne ''  && exists($curr_groups{$item})) {
+                    $groupwarn = &mt('Default section name "[_1]" is the name of a course group. Section names and group names must be distinct.',$item);
+                } elsif ($item ne '') {
+                    push(@cleansec,$item);
+                }
+            }
+            if ($defaultwarn) {
+                $r->print($defaultwarn.'<br />');
+            }
+            if ($groupwarn) {
+                $r->print($groupwarn.'<br />');
+            }
         }
         my (%curr_rules,%got_rules,%alerts);
+        my %customroles = &my_custom_roles();
+        my @permitted_roles = &roles_on_upload($context,$setting,%customroles); 
         # Get new users list
-        foreach (@userdata) {
-            my %entries=&Apache::loncommon::record_sep($_);
+        foreach my $line (@userdata) {
+            my @secs;
+            my %entries=&Apache::loncommon::record_sep($line);
             # Determine user name
             unless (($entries{$fields{'username'}} eq '') ||
                     (!defined($entries{$fields{'username'}}))) {
@@ -3100,30 +3475,43 @@ sub upfile_drop_add {
       &mt('<b>[_1]</b>: Unacceptable username for user [_2] [_3] [_4] [_5]',
           $entries{$fields{'username'}},$fname,$mname,$lname,$gen).
                               '</b>');
+                    next;
                 } else {
                     my $username = $entries{$fields{'username'}};
-                    my $sec;
-                    if ($context eq 'course' || $setting eq 'course') {
-                        # determine section number
-                        if (defined($fields{'sec'})) {
-                            if (defined($entries{$fields{'sec'}})) {
-                                $sec=$entries{$fields{'sec'}};
+                    if (defined($fields{'sec'})) {
+                        if (defined($entries{$fields{'sec'}})) {
+                            $entries{$fields{'sec'}} =~ s/\W//g;
+                            my $item = $entries{$fields{'sec'}};
+                            if ($item eq "none" || $item eq 'all') {
+                                $r->print('<br />'.&mt('<b>[_1]</b>: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a reserved word.',$username,$fname,$mname,$lname,$gen,$item));
+                                next;
+                            } elsif (exists($curr_groups{$item})) {
+                                $r->print('<br />'.&mt('<b>[_1]</b>: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a course group.',$username,$fname,$mname,$lname,$gen,$item).' '.&mt('Section names and group names must be distinct.'));
+                                next;
+                            } else {
+                                push(@secs,$item);
                             }
-                        } else {
-                            $sec = $defaultsec;
                         }
-                        # remove non alphanumeric values from section
-                        $sec =~ s/\W//g;
-                        if ($sec eq "none" || $sec eq 'all') {
-                            $r->print('<br />'.
-      &mt('<b>[_1]</b>: Unable to enroll: section name "[_2]" for user [_3] [_4] [_5] [_6] is a reserved word.',
-                                      $username,$sec,$fname,$mname,$lname,$gen));
-                            next;
-                        } elsif (($sec ne '') && (exists($curr_groups{$sec}))) {
-                            $r->print('<br />'.
-      &mt('<b>[_1]</b>: Unable to enroll: section name "[_2]" for user [_3] [_4] [_5] [_6] is a course group. Section names and group names must be distinct.',
-                                      $username,$sec,$fname,$mname,$lname,$gen));
-                            next;
+                    }
+                    if ($env{'request.course.sec'} ne '') {
+                        @secs = ($env{'request.course.sec'});
+                        if (ref($userlist{$username.':'.$domain}) eq 'ARRAY') {
+                            my $currsec = $userlist{$username.':'.$domain}[$secidx];
+                            if ($currsec ne $env{'request.course.sec'}) {
+                                $r->print('<br />'.&mt('<b>[_1]</b>: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]".',$username,$fname,$mname,$lname,$gen,$secs[0]).'<br />');
+                                if ($currsec eq '') {
+                                    $r->print(&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));
+                                }
+                                $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 />');
+                                next;
+                            }
+                        }
+                    } elsif ($context eq 'course' || $setting eq 'course') {
+                        if (@secs == 0) {
+                            @secs = @cleansec;
                         }
                     }
                     # determine id number
@@ -3152,12 +3540,14 @@ sub upfile_drop_add {
                     my $role = '';
                     if (defined($fields{'role'})) {
                         if ($entries{$fields{'role'}}) {
-                            my @poss_roles = 
-                                 &curr_role_permissions($context,$setting);
-                            if (grep(/^\Q$entries{$fields{'role'}}\E/,@poss_roles)) {
-                                $role=$entries{$fields{'role'}};
-                            } else {
-                                my $rolestr = join(', ',@poss_roles);
+                            $entries{$fields{'role'}}  =~ s/(\s+$|^\s+)//g;
+                            if ($entries{$fields{'role'}} ne '') {
+                                if (grep(/^\Q$entries{$fields{'role'}}\E$/,@permitted_roles)) {
+                                    $role = $entries{$fields{'role'}};
+                                }
+                            }
+                            if ($role eq '') {
+                                my $rolestr = join(', ',@permitted_roles);
                                 $r->print('<br />'.
       &mt('<b>[_1]</b>: You do not have permission to add the requested role [_2] for the user.',$entries{$fields{'username'}},$entries{$fields{'role'}}).'<br />'.&mt('Allowable role(s) is/are: [_1].',$rolestr)."\n");
                                 next;
@@ -3169,7 +3559,7 @@ sub upfile_drop_add {
                     }
                     # Clean up whitespace
                     foreach (\$domain,\$username,\$id,\$fname,\$mname,
-                             \$lname,\$gen,\$sec,\$role) {
+                             \$lname,\$gen) {
                         $$_ =~ s/(\s+$|^\s+)//g;
                     }
                     # check against rules
@@ -3192,7 +3582,35 @@ sub upfile_drop_add {
                             }
                         }
                     } else {
-# FIXME check if user info can be updated.   
+                        if ($context eq 'course' || $context eq 'author') {
+                            if ($role eq '') {
+                                my @checkroles;
+                                foreach my $role (@poss_roles) {
+                                    my $endkey;
+                                    if ($role ne 'st') {
+                                        $endkey = ':'.$role;
+                                    }
+                                    if (exists($userlist{$username.':'.$domain.$endkey})) {
+                                        if (!grep(/^\Q$role\E$/,@checkroles)) {
+                                            push(@checkroles,$role);
+                                        }
+                                    }
+                                }
+                                if (@checkroles > 0) {
+                                    %canmodify = &can_modify_userinfo($context,$domain,\@userinfo,\@checkroles);
+                                }
+                            } elsif (ref($modifiable_fields{$role}) eq 'HASH') {
+                                %canmodify = %{$modifiable_fields{$role}};
+                            }
+                        }
+                        my @newinfo = (\$fname,\$mname,\$lname,\$gen,\$email,\$id);
+                        for (my $i=0; $i<@userinfo; $i++) {
+                            if (${$newinfo[$i]} ne '') {
+                                if (!$canmodify{$userinfo[$i]}) {
+                                    ${$newinfo[$i]} = '';
+                                }
+                            }
+                        }
                     }
                     if ($id ne '') {
                         if (!$newuser) {
@@ -3217,29 +3635,74 @@ sub upfile_drop_add {
                         }
                     }
                     if ($password || $env{'form.login'} eq 'loc') {
-                        my ($userresult,$authresult,$roleresult);
+                        my $multiple = 0;
+                        my ($userresult,$authresult,$roleresult,$idresult);
+                        my (%userres,%authres,%roleres,%idres);
+                        my $singlesec = '';
                         if ($role eq 'st') {
+                            my $sec;
+                            if (@secs > 0) {
+                                $sec = $secs[0];
+                            }
                             &modifystudent($domain,$username,$cid,$sec,
                                            $desiredhost);
-                            $roleresult = 
+                            $roleresult =
                                 &Apache::lonnet::modifystudent
                                     ($domain,$username,$id,$amode,$password,
                                      $fname,$mname,$lname,$gen,$sec,$enddate,
                                      $startdate,$env{'form.forceid'},
-                                     $desiredhost,$email);
+                                     $desiredhost,$email,'manual','',$cid);
+                            $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') { 
+                                        if (@secs > 1) {
+                                            $multiple = 1;
+                                            foreach my $sec (@secs) {
+                                                ($userres{$sec},$authres{$sec},$roleres{$sec},$idres{$sec}) =
+                                                &modifyuserrole($context,$setting,
+                                                    $changeauth,$cid,$domain,$username,
+                                                    $id,$amode,$password,$fname,
+                                                    $mname,$lname,$gen,$sec,
+                                                    $env{'form.forceid'},$desiredhost,
+                                                    $email,$role,$enddate,
+                                                    $startdate,$checkid);
+                                            }
+                                        } elsif (@secs > 0) {
+                                            $singlesec = $secs[0];
+                                        }
+                                    }
+                                }
+                            }
+                            if (!$multiple) {
+                                ($userresult,$authresult,$roleresult,$idresult) = 
+                                    &modifyuserrole($context,$setting,
+                                                    $changeauth,$cid,$domain,$username, 
+                                                    $id,$amode,$password,$fname,
+                                                    $mname,$lname,$gen,$singlesec,
+                                                    $env{'form.forceid'},$desiredhost,
+                                                    $email,$role,$enddate,$startdate,$checkid);
+                            }
+                        }
+                        if ($multiple) {
+                            foreach my $sec (sort(keys(%userres))) {
+                                $flushc =
+                                &user_change_result($r,$userres{$sec},$authres{$sec},
+                                                    $roleres{$sec},$idres{$sec},\%counts,$flushc,
+                                                    $username,\%userchg);
+
+                            }
                         } else {
-                            ($userresult,$authresult,$roleresult) = 
-                                &modifyuserrole($context,$setting,
-                                    $changeauth,$cid,$domain,$username, 
-                                    $id,$amode,$password,$fname,
-                                    $mname,$lname,$gen,$sec,
-                                    $env{'form.forceid'},$desiredhost,
-                                    $email,$role,$enddate,$startdate,$checkid);
+                            $flushc = 
+                                &user_change_result($r,$userresult,$authresult,
+                                                    $roleresult,$idresult,\%counts,$flushc,
+                                                    $username,\%userchg);
                         }
-                        $flushc = 
-                            &user_change_result($r,$userresult,$authresult,
-                                                $roleresult,\%counts,$flushc,
-                                                $username,%userchg);
                     } else {
                         if ($context eq 'course') {
                             $r->print('<br />'. 
@@ -3260,11 +3723,13 @@ sub upfile_drop_add {
         } # end of foreach (@userdata)
         # Flush the course logs so reverse user roles immediately updated
         &Apache::lonnet::flushcourselogs();
-        $r->print("</p>\n<p>\n".&mt('Processed [_1] user(s).',$counts{'user'}).
+        $r->print("</p>\n<p>\n".&mt('Processed [quant,_1,user].',$counts{'user'}).
                   "</p>\n");
         if ($counts{'role'} > 0) {
             $r->print("<p>\n".
-                      &mt('Roles added for [_1] users. If user is active, the new role will be available when the user next logs in to LON-CAPA.',$counts{'role'})."</p>\n");
+                      &mt('Roles added for [quant,_1,user].',$counts{'role'}).' '.&mt('If a user is currently logged-in to LON-CAPA, any new roles which are active will be available when the user next logs in.')."</p>\n");
+        } else {
+            $r->print('<p>'.&mt('No roles added').'</p>');
         }
         if ($counts{'auth'} > 0) {
             $r->print("<p>\n".
@@ -3272,23 +3737,22 @@ sub upfile_drop_add {
                           $counts{'auth'})."</p>\n");
         }
         $r->print(&print_namespacing_alerts($domain,\%alerts,\%curr_rules));
-        $r->print('<form name="uploadresult" action="/adm/createuser">');
-        $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','prevphase','currstate']));
-        $r->print('</form>');
         #####################################
-        #           Drop students           #
+        # Display list of students to drop  #
         #####################################
         if ($env{'form.fullup'} eq 'yes') {
-            $r->print('<h3>'.&mt('Dropping Students')."</h3>\n");
+            $r->print('<h3>'.&mt('Students to Drop')."</h3>\n");
             #  Get current classlist
-            my ($classlist,$keylist)=&Apache::loncoursedata::get_classlist();
+            my $classlist = &Apache::loncoursedata::get_classlist();
             if (! defined($classlist)) {
-                $r->print(&mt('There are no students currently enrolled.').
-                          "\n");
+                $r->print('<form name="studentform" method="post" action="/adm/createuser" />'.
+                          '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.
+                          &mt('There are no students with current/future access to the course.').
+                          '</form>'."\n");
             } else {
                 # Remove the students we just added from the list of students.
-                foreach (@userdata) {
-                    my %entries=&Apache::loncommon::record_sep($_);
+                foreach my $line (@userdata) {
+                    my %entries=&Apache::loncommon::record_sep($line);
                     unless (($entries{$fields{'username'}} eq '') ||
                             (!defined($entries{$fields{'username'}}))) {
                         delete($classlist->{$entries{$fields{'username'}}.
@@ -3296,10 +3760,13 @@ sub upfile_drop_add {
                     }
                 }
                 # Print out list of dropped students.
-                &show_drop_list($r,$classlist,$keylist,'nosort');
+                &show_drop_list($r,$classlist,'nosort',$permission);
             }
         }
     } # end of unless
+    if ($env{'form.fullup'} ne 'yes') {
+        $r->print('</form>');
+    }
 }
 
 sub print_namespacing_alerts {
@@ -3343,8 +3810,8 @@ sub print_namespacing_alerts {
 }
 
 sub user_change_result {
-    my ($r,$userresult,$authresult,$roleresult,$counts,$flushc,$username,
-        $userchg) = @_;
+    my ($r,$userresult,$authresult,$roleresult,$idresult,$counts,$flushc,
+        $username,$userchg) = @_;
     my $okresult = 0;
     if ($userresult ne 'ok') {
         if ($userresult =~ /^error:(.+)$/) {
@@ -3385,6 +3852,9 @@ sub user_change_result {
             $flushc=0;
         }
     }
+    if ($idresult) {
+        $r->print($idresult);
+    }
     return $flushc;
 }
 
@@ -3393,14 +3863,12 @@ sub print_drop_menu {
     my ($r,$context,$permission) = @_;
     $r->print('<h3>'.&mt("Drop Students").'</h3>'."\n".
               '<form name="studentform" method="post">'."\n");
-    my $cid=$env{'request.course.id'};
-    my ($classlist,$keylist) = &Apache::loncoursedata::get_classlist();
+    my $classlist = &Apache::loncoursedata::get_classlist();
     if (! defined($classlist)) {
         $r->print(&mt('There are no students currently enrolled.')."\n");
-        return;
+    } else {
+        &show_drop_list($r,$classlist,'nosort',$permission);
     }
-    # Print out the available choices
-    &show_drop_list($r,$classlist,$keylist,$permission);
     $r->print('</form>'. &Apache::loncommon::end_page());
     return;
 }
@@ -3412,10 +3880,10 @@ sub update_user_list {
     my $now = time;
     my $count=0;
     my @changelist;
-    if ($choice ne '') {
-        @changelist = &Apache::loncommon::get_env_multiple('form.actionlist');
-    } else {
+    if ($choice eq 'drop') {
         @changelist = &Apache::loncommon::get_env_multiple('form.droplist');
+    } else {
+        @changelist = &Apache::loncommon::get_env_multiple('form.actionlist');
     }
     my %result_text = ( ok    => { 'revoke'   => 'Revoked',
                                    'delete'   => 'Deleted',
@@ -3482,7 +3950,6 @@ sub update_user_list {
             }
         }
         my $plrole = &Apache::lonnet::plaintext($role);
-        my ($uid,$first,$middle,$last,$gene,$sec);
         my $start = $env{'form.'.$item.'_start'};
         my $end = $env{'form.'.$item.'_end'};
         if ($choice eq 'drop') {
@@ -3502,16 +3969,12 @@ sub update_user_list {
                     &Apache::lonnet::revokerole($udom,$uname,$scope,$role);
             }
         } elsif ($choice eq 'delete') {
-            $start = -1;
-            $end = -1;
             if ($role eq 'st') {
-# FIXME - how does role deletion affect classlist?
-                &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid);
-            } else {
-                $result =
-                    &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$now,
-                                                0,1);
-             }
+                &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$now,$start,$type,$locktype,$cid);
+            }
+            $result =
+                &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$now,
+                                            $start,1);
         } else {
             #reenable, activate, change access dates or change section
             if ($choice ne 'chgsec') {
@@ -3551,29 +4014,42 @@ sub update_user_list {
                         if (@newsecs == 0) {
                             $result = &mt('No change in section assignment (none)');
                             $nochg = 1;
-                        }
-                    } else {
-                        if (!grep(/^\Q$sec\E$/,@newsecs)) {
+                        } else {
                             $revresult =
-                               &Apache::lonnet::revokerole($udom,$uname,$scope,$role);
+                                &Apache::lonnet::revokerole($udom,$uname,
+                                                            $scope,$role);
+                        } 
+                    } else {
+                        if (@newsecs > 0) {
+                            if (grep(/^\Q$sec\E$/,@newsecs)) {
+                                push(@retained,$sec);
+                            } else {
+                                $revresult =
+                                    &Apache::lonnet::revokerole($udom,$uname,
+                                                                $scope,$role);
+                            }
                         } else {
-                            push(@retained,$sec);
+                            $revresult =
+                                &Apache::lonnet::revokerole($udom,$uname,
+                                                            $scope,$role);
                         }
                     }
                 } else {
-                    push(@retained,$sec);
+                    if ($sec eq '') {
+                        $nochg = 1;
+                    } else { 
+                        push(@retained,$sec);
+                    }
                 }
                 # add new sections
                 if (@newsecs == 0) {
                     if (!$nochg) {
-                        if ($sec ne '') {
-                            if ($role eq 'st') {
-                                $result = 
-                                    &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$end,$start,$type,$locktype,$cid);
-                            } else {
-                                my $newscope = $scopestem;
-                                $result = &Apache::lonnet::assignrole($udom,$uname,$newscope,$role,$end,$start);
-                            }
+                        if ($role eq 'st') {
+                            $result = 
+                                &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$end,$start,$type,$locktype,$cid);
+                        } else {
+                            my $newscope = $scopestem;
+                            $result = &Apache::lonnet::assignrole($udom,$uname,$newscope,$role,$end,$start);
                         }
                     }
                 } else {
@@ -3607,11 +4083,24 @@ sub update_user_list {
             $count++;
         } else {
             $r->print(
-                &mt("Error $result_text{'error'}{$choice} [_1] in [_2] for [_3]:[_4]",
+                &mt("Error $result_text{'error'}{$choice} [_1] in [_2] for [_3]: [_4].",
                     $plrole,$extent,$uname.':'.$udom,$result).'<br />');
         }
     }
-    $r->print('<p><b>'.&mt("$result_text{'ok'}{$choice} role(s) for [quant,_1,user,users,users].",$count).'</b></p>');
+    $r->print('<form name="studentform" method="post" action="/adm/createuser">'."\n");
+    if ($choice eq 'drop') {
+        $r->print('<input type="hidden" name="action" value="listusers" />'."\n".
+                  '<input type="hidden" name="Status" value="Active" />'."\n".
+                  '<input type="hidden" name="showrole" value="st" />'."\n");
+    } else {
+        foreach my $item ('action','sortby','roletype','showrole','Status','secfilter','grpfilter') {
+            if ($env{'form.'.$item} ne '') {
+                $r->print('<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.
+                          '" />'."\n");
+            }
+        }
+    }
+    $r->print('<p><b>'.&mt("$result_text{'ok'}{$choice} role(s) for [quant,_1,user,users,no users].",$count).'</b></p>');
     if ($count > 0) {
         if ($choice eq 'revoke' || $choice eq 'drop') {
             $r->print('<p>'.&mt('Re-enabling will re-activate data for the role.</p>'));
@@ -3621,23 +4110,25 @@ sub update_user_list {
     }
     if ($env{'form.makedatesdefault'}) {
         if ($choice eq 'chgdates' || $choice eq 'reenable' || $choice eq 'activate') {
-            $r->print(&make_dates_default($startdate,$enddate));
+            $r->print(&make_dates_default($startdate,$enddate,$context));
         }
     }
+    my $linktext = &mt('Display User Lists');
+    if ($choice eq 'drop') {
+        $linktext = &mt('Display current class roster');
+    }
+    $r->print('<a href="javascript:document.studentform.submit()">'.$linktext.'</a></form>'."\n");
 }
 
 sub classlist_drop {
-    my ($scope,$uname,$udom,$now,$action) = @_;
+    my ($scope,$uname,$udom,$now) = @_;
     my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)});
-    my $cid=$cdom.'_'.$cnum;
-    my $user = $uname.':'.$udom;
-    if ($action eq 'drop') {
+    if (&Apache::lonnet::is_course($cdom,$cnum)) {
+        my $user = $uname.':'.$udom;
         if (!&active_student_roles($cnum,$cdom,$uname,$udom)) {
             my $result =
                 &Apache::lonnet::cput('classlist',
-                                      { $user => $now },
-                                      $env{'course.'.$cid.'.domain'},
-                                      $env{'course.'.$cid.'.num'});
+                                      { $user => $now },$cdom,$cnum);
             return &mt('Drop from classlist: [_1]',
                        '<b>'.$result.'</b>').'<br />';
         }
@@ -3707,16 +4198,26 @@ sub course_sections {
     my ($sections_count,$role) = @_;
     my $output = '';
     my @sections = (sort {$a <=> $b} keys %{$sections_count});
-    if (scalar(@sections) == 1) {
+    my $numsec = scalar(@sections);
+    if ($numsec <= 1) {
         $output = '<select name="currsec_'.$role.'" >'."\n".
-                  '  <option value="">Select</option>'."\n".
-                  '  <option value="">No section</option>'."\n".
+                  '  <option value="">'.&mt('Select').'</option>'."\n".
+                  '  <option value="">'.&mt('No section').'</option>'."\n";
+        if ($numsec == 1) {
+            $output .=  
                   '  <option value="'.$sections[0].'" >'.$sections[0].'</option>'."\n";
+        }
     } else {
         $output = '<select name="currsec_'.$role.'" ';
         my $multiple = 4;
         if (scalar(@sections) < 4) { $multiple = scalar(@sections); }
-        $output .= 'multiple="multiple" size="'.$multiple.'">'."\n";
+        if ($role eq 'st') {
+            $output .= '>'."\n".
+                       '  <option value="">'.&mt('Select').'</option>'."\n".
+                       '  <option value="">'.&mt('No section')."</option>\n";
+        } else {
+            $output .= 'multiple="multiple" size="'.$multiple.'">'."\n";
+        }
         foreach my $sec (@sections) {
             $output .= '<option value="'.$sec.'">'.$sec."</option>\n";
         }
@@ -3736,16 +4237,41 @@ sub get_groupslist {
 }
 
 sub setsections_javascript {
-    my ($form,$groupslist) = @_;
-    my ($checkincluded,$finish,$roleplace,$setsection_js);
-    if ($form eq 'cu') {
+    my ($formname,$groupslist,$mode,$checkauth) = @_;
+    my ($checkincluded,$finish,$rolecode,$setsection_js);
+    if ($mode eq 'upload') {
+        $checkincluded = 'formname.name == "'.$formname.'"';
+        $finish = "return 'ok';";
+        $rolecode = "var role = formname.defaultrole.options[formname.defaultrole.selectedIndex].value;\n";
+    } elsif ($formname eq 'cu') {
         $checkincluded = 'formname.elements[i-1].checked == true';
-        $finish = 'formname.submit()';
-        $roleplace = 3;
+        if ($checkauth) {
+            $finish = "var authcheck = auth_check();\n".
+                      "   if (authcheck == 'ok') {\n".
+                      "       formname.submit();\n".
+                      "   }\n";
+        } else {
+            $finish = 'formname.submit()';
+        }
+        $rolecode = "var match = str.split('_');
+                var role = match[3];\n";
+    } elsif ($formname eq 'enrollstudent') {
+        $checkincluded = 'formname.name == "'.$formname.'"';
+        if ($checkauth) {
+            $finish = "var authcheck = auth_check();\n".
+                      "   if (authcheck == 'ok') {\n".
+                      "       formname.submit();\n".
+                      "   }\n";
+        } else {
+            $finish = 'formname.submit()';
+        }
+        $rolecode = "var match = str.split('_');
+                var role = match[1];\n";
     } else {
-        $checkincluded = 'formname.name == "'.$form.'"'; 
+        $checkincluded = 'formname.name == "'.$formname.'"'; 
         $finish = "seccheck = 'ok';";
-        $roleplace = 1;
+        $rolecode = "var match = str.split('_');
+                var role = match[1];\n";
         $setsection_js = "var seccheck = 'alert';"; 
     }
     my %alerts = &Apache::lonlocal::texthash(
@@ -3770,8 +4296,7 @@ function setSections(formname) {
         var checkcurr = str.match(re1);
         if (checkcurr != null) {
             if ($checkincluded) {
-                var match = str.split('_');
-                var role = match[$roleplace];
+                $rolecode
                 if (role == 'cc') {
                     alert("$alerts{'secd'}\\n$alerts{'accr'}");
                 }
@@ -3846,6 +4371,9 @@ sub can_create_user {
     my ($dom,$context,$usertype) = @_;
     my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
     my $cancreate = 1;
+    if (&Apache::lonnet::allowed('mau',$dom)) {
+        return $cancreate;
+    }
     if (ref($domconf{'usercreation'}) eq 'HASH') {
         if (ref($domconf{'usercreation'}{'cancreate'}) eq 'HASH') {
             if ($context eq 'course' || $context eq 'author') {
@@ -4000,7 +4528,8 @@ sub get_permission {
     } else {
         my @allroles = &roles_by_context($context);
         foreach my $role (@allroles) {
-            if (&Apache::lonnet::allowed('c'.$role,$env{'request.role.domain'})) {                $permission{'cusr'} = 1;
+            if (&Apache::lonnet::allowed('c'.$role,$env{'request.role.domain'})) {
+                $permission{'cusr'} = 1;
                 last;
             }
         }
@@ -4029,6 +4558,20 @@ sub authorpriv {
          || (&Apache::lonnet::allowed('caa',$audom.'/'.$auname))) { return ''; }    return 1;
 }
 
+sub roles_on_upload {
+    my ($context,$setting,%customroles) = @_;
+    my (@possible_roles,@permitted_roles);
+    @possible_roles = &curr_role_permissions($context,$setting,1);
+    foreach my $role (@possible_roles) {
+        if ($role eq 'cr') {
+            push(@permitted_roles,keys(%customroles));
+        } else {
+            push(@permitted_roles,$role);
+        }
+    }
+    return @permitted_roles;
+}
+
 sub get_course_identity {
     my ($cid) = @_;
     my ($cnum,$cdom,$cdesc);
@@ -4051,15 +4594,19 @@ sub get_course_identity {
 }
 
 sub dc_setcourse_js {
-    my ($formname,$mode) = @_;
-    my $dc_setcourse_code;
+    my ($formname,$mode,$context) = @_;
+    my ($dc_setcourse_code,$authen_check);
     my $cctext = &Apache::lonnet::plaintext('cc');
     my %alerts = &sectioncheck_alerts();
     my $role = 'role';
     if ($mode eq 'upload') {
         $role = 'courserole';
+    } else {
+        $authen_check = &verify_authen($formname,$context);
     }
     $dc_setcourse_code = (<<"SCRIPTTOP");
+$authen_check
+
 function setCourse() {
     var course = document.$formname.dccourse.value;
     if (course != "") {
@@ -4144,9 +4691,11 @@ SCRIPTTOP
             }
         }
     }
-    document.$formname.submit();
+    var authcheck = auth_check();
+    if (authcheck == 'ok') {
+        document.$formname.submit();
+    }
 }
-
 ENDSCRIPT
     } else {
         $dc_setcourse_code .=  "
@@ -4167,6 +4716,66 @@ ENDSCRIPT
         return -1;
     }
 ENDSCRIPT
+    return $dc_setcourse_code;
+}
+
+sub verify_authen {
+    my ($formname,$context) = @_;
+    my %alerts = &authcheck_alerts();
+    my $finish = "return 'ok';";
+    if ($context eq 'author') {
+        $finish = "document.$formname.submit();";
+    }
+    my $outcome = <<"ENDSCRIPT";
+
+function auth_check() {
+    var logintype;
+    if (document.$formname.login.length) {
+        if (document.$formname.login.length > 0) {
+            var loginpicked = 0;
+            for (var i=0; i<document.$formname.login.length; i++) {
+                if (document.$formname.login[i].checked == true) {
+                    loginpicked = 1;
+                    logintype = document.$formname.login[i].value;
+                }
+            }
+            if (loginpicked == 0) {
+                alert("$alerts{'authen'}");
+                return;
+            }
+        }
+    } else {
+        logintype = document.$formname.login.value;
+    }
+    if (logintype == 'nochange') {
+        return 'ok';
+    }
+    var argpicked = document.$formname.elements[logintype+'arg'].value;
+    if ((argpicked == null) || (argpicked == '') || (typeof argpicked == 'undefined')) {
+        var alertmsg = '';
+        switch (logintype) {
+            case 'krb':
+                alertmsg = '$alerts{'krb'}';
+                break;
+            case 'int':
+                alertmsg = '$alerts{'ipass'}';
+            case 'fsys':
+                alertmsg = '$alerts{'ipass'}';
+                break;
+            case 'loc':
+                alertmsg = '';
+                break;
+            default:
+                alertmsg = '';
+        }
+        if (alertmsg != '') {
+            alert(alertmsg);
+            return;
+        }
+    }
+    $finish
+}
+ENDSCRIPT
 }
 
 sub sectioncheck_alerts {
@@ -4188,6 +4797,15 @@ sub sectioncheck_alerts {
     return %alerts;
 }
 
+sub authcheck_alerts {
+    my %alerts = 
+        &Apache::lonlocal::texthash(
+                    authen => 'You must choose an authentication type.',
+                    krb    => 'You need to specify the Kerberos domain.',
+                    ipass  => 'You need to specify the initial password.',
+        );
+    return %alerts;
+}
 
 1;