--- loncom/interface/loncreateuser.pm	2007/12/11 02:27:24	1.206
+++ loncom/interface/loncreateuser.pm	2007/12/21 12:41:25	1.213
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.206 2007/12/11 02:27:24 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.213 2007/12/21 12:41:25 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -115,15 +115,6 @@ sub auth_abbrev {
     return %abv_auth;
 }
 
-# ==================================================== Figure out author access
-
-sub authorpriv {
-    my ($auname,$audom)=@_;
-    unless ((&Apache::lonnet::allowed('cca',$audom.'/'.$auname))
-         || (&Apache::lonnet::allowed('caa',$audom.'/'.$auname))) { return ''; }
-    return 1;
-}
-
 # ====================================================
 
 sub portfolio_quota {
@@ -209,12 +200,14 @@ END_SCRIPT
 # =================================================================== Phase one
 
 sub print_username_entry_form {
-    my ($r,$response,$srch,$forcenewuser) = @_;
+    my ($r,$context,$response,$srch,$forcenewuser) = @_;
     my $defdom=$env{'request.role.domain'};
     my $formtoset = 'crtuser';
     if (exists($env{'form.startrolename'})) {
         $formtoset = 'docustom';
         $env{'form.rolename'} = $env{'form.startrolename'};
+    } elsif ($env{'form.origform'} eq 'crtusername') {
+        $formtoset =  $env{'form.origform'};
     }
 
     my ($jsback,$elements) = &crumb_utilities();
@@ -252,10 +245,11 @@ sub print_username_entry_form {
                     'ecrp' => "Edit Custom Role Privileges",
                     'nr'   => "Name of Role",
                     'cre'  => "Custom Role Editor",
-                    'mod'  => "to add/modify roles",
+                    'mod'  => "to edit user information or add/modify roles",
 				       );
     my $help = &Apache::loncommon::help_open_menu(undef,undef,282,'Instructor Interface');
     my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
+    my $helpsist=&Apache::loncommon::help_open_topic('Course_Add_Student');
     my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles');
     my $sellink=&Apache::loncommon::selectstudent_link('crtuser','srchterm','srchdomain');
     if ($sellink) {
@@ -266,7 +260,7 @@ sub print_username_entry_form {
         $r->print("
 <h3>$lt{'srch'} $sellink $lt{'mod'}$helpsiur</h3>
 $response");
-        $r->print(&entry_form($defdom,$srch,$forcenewuser));
+        $r->print(&entry_form($defdom,$srch,$forcenewuser,$context));
     } elsif ($env{'form.action'} eq 'custom') {
         if (&Apache::lonnet::allowed('mcr','/')) {
             $r->print(<<ENDCUSTOM);
@@ -279,24 +273,71 @@ $lt{'nr'}: $choice <input type="text" si
 </form>
 ENDCUSTOM
         }
+    } else {
+        my $actiontext = $lt{'mod'}.$helpsiur;
+        if ($env{'form.action'} eq 'singlestudent') {
+            $actiontext = $lt{'enrl'}.$helpsist;
+        }
+        $r->print("
+<h3>$lt{'srch'} $sellink $actiontext</h3>");
+        if ($env{'form.origform'} ne 'crtusername') {
+            $r->print("\n".$response);
+        }
+        $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response));
     }
     $r->print(&Apache::loncommon::end_page());
 }
 
 sub entry_form {
-    my ($dom,$srch,$forcenewuser) = @_;
+    my ($dom,$srch,$forcenewuser,$context) = @_;
+    my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
+    my $cancreate = &Apache::lonuserutils::can_create_user($dom,$context);
+    if (!$cancreate) {
+        $forcenewuser = '';
+    }
     my $userpicker = 
        &Apache::loncommon::user_picker($dom,$srch,$forcenewuser,
                                        'document.crtuser');
     my $srchbutton = &mt('Search');
-    my $output = <<"ENDDOCUMENT";
+    my $output = <<"ENDBLOCK";
 <form action="/adm/createuser" method="post" name="crtuser">
 <input type="hidden" name="action" value="$env{'form.action'}" />
 <input type="hidden" name="phase" value="get_user_info" />
 $userpicker
 <input name="userrole" type="button" value="$srchbutton" onclick="javascript:validateEntry(document.crtuser)" />
 </form>
+ENDBLOCK
+    if ($cancreate && $env{'form.phase'} eq '') {
+        my $defdom=$env{'request.role.domain'};
+        my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');
+        my $helpcrt=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
+        my %lt=&Apache::lonlocal::texthash(
+                  'crnu' => 'Create a new user',
+                  'usr'  => 'Username',
+                  'dom'  => 'in domain',
+                  'cra'  => 'Create user',
+        );
+        $output .= <<"ENDDOCUMENT";
+<form action="/adm/createuser" method="post" name="crtusername">
+<input type="hidden" name="action" value="$env{'form.action'}" />
+<input type="hidden" name="phase" value="createnewuser" />
+<input type="hidden" name="srchtype" value="exact" />
+<input type="hidden" name="srchby" value="username" />
+<input type="hidden" name="srchin" value="dom" />
+<input type="hidden" name="forcenewuser" value="1" />
+<input type="hidden" name="origform" value="crtusername" />
+<h3>$lt{crnu}$helpcrt</h3>
+<table>
+ <tr>
+  <td>$lt{'usr'}:</td>
+  <td><input type="text" size="15" name="srchterm" /></td>
+  <td>&nbsp;$lt{'dom'}:</td><td>$domform</td>
+  <td>&nbsp;<input name="userrole" type="submit" value="$lt{'cra'}" /></td>
+ </tr>
+</table>
+</form>
 ENDDOCUMENT
+    }
     return $output;
 }
 
@@ -329,7 +370,7 @@ END
 
 # =================================================================== Phase two
 sub print_user_selection_page {
-    my ($r,$response,$srch,$srch_results,$operation,$srcharray) = @_;
+    my ($r,$response,$srch,$srch_results,$operation,$srcharray,$context) = @_;
     my @fields = ('username','domain','lastname','firstname','permanentemail');
     my $sortby = $env{'form.sortby'};
 
@@ -374,7 +415,7 @@ ENDSCRIPT
               faq=>282,bug=>'Instructor Interface',});
         $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
         $r->print("<b>$lt{'usrch'}</b><br />");
-        $r->print(&entry_form($srch->{'srchdomain'},$srch));
+        $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context));
         $r->print('<h3>'.$lt{'usel'}.'</h3>');
     } else {
         $r->print($jscript."<b>$lt{'stusrch'}</b><br />");
@@ -446,9 +487,17 @@ sub print_user_modification_page {
     my ($r,$ccuname,$ccdomain,$srch,$response,$context) = @_;
     if (($ccuname eq '') || ($ccdomain eq '')) {
         my $usermsg = &mt('No username and/or domain provided.'); 
-	&print_username_entry_form($r,$usermsg);
+	&print_username_entry_form($r,$context,$usermsg);
         return;
     }
+    my ($form,$formname);
+    if ($env{'form.action'} eq 'singlestudent') {
+        $form = 'document.enrollstudent';
+        $formname = 'enrollstudent';
+    } else {
+        $form = 'document.cu';
+        $formname = 'cu';
+    }
     my %abv_auth = &auth_abbrev();
     my ($curr_authtype,%rulematch,%inst_results,$curr_kerb_ver,$newuser,
         %alerts,%curr_rules,%got_rules);
@@ -474,7 +523,7 @@ sub print_user_modification_page {
                             $domdesc,$curr_rules{$ccdomain}{'username'},
                             'username');
                     }
-                    &print_username_entry_form($r,$userchkmsg);
+                    &print_username_entry_form($r,$context,$userchkmsg);
                     return;
                 } 
             }
