--- loncom/interface/loncreateuser.pm	2007/10/09 17:33:57	1.188
+++ loncom/interface/loncreateuser.pm	2007/12/05 16:49:55	1.198
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.188 2007/10/09 17:33:57 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.198 2007/12/05 16:49:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,6 +65,7 @@ use Apache::lonnet;
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::longroup;
+use Apache::lonuserutils;
 use LONCAPA qw(:DEFAULT :match);
 
 my $loginscript; # piece of javascript used in two separate instances
@@ -111,19 +112,6 @@ sub auth_abbrev {
     return %abv_auth;
 }
 
-# ======================================================= Existing Custom Roles
-
-sub my_custom_roles {
-    my %returnhash=();
-    my %rolehash=&Apache::lonnet::dump('roles');
-    foreach my $key (keys %rolehash) {
-	if ($key=~/^rolesdef\_(\w+)$/) {
-	    $returnhash{$1}=$1;
-	}
-    }
-    return %returnhash;
-}
-
 # ==================================================== Figure out author access
 
 sub authorpriv {
@@ -237,21 +225,25 @@ sub print_username_entry_form {
                 'onload' => "javascript:setFormElements(document.$formtoset)",
                     );
     my $start_page =
-	&Apache::loncommon::start_page('Create Users, Change User Privileges',
+	&Apache::loncommon::start_page('User Management',
 				       $jscript,{'add_entries' => \%loaditems,});
-   &Apache::lonhtmlcommon::add_breadcrumb
-     ({href=>"javascript:backPage(document.crtuser)",
-       text=>"User modify/custom role edit",
-       faq=>282,bug=>'Instructor Interface',});
-
+    if ($env{'form.action'} eq 'singleuser') {
+        &Apache::lonhtmlcommon::add_breadcrumb
+          ({href=>"javascript:backPage(document.crtuser)",
+            text=>"Single user search",
+            faq=>282,bug=>'Instructor Interface',});
+    } elsif ($env{'form.action'} eq 'custom') {
+        &Apache::lonhtmlcommon::add_breadcrumb
+          ({href=>"javascript:backPage(document.crtuser)",
+            text=>"Pick custom role",});
+    }
     my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management');
-    my %existingroles=&my_custom_roles();
+    my %existingroles=&Apache::lonuserutils::my_custom_roles();
     my $choice=&Apache::loncommon::select_form('make new role','rolename',
 		('make new role' => 'Generate new role ...',%existingroles));
     my %lt=&Apache::lonlocal::texthash(
                     'srch' => "User Search",
                      or    => "or",
-		    'siur' => "Set Individual User Roles",
 		    'usr'  => "Username",
                     'dom'  => "Domain",
                     'ecrp' => "Edit Custom Role Privileges",
@@ -266,22 +258,24 @@ sub print_username_entry_form {
     if ($sellink) {
         $sellink = "$lt{'or'} ".$sellink;
     } 
-    $r->print("
-$start_page
-$crumbs
-<h2>$lt{siur}$helpsiur</h2>
-<h3>$lt{'srch'} $sellink $lt{'mod'}</h3>
+    $r->print($start_page."\n".$crumbs);
+    if ($env{'form.action'} eq 'singleuser') {
+        $r->print("
+<h3>$lt{'srch'} $sellink $lt{'mod'}$helpsiur</h3>
 $response");
-    $r->print(&entry_form($defdom,$srch,$forcenewuser));
-    if (&Apache::lonnet::allowed('mcr','/')) {
-        $r->print(<<ENDCUSTOM);
+        $r->print(&entry_form($defdom,$srch,$forcenewuser));
+    } elsif ($env{'form.action'} eq 'custom') {
+        if (&Apache::lonnet::allowed('mcr','/')) {
+            $r->print(<<ENDCUSTOM);
 <form action="/adm/createuser" method="post" name="docustom">
+<input type="hidden" name="action" value="$env{'form.action'}" />
 <input type="hidden" name="phase" value="selected_custom_edit" />
-<h2>$lt{'ecrp'}$helpecpr</h2>
+<h3>$lt{'ecrp'}$helpecpr</h3>
 $lt{'nr'}: $choice <input type="text" size="15" name="newrolename" /><br />
 <input name="customeditor" type="submit" value="$lt{'cre'}" />
 </form>
 ENDCUSTOM
+        }
     }
     $r->print(&Apache::loncommon::end_page());
 }
@@ -294,6 +288,7 @@ sub entry_form {
     my $srchbutton = &mt('Search');
     my $output = <<"ENDDOCUMENT";
 <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)" />
@@ -331,7 +326,7 @@ END
 
 # =================================================================== Phase two
 sub print_user_selection_page {
-    my ($r,$response,$srch,$srch_results,$context,$srcharray) = @_;
+    my ($r,$response,$srch,$srch_results,$operation,$srcharray) = @_;
     my @fields = ('username','domain','lastname','firstname','permanentemail');
     my $sortby = $env{'form.sortby'};
 
@@ -365,11 +360,11 @@ ENDSCRIPT
                                        'firstname'      => "first name",
                                        'permanentemail' => "permanent e-mail",
                                       );
-    if ($context eq 'createuser') {
-        $r->print(&Apache::loncommon::start_page('Create Users, Change User Privileges',$jscript));
+    if ($operation eq 'createuser') {
+        $r->print(&Apache::loncommon::start_page('User Management',$jscript));
         &Apache::lonhtmlcommon::add_breadcrumb
             ({href=>"javascript:backPage(document.usersrchform,'','')",
-              text=>"User modify/custom role edit",
+              text=>"Create/modify user",
               faq=>282,bug=>'Instructor Interface',},
              {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')",
               text=>"Select User",
@@ -425,9 +420,10 @@ ENDSCRIPT
               ' <input type="hidden" name="seluname" value="" />'."\n".
               ' <input type="hidden" name="seludom" value="" />'."\n".
               ' <input type="hidden" name="currstate" value="select" />'."\n".
-              ' <input type="hidden" name="phase" value="get_user_info" />'."\n");
+              ' <input type="hidden" name="phase" value="get_user_info" />'."\n".
+              ' <input type="hidden" name="action" value="singleuser" />'."\n");
     $r->print($response);
-    if ($context eq 'createuser') {
+    if ($operation eq 'createuser') {
         $r->print('</form>'.&Apache::loncommon::end_page());
     } else {
         $r->print('<input type="hidden" name="action" value="enrollstudent" />'."\n".
@@ -444,31 +440,41 @@ sub print_user_query_page {
 }
 
 sub print_user_modification_page {
-    my ($r,$ccuname,$ccdomain,$srch,$response) = @_;
+    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);
         return;
     }
     my %abv_auth = &auth_abbrev();
-    my ($curr_authtype,$instsrch,$rulematch,$rules,%inst_results,
-        $curr_kerb_ver,$newuser);
+    my ($curr_authtype,%rulematch,%inst_results,$curr_kerb_ver,$newuser,
+        %alerts,%curr_rules,%got_rules);
     my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
     if ($uhome eq 'no_host') {
         $newuser = 1;
-        $instsrch =
-                      {
-                         srchin => 'instd',
-                         srchby => 'uname',
-                         srchtype => 'exact',
-                         srchterm => $ccuname,
-                         srchdomain => $ccdomain,
-                       };
-        (my $usercheckmsg,$rulematch,$rules,%inst_results) = 
-            &Apache::loncommon::username_rule_check($instsrch,'new');
-        if ($usercheckmsg) {
-            &print_username_entry_form($r,$usercheckmsg);
-            return;
+        my $checkhash;
+        my $checks = { 'username' => 1 };
+        $checkhash->{$ccuname.':'.$ccdomain} = { 'newuser' => $newuser };
+        &Apache::loncommon::user_rule_check($checkhash,$checks,
+            \%alerts,\%rulematch,\%inst_results,\%curr_rules,\%got_rules);
+        if (ref($alerts{'username'}) eq 'HASH') {
+            if (ref($alerts{'username'}{$ccdomain}) eq 'HASH') {
+                my $domdesc =
+                    &Apache::lonnet::domain($ccdomain,'description');
+                if ($alerts{'username'}{$ccdomain}{$ccuname}) {
+                    my $userchkmsg;
+                    if (ref($curr_rules{$ccdomain}) eq 'HASH') {  
+                        $userchkmsg = 
+                            &Apache::loncommon::instrule_disallow_msg('username',
+                                                                 $domdesc,1).
+                        &Apache::loncommon::user_rule_formats($ccdomain,
+                            $domdesc,$curr_rules{$ccdomain}{'username'},
+                            'username');
+                    }
+                    &print_username_entry_form($r,$userchkmsg);
+                    return;
+                } 
+            }
         }
     } else {
         $newuser = 0;
@@ -621,82 +627,8 @@ sub print_user_modification_page {
     }
 ENDSCRIPT
     } else {
-        $nondc_setsection_code = <<"ENDSECCODE";
-    function setSections() {
-        var re1 = /^currsec_/;
-        var groups = new Array($groupslist);
-        for (var i=0;i<document.cu.elements.length;i++) {
-            var str = document.cu.elements[i].name;
-            var checkcurr = str.match(re1);
-            if (checkcurr != null) {
-                if (document.cu.elements[i-1].checked == true) {
-		    var match = str.split('_');
-                    var role = match[3];
-                    if (role == 'cc') {
-                        alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections.");
-                    }
-                    else {
-                        var sections = '';
-                        var numsec = 0;
-                        var sections;
-                        for (var j=0; j<document.cu.elements[i].length; j++) {
-                            if (document.cu.elements[i].options[j].selected == true ) {
-                                if (document.cu.elements[i].options[j].value != "") {
-                                    if (numsec == 0) {
-                                        if (document.cu.elements[i].options[j].value != "") {
-                                            sections = document.cu.elements[i].options[j].value;
-                                            numsec ++;
-                                        }
-                                    }
-                                    else {
-                                        sections = sections + "," +  document.cu.elements[i].options[j].value
-                                        numsec ++;
-                                    }
-                                }
-                            }
-                        }
-                        if (numsec > 0) {
-                            if (document.cu.elements[i+1].value != "" && document.cu.elements[i+1].value != null) {
-                                sections = sections + "," +  document.cu.elements[i+1].value;
-                            }
-                        }
-                        else {
-                            sections = document.cu.elements[i+1].value;
-                        }
-                        var newsecs = document.cu.elements[i+1].value;
-			var numsplit;
-                        if (newsecs != null && newsecs != "") {
-                            numsplit = newsecs.split(/,/g);
-                            numsec = numsec + numsplit.length;
-                        }
-
-                        if ((role == 'st') && (numsec > 1)) {
-                            alert("In each course, each user may only have one student role at a time. You had selected "+numsec+" sections.\\nPlease modify your selections so they include no more than one section.")
-                            return;
-                        }
-                        else if (numsplit != null) {
-                            for (var j=0; j<numsplit.length; j++) {
-                                if ((numsplit[j] == 'all') ||
-                                    (numsplit[j] == 'none')) {
-                                    alert("'"+numsplit[j]+"' may not be used as the name for a section, as it is a reserved word.\\nPlease choose a different section name.");
-                                    return;
-                                }
-                                for (var k=0; k<groups.length; k++) {
-                                    if (numsplit[j] == groups[k]) {
-                                        alert("'"+numsplit[j]+"' may not be used as a section name, as it is the name of a course group.\\nSection names and group names must be distinct. Please choose a different section name.");
-                                        return;
-                                    }
-                                }
-                            }
-                        }
-                        document.cu.elements[i+2].value = sections;
-                    }
-                }
-            }
-        }
-        document.cu.submit();
-    }
-ENDSECCODE
+        $nondc_setsection_code =
+            &Apache::lonuserutils::setsections_javascript('cu',$groupslist);
     }
     my $js = &user_modification_js($pjump_def,$dc_setcourse_code,
                                    $nondc_setsection_code,$groupslist);
@@ -707,18 +639,18 @@ ENDSECCODE
         my ($krbdef,$krbdefdom) =
             &Apache::loncommon::get_kerberos_defaults($ccdomain);
         $javascript_validations = 
-            &Apache::londropadd::javascript_validations('auth',$krbdefdom,undef,
+            &Apache::lonuserutils::javascript_validations('auth',$krbdefdom,undef,
                                                         undef,$ccdomain);
     }
     $js .= "\n".
        '<script type="text/javascript">'."\n".$jsback."\n".
        $javascript_validations.'</script>';
     my $start_page = 
-	&Apache::loncommon::start_page('Create Users, Change User Privileges',
+	&Apache::loncommon::start_page('User Management',
 				       $js,{'add_entries' => \%loaditem,});
     &Apache::lonhtmlcommon::add_breadcrumb
      ({href=>"javascript:backPage(document.cu)",
-       text=>"User modify/custom role edit",
+       text=>"Create/modify user",
        faq=>282,bug=>'Instructor Interface',});
 
     if ($env{'form.phase'} eq 'userpicked') {
@@ -735,7 +667,7 @@ ENDSECCODE
 
     my $forminfo =<<"ENDFORMINFO";
 <form action="/adm/createuser" method="post" name="cu">
-<input type="hidden" name="phase"       value="update_user_data" />
+<input type="hidden" name="phase" value="update_user_data" />
 <input type="hidden" name="ccuname" value="$ccuname" />
 <input type="hidden" name="ccdomain" value="$ccdomain" />
 <input type="hidden" name="pres_value"  value="" />
@@ -759,6 +691,7 @@ ENDFORMINFO
                 'cnu'            => 'Create New User',
                 'ind'            => 'in domain',
                 'lg'             => 'Login Data',
+                'hs'             => "Home Server",
         );
 	$r->print(<<ENDTITLE);
 $start_page
@@ -769,7 +702,7 @@ $forminfo
 $loginscript
 </script>
 <input type='hidden' name='makeuser' value='1' />
-<h3>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain</h3>
+<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain</h2>
 ENDTITLE
         $r->print('<div class="LC_left_float">'.
                   &personal_data_display($ccuname,$ccdomain,$newuser,
@@ -785,17 +718,23 @@ $lt{'hs'}: $home_server_pick
         } else {
             $r->print($home_server_pick);
         }
+        if ($context eq 'domain') {
+            $r->print(&Apache::lonuserutils::forceid_change());
+        }
         $r->print('</div>'."\n".'<div class="LC_left_float"><h3>'.
                   $lt{'lg'}.'</h3>');
         my ($fixedauth,$varauth,$authmsg); 
-        if ($rulematch) {
+        if (ref($rulematch{$ccuname.':'.$ccdomain}) eq 'HASH') {
+            my $matchedrule = $rulematch{$ccuname.':'.$ccdomain}{'username'};
+            my ($rules,$ruleorder) = 
+                &Apache::lonnet::inst_userrules($ccdomain,'username');
             if (ref($rules) eq 'HASH') {
-                if (ref($rules->{$rulematch}) eq 'HASH') {
-                    my $authtype = $rules->{$rulematch}{'authtype'};
+                if (ref($rules->{$matchedrule}) eq 'HASH') {
+                    my $authtype = $rules->{$matchedrule}{'authtype'};
                     if ($authtype !~ /^(krb4|krb5|int|fsys|loc)$/) {
-                        $r->print(&set_login($ccdomain));
+                        $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc));
                     } else { 
-                        my $authparm = $rules->{$rulematch}{'authparm'};
+                        my $authparm = $rules->{$matchedrule}{'authparm'};
                         if ($authtype =~ /^krb(4|5)$/) {
                             my $ver = $1;
                             if ($authparm ne '') {
@@ -804,12 +743,12 @@ $lt{'hs'}: $home_server_pick
 <input type="hidden" name="krbver" value="$ver" />
 <input type="hidden" name="krbarg" value="$authparm" />
 KERB
-                                $authmsg = $rules->{$rulematch}{'authmsg'};    
+                                $authmsg = $rules->{$matchedrule}{'authmsg'};    
                             }
                         } else {
                             $fixedauth = 
 '<input type="hidden" name="login" value="'.$authtype.'" />'."\n";
-                            if ($rules->{$rulematch}{'authparmfixed'}) {
+                            if ($rules->{$matchedrule}{'authparmfixed'}) {
                                 $fixedauth .=    
 '<input type="hidden" name="'.$authtype.'arg" value="'.$authparm.'" />'."\n";
                             } else {
@@ -819,7 +758,7 @@ KERB
                         }
                     }
                 } else {
-                    $r->print(&set_login($ccdomain));
+                    $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc));
                 }
             }
             if ($authmsg) {
@@ -830,7 +769,7 @@ $varauth
 ENDAUTH
             }
         } else {
-            $r->print(&set_login($ccdomain)); 
+            $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc)); 
         }
         $r->print(<<ENDPORT);
         $portfolioform
@@ -838,14 +777,14 @@ ENDAUTH
 ENDPORT
     } else { # user already exists
 	my %lt=&Apache::lonlocal::texthash(
-                    'cup'  => "Existing user ",
+                    'cup'  => "Modify existing user: ",
                     'id'   => "in domain",
 				       );
 	$r->print(<<ENDCHANGEUSER);
 $start_page
 $crumbs
 $forminfo
-<h3>$lt{'cup'} "$ccuname" $lt{'id'} "$ccdomain"</h3>
+<h2>$lt{'cup'} "$ccuname" $lt{'id'} "$ccdomain"</h2>
 ENDCHANGEUSER
         $r->print('<div class="LC_left_float">'.
                   &personal_data_display($ccuname,$ccdomain,$newuser,
@@ -889,7 +828,7 @@ ENDNOPORTPRIV
         unless ($tmp =~ /^(con_lost|error)/i) {
            my $now=time;
 	   my %lt=&Apache::lonlocal::texthash(
-		    'rer'  => "Revoke Existing Roles",
+		    'rer'  => "Existing Roles",
                     'rev'  => "Revoke",                    
                     'del'  => "Delete",
 		    'ren'  => "Re-Enable",
@@ -1129,13 +1068,15 @@ ENDNOPORTPRIV
 "javascript:pjump('."'date_end','End Date Assistant Co-Author',document.cu.end_$cudom\_$cuname\_aa.value,'end_$cudom\_$cuname\_aa','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".
          &Apache::loncommon::end_data_table_row()."\n".
          &Apache::loncommon::end_data_table());
-    } elsif (!(&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>');     
-    } elsif (($env{'user.name'} eq $ccuname) && 
+    } elsif ($env{'request.role'} =~ /^au\./) {
+        if (!(&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>');
+        } elsif (($env{'user.name'} eq $ccuname) && 
              ($env{'user.domain'} eq $ccdomain)) {
-       $r->print(&mt('Assigning yourself a co-author or assistant co-author role in your own author area in Construction Space is not permitted'));  
+           $r->print(&mt('Assigning yourself a co-author or assistant co-author role in your own author area in Construction Space is not permitted'));
+        }
     }
 #
 # Domain level
@@ -1199,7 +1140,7 @@ ENDNOPORTPRIV
         }
     } else {
         $r->print(&course_level_table(%inccourses));
-        $r->print('<br /><input type="button" value="'.&mt('Modify User').'" onClick="setSections()" />'."\n");
+        $r->print('<br /><input type="button" value="'.&mt('Modify User').'" onClick="setSections(this.form)" />'."\n");
     }
     $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
     $r->print('<input type="hidden" name="currstate" value="" />');
@@ -1236,7 +1177,7 @@ sub user_authentication {
         );
         if (&Apache::lonnet::allowed('mau',$ccdomain)) {
             &initialize_authen_forms($ccdomain);
-            my $choices = &set_login($ccdomain);
+            my $choices = &Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc);
             $outcome = <<ENDBADAUTH;
 <script type="text/javascript" language="Javascript">
 $loginscript
@@ -1256,8 +1197,6 @@ $lt{'uuas'} ($currentauth). $lt{'adcs'}.
 ENDBADAUTH
         }
     } else { # Authentication type is valid
-        my $authformcurrent='';
-        my $authform_other='';
         &initialize_authen_forms($ccdomain,$currentauth);
         my ($authformcurrent,$authform_other,$can_modify) =
             &modify_login_block($ccdomain,$currentauth);
@@ -1307,34 +1246,6 @@ ENDNOPRIV
     return $outcome;
 }
 
-sub set_login {
-    my ($dom) = @_;
-    my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
-    my $response;
-    my ($authnum,%can_assign) = 
-        &Apache::loncommon::get_assignable_auth($dom);
-    if ($authnum) {
-        $response = &Apache::loncommon::start_data_table();
-        if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
-            $response .= &Apache::loncommon::start_data_table_row().
-                         '<td>'.$authformkrb.'</td>'.
-                         &Apache::loncommon::end_data_table_row()."\n";
-        }
-        if ($can_assign{'int'}) {
-            $response .= &Apache::loncommon::start_data_table_row().
-                         '<td>'.$authformint.'</td>'.
-                         &Apache::loncommon::end_data_table_row()."\n"
-        }
-        if ($can_assign{'loc'}) {
-            $response .= &Apache::loncommon::start_data_table_row().
-                         '<td>'.$authformloc.'</td>'.
-                         &Apache::loncommon::end_data_table_row()."\n";
-        }
-        $response .= &Apache::loncommon::end_data_table();
-    }
-    return $response;
-}
-
 sub modify_login_block {
     my ($dom,$currentauth) = @_;
     my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
@@ -1432,7 +1343,6 @@ sub personal_data_display {
                 'generation'     => "Generation",
                 'permanentemail' => "Permanent e-mail address",
                 'id'             => "ID/Student Number",
-                'hs'             => "Home Server",
                 'lg'             => "Login Data"
     );
     my @userinfo = ('firstname','middlename','lastname','generation',
@@ -1480,8 +1390,8 @@ sub update_user_data {
                                           $env{'form.ccdomain'});
     # Error messages
     my $error     = '<span class="LC_error">'.&mt('Error').': ';
-    my $end       = '</span><br /><br />'.
-                    '<a href="javascript:backPage(document.userupdate,'.
+    my $end       = '</span><br /><br />';
+    my $rtnlink   = '<a href="javascript:backPage(document.userupdate,'.
                     "'$env{'form.prevphase'}','modify')".'" />'.
                     &mt('Return to previous page').'</a>'.&Apache::loncommon::end_page();
     my $title;
@@ -1498,7 +1408,7 @@ sub update_user_data {
     $r->print(&Apache::loncommon::start_page($title,$jscript));
     &Apache::lonhtmlcommon::add_breadcrumb
        ({href=>"javascript:backPage(document.userupdate)",
-         text=>"User modify/custom role edit",
+         text=>"Create/modify user",
          faq=>282,bug=>'Instructor Interface',});
     if ($env{'form.prevphase'} eq 'userpicked') {
         &Apache::lonhtmlcommon::add_breadcrumb
@@ -1519,25 +1429,25 @@ sub update_user_data {
     $r->print(&update_result_form($uhome));
     # Check Inputs
     if (! $env{'form.ccuname'} ) {
-	$r->print($error.&mt('No login name specified').'.'.$end);
+	$r->print($error.&mt('No login name specified').'.'.$end.$rtnlink);
 	return;
     }
     if (  $env{'form.ccuname'} ne 
 	  &LONCAPA::clean_username($env{'form.ccuname'}) ) {
 	$r->print($error.&mt('Invalid login name').'.  '.
 		  &mt('Only letters, numbers, periods, dashes, @, and underscores are valid').'.'.
-		  $end);
+		  $end.$rtnlink);
 	return;
     }
     if (! $env{'form.ccdomain'}       ) {
-	$r->print($error.&mt('No domain specified').'.'.$end);
+	$r->print($error.&mt('No domain specified').'.'.$end.$rtnlink);
 	return;
     }
     if (  $env{'form.ccdomain'} ne
 	  &LONCAPA::clean_domain($env{'form.ccdomain'}) ) {
 	$r->print($error.&mt ('Invalid domain name').'.  '.
 		  &mt('Only letters, numbers, periods, dashes, and underscores are valid').'.'.
-		  $end);
+		  $end.$rtnlink);
 	return;
     }
     if (! exists($env{'form.makeuser'})) {
@@ -1573,19 +1483,19 @@ sub update_user_data {
         # If they are creating a new user but have not specified login
         # information this will be caught below.
     } else {
-	    $r->print($error.&mt('Invalid login mode or password').$end);    
+	    $r->print($error.&mt('Invalid login mode or password').$end.$rtnlink);    
 	    return;
     }
 
 
     $r->print('<h3>'.&mt('User [_1] in domain [_2]',
 			 $env{'form.ccuname'}, $env{'form.ccdomain'}).'</h3>');
-
+    my (%alerts,%rulematch,%inst_results,%curr_rules);
     if ($env{'form.makeuser'}) {
 	$r->print('<h3>'.&mt('Creating new account.').'</h3>');
         # Check for the authentication mode and password
         if (! $amode || ! $genpwd) {
-	    $r->print($error.&mt('Invalid login mode or password').$end);    
+	    $r->print($error.&mt('Invalid login mode or password').$end.$rtnlink);    
 	    return;
 	}
         # Determine desired host
@@ -1596,13 +1506,43 @@ sub update_user_data {
             my %home_servers = 
 		&Apache::lonnet::get_servers($env{'form.ccdomain'},'library');
             if (! exists($home_servers{$desiredhost})) {
-                $r->print($error.&mt('Invalid home server specified'));
+                $r->print($error.&mt('Invalid home server specified').$end.$rtnlink);
                 return;
             }
         }
+        # Check ID format
+        my %checkhash;
+        my %checks = ('id' => 1);
+        %{$checkhash{$env{'form.ccuname'}.':'.$env{'form.ccdomain'}}} = (
+            'newuser' => 1, 
+            'id' => $env{'form.cid'},
+        );
+        if ($env{'form.cid'} ne '') {
+            &Apache::loncommon::user_rule_check(\%checkhash,\%checks,\%alerts,
+                                          \%rulematch,\%inst_results,\%curr_rules);
+            if (ref($alerts{'id'}) eq 'HASH') {
+                if (ref($alerts{'id'}{$env{'form.ccdomain'}}) eq 'HASH') {
+                    my $domdesc =
+                        &Apache::lonnet::domain($env{'form.ccdomain'},'description');
+                    if ($alerts{'id'}{$env{'form.ccdomain'}}{$env{'form.cid'}}) {
+                        my $userchkmsg;
+                        if (ref($curr_rules{$env{'form.ccdomain'}}) eq 'HASH') {
+                            $userchkmsg  = 
+                                &Apache::loncommon::instrule_disallow_msg('id',
+                                                                    $domdesc,1).
+                                &Apache::loncommon::user_rule_formats($env{'form.ccdomain'},
+                                    $domdesc,$curr_rules{$env{'form.ccdomain'}}{'id'},'id');
+                        }
+                        $r->print($error.&mt('Invalid ID format').$end.
+                                  $userchkmsg.$rtnlink);
+                        return;
+                    }
+                }
+            }
+        }
 	# Call modifyuser
 	my $result = &Apache::lonnet::modifyuser
-	    ($env{'form.ccdomain'},$env{'form.ccuname'},$env{'form.cstid'},
+	    ($env{'form.ccdomain'},$env{'form.ccuname'},$env{'form.cid'},
              $amode,$genpwd,$env{'form.cfirstname'},
              $env{'form.cmiddlename'},$env{'form.clastname'},
              $env{'form.cgeneration'},undef,$desiredhost,
@@ -1616,7 +1556,7 @@ sub update_user_data {
              ($env{'form.login'} ne ''        )) {
 	# Modify user privileges
         if (! $amode || ! $genpwd) {
-	    $r->print($error.'Invalid login mode or password'.$end);    
+	    $r->print($error.'Invalid login mode or password'.$end.$rtnlink);    
 	    return;
 	}
 	# Only allow authentification modification if the person has authority
@@ -1629,7 +1569,7 @@ sub update_user_data {
 		  ($env{'form.ccuname'},$env{'form.ccdomain'}));
 	} else {
 	    # Okay, this is a non-fatal error.
-	    $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.');    
+	    $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.'.$end);    
 	}
     }
     ##
@@ -1637,17 +1577,40 @@ sub update_user_data {
         # Check for need to change
         my %userenv = &Apache::lonnet::get
             ('environment',['firstname','middlename','lastname','generation',
-             'permanentemail','portfolioquota','inststatus'],
+             'id','permanentemail','portfolioquota','inststatus'],
               $env{'form.ccdomain'},$env{'form.ccuname'});
         my ($tmp) = keys(%userenv);
         if ($tmp =~ /^(con_lost|error)/i) { 
             %userenv = ();
         }
         # Check to see if we need to change user information
-        foreach my $item ('firstname','middlename','lastname','generation','permanentemail') {
+        foreach my $item ('firstname','middlename','lastname','generation','permanentemail','id') {
             # Strip leading and trailing whitespace
             $env{'form.c'.$item} =~ s/(\s+$|^\s+)//g; 
         }
+        # Check to see if we can change the ID/student number
+        my $forceid = $env{'form.forceid'};
+        my $recurseid = $env{'form.recurseid'};
+        my $newuser = 0;
+        my $disallowed_id = 0;
+        my (%alerts,%rulematch,%idinst_results,%curr_rules,%got_rules);
+        if (!$forceid) {
+            $env{'form.cid'} = $userenv{'id'};
+        } elsif ($env{'form.cid'} ne $userenv{'id'}) {
+            my $checkhash;
+            my $checks = { 'id' => 1 };
+            $checkhash->{$env{'form.ccuname'}.':'.$env{'form.ccdomain'}} = 
+                   { 'newuser' => $newuser,
+                     'id'  => $env{'form.cid'}, 
+                   };
+            &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'}{$env{'form.ccdomain'}}) eq 'HASH') {
+                   $disallowed_id = 1;
+                }
+            }
+        }
         my ($quotachanged,$namechanged,$oldportfolioquota,$newportfolioquota,
             $inststatus,$isdefault,$defquotatext);
         my ($defquota,$settingstatus) = 
@@ -1703,6 +1666,7 @@ sub update_user_data {
              $env{'form.cmiddlename'} ne $userenv{'middlename'} ||
              $env{'form.clastname'}   ne $userenv{'lastname'}   ||
              $env{'form.cgeneration'} ne $userenv{'generation'} ||
+             $env{'form.cid'} ne $userenv{'id'}                 ||
              $env{'form.cpermanentemail'} ne $userenv{'permanentemail'} )) {
             $namechanged = 1;
         }
@@ -1712,6 +1676,7 @@ sub update_user_data {
             $changeHash{'middlename'} = $env{'form.cmiddlename'};
             $changeHash{'lastname'}   = $env{'form.clastname'};
             $changeHash{'generation'} = $env{'form.cgeneration'};
+            $changeHash{'id'}         = $env{'form.cid'};
             $changeHash{'permanentemail'} = $env{'form.cpermanentemail'};
             my $putresult = &Apache::lonnet::put
                 ('environment',\%changeHash,
@@ -1724,6 +1689,7 @@ sub update_user_data {
                              'mddl' => "middle",
                              'lst'  => "last",
 			     'gen'  => "generation",
+                             'id'   => "ID/Student number",
                              'mail' => "permanent e-mail",
                              'disk' => "disk space allocated to portfolio files",
                              'prvs' => "Previous",
@@ -1737,6 +1703,7 @@ sub update_user_data {
     <th>$lt{'mddl'}</th>
     <th>$lt{'lst'}</th>
     <th>$lt{'gen'}</th>
+    <th>$lt{'id'}</th>
     <th>$lt{'mail'}</th>
     <th>$lt{'disk'}</th></tr>
 <tr><td>$lt{'prvs'}</td>
@@ -1744,6 +1711,7 @@ sub update_user_data {
     <td>$userenv{'middlename'} </td>
     <td>$userenv{'lastname'}   </td>
     <td>$userenv{'generation'} </td>
+    <td>$userenv{'id'}</td>
     <td>$userenv{'permanentemail'} </td>
     <td>$oldportfolioquota Mb</td>
 </tr>
@@ -1752,10 +1720,24 @@ sub update_user_data {
     <td>$env{'form.cmiddlename'} </td>
     <td>$env{'form.clastname'}   </td>
     <td>$env{'form.cgeneration'} </td>
+    <td>$env{'form.cid'} </td>
     <td>$env{'form.cpermanentemail'} </td>
     <td>$newportfolioquota Mb $defquotatext </td></tr>
 </table>
 END
+                if (($forceid) && ($recurseid) && (!$disallowed_id) &&
+                    (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) {
+                    my %userupdate = (
+                                  lastname   => $env{'form.clasaname'},
+                                  middlename => $env{'form.cmiddlename'},
+                                  firstname  => $env{'form.cfirstname'},
+                                  generation => $env{'fora.cgeneration'},
+                                  id         => $env{'form.cid'},
+                             );
+                    my $idresult = &propagate_id_change($env{'form.ccname'},
+                                    $env{'form.ccdomain'},\%userupdate);
+                    $r->print('<br />'.$idresult.'<br />');
+                }
                 if (($env{'form.ccdomain'} eq $env{'user.domain'}) && 
                     ($env{'form.ccuname'} eq $env{'user.name'})) {
                     my %newenvhash;
@@ -1779,12 +1761,19 @@ END
             # They did not want to change the users name but we can
             # still tell them what the name is
 	    my %lt=&Apache::lonlocal::texthash(
+                           'id'   => "ID/Student number",
                            'mail' => "Permanent e-mail",
                            'disk' => "Disk space allocated to user's portfolio files",
 					       );
             $r->print(<<"END");
-<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'}&nbsp;&nbsp;($lt{'mail'}: $userenv{'permanentemail'})</h4>
+<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'}
 END
+            if ($userenv{'permanentemail'} eq '') {
+                $r->print('</h4>');
+            } else {
+                $r->print('&nbsp;&nbsp;('.$lt{'mail'}.': '.
+                          $userenv{'permanentemail'}.')</h4>');
+            }
             if ($putresult eq 'ok') {
                 if ($oldportfolioquota != $newportfolioquota) {
                     $r->print('<h4>'.$lt{'disk'}.': '.$newportfolioquota.' Mb '. 
@@ -1796,9 +1785,11 @@ END
     }
     ##
     my $now=time;
+    my $rolechanges = 0;
     $r->print('<h3>'.&mt('Modifying Roles').'</h3>');
     foreach my $key (keys (%env)) {
 	next if (! $env{$key});
+        next if ($key eq 'form.action');
 	# Revoke roles
 	if ($key=~/^form\.rev/) {
 	    if ($key=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {
@@ -1811,12 +1802,14 @@ END
 	        $r->print(&mt('Revoking [_1] in [_2]: [_3]',
 			      $role,$scope,'<b>'.$result.'</b>').'<br />');
 		if ($role eq 'st') {
-		    my $result = &classlist_drop($scope,$env{'form.ccuname'},
-						 $env{'form.ccdomain'},$now);
+                    my $result =
+                        &Apache::lonuserutils::classlist_drop($scope,
+                            $env{'form.ccuname'},$env{'form.ccdomain'},
+                            $now);
 		    $r->print($result);
 		}
-	    } 
-	    if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$ }s) {
+	    }
+	    if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}s) {
 # Revoke custom role
 		$r->print(&mt('Revoking custom role:').
                       ' '.$4.' by '.$3.':'.$2.' in '.$1.': <b>'.
@@ -1824,6 +1817,7 @@ END
 				  $env{'form.ccuname'},$1,$2,$3,$4).
 		'</b><br />');
 	    }
+            $rolechanges ++;
 	} elsif ($key=~/^form\.del/) {
 	    if ($key=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {
 # Delete standard role
@@ -1835,8 +1829,10 @@ END
 	        $r->print(&mt('Deleting [_1] in [_2]: [_3]',$role,$scope,
 			      '<b>'.$result.'</b>').'<br />');
 		if ($role eq 'st') {
-		    my $result = &classlist_drop($scope,$env{'form.ccuname'},
-						 $env{'form.ccdomain'},$now);
+                    my $result =
+                        &Apache::lonuserutils::classlist_drop($scope,
+                            $env{'form.ccuname'},$env{'form.ccdomain'},
+                            $now);
 		    $r->print($result);
 		}
             }
@@ -1849,6 +1845,7 @@ END
                          $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
                          0,1).'</b><br />');
             }
+            $rolechanges ++;
 	} elsif ($key=~/^form\.ren/) {
             my $udom = $env{'form.ccdomain'};
             my $uname = $env{'form.ccuname'};
@@ -1887,6 +1884,7 @@ END
                 $r->print(&mt('Re-enabling custom role [_1] by [_2]@[_3] in [_4] : <b>[_5]</b>',
                           $rolename,$rnam,$rdom,$url,$result).'<br />');
             }
+            $rolechanges ++;
 	} elsif ($key=~/^form\.act/) {
             my $udom = $env{'form.ccdomain'};
             my $uname = $env{'form.ccuname'};
@@ -1990,7 +1988,7 @@ END
                     }
                 }
 	    } else {
-		$r->print('<p>'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$key.'</tt></p><br />');
+		$r->print('<p><span class="LC_error">'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$key.'</tt></span></p><br />');
             }
             foreach my $key (sort(keys(%disallowed))) {
                 if (($key eq 'none') || ($key eq 'all')) {  
@@ -2000,10 +1998,14 @@ END
                 }
                 $r->print(' '.&mt('Please <a href="javascript:history.go(-1)">go back</a> and choose a different section name.').'</p><br />');
             }
+            $rolechanges ++;
 	}
     } # End of foreach (keys(%env))
 # Flush the course logs so reverse user roles immediately updated
     &Apache::lonnet::flushcourselogs();
+    if (!$rolechanges) {
+        $r->print(&mt('No roles to modify'));
+    }
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -2024,34 +2026,11 @@ sub update_result_form {
     }
     $outcome .= '<input type="hidden" name="phase" value="" />'."\n".
                 '<input type ="hidden" name="currstate" value="" />'."\n".
+                '<input type ="hidden" name="action" value="singleuser" />'."\n".
                 '</form>';
     return $outcome;
 }
 
-sub classlist_drop {
-    my ($scope,$uname,$udom,$now) = @_;
-    my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)});
-    my $cid=$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'});
-	return &mt('Drop from classlist: [_1]',
-		   '<b>'.$result.'</b>').'<br />';
-    }
-}
-
-sub active_student_roles {
-    my ($cnum,$cdom,$uname,$udom) = @_;
-    my %roles = 
-	&Apache::lonnet::get_my_roles($uname,$udom,'userroles',
-				      ['future','active'],['st']);
-    return exists($roles{"$cnum:$cdom:st"});
-}
-
 sub quota_admin {
     my ($setquota,$changeHash) = @_;
     my $quotachanged;
@@ -2108,7 +2087,7 @@ sub custom_role_editor {
 
     $rolename=~s/[^A-Za-z0-9]//gs;
 
-    if (!$rolename) {
+    if (!$rolename || $env{'form.phase'} eq 'pickrole') {
 	&print_username_entry_form($r);
         return;
     }
@@ -2177,8 +2156,8 @@ sub custom_role_editor {
     $head_script .= "\n".$jsback."\n".'</script>'."\n";
     $r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
    &Apache::lonhtmlcommon::add_breadcrumb
-     ({href=>"javascript:backPage(document.form1,'','')",
-       text=>"User modify/custom role edit",
+     ({href=>"javascript:backPage(document.form1,'pickrole','')",
+       text=>"Pick custom role",
        faq=>282,bug=>'Instructor Interface',},
       {href=>"javascript:backPage(document.form1,'','')",
          text=>"Edit custom role",
@@ -2221,6 +2200,7 @@ ENDCCF
              &Apache::loncommon::end_data_table_row());
     }
     $r->print(&Apache::loncommon::end_data_table().
+   '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.
    '<input type="hidden" name="startrolename" value="'.$env{'form.rolename'}.
    '" />'."\n".'<input type="hidden" name="currstate" value="" />'."\n".   
    '<input type="reset" value="'.&mt("Reset").'" />'."\n".
@@ -2302,23 +2282,19 @@ sub make_button_code {
 # ---------------------------------------------------------- Call to definerole
 sub set_custom_role {
     my ($r) = @_;
-
     my $rolename=$env{'form.rolename'};
-
     $rolename=~s/[^A-Za-z0-9]//gs;
-
     if (!$rolename) {
-	&print_username_entry_form($r);
+	&custom_role_editor($r);
         return;
     }
-
     my ($jsback,$elements) = &crumb_utilities();
     my $jscript = '<script type="text/javascript">'.$jsback."\n".'</script>';
 
     $r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript);
     &Apache::lonhtmlcommon::add_breadcrumb
-        ({href=>"javascript:backPage(document.customresult,'','')",
-          text=>"User modify/custom role edit",
+        ({href=>"javascript:backPage(document.customresult,'pickrole','')",
+          text=>"Pick custom role",
           faq=>282,bug=>'Instructor Interface',},
          {href=>"javascript:backPage(document.customresult,'selected_custom_edit','')",
           text=>"Edit custom role",
@@ -2381,7 +2357,7 @@ sub set_custom_role {
 						$env{'user.name'},
 						$rolename));
     }
-    $r->print('<p><a href="/adm/createuser">Create another role, or Create/Modify a user.</a></p><form name="customresult" method="post">');
+    $r->print('<p><a href="javascript:backPage(document.customresult,'."'pickrole'".')">'.&mt('Create or edit another custom role').'</a></p><form name="customresult" method="post">');
     $r->print(&Apache::lonhtmlcommon::echo_form_input([]).'</form>');
     $r->print(&Apache::loncommon::end_page());
 }
@@ -2389,81 +2365,317 @@ sub set_custom_role {
 # ================================================================ Main Handler
 sub handler {
     my $r = shift;
-
     if ($r->header_only) {
        &Apache::loncommon::content_type($r,'text/html');
        $r->send_http_header;
        return OK;
     }
+    my $context;
+    if ($env{'request.course.id'}) {
+        $context = 'course';
+    } elsif ($env{'request.role'} =~ /^au\./) {
+        $context = 'construction_space';
+    } else {
+        $context = 'domain';
+    }
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+                                            ['action','state']);
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    &Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>"/adm/createuser",
+          text=>"User Management"});
+    my ($permission,$allowed) = &get_permission($context);
+    if (!$allowed) {
+        $env{'user.error.msg'}=
+            "/adm/createuser:cst:0:0:Cannot create/modify user data ".
+                                 "or view user status.";
+        return HTTP_NOT_ACCEPTABLE;
+    }
+
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
+
+    # Main switch on form.action and form.state, as appropriate
+    if (! exists($env{'form.action'})) {
+        $r->print(&header());
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+        $r->print(&print_main_menu($permission));
+        $r->print(&Apache::loncommon::end_page());
+    } elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) {
+        $r->print(&header());
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/createuser?action=upload&state=',
+              text=>"Upload Users List"});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Upload Users List',
+                                                   'User_Management_Upload'));
+        $r->print('<form name="studentform" method="post" '.
+                  'enctype="multipart/form-data" '.
+                  ' action="/adm/createuser">'."\n");
+        if (! exists($env{'form.state'})) {
+            &Apache::lonuserutils::print_first_users_upload_form($r,$context);
+        } elsif ($env{'form.state'} eq 'got_file') {
+            &Apache::lonuserutils::print_upload_manager_form($r,$context);
+        } elsif ($env{'form.state'} eq 'enrolling') {
+            if ($env{'form.datatoken'}) {
+                &Apache::lonuserutils::upfile_drop_add($r,$context);
+            }
+        } else {
+            &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);
+        } else {
+            &Apache::lonuserutils::print_expire_menu($r,$context);
+        }
+        $r->print(&Apache::loncommon::end_page());
+    } elsif ($env{'form.action'} eq 'singleuser' && $permission->{'cusr'}) {
+        my $phase = $env{'form.phase'};
+        my @search = ('srchterm','srchby','srchin','srchtype','srchdomain');
+	&Apache::loncreateuser::restore_prev_selections();
+	my $srch;
+	foreach my $item (@search) {
+	    $srch->{$item} = $env{'form.'.$item};
+	}
 
-    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'})) ||
-	(&authorpriv($env{'user.name'},$env{'request.role.domain'})) ||
-        (&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))) {
-       &Apache::loncommon::content_type($r,'text/html');
-       $r->send_http_header;
-       &Apache::lonhtmlcommon::clear_breadcrumbs();
-      
-       my $phase = $env{'form.phase'};
-       my @search = ('srchterm','srchby','srchin','srchtype','srchdomain');
-
-       if (($phase eq 'get_user_info') || ($phase eq 'userpicked')) {
-           my $srch;
-           foreach my $item (@search) {
-               $srch->{$item} = $env{'form.'.$item};
-           }
-           if ($env{'form.phase'} eq 'get_user_info') {
-               my ($currstate,$response,$forcenewuser,$results) = 
-                   &user_search_result($srch);
-               if ($env{'form.currstate'} eq 'modify') {
-                   $currstate = $env{'form.currstate'};
-               }
-               if ($currstate eq 'select') {
-                   &print_user_selection_page($r,$response,$srch,$results,'createuser',\@search);
-               } elsif ($currstate eq 'modify') {
-                   my ($ccuname,$ccdomain);
-                   if (($srch->{'srchby'} eq 'uname') && 
-                       ($srch->{'srchtype'} eq 'exact')) {
-                       $ccuname = $srch->{'srchterm'};
-                       $ccdomain= $srch->{'srchdomain'};
-                   } else {
-                       my @matchedunames = keys(%{$results});
-                       ($ccuname,$ccdomain) = split(/:/,$matchedunames[0]);
-                   }
-                   $ccuname =&LONCAPA::clean_username($ccuname);
-                   $ccdomain=&LONCAPA::clean_domain($ccdomain);
-                   if ($env{'form.forcenewuser'}) {
-                       $response = '';
-                   }   
-                   &print_user_modification_page($r,$ccuname,$ccdomain,$srch,
-                                                 $response);
-               } elsif ($currstate eq 'query') {
-                   &print_user_query_page($r,'createuser');
-               } else {
-                   &print_username_entry_form($r,$response,$srch,$forcenewuser);
-               }
-           } elsif ($env{'form.phase'} eq 'userpicked') {
-               my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
-               my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'});
-               &print_user_modification_page($r,$ccuname,$ccdomain,$srch);
-           }
-       } elsif ($env{'form.phase'} eq 'update_user_data') {
-           &update_user_data($r);
-       } elsif ($env{'form.phase'} eq 'selected_custom_edit') {
-           &custom_role_editor($r);
-       } elsif ($env{'form.phase'} eq 'set_custom_roles') {
-	   &set_custom_role($r);
-       } else {
-           &print_username_entry_form($r);
-       }
-   } else {
-      $env{'user.error.msg'}=
-        "/adm/createuser:mau:0:0:Cannot modify user data";
-      return HTTP_NOT_ACCEPTABLE; 
-   }
-   return OK;
+        if (($phase eq 'get_user_info') || ($phase eq 'userpicked')) {
+            if ($env{'form.phase'} eq 'get_user_info') {
+                my ($currstate,$response,$forcenewuser,$results) = 
+                    &user_search_result($srch);
+                if ($env{'form.currstate'} eq 'modify') {
+                    $currstate = $env{'form.currstate'};
+                }
+                if ($currstate eq 'select') {
+                    &print_user_selection_page($r,$response,$srch,$results,
+                                               'createuser',\@search);
+                } elsif ($currstate eq 'modify') {
+                    my ($ccuname,$ccdomain);
+                    if (($srch->{'srchby'} eq 'uname') && 
+                        ($srch->{'srchtype'} eq 'exact')) {
+                        $ccuname = $srch->{'srchterm'};
+                        $ccdomain= $srch->{'srchdomain'};
+                    } else {
+                        my @matchedunames = keys(%{$results});
+                        ($ccuname,$ccdomain) = split(/:/,$matchedunames[0]);
+                    }
+                    $ccuname =&LONCAPA::clean_username($ccuname);
+                    $ccdomain=&LONCAPA::clean_domain($ccdomain);
+                    if ($env{'form.forcenewuser'}) {
+                        $response = '';
+                    }
+                    &print_user_modification_page($r,$ccuname,$ccdomain,
+                                                  $srch,$response,$context);
+                } elsif ($currstate eq 'query') {
+                    &print_user_query_page($r,'createuser');
+                } else {
+                    &print_username_entry_form($r,$response,$srch,
+                                               $forcenewuser);
+                }
+            } elsif ($env{'form.phase'} eq 'userpicked') {
+                my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
+                my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'});
+                &print_user_modification_page($r,$ccuname,$ccdomain,$srch,'',
+                                              $context);
+            }
+        } elsif ($env{'form.phase'} eq 'update_user_data') {
+            &update_user_data($r);
+        } else {
+            &print_username_entry_form($r,undef,$srch);
+        }
+    } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
+        if ($env{'form.phase'} eq 'set_custom_roles') {
+            &set_custom_role($r);
+        } else {
+            &custom_role_editor($r);
+        }
+    } elsif ($env{'form.action'} eq 'listusers' && $permission->{'view'}) {
+        my ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles);
+        my $formname = 'studentform';
+        if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
+            ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) = 
+                &Apache::lonuserutils::courses_selector($env{'request.role.domain'},
+                                                        $formname);
+            my $js = &add_script($jscript).$cb_jscript;
+            my $loadcode = 
+                &Apache::lonuserutils::course_selector_loadcode($formname);
+            if ($loadcode ne '') {
+                $r->print(&header($js,{'onload' => $loadcode,}));
+            } else {
+                $r->print(&header($js));
+            }
+        } else {
+            $r->print(&header());
+        }
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/createuser?action=listusers',
+              text=>"List Users"});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs("List Users",
+                                                      'User_Management_List'));
+        &Apache::lonuserutils::print_userlist($r,undef,$permission,$context,
+                     $formname,$totcodes,$codetitles,$idlist,$idlist_titles);
+        $r->print(&Apache::loncommon::end_page());
+    } elsif ($env{'form.action'} eq 'expire' && $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);
+        } elsif ($env{'form.state'} eq 'done') {
+            &Apache::lonuserutiles::expire_user_list($r);
+        } else {
+            &print_expire_menu($r,$context);
+        }
+        $r->print(&Apache::loncommon::end_page());
+    } else {
+        $r->print(&header());
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));            $r->print(&print_main_menu($permission));
+        $r->print(&Apache::loncommon::end_page());
+    }
+    return OK;
+}
+
+sub header {
+    my ($jscript,$loaditems) = @_;
+    my $start_page;
+    if (ref($loaditems) eq 'HASH') {
+        $start_page=&Apache::loncommon::start_page('User Management',$jscript,{'add_entries' => $loaditems,});
+    } else {
+        $start_page=&Apache::loncommon::start_page('User Management',$jscript);
+    }
+    return $start_page;
+}
+
+sub add_script {
+    my ($js) = @_;
+    return '<script type="text/javascript">'."\n".$js."\n".'</script>';
+}
+
+###############################################################
+###############################################################
+#  Menu Phase One
+sub print_main_menu {
+    my ($permission) = @_;
+    my @menu =
+        (
+          { text => 'Upload a File of Users to Modify/Create Users and/or Add roles',
+            help => 'User_Management_Upload',
+            action => 'upload',
+            permission => $permission->{'cusr'},
+            },
+          { text => 'Create User/Set User Roles for a single user',
+            help => 'User_Management_Single_User',
+            action => 'singleuser',
+            permission => $permission->{'cusr'},
+            },
+          { text => 'Display Lists of Users',
+            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'},
+          },
+        );
+    my $menu_html = '';
+    foreach my $menu_item (@menu) {
+        next if (! $menu_item->{'permission'});
+        $menu_html.='<p>';
+        $menu_html.='<font size="+1">';
+        if (exists($menu_item->{'url'})) {
+            $menu_html.=qq{<a href="$menu_item->{'url'}">};
+        } else {
+            $menu_html.=
+                qq{<a href="/adm/createuser?action=$menu_item->{'action'}">};
+        }
+        $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
+        if (exists($menu_item->{'help'})) {
+            $menu_html.=
+                &Apache::loncommon::help_open_topic($menu_item->{'help'});
+        }
+        $menu_html.='</p>';
+    }
+    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 'construction_space') {
+        $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',
+			       'srchtype' => 'scalar',
+			       );
+    &Apache::loncommon::store_settings('user','user_picker',
+				       \%saveable_parameters);
+    &Apache::loncommon::restore_settings('user','user_picker',
+					 \%saveable_parameters);
 }
 
 #-------------------------------------------------- functions for &phase_two
