--- loncom/interface/lonuserutils.pm	2007/12/21 14:05:40	1.18
+++ loncom/interface/lonuserutils.pm	2008/08/13 08:17:58	1.61
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.18 2007/12/21 14:05:40 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.61 2008/08/13 08:17:58 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,7 +42,7 @@ use LONCAPA qw(:DEFAULT :match);
 ###############################################################
 # Drop student from all sections of a course, except optional $csec
 sub modifystudent {
-    my ($udom,$unam,$courseid,$csec,$desiredhost)=@_;
+    my ($udom,$unam,$courseid,$csec,$desiredhost,$context)=@_;
     # if $csec is undefined, drop the student from all the courses matching
     # this one.  If $csec is defined, drop them from all other sections of
     # this course and add them to section $csec
@@ -68,14 +68,15 @@ sub modifystudent {
                     my $reply=&Apache::lonnet::modifystudent
                         # dom  name  id mode pass     f     m     l     g
                         ($udom,$unam,'',  '',  '',undef,undef,undef,undef,
-                         $section,time,undef,undef,$desiredhost);
+                         $section,time,undef,undef,$desiredhost,'','manual',
+                         '',$courseid,'',$context);
                     $result .= $reply.':';
                 }
             }
         }
     }
     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;
     }
@@ -126,8 +127,10 @@ sub modifyuserrole {
                                     $email,$role,$start,$end);
     if ($userresult eq 'ok') {
         if ($role ne '') {
+            $role =~ s/_/\//g;
             $roleresult = &Apache::lonnet::assignrole($udom,$uname,$scope,
-                                                      $role,$end,$start);
+                                                      $role,$end,$start,'',
+                                                      '',$context);
         }
     }
     return ($userresult,$authresult,$roleresult,$idresult);
