--- loncom/interface/lonuserutils.pm	2007/12/05 17:53:13	1.9
+++ loncom/interface/lonuserutils.pm	2007/12/05 21:23:14	1.11
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility functions for managing LON-CAPA user accounts
 #
-# $Id: lonuserutils.pm,v 1.9 2007/12/05 17:53:13 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.11 2007/12/05 21:23:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -846,7 +846,7 @@ sub print_upload_manager_form {
 }
 
 sub setup_date_selectors {
-    my ($starttime,$endtime,$mode) = @_;
+    my ($starttime,$endtime,$mode,$nolink) = @_;
     if (! defined($starttime)) {
         $starttime = time;
         unless ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
@@ -867,12 +867,15 @@ sub setup_date_selectors {
             }
         }
     }
-    my $startdateform = &Apache::lonhtmlcommon::date_setter('studentform',
-                                                            'startdate',
-                                                            $starttime);
-    my $enddateform = &Apache::lonhtmlcommon::date_setter('studentform',
-                                                          'enddate',
-                                                          $endtime);
+
+    my $startdateform = 
+        &Apache::lonhtmlcommon::date_setter('studentform','startdate',$starttime,
+            undef,undef,undef,undef,undef,undef,undef,$nolink);
+
+    my $enddateform = 
+        &Apache::lonhtmlcommon::date_setter('studentform','enddate',$endtime,
+            undef,undef,undef,undef,undef,undef,undef,$nolink);
+
     if ($mode eq 'create_enrolldates') {
         $startdateform = &Apache::lonhtmlcommon::date_setter('ccrs',
                                                             'startenroll',
@@ -903,35 +906,44 @@ sub get_dates_from_form {
 }
 
 sub date_setting_table {
-    my ($starttime,$endtime,$mode) = @_;
-    my ($startform,$endform)=&setup_date_selectors($starttime,$endtime,$mode);
+    my ($starttime,$endtime,$mode,$bulkaction) = @_;
+    my $nolink;
+    if ($bulkaction) {
+        $nolink = 1;
+    }
+    my ($startform,$endform) = 
+        &setup_date_selectors($starttime,$endtime,$mode,$nolink);
     my $dateDefault;
     if ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
         $dateDefault = ' ';
     } elsif ($mode ne 'construction_space' && $mode ne 'domain') {
-        $dateDefault = '<nobr>'.
-        '<label><input type="checkbox" name="makedatesdefault" /> '.
-        &mt('make these dates the default for future enrollment').
-        '</label></nobr>';
+        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>';
+        }
     }
-    my $perpetual = '<nobr><label><input type="checkbox" name="no_end_date"';
+    my $perpetual = '<span class="LC_nobreak"><label><input type="checkbox" name="no_end_date"';
     if (defined($endtime) && $endtime == 0) {
         $perpetual .= ' checked';
     }
-    $perpetual.= ' /> '.&mt('no ending date').'</label></nobr>';
+    $perpetual.= ' /> '.&mt('no ending date').'</label></span>';
     if ($mode eq 'create_enrolldates') {
         $perpetual = '&nbsp;';
     }
-    my $result = &Apache::lonhtmlcommon::start_pick_box()."\n".
-                 &Apache::lonhtmlcommon::row_title(&mt('Starting Date'),
-                                                   'LC_oddrow_value')."\n".
-                 $startform."\n".
-                 &Apache::lonhtmlcommon::row_closure(1).
-                 &Apache::lonhtmlcommon::row_title(&mt('Ending Date'),
-                                                   'LC_oddrow_value')."\n".
-                 $endform.'&nbsp;'.$perpetual.
-                 &Apache::lonhtmlcommon::row_closure(1).
-                 &Apache::lonhtmlcommon::end_pick_box().'<br />';
+    my $result = &Apache::lonhtmlcommon::start_pick_box()."\n";
+    $result .= &Apache::lonhtmlcommon::row_title(&mt('Starting Date'),
+                                                     'LC_oddrow_value')."\n".
+               $startform."\n".
+               &Apache::lonhtmlcommon::row_closure(1).
+               &Apache::lonhtmlcommon::row_title(&mt('Ending Date'), 
+                                                     'LC_oddrow_value')."\n".
+               $endform.'&nbsp;'.$perpetual.
+               &Apache::lonhtmlcommon::row_closure(1).
+               &Apache::lonhtmlcommon::end_pick_box().'<br />';
     if ($dateDefault) {
         $result .=  $dateDefault.'<br />'."\n";
     }
@@ -948,7 +960,8 @@ sub make_dates_default {
                 {'default_enrollment_start_date'=>$startdate,
                  'default_enrollment_end_date'  =>$enddate},$dom,$crs);
         if ($put_result eq 'ok') {
-            $result .= "Set default start and end dates for course<br />";
+            $result .= &mt('Set default start and end dates for course').
+                       '<br />'."\n";
             #
             # Refresh the course environment
             &Apache::lonnet::coursedescription($env{'request.course.id'},
@@ -1240,8 +1253,12 @@ sub print_userlist {
                   &Apache::lonhtmlcommon::end_pick_box().'</p>'.
                   '<p>'.&list_submit_button(&mt('Update Display')).
                   "\n</p>\n");
+        if ($env{'form.coursepick'}) {
+            $r->print('<hr />'.&mt('Searching').' ...<br />&nbsp;<br />');
+        }
+    } else {
+        $r->print('<hr />'.&mt('Searching').' ...<br />&nbsp;<br />');
     }
-    $r->print('<hr />'.&mt('Searching').' ...<br />&nbsp;<br />');
     $r->rflush();
     if ($context eq 'course') {
         my $classlist = &Apache::loncoursedata::get_classlist();
@@ -1269,7 +1286,7 @@ sub print_userlist {
         my %advrolehash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef,
                                                         \@statuses,$showroles);
         &gather_userinfo($context,$format,\%userlist,$indexhash,\%userinfo,
-                         \%advrolehash);
+                         \%advrolehash,$permission);
     } else {
         my (%cstr_roles,%dom_roles);
         if ($context eq 'construction_space') {
@@ -1278,14 +1295,14 @@ sub print_userlist {
             %cstr_roles = &Apache::lonnet::get_my_roles(undef,undef,undef,
                                               \@statuses,\@possroles);
             &gather_userinfo($context,$format,\%userlist,$indexhash,\%userinfo,
-                             \%cstr_roles);
+                             \%cstr_roles,$permission);
         } elsif ($context eq 'domain') {
             if ($env{'form.roletype'} eq 'domain') {
                 %dom_roles = &Apache::lonnet::get_domain_roles($env{'request.role.domain'});
                 foreach my $key (keys(%dom_roles)) {
                     if (ref($dom_roles{$key}) eq 'HASH') {
                         &gather_userinfo($context,$format,\%userlist,$indexhash,
-                                         \%userinfo,$dom_roles{$key});
+                                         \%userinfo,$dom_roles{$key},$permission);
                     }
                 }
             } elsif ($env{'form.roletype'} eq 'construction_space') {
@@ -1295,7 +1312,7 @@ sub print_userlist {
                     if (ref($dom_roles{$key}) eq 'HASH') {
                         if ($env{'form.showrole'} eq 'au') {
                             &gather_userinfo($context,$format,\%userlist,$indexhash,
-                                             \%userinfo,$dom_roles{$key});
+                                             \%userinfo,$dom_roles{$key},$permission);
                         } else {
                             my @possroles;
                             if ($env{'form.showrole'} eq 'Any') {
@@ -1311,7 +1328,7 @@ sub print_userlist {
                                        $authordom,undef,\@statuses,\@possroles);
                             }
                             &gather_userinfo($context,$format,\%userlist,
-                                             $indexhash,\%userinfo,\%coauthors);
+                                     $indexhash,\%userinfo,\%coauthors,$permission);
                         }
                     }
                 }
@@ -1324,6 +1341,7 @@ sub print_userlist {
                             &Apache::lonnet::coursedescription($cid,{'one_time' => 1});
                         my $cdom = $coursehash{'domain'};
                         my $cnum = $coursehash{'num'};
+                        next if ($cnum eq '' || $cdom eq '');
                         my $cdesc = $coursehash{'description'};
                         my (@roles,@sections,%access,%users,%userdata,
                             %statushash);
@@ -1356,8 +1374,10 @@ sub print_userlist {
                         }
                     }
                     &gather_userinfo($context,$format,\%userlist,$indexhash,
-                                     \%userinfo,\%allusers);
+                                     \%userinfo,\%allusers,$permission);
                 } else {
+                    $r->print('<input type="hidden" name="phase" value="'.
+                              $env{'form.phase'}.'" /></form>');
                     return;
                 }
             }