@@ -692,6 +741,7 @@ ENDFORMINFO
         &initialize_authen_forms($ccdomain);
         my %lt=&Apache::lonlocal::texthash(
                 'cnu'            => 'Create New User',
+                'ast'            => 'as a student',
                 'ind'            => 'in domain',
                 'lg'             => 'Login Data',
                 'hs'             => "Home Server",
@@ -707,10 +757,13 @@ $loginscript
 <input type='hidden' name='makeuser' value='1' />
 <h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain</h2>
 ENDTITLE
-        $r->print('<div class="LC_left_float">');
+        if ($env{'form.action'} eq 'singlestudent') {
+            $r->print(' ('.$lt{'ast'}.')');
+        }
+        $r->print('</h2>'."\n".'<div class="LC_left_float">');
         my $personal_table = 
-            &personal_data_display($ccuname,$ccdomain,$newuser,
-                                   $context,%inst_results);
+            &personal_data_display($ccuname,$ccdomain,$newuser,$context,
+                                   $inst_results{$ccuname.':'.$ccdomain});
         $r->print($personal_table);
         my ($home_server_pick,$numlib) = 
             &Apache::loncommon::home_server_form_item($ccdomain,'hserver',
@@ -773,25 +826,29 @@ ENDAUTH
         } else {
             $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc)); 
         }