@@ -2574,7 +2786,8 @@ sub user_search_result {
 					{&Apache::lonnet::get('environment',
 							     ['firstname',
 							      'lastname',
-							      'permanentemail'])};
+							      'permanentemail'],
+							      $cudomain,$cuname)};
                                 }
                             }
                         }
@@ -2884,7 +3097,7 @@ sub course_level_table {
     my $table = '';
 # Custom Roles?
 
-    my %customroles=&my_custom_roles();
+    my %customroles=&Apache::lonuserutils::my_custom_roles();
     my %lt=&Apache::lonlocal::texthash(
             'exs'  => "Existing sections",
             'new'  => "Define new section",
@@ -2923,7 +3136,9 @@ sub course_level_table {
 <td>'.$area.'<br />Domain: '.$domain.'</td>'."\n";
 	        if ($role ne 'cc') {
                     if (%sections_count) {
-                        my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$role);
+                        my $currsec =
+                            &Apache::lonuserutils::course_sections(\%sections_count,
+                                                       $protectedcourse.'_'.$role);
                         $table .= 
                     '<td><table class="LC_createuser">'.
                      '<tr class="LC_section_row">
@@ -2963,7 +3178,9 @@ ENDTIMEENTRY
 <td>'.$plrole.'</td>
 <td>'.$area.'</td>'."\n";
                 if (%sections_count) {
-                    my $currsec = &course_sections(\%sections_count,$customrole);
+                    my $currsec =
+                        &Apache::lonuserutils::course_sections(\%sections_count,
+                                                               $customrole);
                     $table.=
                    '<td><table class="LC_createuser">'.
                    '<tr class="LC_section_row"><td valign="top">'.
@@ -3007,31 +3224,9 @@ $table.
     return $result;
 }
 
-sub course_sections {
-    my ($sections_count,$role) = @_;
-    my $output = '';
-    my @sections = (sort {$a <=> $b} keys %{$sections_count});
-    if (scalar(@sections) == 1) {
-        $output = '<select name="currsec_'.$role.'" >'."\n".
-                  '  <option value="">Select</option>'."\n".
-                  '  <option value="">No section</option>'."\n".
-                  '  <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";
-        foreach my $sec (@sections) {
-            $output .= '<option value="'.$sec.'">'.$sec."</option>\n";
-        }
-    }
-    $output .= '</select>'; 
-    return $output;
-}
-
 sub course_level_dc {
     my ($dcdom) = @_;
-    my %customroles=&my_custom_roles();
+    my %customroles=&Apache::lonuserutils::my_custom_roles();
     my $hiddenitems = '<input type="hidden" name="dcdomain" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="origdom" value="'.$dcdom.'" />'.
                       '<input type="hidden" name="dccourse" value="" />';