@@ -1381,26 +1401,27 @@ sub print_userlist {
         # Print out the available choices
         my $usercount;
         if ($env{'form.action'} eq 'modifystudent') {
-            ($usercount) = &show_users_list($r,$context,'view','modify',
+            ($usercount) = &show_users_list($r,$context,'view',$permission,
                                  $env{'form.Status'},\%userlist,$keylist);
         } else {
             ($usercount) = &show_users_list($r,$context,$env{'form.output'},
-                               'aboutme',$env{'form.Status'},\%userlist,$keylist);
+                               $permission,$env{'form.Status'},\%userlist,$keylist);
         }
         if (!$usercount) {
             $r->print('<br />'.&mt('There are no users matching the search criteria.')); 
         }
     }
-    $r->print('</form>');
+    $r->print('<input type="hidden" name="phase" value="'.
+              $env{'form.phase'}.'" /></form>');
 }
 
 sub list_submit_button {
     my ($text) = @_;
-    return '<input type="submit" value="'.$text.'" />';
+    return '<input type="button" name="updatedisplay" value="'.$text.'" onclick="javascript:display_update()" />';
 }
 
 sub gather_userinfo {
-    my ($context,$format,$userlist,$indexhash,$userinfo,$rolehash) = @_;
+    my ($context,$format,$userlist,$indexhash,$userinfo,$rolehash,$permission) = @_;
     foreach my $item (keys(%{$rolehash})) {
         @{$userlist->{$item}} = ();
         my %userdata;
@@ -1430,6 +1451,7 @@ sub gather_userinfo {
                 ($userdata{'username'},$userdata{'domain'},$userdata{'role'}) =
                     split(/:/,$item);
                 if (ref($rolehash->{$item}) eq 'HASH') {
+                    my $numcids = keys(%{$rolehash->{$item}});
                     foreach my $cid (sort(keys(%{$rolehash->{$item}}))) {
                         if (ref($rolehash->{$item}{$cid}) eq 'HASH') {
                             my $spanstart = '';
@@ -1437,6 +1459,13 @@ 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; />';
+                                    }
+                                }
                                 $spanend = '</span><br />';
                                 $space = ',&nbsp;';
                             }
@@ -1459,6 +1488,7 @@ sub gather_userinfo {
 
 sub build_user_record {
     my ($userdata,$userinfo,$indexhash,$record_key,$userlist) = @_;
+    next if ($userdata->{'start'} eq '-1' && $userdata->{'end'} eq '-1');
     &process_date_info($userdata);
     my $username = $userdata->{'username'};
     my $domain = $userdata->{'domain'};
@@ -1696,7 +1726,7 @@ sub process_date_info {
 }
 
 sub show_users_list {
-    my ($r,$context,$mode,$linkto,$statusmode,$userlist,$keylist)=@_;
+    my ($r,$context,$mode,$permission,$statusmode,$userlist,$keylist)=@_;
     #
     # Variables for excel output
     my ($excel_workbook, $excel_sheet, $excel_filename,$row,$format);
@@ -1714,6 +1744,7 @@ sub show_users_list {
     if (!grep(/^\Q$sortby\E$/,@sortable)) {
         $sortby = 'username';
     }
+    my $setting = $env{'form.roleaction'};
     my ($cid,$cdom,$cnum,$classgroups,$displayphotos,$displayclickers);
     if ($context eq 'course') {
         $cid=$env{'request.course.id'};
@@ -1748,7 +1779,69 @@ function photowindow(photolink) {
 END
     }
     unless ($mode eq 'autoenroll') {
+        my $check_uncheck_js = &Apache::loncommon::check_uncheck_jscript();
+        my $alert = &mt("You must select at least one user by checking a user's 'Select' checkbox");
+        my $singconfirm = &mt(' for a single user');
+        my $multconfirm = &mt(' for multiple users');
+        my $date_sec_selector = &date_section_javascript($context,$setting,$statusmode); 
         $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();
+        }
+    }
+}
+
+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;
+        }
+    }
+    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();
+    }
+    else {
+        document.location.href = '/adm/'+domain+'/'+username+'/aboutme';
+    }
+}
+</script>
+$date_sec_selector
 <input type="hidden" name="state" value="$env{'form.state'}" />
 END
     }
@@ -1772,6 +1865,13 @@ END
                        '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",
+                       'aboutme'    => "Display a user's personal page",
+                       'modify'     => "Modify a user's information",
                       );
     if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
         $lt{'extent'} = &mt('Course(s): description, section(s), status');