-        $r->print(<<ENDPORT);
-        $portfolioform
-</div><div class="LC_clear_float_footer"></div>
-ENDPORT
-    } else { # user already exists
+        $r->print('</h2>'."\n".'<div class="LC_left_float">');
+    } else { # user already exist-
 	my %lt=&Apache::lonlocal::texthash(
                     'cup'  => "Modify existing user: ",
+                    'ens'  => "Enroll one student: ",
                     'id'   => "in domain",
 				       );
 	$r->print(<<ENDCHANGEUSER);
 $start_page
 $crumbs
 $forminfo
-<h2>$lt{'cup'} "$ccuname" $lt{'id'} "$ccdomain"</h2>
+<h2>
 ENDCHANGEUSER
-        $r->print('<div class="LC_left_float">');
+        if ($env{'form.action'} eq 'singlestudent') {
+            $r->print($lt{'ens'});
+        } else {
+            $r->print($lt{'cup'});
+        }
+        $r->print(' "'.$ccuname.'" '.$lt{'id'}.' "'.$ccdomain.'"</h2>'.
+                  "\n".'<div class="LC_left_float">');
         my ($personal_table,$showforceid) = 
-            &personal_data_display($ccuname,$ccdomain,$newuser,
-                                   $context,%inst_results);
+            &personal_data_display($ccuname,$ccdomain,$newuser,$context,
+                                   $inst_results{$ccuname.':'.$ccdomain});
         $r->print($personal_table);
         if ($showforceid) {
             $r->print(&Apache::lonuserutils::forceid_change($context));
@@ -823,12 +880,21 @@ ENDNOPORTPRIV
             if ($user_quota_text ne '') {
                 $r->print($user_quota_text);
             }
-            $r->print('</div>');
-
+            if ($env{'form.action'} eq 'singlestudent') {
+                $r->print(&date_sections_select($context,$newuser,$formname));
+            }
         } elsif ($user_quota_text ne '') {
-            $r->print('<div class="LC_left_float">'.$user_quota_text.'</div>');
+            $r->print('<div class="LC_left_float">'.$user_quota_text);
+            if ($env{'form.action'} eq 'singlestudent') {
+                $r->print(&date_sections_select($context,$newuser,$formname));
+            }
+        } else {
+            if ($env{'form.action'} eq 'singlestudent') {
+                $r->print('<div class="LC_left_float">'.
+                          &date_sections_select($context,$newuser,$formname));
+            }
         }
-        $r->print('<div class="LC_clear_float_footer"></div>');
+        $r->print('</div><div class="LC_clear_float_footer"></div>');
         my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname);
         # Build up table of user roles to allow revocation of a role.
         my ($tmp) = keys(%rolesdump);