@@ -145,7 +148,7 @@ sub propagate_id_change {
                 one_time => 1,
                );
     foreach my $item (keys(%roleshash)) {
-        my ($cnum,$cdom,$role) = split(/:/,$item);
+        my ($cnum,$cdom,$role) = split(/:/,$item,-1);
         my ($start,$end) = split(/:/,$roleshash{$item});
         if (&Apache::lonnet::is_course($cdom,$cnum)) {
             my $result = &update_classlist($cdom,$cnum,$udom,$uname,$user);
@@ -265,7 +268,7 @@ sub hidden_input {
 }
 
 sub print_upload_manager_header {
-    my ($r,$datatoken,$distotal,$krbdefdom,$context)=@_;
+    my ($r,$datatoken,$distotal,$krbdefdom,$context,$permission)=@_;
     my $javascript;
     #
     if (! exists($env{'form.upfile_associate'})) {
@@ -295,9 +298,14 @@ sub print_upload_manager_header {
         $password_choice = 'int';
     }
     #
+    my $groupslist;
+    if ($context eq 'course') {
+        $groupslist = &get_groupslist();
+    }
     my $javascript_validations =
-        &javascript_validations('auth',$krbdefdom,$password_choice,undef,
-                                $env{'request.role.domain'});
+        &javascript_validations('upload',$krbdefdom,$password_choice,undef,
+                                $env{'request.role.domain'},$context,
+                                $groupslist);
     my $checked=(($env{'form.noFirstLine'})?' checked="checked" ':'');
     $r->print(&mt('Total number of records found in file: <b>[_1]</b>.',$distotal).
               "<br />\n");
@@ -311,8 +319,8 @@ sub print_upload_manager_header {
               &hidden_input('fileupload',$env{'form.fileupload'}).
               &hidden_input('upfiletype',$env{'form.upfiletype'}).
               &hidden_input('upfile_associate',$env{'form.upfile_associate'}));
-    $r->print('<br /><input type="button" value="Reverse Association" '.
-              'name="'.&mt('Reverse Association').'" '.
+    $r->print('<br /><input type="button" value="'.&mt('Reverse Association').'" '.
+              'name="Reverse Association" '.
               'onClick="javascript:this.form.associate.value=\'Reverse Association\';submit(this.form);" />');
     $r->print('<label><input type="checkbox" name="noFirstLine"'.$checked.'/>'.
               &mt('Ignore First Line').'</label>');
@@ -324,27 +332,47 @@ sub print_upload_manager_header {
 ###############################################################
 ###############################################################
 sub javascript_validations {
-    my ($mode,$krbdefdom,$curr_authtype,$curr_authfield,$domain)=@_;
-    my $authheader;
-    if ($mode eq 'auth') {
-        my %param = ( formname => 'studentform',
-                      kerb_def_dom => $krbdefdom,
-                      curr_authtype => $curr_authtype);
-        $authheader = &Apache::loncommon::authform_header(%param);
-    } elsif ($mode eq 'createcourse') {
-        my %param = ( formname => 'ccrs',
-                      kerb_def_dom => $krbdefdom,
-                      curr_authtype => $curr_authtype );
-        $authheader = &Apache::loncommon::authform_header(%param);
-    } elsif ($mode eq 'modifycourse') {
-        my %param = ( formname => 'cmod',
+    my ($mode,$krbdefdom,$curr_authtype,$curr_authfield,$domain,
+        $context,$groupslist)=@_;
+    my %param = (
                   kerb_def_dom => $krbdefdom,
-                  mode => 'modifycourse',
                   curr_authtype => $curr_authtype,
-                  curr_autharg => $curr_authfield );
-        $authheader = &Apache::loncommon::authform_header(%param);
+                );
+    if ($mode eq 'upload') {
+        $param{'formname'} = 'studentform';
+    } elsif ($mode eq 'createcourse') {
+        $param{'formname'} = 'ccrs';
+    } elsif ($mode eq 'modifycourse') {
+        $param{'formname'} = 'cmod';
+        $param{'mode'} = 'modifycourse',
+        $param{'curr_autharg'} = $curr_authfield;
     }
 
+    my ($setsection_call,$setsections_js);
+    my $finish = "  vf.submit();\n";
+    if ($mode eq 'upload') {
+        if (($context eq 'course') || ($context eq 'domain')) {
+            if ($context eq 'course') {
+                if ($env{'request.course.sec'} eq '') {
+                    $setsection_call = 'setSections(document.'.$param{'formname'}.');';
+                    $setsections_js =
+                        &setsections_javascript($param{'formname'},$groupslist,
+                                                $mode);
+                } else {
+                    $setsection_call = "'ok'";
+                }
+            } elsif ($context eq 'domain') {
+                $setsection_call = 'setCourse()';
+                $setsections_js = &dc_setcourse_js($param{'formname'},$mode,$context);
+            }
+            $finish = "  var checkSec = $setsection_call\n".
+                      "  if (checkSec == 'ok') {\n".
+                      "      vf.submit();\n".
+                      "   }\n";
+        }
+    }
+    my $authheader = &Apache::loncommon::authform_header(%param);
+
     my %alert = &Apache::lonlocal::texthash
         (username => 'You need to specify the username field.',
          authen   => 'You must choose an authentication type.',
@@ -355,12 +383,13 @@ sub javascript_validations {
          section  => 'The optional section field was not specified.',
          email    => 'The optional email address field was not specified.',
          role     => 'The optional role field was not specified.',
+         domain   => 'The optional domain field was not specified.',
          continue => 'Continue adding users?',
          );
+    my $function_name = <<"END";
+$setsections_js
 
-#    my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
-    my $function_name =(<<END);
-function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) {
+function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain) {
 END
     my ($authnum,%can_assign) =  &Apache::loncommon::get_assignable_auth($domain);
     my $auth_checks;
@@ -423,7 +452,7 @@ END
     foundatype=1;
     if (current.argfield == null || current.argfield == '') {
         var alertmsg = '';
-        switch (current.value) {
+        switch (current.radiovalue) {
             case 'krb':
                 alertmsg = '$alert{'krb'}';
                 break;
@@ -475,27 +504,33 @@ END
         }
         message+='$alert{'email'}';
     }
+    if (foundrole==0) {
+        if (message!='') {
+            message+='\\n';
+        }
+        message+='$alert{'role'}';
+    }
+    if (founddomain==0) {
+        if (message!='') {
+            message+='\\n';
+        }
+        message+='$alert{'domain'}';
+    }
     if (message!='') {
         message+= '\\n$alert{'continue'}';
         if (confirm(message)) {
             vf.state.value='enrolling';
-            vf.submit();
+            $finish
         }
     } else {
         vf.state.value='enrolling';
-        vf.submit();
+        $finish
     }
 }
 END
     }
-    my $result = $function_name;
-    if ( ($mode eq 'auth') || ($mode eq 'createcourse') || ($mode eq 'modifycourse')  ) {
-        $result .= $auth_checks;
-    }
-    $result .= $optional_checks."\n".$section_checks;
-    if ( ($mode eq 'auth') || ($mode eq 'createcourse') || ($mode eq 'modifycourse')  ) {
-        $result .= $authheader;
-    }
+    my $result = $function_name.$auth_checks.$optional_checks."\n".
+                 $section_checks.$authheader;
     return $result;
 }
 ###############################################################
@@ -510,6 +545,7 @@ function verify(vf,sec_caller) {
     var foundsec=0;
     var foundemail=0;
     var foundrole=0;
+    var founddomain=0;
     var tw;
     for (i=0;i<=vf.nfields.value;i++) {
         tw=eval('vf.f'+i+'.selectedIndex');
@@ -520,8 +556,9 @@ function verify(vf,sec_caller) {
         if (tw==9) { foundpwd=1; }
         if (tw==10) { foundemail=1; }
         if (tw==11) { foundrole=1; }
+        if (tw==12) { founddomain=1; }
     }
-    verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole);
+    verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddom);
 }
 
 //
@@ -542,6 +579,7 @@ function verify(vf,sec_caller) {
 // 9 = ipwd  (password)
 // 10 = email address
 // 11 = role
+// 12 = domain
 
 function flip(vf,tf) {
    var nw=eval('vf.f'+tf+'.selectedIndex');
@@ -605,6 +643,7 @@ function verify(vf,sec_caller) {
     var foundid=0;
     var foundsec=0;
     var foundrole=0;
+    var founddomain=0;
     var tw;
     for (i=0;i<=vf.nfields.value;i++) {
         tw=eval('vf.f'+i+'.selectedIndex');
@@ -614,8 +653,9 @@ function verify(vf,sec_caller) {
         if (i==7 && tw!=0) { foundsec=1; }
         if (i==8 && tw!=0) { foundpwd=1; }
         if (i==9 && tw!=0) { foundrole=1; }
+        if (i==10 && tw!=0) { founddomain=1; }
     }
-    verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundrole);
+    verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundrole,founddomain);
 }
 
 function flip(vf,tf) {
@@ -654,18 +694,12 @@ ENDPICK
 ###############################################################
 ###############################################################
 sub print_upload_manager_footer {
-    my ($r,$i,$keyfields,$defdom,$today,$halfyear,$context)=@_;
-    my $formname;
-    if ($context eq 'course') {
-        $formname = 'document.studentform';
-    } elsif ($context eq 'author') {
-        $formname = 'document.studentform';
-    } elsif ($context eq 'domain') {
-        $formname = 'document.studentform';
-    }
+    my ($r,$i,$keyfields,$defdom,$today,$halfyear,$context,$permission) = @_;
+    my $form = 'document.studentform';
+    my $formname = 'studentform';
     my ($krbdef,$krbdefdom) =
         &Apache::loncommon::get_kerberos_defaults($defdom);
-    my %param = ( formname => $formname,
+    my %param = ( formname => $form,
                   kerb_def_dom => $krbdefdom,
                   kerb_def_auth => $krbdef
                   );
@@ -677,14 +711,14 @@ sub print_upload_manager_footer {
     my $krbform = &Apache::loncommon::authform_kerberos(%param);
     my $intform = &Apache::loncommon::authform_internal(%param);
     my $locform = &Apache::loncommon::authform_local(%param);
-    my $date_table = &date_setting_table(undef,undef,$context);
-
+    my $date_table = &date_setting_table(undef,undef,$context,undef,
+                                         $formname,$permission);
     my $Str = "\n".'<div class="LC_left_float">';
     $Str .= &hidden_input('nfields',$i);
     $Str .= &hidden_input('keyfields',$keyfields);
     $Str .= "<h3>".&mt('Login Type')."</h3>\n";
     if ($context eq 'domain') {
-        $Str .= '<p>'.&mt('Change authentication for existing users to these settings?').'&nbsp;<span class="LC_nobreak"><label><input type="radio" name="changeauth" value="No" checked="checked" />'.&mt('No').'</label>&nbsp;&nbsp;<label><input type="radio" name="changeauth" value="Yes" />'.&mt('Yes').'</label></span></p>'; 
+        $Str .= '<p>'.&mt('Change authentication for existing users in domain "[_1]" to these settings?',$defdom).'&nbsp;<span class="LC_nobreak"><label><input type="radio" name="changeauth" value="No" checked="checked" />'.&mt('No').'</label>&nbsp;&nbsp;<label><input type="radio" name="changeauth" value="Yes" />'.&mt('Yes').'</label></span></p>'; 
     } else {
         $Str .= "<p>\n".
             &mt('Note: this will not take effect if the user already exists').
@@ -702,6 +736,8 @@ sub print_upload_manager_footer {
     } else {
         $Str .= $home_server_pick;
     }
+    $Str .= '<h3>'.&mt('Default domain').'</h3>'."\n".
+            &Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1);
     $Str .= '<h3>'.&mt('Starting and Ending Dates').
             "</h3>\n";
     $Str .= "<p>\n".$date_table."</p>\n";
@@ -711,40 +747,39 @@ 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 /><br />';
-    my ($options,$cb_script,$coursepick) = &default_role_selector($context,'defaultrole',1);
-    if ($context eq 'domain') {
-        $Str .= '<span class="LC_role_level">'.&mt('Domain Level').'</span><br />'.$options.'<br /><br /><span class="LC_role_level">'.&mt('Course Level').'</span><br />'.$cb_script.$coursepick;
-    } elsif ($context eq 'author') {
-        $Str .= $options;
+    $Str .= '<br />';
+    if (($context eq 'domain') || ($context eq 'author')) {
+        my ($options,$cb_script,$coursepick) = &default_role_selector($context,1);
+        if ($context eq 'domain') {
+            $Str .= '<span class="LC_role_level">'.&mt('Domain Level').'</span><br />'.$options.'<br /><br /><span class="LC_role_level">'.&mt('Course Level').'</span><br />'.$cb_script.$coursepick;
+        } elsif ($context eq 'author') {
+            $Str .= $options;
+        }
     } else {
-        $Str .= '<table><tr><td><span class="LC_nobreak"<b>'.&mt('role').':&nbsp;</b>'.
-                $options.'</span></td><td>&nbsp;</td><td><span class="LC_nobreak">'.
-                '<b>'.&mt('section').':&nbsp;</b><input type="text" name="section" value="" size="12" /></span></td></tr></table>';
-    }
-    if ($context eq 'course') {
-        $Str .= "<h3>".&mt('Full Update')."</h3>\n".
-                '<label><input type="checkbox" name="fullup" value="yes">'.
-                ' '.&mt('Full update (also print list of users not enrolled anymore)').
-                "</label></p>\n";
+        my ($cnum,$cdom) = &get_course_identity();
+        my $rowtitle = &mt('section');
+        my $secbox = &section_picker($cdom,$cnum,'Any',$rowtitle,
+                                     $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.').'</label><br />'.&mt('Students selected from this list can be dropped.').'</p>'."\n";
     }
     if ($context eq 'course' || $context eq 'domain') {
         $Str .= &forceid_change($context);
     }
     $Str .= '</div><div class="LC_clear_float_footer"><br /><input type="button"'.
               'onClick="javascript:verify(this.form,this.form.csec)" '.
-        'value="Update Users" />'."<br />\n";
+        'value="'.&mt('Update Users').'" />'."<br />\n";
     if ($context eq 'course') {
-        $Str .= &mt('Note: for large courses, this operation may be time '.
-                    'consuming');
+        $Str .= &mt('Note: for large courses, this operation may be time consuming');
     }
     $Str .= '</div>';
     $r->print($Str);
@@ -754,24 +789,25 @@ sub print_upload_manager_footer {
 sub forceid_change {
     my ($context) = @_;
     my $output = 
-        "<h3>".&mt('ID/Student Number')."</h3>\n".
+        "<h3>".&mt('Student/Employee ID')."</h3>\n".
         "<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('Disable Student/Employee ID Safeguard and force change of conflicting IDs').
+        '</label><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";
+  &mt('Update Student/Employee ID in courses in which user is active/future student,[_1](if forcing change).','<br />').
+                   '</label>'."\n";
     }
+    $output .= '</p>';
     return $output;
 }
 
 ###############################################################
 ###############################################################
 sub print_upload_manager_form {
-    my ($r,$context) = @_;
+    my ($r,$context,$permission) = @_;
     my $firstLine;
     my $datatoken;
     if (!$env{'form.datatoken'}) {
@@ -801,6 +837,7 @@ sub print_upload_manager_form {
                                'ipwd_choice' => 'scalar',
                                'email_choice' => 'scalar',
                                'role_choice' => 'scalar',
+                               'domain_choice' => 'scalar',
                              };
     my $defdom = $env{'request.role.domain'};
     if ($context eq 'course') {
@@ -815,7 +852,8 @@ sub print_upload_manager_form {
     my ($krbdef,$krbdefdom) =
         &Apache::loncommon::get_kerberos_defaults($defdom);
     #
-    &print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom,$context);
+    &print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom,$context,
+                                 $permission);
     my $i;
     my $keyfields;
     if ($total>=0) {
@@ -826,11 +864,12 @@ sub print_upload_manager_form {
              ['mname',&mt('Middle Names/Initials'),$env{'form.mname_choice'}],
              ['lname',&mt('Last Name'),       $env{'form.lname_choice'}],
              ['gen',  &mt('Generation'),      $env{'form.gen_choice'}],
-             ['id',   &mt('ID/Student Number'),$env{'form.id_choice'}],
+             ['id',   &mt('Student/Employee ID'),$env{'form.id_choice'}],
              ['sec',  &mt('Section'),          $env{'form.sec_choice'}],
              ['ipwd', &mt('Initial Password'),$env{'form.ipwd_choice'}],
              ['email',&mt('E-mail Address'),   $env{'form.email_choice'}],
-             ['role',&mt('Role'),             $env{'form.role_choice'}]);
+             ['role',&mt('Role'),             $env{'form.role_choice'}],
+             ['domain',&mt('Domain'),         $env{'form.domain_choice'}]);
         if ($env{'form.upfile_associate'} eq 'reverse') {
             &Apache::loncommon::csv_print_samples($r,\@records);
             $i=&Apache::loncommon::csv_print_select_table($r,\@records,
@@ -849,11 +888,14 @@ sub print_upload_manager_form {
     }
     $r->print('</div>');
     &print_upload_manager_footer($r,$i,$keyfields,$defdom,$today,$halfyear,
-                                 $context);
+                                 $context,$permission);
 }
 
 sub setup_date_selectors {
-    my ($starttime,$endtime,$mode,$nolink) = @_;
+    my ($starttime,$endtime,$mode,$nolink,$formname) = @_;
+    if ($formname eq '') {
+        $formname = 'studentform';
+    }
     if (! defined($starttime)) {
         $starttime = time;
         unless ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
@@ -876,11 +918,11 @@ sub setup_date_selectors {
     }
 
     my $startdateform = 
-        &Apache::lonhtmlcommon::date_setter('studentform','startdate',$starttime,
+        &Apache::lonhtmlcommon::date_setter($formname,'startdate',$starttime,
             undef,undef,undef,undef,undef,undef,undef,$nolink);
 
     my $enddateform = 
-        &Apache::lonhtmlcommon::date_setter('studentform','enddate',$endtime,
+        &Apache::lonhtmlcommon::date_setter($formname,'enddate',$endtime,
             undef,undef,undef,undef,undef,undef,undef,$nolink);
 
     if ($mode eq 'create_enrolldates') {
@@ -904,8 +946,15 @@ sub setup_date_selectors {
 
 
 sub get_dates_from_form {
-    my $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate');
-    my $enddate   = &Apache::lonhtmlcommon::get_date_from_form('enddate');
+    my ($startname,$endname) = @_;
+    if ($startname eq '') {
+        $startname = 'startdate';
+    }
+    if ($endname eq '') {
+        $endname = 'enddate';
+    }
+    my $startdate = &Apache::lonhtmlcommon::get_date_from_form($startname);
+    my $enddate   = &Apache::lonhtmlcommon::get_date_from_form($endname);
     if ($env{'form.no_end_date'}) {
         $enddate = 0;
     }
@@ -913,24 +962,27 @@ sub get_dates_from_form {
 }
 
 sub date_setting_table {
-    my ($starttime,$endtime,$mode,$bulkaction) = @_;
+    my ($starttime,$endtime,$mode,$bulkaction,$formname,$permission) = @_;
     my $nolink;
     if ($bulkaction) {
         $nolink = 1;
     }
     my ($startform,$endform) = 
-        &setup_date_selectors($starttime,$endtime,$mode,$nolink);
+        &setup_date_selectors($starttime,$endtime,$mode,$nolink,$formname);
     my $dateDefault;
     if ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
         $dateDefault = '&nbsp;';
     } elsif ($mode ne 'author' && $mode ne 'domain') {
         if (($bulkaction eq 'reenable') || 
             ($bulkaction eq 'activate') || 
-            ($bulkaction eq 'chgdates')) { 
-            $dateDefault = '<span class="LC_nobreak">'.
-                '<label><input type="checkbox" name="makedatesdefault" /> '.
-                &mt('make these dates the default for future enrollment').
-                '</label></span>';
+            ($bulkaction eq 'chgdates') ||
+            ($env{'form.action'} eq 'upload')) {
+            if ($env{'request.course.sec'} eq '') {
+                $dateDefault = '<span class="LC_nobreak">'.
+                    '<label><input type="checkbox" name="makedatesdefault" value="1" /> '.
+                    &mt('make these dates the default access dates for future student enrollment').
+                    '</label></span>';
+            }
         }
     }
     my $perpetual = '<span class="LC_nobreak"><label><input type="checkbox" name="no_end_date"';
@@ -950,7 +1002,7 @@ sub date_setting_table {
                                                      'LC_oddrow_value')."\n".
                $endform.'&nbsp;'.$perpetual.
                &Apache::lonhtmlcommon::row_closure(1).
-               &Apache::lonhtmlcommon::end_pick_box().'<br />';
+               &Apache::lonhtmlcommon::end_pick_box();
     if ($dateDefault) {
         $result .=  $dateDefault.'<br />'."\n";
     }
@@ -966,14 +1018,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 />';
         }
     }
@@ -1011,33 +1063,36 @@ sub default_role_selector {
            $options .= '  <option value="'.$role.'">'.$plrole.'</option>';
         }
         my $courseform = &Apache::loncommon::selectcourse_link
-            ('studentform','defaultcourse','defaultdomain','defaultdesc',"$env{'request.role.domain'}",undef,'Course');
+            ('studentform','dccourse','dcdomain','coursedesc',"$env{'request.role.domain'}",undef,'Course');
         $cb_jscript = 
-            &Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'},'defaultsec','studentform');
+            &Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'},'currsec','studentform');
         $coursepick = &Apache::loncommon::start_data_table().
                       &Apache::loncommon::start_data_table_header_row().
                       '<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th>'.
                       '<th>'.$lt{'grs'}.'</th>'.
                       &Apache::loncommon::end_data_table_header_row().
                       &Apache::loncommon::start_data_table_row()."\n".
-                      '<td><input type="text" name="defaultdesc" value="" onFocus="this.blur();opencrsbrowser('."'studentform','defcourse','defdomain','coursedesc',''".')" /></td>'."\n".
+                      '<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'studentform','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
                       '<td><select name="courserole">'."\n".
                       &default_course_roles($context,$checkpriv,%customroles)."\n".
                       '</select></td><td>'.
                       '<table class="LC_createuser">'.
                       '<tr class="LC_section_row"><td valign"top">'.
-                      $lt{'exs'}.'<br /><select name="defaultsec">'.
+                      $lt{'exs'}.'<br /><select name="currsec">'.
                       ' <option value=""><--'.&mt('Pick course first').
                       '</select></td>'.
                       '<td>&nbsp;&nbsp;</td>'.
                       '<td valign="top">'.$lt{'new'}.'<br />'.
                       '<input type="text" name="newsec" value="" size="5" />'.
-                      '<input type="hidden" name="groups" value="" /></td>'.
-                      '</tr></table></td>'.
+                      '<input type="hidden" name="groups" value="" />'.
+                      '<input type="hidden" name="sections" value="" />'.
+                      '<input type="hidden" name="origdom" value="'.
+                      $env{'request.role.domain'}.'" />'.
+                      '<input type="hidden" name="dccourse" value="" />'.
+                      '<input type="hidden" name="dcdomain" value="" />'.
+                      '</td></tr></table></td>'.
                       &Apache::loncommon::end_data_table_row().
-                      &Apache::loncommon::end_data_table()."\n".
-                      '<input type="hidden" name="defaultcourse" value="" />'.
-                      '<input type="hidden" name="defaultdomain" value="" />';
+                      &Apache::loncommon::end_data_table()."\n";
     }
     $options .= '</select>';
     return ($options,$cb_jscript,$coursepick);
@@ -1049,15 +1104,18 @@ sub default_course_roles {
     my $custom = 1;
     my @roles = &course_roles($context,$checkpriv,$custom);
     foreach my $role (@roles) {
-        my $plrole=&Apache::lonnet::plaintext($role);
-        $output .= '  <option value="'.$role.'">'.$plrole.'</option>';
+        if ($role ne 'cr') {
+            my $plrole=&Apache::lonnet::plaintext($role);
+            $output .= '  <option value="'.$role.'">'.$plrole.'</option>';
+        }
     }
     if (keys(%customroles) > 0) {
-        my %customroles = &my_custom_roles();
-        foreach my $cust (sort(keys(%customroles))) {
-            my $custrole='cr_cr_'.$env{'user.domain'}.
-                '_'.$env{'user.name'}.'_'.$cust;
-            $output .= '  <option value="'.$custrole.'">'.$cust.'</option>';
+        if (grep(/^cr$/,@roles)) {
+            foreach my $cust (sort(keys(%customroles))) {
+                my $custrole='cr_'.$env{'user.domain'}.
+                             '_'.$env{'user.name'}.'_'.$cust;
+                $output .= '  <option value="'.$custrole.'">'.$cust.'</option>';
+            }
         }
     }
     return $output;
@@ -1108,10 +1166,10 @@ sub course_roles {
                     if (&Apache::lonnet::allowed('c'.$role,$env{'request.course.id'})) {
                         push(@roles,$role);
                     } else {
-                        if ($role ne 'cc' && $env{'request.course.section'} ne '') {
-                            if (!&Apache::lonnet::allowed('c'.$role,
+                        if ($role ne 'cc' && $env{'request.course.sec'} ne '') {
+                            if (&Apache::lonnet::allowed('c'.$role,
                                              $env{'request.course.id'}.'/'.
-                                             $env{'request.course.section'})) {
+                                             $env{'request.course.sec'})) {
                                 push(@roles,$role);
                             }
                         }
@@ -1222,33 +1280,15 @@ sub print_userlist {
     if ($env{'form.showrole'} eq 'Any') {
        $roleselected = ' selected="selected" '; 
     }
-    my $role_select;
-    if ($context eq 'domain') {
-        $role_select = &domain_roles_select();
-        $r->print('<label>'.&mt('Role Type: [_1]',$role_select).'</label>');
-    } else {
-        $role_select = '<select name="showrole">'."\n".
-                       '<option value="Any" '.$roleselected.'>'.
-                       &mt('Any role').'</option>';
-        my @poss_roles = &curr_role_permissions($context);
-        foreach my $role (@poss_roles) {
-            $roleselected = '';
-            if ($role eq $env{'form.showrole'}) {
-                $roleselected = ' selected="selected" ';
-            }
-            my $plrole=&Apache::lonnet::plaintext($role);
-            $role_select .= '<option value="'.$role.'"'.$roleselected.'>'.$plrole.'</option>';
-        }
-        $roleselected = '';
-        if ($env{'form.showrole'} eq 'cr') {
-            $roleselected = ' selected="selected" ';
-        }
-        $role_select .= '<option value="cr"'.$roleselected.'>'.&mt('Custom role').'</option>'.
-                        '</select>';
-        $r->print('<label>'.&mt('Role: [_1]',$role_select).'</label>');
+    my ($cnum,$cdom);
+    $r->print(&role_filter($context));
+    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);
@@ -1264,7 +1304,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 />');
         }
@@ -1273,31 +1313,24 @@ sub print_userlist {
     }
     $r->rflush();
     if ($context eq 'course') {
-        my $classlist = &Apache::loncoursedata::get_classlist();
-        my $secidx = &Apache::loncoursedata::CL_SECTION();
-        foreach my $student (keys(%{$classlist})) {
-            if (exists($permission->{'view_section'})) {
-                if ($classlist->{$student}[$secidx] ne $permission->{'view_section'}) {
-                    next;
-                } else {
-                    $userlist{$student} = $classlist->{$student};
-                }
+        if (($env{'form.showrole'} eq 'st') || ($env{'form.showrole'} eq 'Any')) { 
+            my $classlist = &Apache::loncoursedata::get_classlist();
+            %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 %advrolehash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef,
-                                                        \@statuses,$showroles);
-        &gather_userinfo($context,$format,\%userlist,$indexhash,\%userinfo,
-                         \%advrolehash,$permission);
     } else {
         my (%cstr_roles,%dom_roles);
         if ($context eq 'author') {
@@ -1327,12 +1360,12 @@ sub print_userlist {
                         } else {
                             my @possroles;
                             if ($env{'form.showrole'} eq 'Any') {
-                                my @possroles = &roles_by_context($context);
+                                @possroles = &roles_by_context('author');
                             } else {
                                 @possroles = ($env{'form.showrole'}); 
                             }
                             foreach my $author (sort(keys(%{$dom_roles{$key}}))) {
-                                my ($role,$authorname,$authordom) = split(/:/,$author);
+                                my ($role,$authorname,$authordom) = split(/:/,$author,-1);
                                 my $extent = '/'.$authordom.'/'.$authorname;
                                 %{$coauthors{$extent}} =
                                     &Apache::lonnet::get_my_roles($authorname,
@@ -1346,10 +1379,9 @@ 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 %coursehash =
-                            &Apache::lonnet::coursedescription($cid,{'one_time' => 1});
                         my ($cnum,$cdom,$cdesc) = &get_course_identity($cid);
                         next if ($cnum eq '' || $cdom eq '');
                         my $custom = 1;
@@ -1357,7 +1389,6 @@ sub print_userlist {
                             %statushash);
                         if ($env{'form.showrole'} eq 'Any') {
                             @roles = &course_roles($context,undef,$custom);
-                            unshift(@roles,'cr');
                         } else {
                             @roles = ($env{'form.showrole'});
                         }
@@ -1367,7 +1398,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') {
@@ -1425,6 +1456,97 @@ sub print_userlist {
               $env{'form.phase'}.'" /></form>');
 }
 
+sub role_filter {
+    my ($context) = @_;
+    my $output;
+    my $roleselected = '';
+    if ($env{'form.showrole'} eq 'Any') {
+       $roleselected = ' selected="selected" ';
+    }
+    my ($role_select);
+    if ($context eq 'domain') {
+        $role_select = &domain_roles_select();
+        $output = '<label>'.&mt('Role Type: [_1]',$role_select).'</label>';
+    } else {
+        $role_select = '<select name="showrole">'."\n".
+                       '<option value="Any" '.$roleselected.'>'.
+                       &mt('Any role').'</option>';
+        my @poss_roles = &curr_role_permissions($context);
+        foreach my $role (@poss_roles) {
+            $roleselected = '';
+            if ($role eq $env{'form.showrole'}) {
+                $roleselected = ' selected="selected" ';
+            }
+            my $plrole;
+            if ($role eq 'cr') {
+                $plrole = &mt('Custom role');
+            } else {
+                $plrole=&Apache::lonnet::plaintext($role);
+            }
+            $role_select .= '<option value="'.$role.'"'.$roleselected.'>'.$plrole.'</option>';
+        }
+        $role_select .= '</select>';
+        $output = '<label>'.&mt('Role: [_1]',$role_select).'</label>';
+    }
+    return $output;
+}
+
+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;
+    foreach my $item (@filters) {
+        my ($markup,@options); 
+        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()" />';
@@ -1432,20 +1554,34 @@ sub list_submit_button {
 
 sub gather_userinfo {
     my ($context,$format,$userlist,$indexhash,$userinfo,$rolehash,$permission) = @_;
+    my $viewablesec;
+    if ($context eq 'course') {
+        $viewablesec = &viewable_section($permission);
+    }
     foreach my $item (keys(%{$rolehash})) {
-        @{$userlist->{$item}} = ();
         my %userdata;
-        if ($context eq 'author' || $context eq 'course') { 
+        if ($context eq 'author') { 
             ($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') {
+            ($userdata{'username'},$userdata{'domain'},$userdata{'role'},
+             $userdata{'section'}) = split(/:/,$item,-1);
+            ($userdata{'start'},$userdata{'end'})=split(/:/,$rolehash->{$item});
+            if (($viewablesec ne '') && ($userdata{'section'} ne '')) {
+                next if ($viewablesec ne $userdata{'section'});
+            }
+            &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;
@@ -1454,7 +1590,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') {
@@ -1469,13 +1606,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;';
                             }
@@ -1483,13 +1621,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);
+                }
             }
         }
     }
@@ -1497,14 +1642,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);
@@ -1688,6 +1834,8 @@ 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();
+    $index->{'thumbnail'} = &Apache::loncoursedata::CL_THUMBNAIL();
     foreach my $key (keys(%{$index})) {
         $keylist->[$index->{$key}] = $key;
     }
@@ -1736,7 +1884,10 @@ sub process_date_info {
 }
 
 sub show_users_list {
-    my ($r,$context,$mode,$permission,$statusmode,$userlist,$keylist)=@_;
+    my ($r,$context,$mode,$permission,$statusmode,$userlist,$keylist,$formname)=@_;
+    if ($formname eq '') {
+        $formname = 'studentform';
+    }
     #
     # Variables for excel output
     my ($excel_workbook, $excel_sheet, $excel_filename,$row,$format);
@@ -1751,13 +1902,16 @@ sub show_users_list {
     } else {
         push(@sortable,'extent');
     }
+    if ($mode eq 'pickauthor') {
+        @sortable = ('username','fullname','email','status');
+    }
     if (!grep(/^\Q$sortby\E$/,@sortable)) {
         $sortby = 'username';
     }
-    my $setting = $env{'form.roleaction'};
+    my $setting = $env{'form.roletype'};
     my ($cid,$cdom,$cnum,$classgroups,$displayphotos,$displayclickers);
     if ($context eq 'course') {
-        $cid=$env{'request.course.id'};
+        $cid = $env{'request.course.id'};
         ($cnum,$cdom) = &get_course_identity($cid);
         ($classgroups) = &Apache::loncoursedata::get_group_memberships(
                                      $userlist,$keylist,$cdom,$cnum);
@@ -1791,66 +1945,49 @@ function photowindow(photolink) {
 END
         }
     }
-    if ($mode ne 'autoenroll') {
+    if ($mode ne 'autoenroll' && $mode ne 'pickauthor') {
         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 $date_sec_selector = &date_section_javascript($context,$setting,$statusmode);
+        my $verify_action_js = &bulkaction_javascript($formname);
         $r->print(<<END);
 
 <script type="text/javascript" language="Javascript">
 $check_uncheck_js
 
-function verify_action (field) {
-    var numchecked = 0;
-    var singconf = '$singconfirm';
-    var multconf = '$multconfirm';
-    if (field.length > 0) {
-        for (i = 0; i < field.length; i++) {
-            if (field[i].checked == true) {
-               numchecked ++;
-            }
-        }
-    } else {
-        if (field.checked == true) {
-            numchecked ++;
-        }
-    }
-    if (numchecked == 0) {
-        alert("$alert");
-    } 
-    else {
-        var message = document.studentform.bulkaction[document.studentform.bulkaction.selectedIndex].text;
-        if (numchecked == 1) { 
-            message += singconf;
-        } 
-        else {
-            message += multconf; 
-        }
-        if (confirm(message)) {
-            document.studentform.phase.value = 'bulkchange';
-            document.studentform.submit();
-        }
-    }
-}
+$verify_action_js
 
 function username_display_launch(username,domain) {
     var target;
-    for (var i=0; i<document.studentform.usernamelink.length; i++) {
-        if (document.studentform.usernamelink[i].checked) {
-            target = document.studentform.usernamelink[i].value;
+    for (var i=0; i<document.$formname.usernamelink.length; i++) {
+        if (document.$formname.usernamelink[i].checked) {
+            target = document.$formname.usernamelink[i].value;
         }
     }
     if (target == 'modify') {
-        document.studentform.srchterm.value=username;
-        document.studentform.srchdomain.value=domain;
-        document.studentform.phase.value='get_user_info';
-        document.studentform.action.value = 'singleuser';
-        document.studentform.submit();
+        if (document.$formname.userwin.checked == true) {
+            var url = '/adm/createuser?srchterm='+username+'&srchdomain='+domain+'&phase=get_user_info&action=singleuser&srchin=dom&srchby=uname&srchtype=exact&popup=1';
+            var options = 'height=600,width=800,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no';
+            modifywin = window.open(url,'',options,1);
+            modifywin.focus();
+            return;
+        } else {
+            document.$formname.srchterm.value=username;
+            document.$formname.srchdomain.value=domain;
+            document.$formname.phase.value='get_user_info';
+            document.$formname.action.value = 'singleuser';
+            document.$formname.submit();
+        }
     }
-    else {
-        document.location.href = '/adm/'+domain+'/'+username+'/aboutme';
+    if (target == 'aboutme') {
+        if (document.$formname.userwin.checked == true) {
+            var url = '/adm/'+domain+'/'+username+'/aboutme?popup=1';
+            var options = 'height=600,width=800,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no';
+            aboutmewin = window.open(url,'',options,1);
+            aboutmewin.focus();
+            return;
+        } else {
+            document.location.href = '/adm/'+domain+'/'+username+'/aboutme';
+        }
     }
 }
 </script>
@@ -1875,15 +2012,15 @@ END
                        'role'       => "role",
                        'type'       => "enroll type/action",
                        'email'      => "email address",
-                       'clicker'    => "clicker id",
                        'photo'      => "photo",
                        'extent'     => "extent",
                        'pr'         => "Proceed",
                        'ca'         => "check all",
                        'ua'         => "uncheck all",
                        'ac'         => "Action to take for selected users",
-                       'link'       => "Behavior of username links",
+                       'link'       => "Behavior of clickable username link for each user",
                        'aboutme'    => "Display a user's personal page",
+                       'owin'       => "Open in a new window",
                        'modify'     => "Modify a user's information",
                       );
     if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
@@ -1891,28 +2028,33 @@ END
     } elsif ($context eq 'author') {
         $lt{'extent'} = &mt('Author'); 
     }
-    my @cols = ('username','domain','id','fullname');
-    if ($context eq 'course') {
-        push(@cols,'section');
-    }
-    if (!($context eq 'domain' && $env{'form.roletype'} eq 'course')) { 
-        push(@cols,('start','end'));
-    }
-    if ($env{'form.showrole'} eq 'Any' || $env{'form.showrole'} eq 'cr') {
-        push(@cols,'role');
-    }
-    if ($context eq 'domain' && ($env{'form.roletype'} eq 'author' ||
-                                $env{'form.roletype'} eq 'course')) {
-        push (@cols,'extent');
-    }
-    if (($statusmode eq 'Any') && 
-        (!($context eq 'domain' && $env{'form.roletype'} eq 'course'))) {
-        push(@cols,'status');
-    }
-    if ($context eq 'course') {
-        push(@cols,'groups');
+    my @cols;
+    if ($mode eq 'pickauthor') {
+        @cols = ('username','fullname','status','email');
+    } else {
+        @cols = ('username','domain','id','fullname');
+        if ($context eq 'course') {
+            push(@cols,'section');
+        }
+        if (!($context eq 'domain' && $env{'form.roletype'} eq 'course')) { 
+            push(@cols,('start','end'));
+        }
+        if ($env{'form.showrole'} eq 'Any' || $env{'form.showrole'} eq 'cr') {
+            push(@cols,'role');
+        }
+        if ($context eq 'domain' && ($env{'form.roletype'} eq 'author' ||
+                                    $env{'form.roletype'} eq 'course')) {
+            push (@cols,'extent');
+        }
+        if (($statusmode eq 'Any') && 
+            (!($context eq 'domain' && $env{'form.roletype'} eq 'course'))) {
+            push(@cols,'status');
+        }
+        if ($context eq 'course') {
+            push(@cols,'groups');
+        }
+        push(@cols,'email');
     }
-    push(@cols,'email');
 
     my $rolefilter = $env{'form.showrole'};
     if ($env{'form.showrole'} eq 'cr') {
@@ -1923,14 +2065,14 @@ END
     my $results_description;
     if ($mode ne 'autoenroll') {
         $results_description = &results_header_row($rolefilter,$statusmode,
-                                                   $context,$permission);
-        $r->print('<b>'.$results_description.'</b><br />');
+                                                   $context,$permission,$mode);
+        $r->print('<b>'.$results_description.'</b><br /><br />');
     }
-    my ($output,$actionselect);
-    if ($mode eq 'html' || $mode eq 'view' || $mode eq 'autoenroll') {
-        if ($mode ne 'autoenroll') {
+    my ($output,$actionselect,%canchange,%canchangesec);
+    if ($mode eq 'html' || $mode eq 'view' || $mode eq 'autoenroll' || $mode eq 'pickauthor') {
+        if ($mode ne 'autoenroll' && $mode ne 'pickauthor') {
             if ($permission->{'cusr'}) {
-                $actionselect = &select_actions($context,$setting,$statusmode);
+                $actionselect = &select_actions($context,$setting,$statusmode,$formname);
             }
             $r->print(<<END);
 <input type="hidden" name="srchby"  value="uname" />
@@ -1939,67 +2081,115 @@ END
 <input type="hidden" name="srchterm" value="" />
 <input type="hidden" name="srchdomain" value="" /> 
 END
-            $output = '<p>';
+            if ($actionselect) {
+                $output .= <<"END";
+<div class="LC_left_float"><fieldset><legend><b>$lt{'ac'}</b></legend>
+$actionselect
+<br/><br /><input type="button" value="$lt{'ca'}" onclick="javascript:checkAll(document.$formname.actionlist)" /> &nbsp;
+<input type="button" value="$lt{'ua'}" onclick="javascript:uncheckAll(document.$formname.actionlist)" /><br /><input type="button" value="$lt{'pr'}" onclick="javascript:verify_action('actionlist')" /></fieldset></div>
+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 .= '<div class="LC_left_float"><fieldset><legend><b>'.$lt{'link'}.'</b></legend>'.
+                       '<table><tr>';
             my @linkdests = ('aboutme');
             if ($permission->{'cusr'}) {
-                push (@linkdests,'modify');
-                $output .= '<span class="LC_nobreak">'.$lt{'link'}.':&nbsp;';
-                my $usernamelink = $env{'form.usernamelink'};
-                if ($usernamelink eq '') {
-                    $usernamelink = 'aboutme';
-                }
-                foreach my $item (@linkdests) {
-                    my $checkedstr = '';
-                    if ($item eq $usernamelink) {
-                        $checkedstr = ' checked="checked" ';
-                    }
-                    $output .= '<label><input type="radio" name="usernamelink" value="'.$item.'"'.$checkedstr.'>&nbsp;'.$lt{$item}.'</label>&nbsp;&nbsp;';
+                unshift (@linkdests,'modify');
+            }
+            $output .= '<td>';
+            my $usernamelink = $env{'form.usernamelink'};
+            if ($usernamelink eq '') {
+                $usernamelink = 'aboutme';
+            }
+            foreach my $item (@linkdests) {
+                my $checkedstr = '';
+                if ($item eq $usernamelink) {
+                    $checkedstr = ' checked="checked" ';
                 }
-                $output .= '</span><br />';
-            } else {
-                $output .= &mt("Click on a username to view the user's personal page.").'<br />';
+                $output .= '<span class="LC_nobreak"><label><input type="radio" name="usernamelink" value="'.$item.'"'.$checkedstr.'>&nbsp;'.$lt{$item}.'</label></span><br />';
             }
-            if ($actionselect) {
-                $output .= <<"END"; 
-$lt{'ac'}:&nbsp;$actionselect <input type="button" value="$lt{'pr'}" onclick="javascript:verify_action(document.studentform.actionlist)" /></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)" />
-END
+            my $checkwin;
+            if ($env{'form.userwin'}) {
+                $checkwin = 'checked = "checked"';
             }
+            $output .= '</td><td valign="top"><span class="LC_nobreak"><input type="checkbox" name="userwin" value="1" '.$checkwin.'/>'.$lt{'owin'}.'</span></td></tr></table></fieldset></div>';
         }
-        $output .= "\n<p>\n".
+        $output .= "\n".'<div class="LC_clear_float_footer">&nbsp;</div>'."\n".
                   &Apache::loncommon::start_data_table().
                   &Apache::loncommon::start_data_table_header_row();
         if ($mode eq 'autoenroll') {
             $output .= "
- <th><a href=\"javascript:document.studentform.sortby.value='type';document.studentform.submit();\">$lt{'type'}</a></th>
+ <th><a href=\"javascript:document.$formname.sortby.value='type';document.$formname.submit();\">$lt{'type'}</a></th>
             ";
         } else {
-            $output .= "\n".'<th>'.&mt('Count').'</th>'."\n";
+            if ($mode eq 'pickauthor') {
+                $output .= "\n".'<th>&nbsp;</th>'."\n";
+            } else { 
+                $output .= "\n".'<th>'.&mt('Count').'</th>'."\n";
+            }
             if ($actionselect) {
                 $output .= '<th>'.&mt('Select').'</th>'."\n";
             }
         }
         foreach my $item (@cols) {
-            $output .= "<th><a href=\"javascript:document.studentform.sortby.value='$item';document.studentform.submit();\">$lt{$item}</a></th>\n";
+            $output .= "<th><a href=\"javascript:document.$formname.sortby.value='$item';document.$formname.submit();\">$lt{$item}</a></th>\n";
         }
         my %role_types = &role_type_names();
         if ($context eq 'course' && $mode ne 'autoenroll') {
             if ($env{'form.showrole'} eq 'st' || $env{'form.showrole'} eq 'Any') {
                 # Clicker display on or off?
-                my %clicker_options = &Apache::lonlocal::texthash(
-                                                            'on' => 'Show',
-                                                            'off' => 'Hide',
-                                                           );
+                my %clicker_options = (
+                                        'on' => 'Show',
+                                        'off' => 'Hide',
+                                      );
                 my $clickerchg = 'on';
                 if ($displayclickers eq 'on') {
                     $clickerchg = 'off';
                 }
-                $output .= '    <th>'."\n".'     '.
-                    '<a href="javascript:document.studentform.displayclickers.value='.
-                      "'".$clickerchg."'".';document.studentform.submit();">'.
-                      $clicker_options{$clickerchg}.'</a>&nbsp;'.$lt{'clicker'}."\n".
-                      '    </th>'."\n";
+                $output .= '    <th>'."\n".'     '
+                        .&mt('[_1]'.$clicker_options{$clickerchg}.'[_2] clicker id'
+                            ,'<a href="javascript:document.'.$formname.'.displayclickers.value='
+                             ."'".$clickerchg."'".';document.'.$formname.'.submit();">'
+                            ,'</a>')
+                        ."\n".'    </th>'."\n";
 
                 # Photo display on or off?
                 if ($env{'course.'.$env{'request.course.id'}.'.internal.showphoto'}) {
@@ -2012,8 +2202,8 @@ END
                         $photochg = 'off';
                     }
                     $output .= '    <th>'."\n".'     '.
-                '<a href="javascript:document.studentform.displayphotos.value='.
-                      "'".$photochg."'".';document.studentform.submit();">'.
+                '<a href="javascript:document.'.$formname.'.displayphotos.value='.
+                      "'".$photochg."'".';document.'.$formname.'.submit();">'.
                       $photo_options{$photochg}.'</a>&nbsp;'.$lt{'photo'}."\n".
                       '    </th>'."\n";
                 }
@@ -2053,16 +2243,30 @@ END
     }
 
 # Done with header lines in all formats
-
     my %index;
     my $i;
     foreach my $idx (@$keylist) {
         $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;
@@ -2097,11 +2301,56 @@ 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,'jpg');
+                        $userlist->{$user}->[$index{'thumbnail'}] =
+                            &Apache::lonnet::retrievestudentphoto($udom,$uname,
+                                                                'gif','thumbnail');
+                    }
+                }
+            }
         }
         my %emails   = &Apache::loncommon::getemails($uname,$udom);
         if ($emails{'permanentemail'} =~ /\S/) {
@@ -2153,7 +2402,7 @@ END
         } else {
             $in{'end'} = &Apache::lonlocal::locallocaltime($in{'end'});
         }
-        if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') {
+        if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll' || $mode eq 'pickauthor') {
             $r->print(&Apache::loncommon::start_data_table_row());
             my $checkval;
             if ($mode eq 'autoenroll') {
@@ -2175,27 +2424,49 @@ END
                 }
                 $r->print("<td>$cellentry</td>\n");
             } else {
-                $r->print("<td>$rowcount</td>\n");
-                $checkval;
+                if ($mode ne 'pickauthor') {  
+                    $r->print("<td>$rowcount</td>\n");
+                }
                 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>');
+                } elsif ($mode eq 'pickauthor') {
+                        $r->print('<td><input type="button" name="chooseauthor" onclick="javascript:gochoose('."'$in{'username'}'".');" value="'.&mt('Select').'" /></td>');
                 }
             }
             foreach my $item (@cols) {
                 if ($item eq 'username') {
-                    $r->print('<td>'.&print_username_link($mode,$permission,
-                                                          \%in).'</td>');
+                    $r->print('<td>'.&print_username_link($mode,\%in).'</td>');
                 } elsif (($item eq 'start' || $item eq 'end') && ($actionselect)) {
                     $r->print('<td>'.$in{$item}.'<input type="hidden" name="'.$checkval.'_'.$item.'" value="'.$sdata->[$index{$item}].'" /></td>'."\n");
                 } else {
@@ -2213,11 +2484,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('."'".$in{'photo'}."'".')"><img src="'.$in{'thumbnail'}.'" border="1"></a></td>');
                         } else {
                             $r->print('    <td>&nbsp;</td>  ');
                         }
@@ -2261,7 +2529,7 @@ END
             $row++;
         }
     }
-    if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') {
+    if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll' || $mode eq 'pickauthor') {
             $r->print(&Apache::loncommon::end_data_table().'<br />');
     } elsif ($mode eq 'excel') {
         $excel_workbook->close();
@@ -2281,15 +2549,130 @@ END
     }
 }
 
+sub bulkaction_javascript {
+    my ($formname,$caller) = @_;
+    my $docstart = 'document';
+    if ($caller eq 'popup') {
+        $docstart = 'opener.document';
+    }
+    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):',
+            );
+    my $alert = &mt("You must select at least one user by checking a user's 'Select' checkbox");
+    my $noaction = &mt("You need to select an action to take for the user(s) you have selected"); 
+    my $singconfirm = &mt(' for a single user?');
+    my $multconfirm = &mt(' for multiple users?');
+    my $output = <<"ENDJS";
+function verify_action (field) {
+    var numchecked = 0;
+    var singconf = '$singconfirm';
+    var multconf = '$multconfirm';
+    if ($docstart.$formname.elements[field].length > 0) {
+        for (i=0; i<$docstart.$formname.elements[field].length; i++) {
+            if ($docstart.$formname.elements[field][i].checked == true) {
+               numchecked ++;
+            }
+        }
+    } else {
+        if ($docstart.$formname.elements[field].checked == true) {
+            numchecked ++;
+        }
+    }
+    if (numchecked == 0) {
+        alert("$alert");
+        return;
+    } else {
+        var message = $docstart.$formname.bulkaction[$docstart.$formname.bulkaction.selectedIndex].text;
+        var choice = $docstart.$formname.bulkaction[$docstart.$formname.bulkaction.selectedIndex].value;
+        if (choice == '') {
+            alert("$noaction");
+            return;
+        } else {
+            if (numchecked == 1) {
+                message += singconf;
+            } else {
+                message += multconf;
+            }
+ENDJS
+    if ($caller ne 'popup') {
+        $output .= <<"NEWWIN";
+            if (choice == 'chgdates' || choice == 'reenable' || choice == 'activate' || choice == 'chgsec') {
+                opendatebrowser(document.$formname,'$formname','go');
+                return;
+
+            } else {
+                if (confirm(message)) {
+                    document.$formname.phase.value = 'bulkchange';
+                    document.$formname.submit();
+                    return;
+                }
+            }
+NEWWIN
+    } else {
+        $output .= <<"POPUP";
+            if (choice == 'chgdates' || choice == 'reenable' || choice == 'activate') {
+                var datemsg = '';
+                if (($docstart.$formname.startdate_month.value == '') &&
+                    ($docstart.$formname.startdate_day.value  == '') &&
+                    ($docstart.$formname.startdate_year.value == '')) {
+                    datemsg = "\\n$lt{'acwi'},\\n$lt{'asyo'}.\\n";
+                }
+                if (($docstart.$formname.enddate_month.value == '') &&
+                    ($docstart.$formname.enddate_day.value  == '') &&
+                    ($docstart.$formname.enddate_year.value == '')) {
+                    datemsg += "\\n$lt{'accw'},\\n$lt{'asyd'}.\\n";
+                }
+                if (datemsg != '') {
+                    message += "\\n"+datemsg;
+                }
+            }
+            if (choice == 'chgsec') {
+                var rolefilter = $docstart.$formname.showrole.options[$docstart.$formname.showrole.selectedIndex].value;
+                var retained =  $docstart.$formname.retainsec.value;
+                var secshow = $docstart.$formname.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)) {
+                $docstart.$formname.phase.value = 'bulkchange';
+                $docstart.$formname.submit();
+                window.close();
+            }
+POPUP
+    }
+    $output .= '
+        }
+    }
+}
+';
+    return $output;
+}
+
 sub print_username_link {
-    my ($mode,$permission,$in) = @_;
+    my ($mode,$in) = @_;
     my $output;
     if ($mode eq 'autoenroll') {
         $output = $in->{'username'};
-    } elsif (!$permission->{'cusr'}) {
-        $output = &Apache::loncommon::aboutmewrapper($in->{'username'},
-                                                     $in->{'username'},
-                                                     $in->{'domain'});
     } else {
         $output = '<a href="javascript:username_display_launch('.
                   "'$in->{'username'}','$in->{'domain'}'".')" />'.
@@ -2308,7 +2691,7 @@ sub role_type_names {
 }
 
 sub select_actions {
-    my ($context,$setting,$statusmode) = @_;
+    my ($context,$setting,$statusmode,$formname) = @_;
     my %lt = &Apache::lonlocal::texthash(
                 revoke   => "Revoke user roles",
                 delete   => "Delete user roles",
@@ -2318,6 +2701,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>';
@@ -2344,14 +2745,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">'."\n".
                   '<option value="" selected="selected">'.
                   &mt('Please select').'</option>'."\n".$options."\n".'</select>';
         if ($choices{'dates'}) {
@@ -2367,7 +2768,8 @@ sub select_actions {
                 '<input type="hidden" name="enddate_year" value="" />'."\n".
                 '<input type="hidden" name="enddate_hour" value="" />'."\n".
                 '<input type="hidden" name="enddate_minute" value="" />'."\n".
-                '<input type="hidden" name="enddate_second" value="" />'."\n";
+                '<input type="hidden" name="enddate_second" value="" />'."\n".
+                '<input type="hidden" name="no_end_date" value="" />'."\n";
             if ($context eq 'course') {
                 $output .= '<input type="hidden" name="makedatesdefault" value="" />'."\n";
             }
@@ -2382,21 +2784,17 @@ sub select_actions {
 
 sub date_section_javascript {
     my ($context,$setting) = @_;
-    my $title;
-    if (($context eq 'course') || ($context eq 'domain' && $setting eq 'course'))  {
-        $title = &mt('Date and Section selector');
-    } else {
-        $title = &mt('Date selector');
-    }
+    my $title = 'Date_And_Section_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";
+<script type="text/javascript">'."\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 == '') {
-            return;
-        }
         var url = '/adm/createuser?';
         var type = '';
         var showrole = callingform.showrole.options[callingform.showrole.selectedIndex].value;
@@ -2423,7 +2821,7 @@ ENDTWO
 }
 
 sub date_section_selector {
-    my ($context) = @_;
+    my ($context,$permission) = @_;
     my $callingform = $env{'form.callingform'};
     my $formname = 'dateselect';  
     my $groupslist = &get_groupslist();
@@ -2438,20 +2836,27 @@ 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;
-            window.close();
         }
-        return;
 END
     } else {
         if ($context eq 'course') {
             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;
@@ -2461,6 +2866,7 @@ END
         }
 
 END
+                }
             }
         }
         $output .= <<"END";
@@ -2476,13 +2882,22 @@ END
     opener.document.$callingform.enddate_hour.value =  formname.enddate_hour.options[formname.enddate_hour.selectedIndex].value;
     opener.document.$callingform.enddate_minute.value =  formname.enddate_minute.value;
     opener.document.$callingform.enddate_second.value = formname.enddate_second.value;
-    window.close();
+    if (formname.no_end_date.checked) {
+        opener.document.$callingform.no_end_date.value = '1';
+    } else {
+        opener.document.$callingform.no_end_date.value = '0';
+    }
 END
     }
-    $output .= '
+    my $verify_action_js = &bulkaction_javascript($callingform,'popup');
+    $output .= <<"ENDJS";
+    verify_action('actionlist');
 }
+
+$verify_action_js
+
 </script>
-';
+ENDJS
     my %lt = &Apache::lonlocal::texthash (
                  chac => 'Access dates to apply for selected users',
                  chse => 'Changes in section affiliation to apply to selected users',
@@ -2502,19 +2917,18 @@ END
             $starttime = time;
         }
         $date_items = &date_setting_table($starttime,undef,$context,
-                                          $env{'form.bulkaction'});
+                                          $env{'form.bulkaction'},$formname,
+                                          $permission);
     }
     $output .= '<h3>'.$headertext.'</h3>'.
                '<form name="'.$formname.'" method="post">'."\n".
                 $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'};
@@ -2535,23 +2949,12 @@ END
         } else {
             $info = '<input type="hidden" name="retainsec" value="0" />'; 
         }
-        my $sections_select .= &course_sections(\%sections_count,$env{'form.showrole'});
-        my $secbox = '<p>'.&Apache::lonhtmlcommon::start_pick_box()."\n".
-                     &Apache::lonhtmlcommon::row_title(&mt('New section to assign'),'LC_oddrow_value')."\n".
-                     '<table class="LC_createuser"><tr class="LC_section_row">'."\n".
-                     '<td align="center">'.&mt('Existing sections')."\n".
-                     '<br />'.$sections_select.'</td><td align="center">'.
-                     &mt('New section').'<br />'."\n".
-                     '<input type="text" name="newsec" size="15" />'."\n".
-                     '<input type="hidden" name="sections" value="" />'."\n".
-                     '</td></tr></table>'."\n".
-                     &Apache::lonhtmlcommon::row_closure(1)."\n".
-                     &Apache::lonhtmlcommon::end_pick_box().'</p>';
+        my $rowtitle = &mt('New section to assign');
+        my $secbox = &section_picker($cdom,$cnum,$env{'form.showrole'},$rowtitle,$permission,$context);
         $output .= $info.$secbox;
     }
     $output .= '<p>'.
-&mt('Use "Save" to update the main window with your selections.').'<br /><br />'.
-'<input type="button" name="dateselection" value="'.&mt('Save').'" onclick="javascript:saveselections(this.form)" /></p>'."\n".
+'<input type="button" name="dateselection" value="'.&mt('Make changes').'" onclick="javascript:saveselections(this.form)" /></p>'."\n".
 '</form>';
     return $output;
 }
@@ -2564,7 +2967,7 @@ sub section_picker {
     if ($mode eq 'upload') {
         my ($options,$cb_script,$coursepick) =
             &default_role_selector($context,1);
-        $secbox .= &Apache::lonhtmlcommon::row_title('role','LC_oddrow_value').
+        $secbox .= &Apache::lonhtmlcommon::row_title(&mt('role'),'LC_oddrow_value').
                    $options. &Apache::lonhtmlcommon::row_closure(1)."\n";
     }
     $secbox .= &Apache::lonhtmlcommon::row_title($rowtitle,'LC_oddrow_value')."\n";
@@ -2587,13 +2990,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') {
@@ -2607,13 +3012,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>',
@@ -2693,12 +3133,26 @@ sub results_header_row {
     }
     return $description;
 }
+
+sub viewable_section {
+    my ($permission) = @_;
+    my $viewablesec;
+    if (ref($permission) eq 'HASH') {
+        if (exists($permission->{'view_section'})) {
+            $viewablesec = $permission->{'view_section'};
+        } elsif (exists($permission->{'cusr_section'})) {
+            $viewablesec = $permission->{'cusr_section'};
+        }
+    }
+    return $viewablesec;
+}
+
     
 #################################################
 #################################################
 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'},
@@ -2708,9 +3162,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);
@@ -2723,15 +3174,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());
@@ -2774,32 +3250,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') {
@@ -2815,25 +3285,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
@@ -2841,7 +3304,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",
                                        );
@@ -2883,7 +3346,7 @@ sub print_first_users_upload_form {
 
 # ================================================= Drop/Add from uploaded file
 sub upfile_drop_add {
-    my ($r,$context) = @_;
+    my ($r,$context,$permission) = @_;
     &Apache::loncommon::load_tmp_file($r);
     my @userdata=&Apache::loncommon::upfile_record_sep();
     if($env{'form.noFirstLine'}){shift(@userdata);}
@@ -2898,10 +3361,14 @@ 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
-                       fname mname lname gen id sec ipwd email role/) {
+                       fname mname lname gen id sec ipwd email role domain/) {
         $env{'form.'.$field.'_choice'}=$fields{$field};
     }
     &Apache::loncommon::store_course_settings('enrollment_upload',
@@ -2915,19 +3382,26 @@ sub upfile_drop_add {
                                                 'sec_choice' => 'scalar',
                                                 'ipwd_choice' => 'scalar',
                                                 'email_choice' => 'scalar',
-                                                'role_choice'  => 'scalar' });
+                                                'role_choice'  => 'scalar',
+                                                'domain_choice' => 'scalar'});
     #
     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'};
+    my $defdom=$env{'request.role.domain'};
+    my $domain;
+    if ($env{'form.defaultdomain'} ne '') {
+        $domain = $env{'form.defaultdomain'};
+    } else {
+        $domain = $defdom;
+    }
     my $desiredhost = $env{'form.lcserver'};
     if (lc($desiredhost) eq 'default') {
         $desiredhost = undef;
     } else {
-        my %home_servers = &Apache::lonnet::get_servers($domain,'library');
+        my %home_servers = &Apache::lonnet::get_servers($defdom,'library');
         if (! exists($home_servers{$desiredhost})) {
             $r->print('<span class="LC_error">'.&mt('Error').
                       &mt('Invalid home server specified').'</span>');
@@ -2972,22 +3446,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 '')) {
@@ -3008,16 +3519,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'}}))) {
@@ -3045,30 +3590,61 @@ 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 $baddom = 0;
+                    if ($entries{$fields{'dom'}} 
+                        ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) {
+                        $baddom = 1;
+                    } else {
+                        if (&Apache::lonnet::domain($entries{$fields{'domain'}}) eq '') {
+                            $baddom = 1;
+                        }
+                    }
+                    if ($baddom) {
+                        $r->print('<br />'. '<b>'.$entries{$fields{'domain'}}.
+                                  '</b>: '.&mt('Unacceptable domain for user [_2] [_3] [_4] [_5]',$fname,$mname,$lname,$gen).'</b>');
+                        next;
+                    }
                     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'}};
+                    my $userdomain = $entries{$fields{'domain'}};
+                    if ($userdomain eq '') {
+                        $userdomain = $domain;
+                    }
+                    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.':'.$userdomain}) eq 'ARRAY') {
+                            my $currsec = $userlist{$username.':'.$userdomain}[$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
@@ -3097,12 +3673,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;
@@ -3113,16 +3691,16 @@ sub upfile_drop_add {
                         $role = $defaultrole;
                     }
                     # Clean up whitespace
-                    foreach (\$domain,\$username,\$id,\$fname,\$mname,
-                             \$lname,\$gen,\$sec,\$role) {
+                    foreach (\$id,\$fname,\$mname,\$lname,\$gen) {
                         $$_ =~ s/(\s+$|^\s+)//g;
                     }
                     # check against rules
                     my $checkid = 0;
                     my $newuser = 0;
                     my (%rulematch,%inst_results,%idinst_results);
-                    my $uhome=&Apache::lonnet::homeserver($username,$domain);
+                    my $uhome=&Apache::lonnet::homeserver($username,$userdomain);
                     if ($uhome eq 'no_host') {
+                        next if ($userdomain ne $domain);
                         $checkid = 1;
                         $newuser = 1;
                         my $checkhash;
@@ -3137,11 +3715,41 @@ sub upfile_drop_add {
                             }
                         }
                     } else {
-# FIXME check if user info can be updated.   
+                        if ($context eq 'course' || $context eq 'author') {
+                            if ($userdomain eq $domain ) {
+                                if ($role eq '') {
+                                    my @checkroles;
+                                    foreach my $role (@poss_roles) {
+                                        my $endkey;
+                                        if ($role ne 'st') {
+                                            $endkey = ':'.$role;
+                                        }
+                                        if (exists($userlist{$username.':'.$userdomain.$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) {
-                            my %idhash = &Apache::lonnet::idrget($domain,($username));
+                            my %idhash = &Apache::lonnet::idrget($userdomain,($username));
                             if ($idhash{$username} ne $id) {
                                 $checkid = 1;
                             }
@@ -3149,42 +3757,88 @@ sub upfile_drop_add {
                         if ($checkid) {
                             my $checkhash;
                             my $checks = { 'id' => 1 };
-                            $checkhash->{$username.':'.$domain} = { 'newuser' => $newuser,
+                            $checkhash->{$username.':'.$userdomain} = { 'newuser' => $newuser,
                                                                     'id'  => $id };
                             &Apache::loncommon::user_rule_check($checkhash,$checks,
                                 \%alerts,\%rulematch,\%idinst_results,\%curr_rules,
                                 \%got_rules);
                             if (ref($alerts{'id'}) eq 'HASH') {
-                                if (ref($alerts{'id'}{$domain}) eq 'HASH') {
-                                    next if ($alerts{'id'}{$domain}{$id});
+                                if (ref($alerts{'id'}{$userdomain}) eq 'HASH') {
+                                    next if ($alerts{'id'}{$userdomain}{$id});
                                 }
                             }
                         }
                     }
                     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') {
-                            &modifystudent($domain,$username,$cid,$sec,
-                                           $desiredhost);
-                            $roleresult = 
+                            my $sec;
+                            if (@secs > 0) {
+                                $sec = $secs[0];
+                            }
+                            &modifystudent($userdomain,$username,$cid,$sec,
+                                           $desiredhost,$context);
+                            $roleresult =
                                 &Apache::lonnet::modifystudent
-                                    ($domain,$username,$id,$amode,$password,
+                                    ($userdomain,$username,$id,$amode,$password,
                                      $fname,$mname,$lname,$gen,$sec,$enddate,
                                      $startdate,$env{'form.forceid'},
-                                     $desiredhost,$email);
+                                     $desiredhost,$email,'manual','',$cid,
+                                     '',$context);
+                            $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,$userdomain,$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,$userdomain,$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,$userdomain,\%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,\%counts,$flushc,
-                                                $username,%userchg);
+                            $flushc = 
+                                &user_change_result($r,$userresult,$authresult,
+                                                    $roleresult,$idresult,\%counts,$flushc,
+                                                    $username,$userdomain,\%userchg);
+                        }
                     } else {
                         if ($context eq 'course') {
                             $r->print('<br />'. 
@@ -3205,11 +3859,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".
@@ -3217,23 +3873,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'}}.
@@ -3241,10 +3896,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 {
@@ -3288,14 +3946,14 @@ 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,$userdomain,$userchg) = @_;
     my $okresult = 0;
     if ($userresult ne 'ok') {
         if ($userresult =~ /^error:(.+)$/) {
             my $error = $1;
             $r->print('<br />'.
-                  &mt('<b>[_1]</b>:  Unable to add/modify: [_2]',$username,$error));
+                  &mt('<b>[_1]</b>:  Unable to add/modify: [_2]',$username.':'.$userdomain,$error));
         }
     } else {
         $counts->{'user'} ++;
@@ -3305,7 +3963,7 @@ sub user_change_result {
         if ($authresult =~ /^error:(.+)$/) {
             my $error = $1;
             $r->print('<br />'.
-                  &mt('<b>[_1]</b>:  Unable to modify authentication: [_2]',$username,$error));
+                  &mt('<b>[_1]</b>:  Unable to modify authentication: [_2]',$username.':'.$userdomain,$error));
         } 
     } else {
         $counts->{'auth'} ++;
@@ -3315,7 +3973,7 @@ sub user_change_result {
         if ($roleresult =~ /^error:(.+)$/) {
             my $error = $1;
             $r->print('<br />'.
-                  &mt('<b>[_1]</b>:  Unable to add role: [_2]',$username,$error));
+                  &mt('<b>[_1]</b>:  Unable to add role: [_2]',$username.':'.$userdomain,$error));
         }
     } else {
         $counts->{'role'} ++;
@@ -3323,13 +3981,16 @@ sub user_change_result {
     }
     if ($okresult) {
         $flushc++;
-        $userchg->{$username}=1;
+        $userchg->{$username.':'.$userdomain}=1;
         $r->print('. ');
         if ($flushc>15) {
             $r->rflush;
             $flushc=0;
         }
     }
+    if ($idresult) {
+        $r->print($idresult);
+    }
     return $flushc;
 }
 
@@ -3338,14 +3999,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;
 }
@@ -3357,10 +4016,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',
@@ -3427,7 +4086,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') {
@@ -3435,28 +4093,25 @@ sub update_user_list {
             $end = $now;
             $type = 'manual';
             $result =
-                &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid);
+                &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context);
         } elsif ($choice eq 'revoke') {
             # revoke or delete user role
             $end = $now; 
             if ($role eq 'st') {
                 $result = 
-                    &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid);
+                    &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context);
             } else {
                 $result = 
-                    &Apache::lonnet::revokerole($udom,$uname,$scope,$role);
+                    &Apache::lonnet::revokerole($udom,$uname,$scope,$role,
+                                                '','',$context);
             }
         } 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,'',$context);
+            }
+            $result =
+                &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$now,
+                                            $start,1,'',$context);
         } else {
             #reenable, activate, change access dates or change section
             if ($choice ne 'chgsec') {
@@ -3465,25 +4120,25 @@ sub update_user_list {
             }
             if ($choice eq 'reenable') {
                 if ($role eq 'st') {
-                    $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid);
+                    $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context);
                 } else {
                     $result = 
                         &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end,
-                                                    $now);
+                                                    $now,'','',$context);
                 }
             } elsif ($choice eq 'activate') {
                 if ($role eq 'st') {
-                    $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid);
+                    $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context);
                 } else {
                     $result = &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end,
-                                            $now);
+                                            $now,'','',$context);
                 }
             } elsif ($choice eq 'chgdates') {
                 if ($role eq 'st') {
-                    $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid);
+                    $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context);
                 } else {
                     $result = &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end,
-                                                $start);
+                                                $start,'','',$context);
                 }
             } elsif ($choice eq 'chgsec') {
                 my (@newsecs,$revresult,$nochg,@retained);
@@ -3496,36 +4151,52 @@ 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,
+                                                            '','',$context);
+                        } 
+                    } else {
+                        if (@newsecs > 0) {
+                            if (grep(/^\Q$sec\E$/,@newsecs)) {
+                                push(@retained,$sec);
+                            } else {
+                                $revresult =
+                                    &Apache::lonnet::revokerole($udom,$uname,
+                                                                $scope,$role,
+                                                                '','',$context);
+                            }
                         } else {
-                            push(@retained,$sec);
+                            $revresult =
+                                &Apache::lonnet::revokerole($udom,$uname,
+                                                            $scope,$role,
+                                                            '','',$context);
                         }
                     }
                 } 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,'',$context);
+                        } else {
+                            my $newscope = $scopestem;
+                            $result = &Apache::lonnet::assignrole($udom,$uname,$newscope,$role,$end,$start,'','',$context);
                         }
                     }
                 } else {
                     foreach my $newsec (@newsecs) { 
                         if (!grep(/^\Q$newsec\E$/,@retained)) {
                             if ($role eq 'st') {
-                                $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$newsec,$end,$start,$type,$locktype,$cid);
+                                $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$newsec,$end,$start,$type,$locktype,$cid,'',$context);
                             } else {
                                 my $newscope = $scopestem;
                                 if ($newsec ne '') {
@@ -3552,11 +4223,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>'));
@@ -3566,23 +4250,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 />';
         }
@@ -3649,21 +4335,53 @@ sub set_login {
 }
 
 sub course_sections {
-    my ($sections_count,$role) = @_;
+    my ($sections_count,$role,$current_sec) = @_;
     my $output = '';
     my @sections = (sort {$a <=> $b} keys %{$sections_count});
-    if (scalar(@sections) == 1) {
+    my $numsec = scalar(@sections);
+    my $is_selected = ' selected="selected" ';
+    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";
+        if ($current_sec eq 'none') {
+            $output .=       
+                  '  <option value=""'.$is_selected.'>'.&mt('No section').'</option>'."\n";
+        } else {
+            $output .=
+                  '  <option value="">'.&mt('No section').'</option>'."\n";
+        }
+        if ($numsec == 1) {
+            if ($current_sec eq $sections[0]) {
+                $output .=
+                  '  <option value="'.$sections[0].'"'.$is_selected.'>'.$sections[0].'</option>'."\n";
+            } else {
+                $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";
+            if ($current_sec eq 'none') {
+                $output .= 
+                       '  <option value=""'.$is_selected.'>'.&mt('No section')."</option>\n";
+            } else {
+                $output .=
+                       '  <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";
+            if ($current_sec eq $sec) {
+                $output .= '<option value="'.$sec.'"'.$is_selected.'>'.$sec."</option>\n";
+            } else {
+                $output .= '<option value="'.$sec.'">'.$sec."</option>\n";
+            }
         }
     }
     $output .= '</select>';
@@ -3681,16 +4399,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(
@@ -3715,8 +4458,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'}");
                 }
@@ -3791,6 +4533,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') {
@@ -3810,6 +4555,65 @@ sub can_create_user {
     return $cancreate;
 }
 
+sub can_modify_userinfo {
+    my ($context,$dom,$fields,$userroles) = @_;
+    my %domconfig =
+       &Apache::lonnet::get_dom('configuration',['usermodification'],
+                                $dom);
+    my %canmodify;
+    if (ref($fields) eq 'ARRAY') {
+        foreach my $field (@{$fields}) {
+            $canmodify{$field}  = 0;
+            if (&Apache::lonnet::allowed('mau',$dom)) {
+                $canmodify{$field} = 1;
+            } else {
+                if (ref($domconfig{'usermodification'}) eq 'HASH') {
+                    if (ref($domconfig{'usermodification'}{$context}) eq 'HASH') {
+                        if (ref($userroles) eq 'ARRAY') {
+                            foreach my $role (@{$userroles}) {
+                                my $testrole;
+                                if ($context eq 'selfcreate') {
+                                    $testrole = $role;
+                                } else {
+                                    if ($role =~ /^cr\//) {
+                                        $testrole = 'cr';
+                                    } else {
+                                        $testrole = $role;
+                                    }
+                                }
+                                if (ref($domconfig{'usermodification'}{$context}{$testrole}) eq 'HASH') {
+                                    if ($domconfig{'usermodification'}{$context}{$testrole}{$field}) {
+                                        $canmodify{$field} = 1;
+                                        last;
+                                    }
+                                }
+                            }
+                        } else {
+                            foreach my $key (keys(%{$domconfig{'usermodification'}{$context}})) {
+                                if (ref($domconfig{'usermodification'}{$context}{$key}) eq 'HASH') {
+                                    if ($domconfig{'usermodification'}{$context}{$key}{$field}) {
+                                        $canmodify{$field} = 1;
+                                        last;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } elsif ($context eq 'course') {
+                    if (ref($userroles) eq 'ARRAY') {
+                        if (grep(/^st$/,@{$userroles})) {
+                            $canmodify{$field} = 1;
+                        }
+                    } else {
+                        $canmodify{$field} = 1;
+                    }
+                }
+            }
+        }
+    }
+    return %canmodify;
+}
+
 sub check_usertype {
     my ($dom,$uname,$rules) = @_;
     my $usertype;
@@ -3890,7 +4694,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;
             }
         }
@@ -3919,6 +4724,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);
@@ -3940,7 +4759,219 @@ sub get_course_identity {
     return ($cnum,$cdom,$cdesc);
 }
 
+sub dc_setcourse_js {
+    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 != "") {
+        if (document.$formname.dcdomain.value != document.$formname.origdom.value) {
+            alert("$alerts{'curd'}");
+            return;
+        }
+        var userrole = document.$formname.$role.options[document.$formname.$role.selectedIndex].value
+        var section="";
+        var numsections = 0;
+        var newsecs = new Array();
+        for (var i=0; i<document.$formname.currsec.length; i++) {
+            if (document.$formname.currsec.options[i].selected == true ) {
+                if (document.$formname.currsec.options[i].value != "" && document.$formname.currsec.options[i].value != null) {
+                    if (numsections == 0) {
+                        section = document.$formname.currsec.options[i].value
+                        numsections = 1;
+                    }
+                    else {
+                        section = section + "," +  document.$formname.currsec.options[i].value
+                        numsections ++;
+                    }
+                }
+            }
+        }
+        if (document.$formname.newsec.value != "" && document.$formname.newsec.value != null) {
+            if (numsections == 0) {
+                section = document.$formname.newsec.value
+            }
+            else {
+                section = section + "," +  document.$formname.newsec.value
+            }
+            newsecs = document.$formname.newsec.value.split(/,/g);
+            numsections = numsections + newsecs.length;
+        }
+        if ((userrole == 'st') && (numsections > 1)) {
+            alert("$alerts{'inea'}. $alerts{'youh'} "+numsections+" $alerts{'sect'}.\\n$alerts{'plsm'}.")
+            return;
+        }
+        for (var j=0; j<newsecs.length; j++) {
+            if ((newsecs[j] == 'all') || (newsecs[j] == 'none')) {
+                alert("'"+newsecs[j]+"' $alerts{'mayn'}.\\n$alerts{'plsc'}.");
+                return;
+            }
+            if (document.$formname.groups.value != '') {
+                var groups = document.$formname.groups.value.split(/,/g);
+                for (var k=0; k<groups.length; k++) {
+                    if (newsecs[j] == groups[k]) {
+                        alert("'"+newsecs[j]+"' $alerts{'mayt'}.\\n$alerts{'secn'}. $alerts{'plsc'}.");
+                        return;
+                    }
+                }
+            }
+        }
+        if ((userrole == 'cc') && (numsections > 0)) {
+            alert("$alerts{'secd'} $cctext $alerts{'role'}.\\n$alerts{'accr'}.");
+            section = "";
+        }
+SCRIPTTOP
+    if ($mode ne 'upload') {
+        $dc_setcourse_code .= (<<"ENDSCRIPT");
+        var coursename = "_$env{'request.role.domain'}"+"_"+course+"_"+userrole
+        var numcourse = getIndex(document.$formname.dccourse);
+        if (numcourse == "-1") {
+            alert("$alerts{'thwa'}");
+            return;
+        }
+        else {
+            document.$formname.elements[numcourse].name = "act"+coursename;
+            var numnewsec = getIndex(document.$formname.newsec);
+            if (numnewsec != "-1") {
+                document.$formname.elements[numnewsec].name = "sec"+coursename;
+                document.$formname.elements[numnewsec].value = section;
+            }
+            var numstart = getIndex(document.$formname.start);
+            if (numstart != "-1") {
+                document.$formname.elements[numstart].name = "start"+coursename;
+            }
+            var numend = getIndex(document.$formname.end);
+            if (numend != "-1") {
+                document.$formname.elements[numend].name = "end"+coursename
+            }
+        }
+    }
+    var authcheck = auth_check();
+    if (authcheck == 'ok') {
+        document.$formname.submit();
+    }
+}
+ENDSCRIPT
+    } else {
+        $dc_setcourse_code .=  "
+        document.$formname.sections.value = section;
+    }
+    return 'ok';
+}
+";
+    }
+    $dc_setcourse_code .= (<<"ENDSCRIPT");
+
+    function getIndex(caller) {
+        for (var i=0;i<document.$formname.elements.length;i++) {
+            if (document.$formname.elements[i] == caller) {
+                return i;
+            }
+        }
+        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 {
+    my %alerts = &Apache::lonlocal::texthash(
+                    curd => 'You must select a course in the current domain',
+                    inea => 'In each course, each user may only have one student role at a time',
+                    youh => 'You had selected',
+                    sect => 'sections',
+                    plsm => 'Please modify your selections so they include no more than one section',
+                    mayn => 'may not be used as the name for a section, as it is a reserved word',
+                    plsc => 'Please choose a different section name',
+                    mayt => 'may not be used as the name for a section, as it is the name of a course group',
+                    secn => 'Section names and group names must be distinct',
+                    secd => 'Section designations do not apply to ',
+                    role => 'roles',
+                    accr => 'role will be added with access to all sections',
+                    thwa => 'There was a problem with your course selection'
+                 );
+    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;