@@ -1810,16 +1910,46 @@ END
     my $results_description = &results_header_row($rolefilter,$statusmode,
                                                   $context);
     $r->print('<b>'.$results_description.'</b><br />');
-    my $output;
+    my ($output,$actionselect);
     if ($mode eq 'html' || $mode eq 'view') {
+        if ($permission->{'cusr'}) {
+            $actionselect = &select_actions($context,$setting,$statusmode);
+        }
         $r->print(<<END);
-<input type="hidden" name="sname"  value="" />
-<input type="hidden" name="sdom"   value="" />
+<input type="hidden" name="srchby"  value="uname" />
+<input type="hidden" name="srchin"   value="dom" />
+<input type="hidden" name="srchtype" value="exact" />
+<input type="hidden" name="srchterm" value="" />
+<input type="hidden" name="srchdomain" value="" /> 
+END
+         if ($mode ne 'autoenroll') {
+             $output = '<p>';
+             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;';
+                 }
+                 $output .= '</span><br />';
+             } else {
+                 $output .= &mt("Click on a username to view the user's personal page.").'<br />';
+             }
+             if ($actionselect) {
+                 $output .= <<"END"; 
+$lt{'ac'}:&nbsp;$actionselect <input type="button" value="$lt{'pr'}" onclick="javascript:verify_action(document.studentform.actionlist)" /></p>
+<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
-        if ($linkto eq 'aboutme') {
-            $output = &mt("Select a user name to view the user's personal page.");
-        } elsif ($linkto eq 'modify') {
-            $output = &mt("Select a user name to modify the user's information");
+             }
         }
         $output .= "\n<p>\n".
                   &Apache::loncommon::start_data_table().