@@ -932,7 +998,7 @@ ENDNOPORTPRIV
                }
                if (($role_code eq 'ca') || ($role_code eq 'aa')) {
                    $area=~m{/($match_domain)/($match_username)};
-		   if (&authorpriv($2,$1)) {
+		   if (&Apache::lonuserutils::authorpriv($2,$1)) {
 		       $allowed=1;
                    } else {
                        $allowed=0;
@@ -1025,7 +1091,8 @@ ENDNOPORTPRIV
 #
 # Co-Author
 # 
-    if (&authorpriv($env{'user.name'},$env{'request.role.domain'}) &&
+    if (&Apache::lonuserutils::authorpriv($env{'user.name'},
+                                          $env{'request.role.domain'}) &&
         ($env{'user.name'} ne $ccuname || $env{'user.domain'} ne $ccdomain)) {
         # No sense in assigning co-author role to yourself
         $addrolesdisplay = 1;
@@ -1076,7 +1143,8 @@ ENDNOPORTPRIV
          &Apache::loncommon::end_data_table_row()."\n".
          &Apache::loncommon::end_data_table());
     } elsif ($env{'request.role'} =~ /^au\./) {
-        if (!(&authorpriv($env{'user.name'},$env{'request.role.domain'}))) {
+        if (!(&Apache::lonuserutils::authorpriv($env{'user.name'},
+                                                $env{'request.role.domain'}))) {
             $r->print('<span class="LC_error">'.
                       &mt('You do not have privileges to assign co-author roles.').
                       '</span>');
@@ -1155,6 +1223,35 @@ ENDNOPORTPRIV
     $r->print("</form>".&Apache::loncommon::end_page());
 }
 
+sub singleuser_breadcrumb {
+    my %breadcrumb_text;
+    if ($env{'form.action'} eq 'singlestudent') {
+        $breadcrumb_text{'search'} = 'Enroll a student';
+        $breadcrumb_text{'userpicked'} = 'Select a user',
+        $breadcrumb_text{'modify'} = 'Set section/dates',
+    } else {
+        $breadcrumb_text{'search'} = 'Create/modify user';
+        $breadcrumb_text{'userpicked'} = 'Select a user',
+        $breadcrumb_text{'modify'} = 'Set user role',
+    }
+    return %breadcrumb_text;
+}
+
+sub date_sections_select {
+    my ($context,$newuser,$formname,$permission) = @_;
+    my $cid = $env{'request.course.id'};
+    my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity($cid);
+    my $date_table = '<h3>'.&mt('Starting and Ending Dates').'</h3>'."\n".
+        &Apache::lonuserutils::date_setting_table(undef,undef,$context,
+                                                  undef,$formname,$permission);
+    my $rowtitle = 'Section';
+    my $secbox = '<h3>'.&mt('Section').'</h3>'."\n".
+        &Apache::lonuserutils::section_picker($cdom,$cnum,'st',$rowtitle,
+                                              $permission);
+    my $output = $date_table.$secbox;
+    return $output;
+}
+
 sub user_authentication {
     my ($ccuname,$ccdomain,$krbdefdom,$abv_auth) = @_;
     my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
@@ -1322,7 +1419,7 @@ sub modify_login_block {
 }
 
 sub personal_data_display {
-    my ($ccuname,$ccdomain,$newuser,$context,%inst_results) = @_; 
+    my ($ccuname,$ccdomain,$newuser,$context,$inst_results) = @_;
     my ($output,$showforceid,%userenv,%domconfig);
     if (!$newuser) {
         # Get the users information
@@ -1363,8 +1460,12 @@ sub personal_data_display {
         }
         $output .= &Apache::lonhtmlcommon::row_title($rowtitle,undef,'LC_oddrow_value')."\n";
         if ($newuser) {
-            if ($inst_results{$item} ne '') {
-                $output .= '<input type="hidden" name="c'.$item.'" value="'.$inst_results{$item}.'" />'.$inst_results{$item};
+            if (ref($inst_results) eq 'HASH') {
+                if ($inst_results->{$item} ne '') {
+                    $output .= '<input type="hidden" name="c'.$item.'" value="'.$inst_results->{$item}.'" />'.$inst_results->{$item};
+                } else {
+                    $output .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+                }
             } else {
                 $output .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
             }
@@ -1424,20 +1525,20 @@ sub update_user_data {
     } else {
         $title='Modify User Privileges';
     }
-
+    my $newuser = 0;
     my ($jsback,$elements) = &crumb_utilities();
     my $jscript = '<script type="text/javascript">'."\n".
                   $jsback."\n".'</script>'."\n";
-
+    my %breadcrumb_text = &singleuser_breadcrumb();
     $r->print(&Apache::loncommon::start_page($title,$jscript));
     &Apache::lonhtmlcommon::add_breadcrumb
        ({href=>"javascript:backPage(document.userupdate)",
-         text=>"Create/modify user",
+         text=>$breadcrumb_text{'search'},
          faq=>282,bug=>'Instructor Interface',});
     if ($env{'form.prevphase'} eq 'userpicked') {
         &Apache::lonhtmlcommon::add_breadcrumb
            ({href=>"javascript:backPage(document.userupdate,'get_user_info','select')",
-             text=>"Select a user",
+             text=>$breadcrumb_text{'userpicked'},
              faq=>282,bug=>'Instructor Interface',});
     }
     &Apache::lonhtmlcommon::add_breadcrumb
@@ -1597,6 +1698,10 @@ sub update_user_data {
 	}
     }
     ##
+    my (@userroles,%userupdate,$cnum,$cdom,$namechanged);
+    if ($context eq 'course') {
+        ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
+    }
     if (! $env{'form.makeuser'} ) {
         # Check for need to change
         my %userenv = &Apache::lonnet::get
@@ -1612,10 +1717,9 @@ sub update_user_data {
         my %domconfig =
             &Apache::lonnet::get_dom('configuration',['usermodification'],
                                      $env{'form.ccdomain'});
-        my @roletypes = ('active','future');
-        my %roles = &Apache::lonnet::get_my_roles($env{'form.ccuname'},$env{'form.ccdomain'},'userroles',\@roletypes,undef,$env{'request.role.domain'});
-        my @userroles;
-        my ($cnum,$cdom,$auname,$audom);
+        my @statuses = ('active','future');
+        my %roles = &Apache::lonnet::get_my_roles($env{'form.ccuname'},$env{'form.ccdomain'},'userroles',\@statuses,undef,$env{'request.role.domain'});
+        my ($auname,$audom);
         if ($context eq 'course') {
             $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
             $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -1710,8 +1814,10 @@ sub update_user_data {
             # Strip leading and trailing whitespace
             $env{'form.c'.$item} =~ s/(\s+$|^\s+)//g;
             if (!$canmodify) {
-                if ($env{'form.c'.$item} ne $userenv{$item}) {
-                    push(@mod_disallowed,$item);
+                if (defined($env{'form.c'.$item})) {
+                    if ($env{'form.c'.$item} ne $userenv{$item}) {
+                        push(@mod_disallowed,$item);
+                    }
                 }
                 $env{'form.c'.$item} = $userenv{$item};
             }
@@ -1746,7 +1852,7 @@ sub update_user_data {
                 }
             }
         }
-        my ($quotachanged,$namechanged,$oldportfolioquota,$newportfolioquota,
+        my ($quotachanged,$oldportfolioquota,$newportfolioquota,
             $inststatus,$oldisdefault,$newisdefault,$olddefquotatext,
             $newdefquotatext);
         my ($defquota,$settingstatus) = 
@@ -1881,7 +1987,7 @@ END
                          ($env{'form.ccuname'} => $env{'form.cid'}));
                     if (($recurseid) &&
                         (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) {
-                        my %userupdate = (
+                        %userupdate = (
                                   lastname   => $env{'form.clasaname'},
                                   middlename => $env{'form.cmiddlename'},
                                   firstname  => $env{'form.cfirstname'},
@@ -1943,7 +2049,14 @@ END
             foreach my $field (@mod_disallowed) {
                 $r->print('<li>'.$fieldtitles{$field}.'</li>'."\n"); 
             }
-            $r->print('</ul>'.&mt("You do not have the authority to change these fields given the user's current set of active/future [_1] roles: <span class=\"LC_cusr_emph\">[_2]</span>.",$contextname,$rolestr).'<br />'.&mt('Contact your <a href="[_1]">helpdesk</a> for more information.',"javascript:helpMenu('display')").'<br />');
+            $r->print('</ul>');
+            if (@mod_disallowed == 1) {
+                $r->print(&mt("You do not have the authority to change this field given the user's current set of active/future [_1] roles:",$contextname));
+            } else {
+                $r->print(&mt("You do not have the authority to change these fields given the user's current set of active/future [_1] roles:",$contextname));
+            }
+            $r->print('<span class="LC_cusr_emph">'.$rolestr.'</span><br />'.
+                      &mt('Contact your <a href="[_1]">helpdesk</a> for more information.',"javascript:helpMenu('display')").'<br />');
         }
         $r->print($no_forceid_alert.
                   &Apache::lonuserutils::print_namespacing_alerts($env{'form.ccdomain'},\%alerts, \%curr_rules));
@@ -2198,6 +2311,9 @@ sub update_result_form {
     foreach my $item ('srchby','srchin','srchtype','srchterm','srchdomain','ccuname','ccdomain') {
         $outcome .= '<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n";
     }
+    if ($env{'form.origname'} ne '') {
+        $outcome .= '<input type="hidden" name="origname" value="'.$env{'form.origname'}.'" />'."\n";
+    }
     foreach my $item ('sortby','seluname','seludom') {
         if (exists($env{'form.'.$item})) {
             $outcome .= '<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n";
@@ -2568,7 +2684,8 @@ sub handler {
             ({href=>"/adm/createuser",
               text=>"User Management"});
     }
-    my ($permission,$allowed) = &get_permission($context);
+    my ($permission,$allowed) = 
+        &Apache::lonuserutils::get_permission($context);
     if (!$allowed) {
         $env{'user.error.msg'}=
             "/adm/createuser:cst:0:0:Cannot create/modify user data ".
@@ -2583,7 +2700,7 @@ sub handler {
     if (! exists($env{'form.action'})) {
         $r->print(&header());
         $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
-        $r->print(&print_main_menu($permission));
+        $r->print(&print_main_menu($permission,$context));
         $r->print(&Apache::loncommon::end_page());
     } elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) {
         $r->print(&header());
@@ -2607,22 +2724,8 @@ sub handler {
             &Apache::lonuserutils::print_first_users_upload_form($r,$context);
         }
         $r->print('</form>'.&Apache::loncommon::end_page());
-    } elsif ($env{'form.action'} eq 'expire' && $permission->{'cusr'}) {
-        $r->print(&header());
-        &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>'/adm/createuser?action=expire',
-              text=>"Expire User Roles"});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Expire User Roles',
-                                                      'User_Management_Drops'));
-        if (! exists($env{'form.state'})) {
-            &Apache::lonuserutils::print_expire_menu($r,$context);
-        } elsif ($env{'form.state'} eq 'done') {
-            &Apache::lonuserutils::expire_user_list($r,$context);
-        } else {
-            &Apache::lonuserutils::print_expire_menu($r,$context);
-        }
-        $r->print(&Apache::loncommon::end_page());
-    } elsif ($env{'form.action'} eq 'singleuser' && $permission->{'cusr'}) {
+    } elsif ((($env{'form.action'} eq 'singleuser') || ($env{'form.action'}
+             eq 'singlestudent')) && ($permission->{'cusr'})) {
         my $phase = $env{'form.phase'};
         my @search = ('srchterm','srchby','srchin','srchtype','srchdomain');
 	&Apache::loncreateuser::restore_prev_selections();
@@ -2631,8 +2734,20 @@ sub handler {
 	    $srch->{$item} = $env{'form.'.$item};
 	}
 
-        if (($phase eq 'get_user_info') || ($phase eq 'userpicked')) {
-            if ($env{'form.phase'} eq 'get_user_info') {
+        if (($phase eq 'get_user_info') || ($phase eq 'userpicked') ||
+            ($phase eq 'createnewuser')) {
+            if ($env{'form.phase'} eq 'createnewuser') {
+                my $response;
+                if ($env{'form.srchterm'} !~ /^$match_username$/) {
+                    my $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @');
+                    &print_username_entry_form($r,$context,$response,$srch);
+                } else {
+                    my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'});
+                    my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'});
+                    &print_user_modification_page($r,$ccuname,$ccdomain,
+                                                  $srch,$response,$context);
+                }
+            } elsif ($env{'form.phase'} eq 'get_user_info') {
                 my ($currstate,$response,$forcenewuser,$results) = 
                     &user_search_result($srch);
                 if ($env{'form.currstate'} eq 'modify') {
@@ -2640,7 +2755,7 @@ sub handler {
                 }
                 if ($currstate eq 'select') {
                     &print_user_selection_page($r,$response,$srch,$results,
-                                               'createuser',\@search);
+                                               'createuser',\@search,$context);
                 } elsif ($currstate eq 'modify') {
                     my ($ccuname,$ccdomain);
                     if (($srch->{'srchby'} eq 'uname') && 
@@ -2661,7 +2776,7 @@ sub handler {
                 } elsif ($currstate eq 'query') {
                     &print_user_query_page($r,'createuser');
                 } else {
-                    &print_username_entry_form($r,$response,$srch,
+                    &print_username_entry_form($r,$context,$response,$srch,
                                                $forcenewuser);
                 }
             } elsif ($env{'form.phase'} eq 'userpicked') {
@@ -2673,7 +2788,7 @@ sub handler {
         } elsif ($env{'form.phase'} eq 'update_user_data') {
             &update_user_data($r,$context);
         } else {
-            &print_username_entry_form($r,undef,$srch);
+            &print_username_entry_form($r,$context,undef,$srch);
         }
     } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
         if ($env{'form.phase'} eq 'set_custom_roles') {
@@ -2681,7 +2796,8 @@ sub handler {
         } else {
             &custom_role_editor($r);
         }
-    } elsif ($env{'form.action'} eq 'listusers' && $permission->{'view'}) {
+    } elsif (($env{'form.action'} eq 'listusers') && 
+             ($permission->{'view'} || $permission->{'cusr'})) {
         if ($env{'form.phase'} eq 'bulkchange') {
             &Apache::lonhtmlcommon::add_breadcrumb
                 ({href=>'backPage(document.studentform)',
@@ -2722,19 +2838,24 @@ sub handler {
                          $formname,$totcodes,$codetitles,$idlist,$idlist_titles);
             $r->print(&Apache::loncommon::end_page());
         }
-    } elsif ($env{'form.action'} eq 'expire' && $permission->{'cusr'}) {
+    } elsif ($env{'form.action'} eq 'drop' && $permission->{'cusr'}) {
         $r->print(&header());
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>'/adm/createuser?action=drop',
-              text=>"Expire Users"});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Expire User Roles',
-                                                      'User_Management_Drops'));
-        if (! exists($env{'form.state'})) {
-            &Apache::lonuserutils::print_expire_menu($r,$context);
+              text=>"Drop Students"});
+        if (!exists($env{'form.state'})) {
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',
+                                                          'Course_Drop_Student'));
+
+            &Apache::lonuserutils::print_drop_menu($r,$context,$permission);
         } elsif ($env{'form.state'} eq 'done') {
-            &Apache::lonuserutiles::expire_user_list($r,$context);
-        } else {
-            &print_expire_menu($r,$context);
+            &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/createuser?action=drop',
+              text=>"Result"});
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students',
+                                                          'Course_Drop_Student'));
+            &Apache::lonuserutils::update_user_list($r,$context,undef,
+                                                    $env{'form.action'});
         }
         $r->print(&Apache::loncommon::end_page());
     } elsif ($env{'form.action'} eq 'dateselect') {
@@ -2750,7 +2871,7 @@ sub handler {
     } else {
         $r->print(&header());
         $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
-        $r->print(&print_main_menu($permission));
+        $r->print(&print_main_menu($permission,$context));
         $r->print(&Apache::loncommon::end_page());
     }
     return OK;
@@ -2790,35 +2911,80 @@ END
 ###############################################################
 #  Menu Phase One
 sub print_main_menu {
-    my ($permission) = @_;
+    my ($permission,$context) = @_;
+    my %links = (
+                       domain => {
+                                   upload => 'Upload a File of Users',
+                                   singleuser => 'Add/Manage a Single User',
+                                   listusers => 'Manage Multiple Users',
+                                 },
+                       author => {
+                                   upload => 'Upload a File of Co-authors',
+                                   singleuser => 'Add/Manage a Single Co-author',
+                                   listusers => 'Display Co-authors and Manage Multiple Users',
+                                 },
+                       course => {
+                                   upload => 'Upload a File of Course Users',
+                                   singleuser => 'Add/Manage a Single Course User',
+                                   listusers => 'Display Class Lists and Manage Multiple Users',
+                                 },
+                     );
     my @menu =
         (
-          { text => 'Upload a File of Users to Modify/Create Users and/or Add roles',
+          { text => $links{$context}{'upload'},
             help => 'User_Management_Upload',
             action => 'upload',
             permission => $permission->{'cusr'},
             },
-          { text => 'Create User/Set User Roles for a single user',
+          { text => $links{$context}{'singleuser'}, 
             help => 'User_Management_Single_User',
             action => 'singleuser',
             permission => $permission->{'cusr'},
             },
-          { text => 'Display Lists of Users',
+          { text => $links{$context}{'listusers'},
             help => 'User_Management_List',
             action => 'listusers',
-            permission => $permission->{'view'},
-            },
-#          { text => 'Expire User Roles',
-#            help => 'User_Management_Drops',
-#            action => 'expire',
-#            permission => $permission->{'cusr'},
-#            },
-          { text => 'Edit Custom Roles',
-            help => 'Custom_Role_Edit',
-            action => 'custom',
-            permission => $permission->{'custom'},
+            permission => ($permission->{'view'} || $permission->{'cusr'}),
           },
         );
+    if ($context eq 'domain' || $context eq 'course') {
+        my $customlink =  { text => 'Edit Custom Roles',
+                            help => 'Custom_Role_Edit',
+                            action => 'custom',
+                            permission => $permission->{'custom'},
+                          };
+        push(@menu,$customlink);
+    }
+    if ($context eq 'course') {
+        my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
+        my @courselinks =
+            (
+              { text => 'Enroll a Single Student',
+                 help => 'Course_Single_Student',
+                 action => 'singlestudent',
+                 permission => $permission->{'cusr'},
+                 },
+              { text => 'Drop Students',
+                help => 'Course_Drop_Student',
+                action => 'drop',
+                permission => $permission->{'cusr'},
+              });
+        if (!exists($permission->{'cusr_section'})) {
+            push(@courselinks,
+               { text => 'Automated Student Enrollment Manager',
+                 permission => (&Apache::lonnet::auto_run($cnum,$cdom)
+                                && $permission->{'cusr'}),
+                 url  => '/adm/populate',
+                 });
+        }
+        push(@courselinks,
+               { text => 'Manage Course Groups',
+                 help => 'Course_Manage_Group',
+                 permission => $permission->{'grp_manage'},
+                 url => '/adm/coursegroups?refpage=cusr',
+               });
+        push(@menu,@courselinks);
+    }
     my $menu_html = '';
     foreach my $menu_item (@menu) {
         next if (! $menu_item->{'permission'});
@@ -2840,57 +3006,6 @@ sub print_main_menu {
     return $menu_html;
 }
 
-sub get_permission {
-    my ($context) = @_;
-    my %permission;
-    if ($context eq 'course') {
-        if ((&Apache::lonnet::allowed('cta',$env{'request.course.id'})) ||
-            (&Apache::lonnet::allowed('cin',$env{'request.course.id'})) ||
-            (&Apache::lonnet::allowed('ccr',$env{'request.course.id'})) ||
-            (&Apache::lonnet::allowed('cep',$env{'request.course.id'})) ||
-            (&Apache::lonnet::allowed('cst',$env{'request.course.id'}))) {
-            $permission{'cusr'} = 1;
-            $permission{'view'} =
-                 &Apache::lonnet::allowed('vcl',$env{'request.course.id'});
-
-        }
-        if (&Apache::lonnet::allowed('ccr',$env{'request.course.id'})) {
-            $permission{'custom'} = 1;
-        }
-        if (&Apache::lonnet::allowed('vcl',$env{'request.course.id'})) {
-            $permission{'view'} = 1;
-            if (!$permission{'view'}) {
-                my $scope = $env{'request.course.id'}.'/'.$env{'request.course.sec'};
-                $permission{'view'} =  &Apache::lonnet::allowed('vcl',$scope);
-                if ($permission{'view'}) {
-                    $permission{'view_section'} = $env{'request.course.sec'};
-                }
-            }
-        }
-    } elsif ($context eq 'author') {
-        $permission{'cusr'} = &authorpriv($env{'user.name'},$env{'request.role.domain'});
-        $permission{'view'} = $permission{'cusr'};
-    } else {
-        if ((&Apache::lonnet::allowed('cad',$env{'request.role.domain'})) ||
-            (&Apache::lonnet::allowed('cli',$env{'request.role.domain'})) ||
-            (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) ||
-            (&Apache::lonnet::allowed('csc',$env{'request.role.domain'})) ||
-            (&Apache::lonnet::allowed('cdg',$env{'request.role.domain'})) || 
-            (&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))) {
-            $permission{'cusr'} = 1;
-        }
-        if (&Apache::lonnet::allowed('ccr',$env{'request.role.domain'})) {
-            $permission{'custom'} = 1;
-        }
-        $permission{'view'} = $permission{'cusr'};
-    }
-    my $allowed = 0;
-    foreach my $perm (values(%permission)) {
-        if ($perm) { $allowed=1; last; }
-    }
-    return (\%permission,$allowed);
-}
-
 sub restore_prev_selections {
     my %saveable_parameters = ('srchby'   => 'scalar',
 			       'srchin'   => 'scalar',
@@ -3293,6 +3408,10 @@ sub crumb_utilities {
            srchtype => 'selectbox',
            srchdomain => 'selectbox',
        },
+       crtusername => {
+           srchterm => 'text',
+           srchdomain => 'selectbox',
+       },
        docustom => {
            rolename => 'selectbox',
            newrolename => 'textbox',
@@ -3308,8 +3427,18 @@ sub crumb_utilities {
 
     my $jsback .= qq|
 function backPage(formname,prevphase,prevstate) {
-    formname.phase.value = prevphase;
-    formname.currstate.value = prevstate;
+    if (typeof prevphase == 'undefined') {
+        formname.phase.value = '';
+    }
+    else {  
+        formname.phase.value = prevphase;
+    }
+    if (typeof prevstate == 'undefined') {
+        formname.currstate.value = '';
+    }
+    else {
+        formname.currstate.value = prevstate;
+    }
     formname.submit();
 }
 |;
@@ -3351,7 +3480,8 @@ sub course_level_table {
 		    &Apache::loncommon::get_sections($domain,$cnum);
             }
         }
-	foreach my $role ('st','ta','ep','in','cc') {
+        my @roles = &Apache::lonuserutils::roles_by_context('course');
+	foreach my $role (@roles) {
 	    if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) {
 		my $plrole=&Apache::lonnet::plaintext($role);
 		$table .= &Apache::loncommon::start_data_table_row().
@@ -3451,6 +3581,7 @@ $table.
 sub course_level_dc {
     my ($dcdom) = @_;
     my %customroles=&Apache::lonuserutils::my_custom_roles();
+    my @roles = &Apache::lonuserutils::roles_by_context('course');
     my $hiddenitems = '<input type="hidden" name="dcdomain" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="origdom" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="dccourse" value="" />';
@@ -3475,7 +3606,7 @@ sub course_level_dc {
     my $otheritems = &Apache::loncommon::start_data_table_row()."\n".
                      '<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
                      '<td><select name="role">'."\n";
-    foreach  my $role ('st','ta','ep','in','cc') {
+    foreach my $role (@roles) {
         my $plrole=&Apache::lonnet::plaintext($role);
         $otheritems .= '  <option value="'.$role.'">'.$plrole;
     }