@@ -1829,9 +1959,10 @@ END
  <th><a href=\"javascript:document.studentform.sortby.value='type';document.studentform.submit();\">$lt{'type'}</a></th>
             ";
         } else {
-            $output .= "
-<th>Count</th>
-            ";
+            $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";
@@ -1916,6 +2047,10 @@ END
     # Get groups, role, permanent e-mail so we can sort on them if
     # necessary.
     foreach my $user (keys(%{$userlist})) {
+        if ($context eq 'domain' &&  $user eq $env{'request.role.domain'}.'-domainconfig:'.$env{'request.role.domain'}) {
+            delete($userlist->{$user});
+            next;
+        }
         my ($uname,$udom,$role,$groups,$email);
         if (($statusmode ne 'Any') && 
                  ($userlist->{$user}->[$index{'status'}] ne $statusmode)) {
@@ -1925,7 +2060,11 @@ END
         if ($context eq 'domain') {
             if ($env{'form.roletype'} eq 'domain') {
                 ($role,$uname,$udom) = split(/:/,$user);
-               
+                if (($uname eq $env{'request.role.domain'}.'-domainconfig') &&
+                    ($udom eq $env{'request.role.domain'})) {
+                    delete($userlist->{$user});
+                    next;
+                }
             } elsif ($env{'form.roletype'} eq 'construction_space') {
                 ($uname,$udom,$role) = split(/:/,$user,-1);
             } elsif ($env{'form.roletype'} eq 'course') {
@@ -1986,6 +2125,7 @@ END
         foreach my $item (@{$keylist}) {
             $in{$item} = $sdata->[$index{$item}];
         }
+        my $role = $in{'role'};
         $in{'role'}=&Apache::lonnet::plaintext($sdata->[$index{'role'}]); 
         if (! defined($in{'start'}) || $in{'start'} == 0) {
             $in{'start'} = &mt('none');
@@ -2000,22 +2140,29 @@ END
         if ($mode eq 'view' || $mode eq 'html' || $mode eq 'autoenroll') {
             $r->print(&Apache::loncommon::start_data_table_row());
             $r->print("<td>$rowcount</td>\n");
-            if ($linkto eq 'aboutme') {
-                $in{'username'} = 
-                    &Apache::loncommon::aboutmewrapper($in{'username'},
-                                                       $in{'username'},
-                                                       $in{'domain'});
-            } elsif ($linkto eq 'modify') {
-                $in{'username'} = '<a href="'.
-                          "javascript:document.studentform.sname.value='".
-                           $in{'username'}.
-                           "';document.studentform.sdom.value='".$in{'domain'}.
-                           "';document.studentform.state.value='selected".
-                           "';document.studentform.submit();".'">'.
-                           $in{'username'}."</a>\n";
+            my $checkval;
+            if ($mode ne 'autoenroll' && $actionselect) {
+                $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>');
             }
             foreach my $item (@cols) {
-                $r->print('<td>'.$in{$item}.'</td>'."\n");
+                if ($item eq 'username') {
+                    $r->print('<td>'.&print_username_link($permission,\%in).'</td>');
+                } elsif (($item eq 'start' || $item eq 'end') && ($mode ne 'autoeroll') && ($actionselect)) {
+                    $r->print('<td>'.$in{$item}.'<input type="hidden" name="'.$checkval.'_'.$item.'" value="'.$sdata->[$index{$item}].'" /></td>'."\n");
+                } else {
+                    $r->print('<td>'.$in{$item}.'</td>'."\n");
+                }
             }
             if ($context eq 'course') {
                 if ($env{'form.showrole'} eq 'st' || $env{'form.showrole'} eq 'Any') {
@@ -2096,6 +2243,21 @@ END
     }
 }
 
+sub print_username_link {
+    my ($permission,$in) = @_;
+    my $output;
+    if (!$permission->{'cusr'}) {
+        $output = &Apache::loncommon::aboutmewrapper($in->{'username'},
+                                                     $in->{'username'},
+                                                     $in->{'domain'});
+    } else {
+        $output = '<a href="javascript:username_display_launch('.
+                  "'$in->{'username'}','$in->{'domain'}'".')" />'.
+                  $in->{'username'}.'</a>';
+    }
+    return $output;
+}
+
 sub role_type_names {
     my %lt = &Apache::lonlocal::texthash (
                          'domain'             => 'Domain Roles',
@@ -2105,6 +2267,254 @@ sub role_type_names {
     return %lt;
 }
 
+sub select_actions {
+    my ($context,$setting,$statusmode) = @_;
+    my %lt = &Apache::lonlocal::texthash(
+                revoke   => "Revoke user roles",
+                delete   => "Delete user roles",
+                reenable => "Re-enable expired user roles",
+                activate => "Make future user roles active now",
+                chgdates  => "Change starting/ending dates",
+                chgsec   => "Change section associated with user roles",
+    );
+    my ($output,$options,%choices);
+    if ($statusmode eq 'Any') {
+        $options .= '
+<option value="chgdates">'.$lt{'chgdates'}.'</option>';
+        $choices{'dates'} = 1;
+    } else {
+        if ($statusmode eq 'Active' || $statusmode eq 'Future') {
+            $options .= '
+<option value="revoke">'.$lt{'revoke'}.'</option>';
+        }
+        if ($statusmode eq 'Future') {
+            $options .= '
+<option value="activate">'.$lt{'activate'}.'</option>';
+            $choices{'dates'} = 1;
+        } elsif ($statusmode eq 'Expired') {
+            $options .= '
+<option value="reenable">'.$lt{'reenable'}.'</option>';
+            $choices{'dates'} = 1;
+        }
+    }
+    if ($context eq 'domain') {
+        $options .= '
+<option value="delete">'.$lt{'delete'}.'</option>';
+    }
+    if (($context eq 'course') || ($context eq 'domain' && $setting eq 'course')) {
+        if ($statusmode ne 'Expired') {
+            $options .= '
+<option value="chgsec">'.$lt{'chgsec'}.'</option>';
+            $choices{'sections'} = 1;
+        }
+    }
+    if ($options) {
+        $output = '<select name="bulkaction" onchange="javascript:opendatebrowser(this.form,'."'studentform'".')" />'."\n".
+                  '<option value="" selected="selected">'.
+                  &mt('Please select').'</option>'."\n".$options."\n".'</select>';
+        if ($choices{'dates'}) {
+            $output .= 
+                '<input type="hidden" name="startdate_month" value="" />'."\n".
+                '<input type="hidden" name="startdate_day" value="" />'."\n".
+                '<input type="hidden" name="startdate_year" value="" />'."\n".
+                '<input type="hidden" name="startdate_hour" value="" />'."\n".
+                '<input type="hidden" name="startdate_minute" value="" />'."\n".
+                '<input type="hidden" name="startdate_second" value="" />'."\n".
+                '<input type="hidden" name="enddate_month" value="" />'."\n".
+                '<input type="hidden" name="enddate_day" value="" />'."\n".
+                '<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";
+            if ($context eq 'course') {
+                $output .= '<input type="hidden" name="makedatesdefault" value="" />'."\n";
+            }
+        }
+        if ($choices{'sections'}) {
+            $output .= '<input type="hidden" name="retainsec" value= "" />'."\n".
+                       '<input type="hidden" name="newsecs" value= "" />'."\n";
+        }
+    }
+    return $output;
+}
+
+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 $output = '
+<script type="text/javascript">
+    var stdeditbrowser;'."\n";
+    $output .= <<"ENDONE";
+    function opendatebrowser(callingform,formname) {
+        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;
+ENDONE
+    if ($context eq 'domain') {
+        $output .= '
+        type = callingform.roletype.options[callingform.roletype.selectedIndex].value;
+';
+    }
+    my $width= '700';
+    my $height = '400';
+    $output .= <<"ENDTWO";
+        url += 'action=dateselect&callingform=' + formname + 
+               '&roletype='+type+'&showrole='+showrole +'&bulkaction='+bulkaction;
+        var title = '$title';
+        var options = 'scrollbars=1,resizable=1,menubar=0';
+        options += ',width=$width,height=$height';
+        stdeditbrowser = open(url,title,options,'1');
+        stdeditbrowser.focus();
+    }
+</script>
+ENDTWO
+    return $output;
+}
+
+sub date_section_selector {
+    my ($context) = @_;
+    my $callingform = $env{'form.callingform'};
+    my $formname = 'dateselect';  
+    my $groupslist = &get_groupslist();
+    my $sec_js = &setsections_javascript($formname,$groupslist);
+    my $output = <<"END";
+<script type="text/javascript">
+
+$sec_js
+
+function saveselections(formname) {
+
+END
+    if ($env{'form.bulkaction'} eq 'chgsec') {
+        $output .= <<"END";
+        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 (formname.makedatesdefault.checked == true) {
+            opener.document.$callingform.makedatesdefault.value = 1;
+        }
+        else {
+            opener.document.$callingform.makedatesdefault.value = 0;
+        }
+
+END
+            }
+        }
+        $output .= <<"END";
+    opener.document.$callingform.startdate_month.value =  formname.startdate_month.options[formname.startdate_month.selectedIndex].value;
+    opener.document.$callingform.startdate_day.value =  formname.startdate_day.value;
+    opener.document.$callingform.startdate_year.value = formname.startdate_year.value;
+    opener.document.$callingform.startdate_hour.value =  formname.startdate_hour.options[formname.startdate_hour.selectedIndex].value;
+    opener.document.$callingform.startdate_minute.value =  formname.startdate_minute.value;
+    opener.document.$callingform.startdate_second.value = formname.startdate_second.value;
+    opener.document.$callingform.enddate_month.value =  formname.enddate_month.options[formname.enddate_month.selectedIndex].value;
+    opener.document.$callingform.enddate_day.value =  formname.enddate_day.value;
+    opener.document.$callingform.enddate_year.value = formname.enddate_year.value;
+    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();
+END
+    }
+    $output .= '
+}
+</script>
+';
+    my %lt = &Apache::lonlocal::texthash (
+                 chac => 'Access dates to apply for selected users',
+                 chse => 'Changes in section affiliation to apply to selected users',
+                 fors => 'For student roles changing the section, will result in a section switch as students may only be in one section of a course at a time.',
+                 forn => 'For a role in a course that is not a student role, a user may have roles in more than one section of a course at a time.',
+                 reta => "Retain each user's current section affiliations?", 
+                 dnap => '(Does not apply to student roles).', 
+            );
+    my ($date_items,$headertext);
+    if ($env{'form.bulkaction'} eq 'chgsec') {
+        $headertext = $lt{'chse'};
+    } else {
+        $headertext = $lt{'chac'};
+        my $starttime;
+        if (($env{'form.bulkaction'} eq 'activate') || 
+            ($env{'form.bulkaction'} eq 'reenable')) {
+            $starttime = time;
+        }
+        $date_items = &date_setting_table($starttime,undef,$context,
+                                          $env{'form.bulkaction'});
+    }
+    $output .= '<h3>'.$headertext.'</h3>'.
+               '<form name="'.$formname.'" method="post">'."\n".
+                $date_items;
+    if ($context eq 'course' && $env{'form.bulkaction'} eq 'chgsec') {
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        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') {
+            $output .= '<p>'.$lt{'fors'}.'</p>'.
+                       '<p>'.$lt{'forn'}.'&nbsp;';
+            $info = $lt{'reta'};
+        } else {
+            $output .= '<p>'.$lt{'forn'}.'&nbsp;';
+            $info = $lt{'reta'};
+        }
+        if ($info) {
+            $info .= '<span class="LC_nobreak">'.
+                     '<label><input type="radio" name="retainsec" value="1" '.
+                     'checked="checked" />'.&mt('Yes').'</label>&nbsp;&nbsp;'.
+                     '<label><input type="radio" name="retainsec" value="0" />'.
+                     &mt('No').'</label></span>';
+            if ($env{'form.showrole'} eq 'Any') {
+                $info .= '<br />'.$lt{'dnap'};
+            }
+            $info .= '</p>';
+        } 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>';
+        $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".
+'</form>';
+    return $output;
+}
+
 sub results_header_row {
     my ($rolefilter,$statusmode,$context) = @_;
     my ($description,$showfilter);
@@ -2115,8 +2525,7 @@ sub results_header_row {
         $description = &mt('Course - ').$env{'course.'.$env{'request.course.id'}.'.description'}.': ';
         if ($statusmode eq 'Expired') {
             $description .= &mt('Users in course with expired [_1] roles',$showfilter);
-        }
-        if ($statusmode eq 'Future') {
+        } elsif ($statusmode eq 'Future') {
             $description .= &mt('Users in course with future [_1] roles',$showfilter);
         } elsif ($statusmode eq 'Active') {
             $description .= &mt('Users in course with active [_1] roles',$showfilter);
@@ -2853,25 +3262,193 @@ sub print_expire_menu {
 
 # ================================================================== Phase four
 
-sub expire_user_list {
-    my ($r,$context) = @_;
+sub update_user_list {
+    my ($r,$context,$setting,$choice) = @_;
+    my $now = time;
     my $count=0;
-    my @droplist = &Apache::loncommon::get_env_multiple('form.droplist');
-    foreach (@droplist) {
-        my ($uname,$udom)=split(/\:/,$_);
-        # drop student
-        my $result = &modifystudent($udom,$uname,$env{'request.course.id'});
+    my @changelist;
+    if ($choice ne '') {
+        @changelist = &Apache::loncommon::get_env_multiple('form.actionlist');
+    } else {
+        @changelist = &Apache::loncommon::get_env_multiple('form.droplist');
+    }
+    my %result_text = ( ok    => { 'revoke'   => 'Revoked',
+                                   'delete'   => 'Deleted',
+                                   'reenable' => 'Re-enabled',
+                                   'activate' => 'Activated', 
+                                 },
+                        error => {'revoke'    => 'revoking',
+                                  'delete'    => 'deleting',
+                                  'reenable'  => 're-enabling',
+                                  'activate'  => 'activating',
+                                 },
+                      );
+    my ($startdate,$enddate);
+    if ($choice eq 'chgdates' || $choice eq 'reenable' || $choice eq 'activate') {
+        ($startdate,$enddate) = &get_dates_from_form();
+    }
+    foreach my $item (@changelist) {
+        my ($role,$uname,$udom,$cid,$sec,$scope,$result,$type,$locktype,@sections,
+            $scopestem);
+        if ($context eq 'course') {
+            ($uname,$udom,$role,$sec,$type,$locktype) = split(/\:/,$item,-1);
+            $cid = $env{'request.course.id'};
+            $scopestem = '/'.$cid;
+            $scopestem =~s/\_/\//g;
+            if ($sec eq '') {
+                $scope = $scopestem;
+            } else {
+                $scope = $scopestem.'/'.$sec;
+            }
+        } elsif ($context eq 'construction_space') {
+            ($uname,$udom,$role) = split(/\:/,$item,-1);
+            $scope = '/'.$env{'user.domain'}.'/'.$env{'user.name'};
+        } elsif ($context eq 'domain') {
+            if ($setting eq 'domain') {
+                ($role,$uname,$udom) = split(/\:/,$item,-1);
+                $scope = '/'.$env{'request.role.domain'}.'/';
+            } elsif ($setting eq 'construction_space') { 
+                ($uname,$udom,$role,$scope) = split(/\:/,$item);
+            } elsif ($setting eq 'course') {
+                ($uname,$udom,$role,$cid,$sec,$type,$locktype) = 
+                    split(/\:/,$item);
+                $scope = '/'.$cid;
+                $scope =~s/\_/\//g;
+                if ($sec ne '') {
+                    $scope .= '/'.$sec;
+                }
+            }
+        }
+        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'};
+        # revoke or delete user role
+        if ($choice eq 'revoke') {
+            $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);
+            } else {
+                $result = 
+                    &Apache::lonnet::revokerole($udom,$uname,$scope,$role);
+            }
+        } elsif ($choice eq 'delete') {
+            $start = -1;
+            $end = -1;
+            if ($role eq 'st') {
+# FIXME - how does role deletion affect classlist?
+                &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid);
+            } else {
+                $result =
+                    &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$now,
+                                                0,1);
+             }
+        } else {
+            #reenable, activate, change access dates or change section
+            if ($choice ne 'chgsec') {
+                $start = $startdate; 
+                $end = $enddate;
+            }
+            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);
+                } else {
+                    $result = 
+                        &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end,
+                                                    $now);
+                }
+            } 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);
+                } else {
+                    $result = &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end,
+                                            $now);
+                }
+            } 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);
+                } else {
+                    $result = &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end,
+                                                $start);
+                }
+            } elsif ($choice eq 'chgsec') {
+                my (@newsecs,$revresult,$nochg,@retained);
+                if ($role ne 'cc') {
+                    @newsecs = split(/,/,$env{'form.newsecs'});
+                }
+                # remove existing section if not to be retained.   
+                if (!$env{'form.retainsec'}) {
+                    if ($sec eq '') {
+                        if (@newsecs == 0) {
+                            $result = &mt('No change in section assignment (none)');
+                            $nochg = 1;
+                        }
+                    } else {
+                        if (!grep(/^\Q$sec\E$/,@newsecs)) {
+                            $revresult =
+                               &Apache::lonnet::revokerole($udom,$uname,$scope,$role);
+                        } else {
+                            push(@retained,$sec);
+                        }
+                    }
+                } 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);
+                            }
+                        }
+                    }
+                } 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);
+                            } else {
+                                my $newscope = $scopestem;
+                                if ($newsec ne '') {
+                                   $newscope .= '/'.$newsec;
+                                }
+                                $result = &Apache::lonnet::assignrole($udom,$uname,
+                                                        $newscope,$role,$end,$start);
+                            }
+                        }
+                    }
+                }
+            }
+        }
         if ($result eq 'ok' || $result eq 'ok:') {
-            $r->print(&mt('Dropped [_1]',$uname.'@'.$udom).'<br>');
+            $r->print(&mt("$result_text{'ok'}{$choice} role of '[_1]' in [_2] for [_3]",
+                          $plrole,$scope,$uname.':'.$udom).'<br />');
             $count++;
         } else {
             $r->print(
-          &mt('Error dropping [_1]:[_2]',$uname.'@'.$udom,$result).
-                      '<br />');
+                &mt("Error $result_text{'error'}{$choice} [_1] in [_2] for [_3]:[_4]",
+                    $plrole,$scope,$uname.':'.$udom,$result).'<br />');
+        }
+    }
+    $r->print('<p><b>'.&mt("$result_text{'ok'}{$choice} role(s) for [quant,_1,user,users,users].",$count).'</b></p>');
+    if ($count > 0) {
+        if ($choice eq 'revoke') {
+            $r->print('<p>'.&mt('Re-enabling will re-activate data for the role.</p>'));
+        }
+        # Flush the course logs so reverse user roles immediately updated
+        &Apache::lonnet::flushcourselogs();
+    }
+    if ($env{'form.makedatesdefault'}) {
+        if ($choice eq 'chgdates' || $choice eq 'reenable' || $choice eq 'activate') {
+            $r->print(&make_dates_default($startdate,$enddate));
         }
     }
-    $r->print('<p><b>'.&mt('Dropped [_1] user(s).',$count).'</b></p>');
-    $r->print('<p>'.&mt('Re-enrollment will re-activate data.')) if ($count);
 }
 
 sub classlist_drop {
@@ -2980,7 +3557,7 @@ sub get_groupslist {
         $groupslist = join('","',sort(keys(%curr_groups)));
         $groupslist = '"'.$groupslist.'"';
     }
-    return $groupslist;
+    return $groupslist; 
 }
 
 sub setsections_javascript {
@@ -2991,10 +3568,10 @@ sub setsections_javascript {
         $finish = 'formname.submit()';
         $roleplace = 3;
     } else {
-        $checkincluded = 'formname.name == "'.$form.'"';
+        $checkincluded = 'formname.name == "'.$form.'"'; 
         $finish = "seccheck = 'ok';";
         $roleplace = 1;
-        $setsection_js = "var seccheck = 'alert';";
+        $setsection_js = "var seccheck = 'alert';"; 
     }
     my %alerts = &Apache::lonlocal::texthash(
                     secd => 'Section designations do not apply to Course Coordinator roles.',
@@ -3007,7 +3584,7 @@ sub setsections_javascript {
                     plch => 'Please choose a different section name.',
                     mnot => 'may not be used as a section name, as it is the name of a course group.',
                     secn => 'Section names and group names must be distinct. Please choose a different section name.',
-                 );
+                 );                
     $setsection_js .= <<"ENDSECCODE";
 
 function setSections(formname) {
@@ -3087,7 +3664,7 @@ function setSections(formname) {
     $finish
 }
 ENDSECCODE
-    return $setsection_js;
+    return $setsection_js; 
 }
 
 1;