--- loncom/interface/loncreateuser.pm	2007/09/19 06:24:26	1.187
+++ loncom/interface/loncreateuser.pm	2007/12/14 17:35:52	1.210
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.187 2007/09/19 06:24:26 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.210 2007/12/14 17:35:52 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
@@ -75,15 +76,24 @@ my $authformfsys;
 my $authformloc;
 
 sub initialize_authen_forms {
-    my ($dom,$curr_authtype) = @_; 
+    my ($dom,$curr_authtype,$mode) = @_; 
     my ($krbdefdom)=( $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/);
     $krbdefdom= uc($krbdefdom);
     my %param = ( formname => 'document.cu',
                   kerb_def_dom => $krbdefdom,
                   domain => $dom,
                 );
+    my %abv_auth = &auth_abbrev();
     if ($curr_authtype =~ /^(krb4|krb5|internal|localauth|unix):$/) {
-        $param{'curr_authtype'} = $curr_authtype;
+        my $long_auth = $1;
+        my %abv_auth = &auth_abbrev();
+        $param{'curr_authtype'} = $abv_auth{$long_auth};
+        if ($long_auth =~ /^krb(4|5)$/) {
+            $param{'curr_kerb_ver'} = $1;
+        }
+        if ($mode eq 'modifyuser') {
+            $param{'mode'} = $mode;
+        }
     }
 # no longer static due to configurable kerberos defaults
 #    $loginscript  = &Apache::loncommon::authform_header(%param);
@@ -95,27 +105,14 @@ sub initialize_authen_forms {
     $authformloc  = &Apache::loncommon::authform_local(%param);
 }
 
-
-# ======================================================= 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 {
-    my ($auname,$audom)=@_;
-    unless ((&Apache::lonnet::allowed('cca',$audom.'/'.$auname))
-         || (&Apache::lonnet::allowed('caa',$audom.'/'.$auname))) { return ''; }
-    return 1;
+sub auth_abbrev {
+    my %abv_auth = (
+                     krb4     => 'krb',
+                     internal => 'int',
+                     localuth => 'loc',
+                     unix     => 'fsys',
+                   );
+    return %abv_auth;
 }
 
 # ====================================================
@@ -178,8 +175,13 @@ END_SCRIPT
     }
     my $output = $quota_javascript.
                  '<h3>'.$lt{'disk'}.'</h3>'.
-                 $lt{'cuqu'}.': '.$currquota.'&nbsp;Mb.&nbsp;&nbsp;'.
-                 $defaultinfo.'<br /><span class="LC_nobreak">'.$lt{'chqu'}.
+                 &Apache::loncommon::start_data_table().
+                 &Apache::loncommon::start_data_table_row().
+                 '<td>'.$lt{'cuqu'}.': '.$currquota.'&nbsp;Mb.&nbsp;&nbsp;'.
+                 $defaultinfo.'</td>'.
+                 &Apache::loncommon::end_data_table_row().
+                 &Apache::loncommon::start_data_table_row().
+                 '<td><span class="LC_nobreak">'.$lt{'chqu'}.
                  ': <label>'.
                  '<input type="radio" name="customquota" value="0" '.
                  $custom_off.' onchange="javascript:quota_changes('."'custom'".')"
@@ -189,19 +191,23 @@ END_SCRIPT
                  $lt{'cust'}.':</label>&nbsp;'.
                  '<input type="text" name="portfolioquota" size ="5" value="'.
                  $showquota.'" onfocus="javascript:quota_changes('."'quota'".')" '.
-                 '/>&nbsp;Mb';
+                 '/>&nbsp;Mb</span></td>'.
+                 &Apache::loncommon::end_data_table_row().
+                 &Apache::loncommon::end_data_table();
     return $output;
 }
 
 # =================================================================== 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();
@@ -215,27 +221,31 @@ 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",
                     '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');
@@ -244,39 +254,78 @@ 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,$context));
+    } 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());
 }
 
 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) {
+        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;
 }
 
@@ -309,7 +358,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,$context) = @_;
     my @fields = ('username','domain','lastname','firstname','permanentemail');
     my $sortby = $env{'form.sortby'};
 
@@ -343,18 +392,18 @@ 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",
               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 />");
@@ -403,9 +452,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".
@@ -422,32 +472,52 @@ 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);
+	&print_username_entry_form($r,$context,$usermsg);
         return;
     }
-    my ($curr_authtype,$instsrch,$rulematch,$rules,%inst_results);
+    my %abv_auth = &auth_abbrev();
+    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') {
-        $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;
+        $newuser = 1;
+        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,$context,$userchkmsg);
+                    return;
+                } 
+            }
         }
     } else {
-        $curr_authtype = 
+        $newuser = 0;
+        my $currentauth = 
             &Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
+        if ($currentauth =~ /^(krb4|krb5|unix|internal|localauth):/) {	
+            $curr_authtype = $abv_auth{$1};
+            if ($currentauth =~ /^krb(4|5)/) {
+                $curr_kerb_ver = $1;
+            }
+        }
     }
     if ($response) {
         $response = '<br />'.$response
@@ -461,6 +531,7 @@ sub print_user_modification_page {
                   kerb_def_dom => $krbdefdom,
                   kerb_def_auth => $krbdef,
                   curr_authtype => $curr_authtype,
+                  curr_kerb_ver => $curr_kerb_ver,
                   domain => $ccdomain,
                 );
     $loginscript  = &Apache::loncommon::authform_header(%param);
@@ -588,97 +659,30 @@ 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);
 
     my ($jsback,$elements) = &crumb_utilities();
-
+    my $javascript_validations;
+    if ((&Apache::lonnet::allowed('mau',$ccdomain)) || ($uhome eq 'no_host')) {
+        my ($krbdef,$krbdefdom) =
+            &Apache::loncommon::get_kerberos_defaults($ccdomain);
+        $javascript_validations = 
+            &Apache::lonuserutils::javascript_validations('auth',$krbdefdom,undef,
+                                                        undef,$ccdomain);
+    }
     $js .= "\n".
-           '<script type="text/javascript">'."\n".$jsback."\n".'</script>';
-
+       '<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') {
@@ -695,9 +699,9 @@ 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="ccuname"     value="$ccuname" />
-<input type="hidden" name="ccdomain"    value="$ccdomain" />
+<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="" />
 <input type="hidden" name="pres_type"   value="" />
 <input type="hidden" name="pres_marker" value="" />
@@ -709,72 +713,34 @@ ENDFORMINFO
         }
     }
     if ($uhome eq 'no_host') {
-	my %lt=&Apache::lonlocal::texthash(
-                    'cnu'            => "Create New User",
-                    'nu'             => "New User",
-                    'ind'            => "in domain",
-                    'pd'             => "Personal Data",
-                    'firstname'      => "First Name",
-                    'middlename'     => "Middle Name",
-                    'lastname'       => "Last Name",
-                    'generation'     => "Generation",
-                    'permanentemail' => "Permanent e-mail address",
-                    'id'             => "ID/Student Number",
-                    'hs'             => "Home Server",
-                    'lg'             => "Login Data"
-				       );
-        my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
-        my %textboxsize = (
-                           firstname      => '15',
-                           middlename     => '15',
-                           lastname       => '15',
-                           generation     => '5',
-                           permanentemail => '25',
-                           id             => '15',
-                          );
-        my %element   = (
-                           firstname      => 'cfirst', 
-                           middlename     => 'cmiddle',
-                           lastname       => 'clast',
-                           generation     => 'cgen',
-                           permanentemail => 'cemail',
-                           id             => 'cstid',
-                          );
         my $portfolioform;
         if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
             # Current user has quota modification privileges
-            $portfolioform = &portfolio_quota($ccuname,$ccdomain);
+            $portfolioform = '<br />'.&portfolio_quota($ccuname,$ccdomain);
         }
-	my $genhelp=&Apache::loncommon::help_open_topic('Generation');
         &initialize_authen_forms($ccdomain);
+        my %lt=&Apache::lonlocal::texthash(
+                'cnu'            => 'Create New User',
+                'ind'            => 'in domain',
+                'lg'             => 'Login Data',
+                'hs'             => "Home Server",
+        );
 	$r->print(<<ENDTITLE);
 $start_page
 $crumbs
 $response
 $forminfo
-<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain</h2>
 <script type="text/javascript" language="Javascript">
 $loginscript
 </script>
 <input type='hidden' name='makeuser' value='1' />
-<h3>$lt{'pd'}</h3>
-<p>
+<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain</h2>
 ENDTITLE
-        $r->print(&Apache::lonhtmlcommon::start_pick_box());
-        foreach my $item (@userinfo) {
-            my $rowtitle = $lt{$item};
-            if ($item eq 'generation') {
-                $rowtitle = $genhelp.$rowtitle;
-            }
-            $r->print(&Apache::lonhtmlcommon::row_title($rowtitle,undef,'LC_oddrow_value')."\n");
-            if ($inst_results{$item} ne '') {
-                $r->print('<input type="hidden" name="'.$element{$item}.'" value="'.$inst_results{$item}.'" />'.$inst_results{$item});
-            } else {
-                $r->print('<input type="text" name="'.$element{$item}.'" size="'.$textboxsize{$item}.'" value="" />');
-            }
-            $r->print(&Apache::lonhtmlcommon::row_closure(1));
-        }
-        $r->print(&Apache::lonhtmlcommon::end_pick_box());
+        $r->print('<div class="LC_left_float">');
+        my $personal_table = 
+            &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',
                                                       'default','hide');
@@ -786,16 +752,20 @@ $lt{'hs'}: $home_server_pick
         } else {
             $r->print($home_server_pick);
         }
-        $r->print("<hr />\n".'<h3>'.$lt{'lg'}.'</h3>');
+        $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 +774,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 +789,7 @@ KERB
                         }
                     }
                 } else {
-                    $r->print(&set_login($ccdomain));
+                    $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc));
                 }
             }
             if ($authmsg) {
@@ -830,21 +800,16 @@ $varauth
 ENDAUTH
             }
         } else {
-            $r->print(&set_login($ccdomain)); 
+            $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc)); 
         }
         $r->print(<<ENDPORT);
-<hr />
-$portfolioform
+        $portfolioform
+</div><div class="LC_clear_float_footer"></div>
 ENDPORT
     } else { # user already exists
 	my %lt=&Apache::lonlocal::texthash(
-                    'cup'  => "Change User Privileges for",
+                    'cup'  => "Modify existing user: ",
                     'id'   => "in domain",
-                    'fn'   => "first name",
-                    'mn'   => "middle name",
-                    'ln'   => "last name",
-                    'gen'  => "generation",
-                    'email' => "permanent e-mail",
 				       );
 	$r->print(<<ENDCHANGEUSER);
 $start_page
@@ -852,36 +817,54 @@ $crumbs
 $forminfo
 <h2>$lt{'cup'} "$ccuname" $lt{'id'} "$ccdomain"</h2>
 ENDCHANGEUSER
-        # Get the users information
-        my %userenv = 
-            &Apache::lonnet::get('environment',
-                ['firstname','middlename','lastname','generation',
-                 'permanentemail','portfolioquota'],$ccdomain,$ccuname);
-        my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname);
-        $r->print('
-<hr />'.
-                  &Apache::loncommon::start_data_table().
-                  &Apache::loncommon::start_data_table_header_row().
-'<th>'.$lt{'fn'}.'</th><th>'.$lt{'mn'}.'</th><th>'.$lt{'ln'}.'</th><th>'.$lt{'gen'}.'</th><th>'.$lt{'email'}.'</th>'.
-                  &Apache::loncommon::end_data_table_header_row().
-                  &Apache::loncommon::start_data_table_row());
-        foreach my $item ('firstname','middlename','lastname','generation','permanentemail') {
-           if (&Apache::lonnet::allowed('mau',$ccdomain)) {
-              $r->print(<<"END");
-<td><input type="text" name="c$item" value="$userenv{$item}" size="15" /></td>
-END
-           } else {
-               $r->print('<td>'.$userenv{$item}.'</td>');
-           }
+        $r->print('<div class="LC_left_float">');
+        my ($personal_table,$showforceid) = 
+            &personal_data_display($ccuname,$ccdomain,$newuser,$context,
+                                   $inst_results{$ccuname.':'.$ccdomain});
+        $r->print($personal_table);
+        if ($showforceid) {
+            $r->print(&Apache::lonuserutils::forceid_change($context));
+        }
+        $r->print('</div>');
+        my $user_auth_text = 
+            &user_authentication($ccuname,$ccdomain,$krbdefdom,\%abv_auth);
+        my $user_quota_text;
+        if (&Apache::lonnet::allowed('mpq',$ccdomain)) {
+            # Current user has quota modification privileges
+            $user_quota_text = &portfolio_quota($ccuname,$ccdomain);
+        } elsif (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
+            # Get the user's portfolio information
+            my %portq = &Apache::lonnet::get('environment',['portfolioquota'],
+                                             $ccdomain,$ccuname);
+
+            my %lt=&Apache::lonlocal::texthash(
+                'dska'  => "Disk space allocated to user's portfolio files",
+                'youd'  => "You do not have privileges to modify the portfolio quota for this user.",
+                'ichr'  => "If a change is required, contact a domain coordinator for the domain",
+            );
+            $user_quota_text = <<ENDNOPORTPRIV;
+<h3>$lt{'dska'}</h3>
+$lt{'youd'} $lt{'ichr'}: $ccdomain
+ENDNOPORTPRIV
         }
-        $r->print(&Apache::loncommon::end_data_table_row().
-                  &Apache::loncommon::end_data_table());
+        if ($user_auth_text ne '') {
+            $r->print('<div class="LC_left_float">'.$user_auth_text);
+            if ($user_quota_text ne '') {
+                $r->print($user_quota_text);
+            }
+            $r->print('</div>');
+
+        } elsif ($user_quota_text ne '') {
+            $r->print('<div class="LC_left_float">'.$user_quota_text.'</div>');
+        }
+        $r->print('<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);
         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",
@@ -978,7 +961,7 @@ END
                }
                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;
@@ -1014,7 +997,7 @@ END
                    $plaintext=&Apache::lonnet::plaintext($role_code,$class)
 	       } else {
 	           $plaintext=
-		"Customrole '$croletitle' defined by $croleuname\@$croleudom";
+		"Customrole '$croletitle'<br />defined by $croleuname\@$croleudom";
 	       }
                $row.= '</td><td>'.$plaintext.
                       '</td><td>'.$area.
@@ -1050,7 +1033,6 @@ END
 	   }
            if ($rolesdisplay == 1) {
                $r->print('
-<hr />
 <h3>'.$lt{'rer'}.'</h3>'.
 &Apache::loncommon::start_data_table("LC_createuser").
 &Apache::loncommon::start_data_table_header_row().
@@ -1066,121 +1048,17 @@ END
 	       $r->print(&Apache::loncommon::end_data_table());
            }
         }  # End of unless
-	my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
-	if ($currentauth=~/^krb(4|5):/) {
-	    $currentauth=~/^krb(4|5):(.*)/;
-	    my $krbdefdom=$2;
-            my %param = ( formname => 'document.cu',
-                          kerb_def_dom => $krbdefdom,
-                          domain => $ccdomain,
-                          curr_authtype => $currentauth, 
-                          );
-            $loginscript  = &Apache::loncommon::authform_header(%param);
-	}
-	# Check for a bad authentication type
-        if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) {
-	    # bad authentication scheme
-	    if (&Apache::lonnet::allowed('mau',$ccdomain)) {
-                &initialize_authen_forms($ccdomain);
-		my %lt=&Apache::lonlocal::texthash(
-                               'err'   => "ERROR",
-			       'uuas'  => "This user has an unrecognized authentication scheme",
-                               'sldb'  => "Please specify login data below",
-                               'ld'    => "Login Data"
-						   );
-                my $choices = &set_login($ccdomain);
-		$r->print(<<ENDBADAUTH);
-<hr />
-<script type="text/javascript" language="Javascript">
-$loginscript
-</script>
-<font color='#ff0000'>$lt{'err'}:</font>
-$lt{'uuas'} ($currentauth). $lt{'sldb'}.
-<h3>$lt{'ld'}</h3>
-$choices
-ENDBADAUTH
-            } else { 
-                # This user is not allowed to modify the user's 
-                # authentication scheme, so just notify them of the problem
-		my %lt=&Apache::lonlocal::texthash(
-                               'err'   => "ERROR",
-			       'uuas'  => "This user has an unrecognized authentication scheme",
-                               'adcs'  => "Please alert a domain coordinator of this situation"
-						   );
-		$r->print(<<ENDBADAUTH);
-<hr />
-<font color="#ff0000"> $lt{'err'}: </font>
-$lt{'uuas'} ($currentauth). $lt{'adcs'}.
-<hr />
-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);
-            if (&Apache::lonnet::allowed('mau',$ccdomain)) {
-		# Current user has login modification privileges
-		my %lt=&Apache::lonlocal::texthash(
-                               'ccld'  => "Change Current Login Data",
-			       'enld'  => "Enter New Login Data"
-						   );
-		$r->print(<<ENDOTHERAUTHS);
-<hr />
-<script type="text/javascript" language="Javascript">
-$loginscript
-</script>
-<h3>$lt{'ccld'}</h3>
-<p>$authformnop
-ENDOTHERAUTHS
-                if ($can_modify) {
-                    $r->print('</p><p>'.$authformcurrent.'</p>');
-                } else {
-                    $r->print('&nbsp;('.$authformcurrent.')</p>'); 
-                }
-                if ($authform_other ne '') {
-                    $r->print('<h3>'.$lt{'enld'}.'</h3>'."\n".
-                              $authform_other);
-                }
-            } else {
-                if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {
-                    my %lt=&Apache::lonlocal::texthash(
-                               'ccld'  => "Change Current Login Data",
-                               'yodo'  => "You do not have privileges to modify the authentication configuration for this user.",
-                               'ifch'  => "If a change is required, contact a domain coordinator for the domain",
-                    );
-                    $r->print(<<ENDNOPRIV);
-<hr />
-<h3>$lt{'ccld'}</h3>
-$lt{'yodo'} $lt{'ifch'}: $ccdomain 
-ENDNOPRIV
-                } 
-            }
-        }  ## End of "check for bad authentication type" logic
-        if (&Apache::lonnet::allowed('mpq',$ccdomain)) {
-            # Current user has quota modification privileges
-            $r->print(&portfolio_quota($ccuname,$ccdomain));
-        } elsif (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) { 
-            my %lt=&Apache::lonlocal::texthash(
-                'dska'  => "Disk space allocated to user's portfolio files",
-                'youd'  => "You do not have privileges to modify the portfolio quota for this user.",
-                'ichr'  => "If a change is required, contact a domain coordinator for the domain",
-            );
-            $r->print(<<ENDNOPORTPRIV);
-<hr />
-<h3>$lt{'dska'}</h3>
-$lt{'youd'} $lt{'ichr'}: $ccdomain
-ENDNOPORTPRIV
-        }
     } ## End of new user/old user logic
-    $r->print('<hr /><h3>'.&mt('Add Roles').'</h3>');
+    my $addrolesdisplay = 0;
+    $r->print('<h3>'.&mt('Add Roles').'</h3>');
 #
 # 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;
 	my $cuname=$env{'user.name'};
         my $cudom=$env{'request.role.domain'};
 	   my %lt=&Apache::lonlocal::texthash(
@@ -1227,6 +1105,16 @@ 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 ($env{'request.role'} =~ /^au\./) {
+        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>');
+        } 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'));
+        }
     }
 #
 # Domain level
@@ -1267,40 +1155,135 @@ ENDNOPORTPRIV
     $domaintext.= &Apache::loncommon::end_data_table();
     if ($num_domain_level > 0) {
         $r->print($domaintext);
+        $addrolesdisplay = 1;
     }
 #
-# Course and group levels
+# Course level
 #
 
     if ($env{'request.role'} =~ m{^dc\./($match_domain)/$}) {
         $r->print(&course_level_dc($1,'Course'));
-        $r->print('<hr /><input type="button" value="'.&mt('Modify User').'" onClick="setCourse()" />'."\n");
+        $r->print('<br /><input type="button" value="'.&mt('Modify User').'" onClick="setCourse()" />'."\n");
+    } elsif ($env{'request.role'} =~ m{^au\./($match_domain)/$}) {
+        if ($addrolesdisplay) {
+            $r->print('<br /><input type="button" value="'.&mt('Modify User').'"');
+            if ($newuser) {
+                $r->print(' onClick="verify_message(this.form)" \>'."\n");
+            } else {
+                $r->print('onClick="this.form.submit()" \>'."\n"); 
+            }
+        } else {
+            $r->print('<br /><a href="javascript:backPage(document.cu)">'.
+                      &mt('Back to previous page').'</a>');
+        }
     } else {
         $r->print(&course_level_table(%inccourses));
-        $r->print('<hr /><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']));
+    $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
     $r->print('<input type="hidden" name="currstate" value="" />');
     $r->print('<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />');
     $r->print("</form>".&Apache::loncommon::end_page());
 }
 
-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 (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
-        $response .= "<p>$authformkrb </p>\n";
-    }
-    if ($can_assign{'int'}) {
-        $response .= "<p>$authformint </p>\n"
-    }
-    if ($can_assign{'loc'}) {
-        $response .= "<p>$authformloc </p>\n";
+sub user_authentication {
+    my ($ccuname,$ccdomain,$krbdefdom,$abv_auth) = @_;
+    my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
+    my ($loginscript,$outcome);
+    if ($currentauth=~/^(krb)(4|5):(.*)/) {
+        my $long_auth = $1.$2;
+        my $curr_kerb_ver = $2;
+        my $krbdefdom=$3;
+        my $curr_authtype = $abv_auth->{$long_auth};
+        my %param = ( formname      => 'document.cu',
+                      kerb_def_dom  => $krbdefdom,
+                      domain        => $ccdomain,
+                      curr_authtype => $curr_authtype,
+                      curr_kerb_ver => $curr_kerb_ver,
+                          );
+        $loginscript  = &Apache::loncommon::authform_header(%param);
     }
-    return $response;
+    # Check for a bad authentication type
+    if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) {
+        # bad authentication scheme
+        my %lt=&Apache::lonlocal::texthash(
+                       'err'   => "ERROR",
+                       'uuas'  => "This user has an unrecognized authentication scheme",
+                       'adcs'  => "Please alert a domain coordinator of this situation",
+                       'sldb'  => "Please specify login data below",
+                       'ld'    => "Login Data"
+        );
+        if (&Apache::lonnet::allowed('mau',$ccdomain)) {
+            &initialize_authen_forms($ccdomain);
+            my $choices = &Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc);
+            $outcome = <<ENDBADAUTH;
+<script type="text/javascript" language="Javascript">
+$loginscript
+</script>
+<span class="LC_error">$lt{'err'}:
+$lt{'uuas'} ($currentauth). $lt{'sldb'}.</span>
+<h3>$lt{'ld'}</h3>
+$choices
+ENDBADAUTH
+        } else {
+            # This user is not allowed to modify the user's
+            # authentication scheme, so just notify them of the problem
+            $outcome = <<ENDBADAUTH;
+<span class="LC_error"> $lt{'err'}: 
+$lt{'uuas'} ($currentauth). $lt{'adcs'}.
+</span>
+ENDBADAUTH
+        }
+    } else { # Authentication type is valid
+        &initialize_authen_forms($ccdomain,$currentauth,'modifyuser');
+        my ($authformcurrent,$can_modify,@authform_others) =
+            &modify_login_block($ccdomain,$currentauth);
+        if (&Apache::lonnet::allowed('mau',$ccdomain)) {
+            # Current user has login modification privileges
+            my %lt=&Apache::lonlocal::texthash (
+                           'ld'    => "Login Data",
+                           'ccld'  => "Change Current Login Data",
+                           'enld'  => "Enter New Login Data"
+                                               );
+            $outcome =
+                       '<script type="text/javascript" language="Javascript">'."\n".
+                       $loginscript."\n".
+                       '</script>'."\n".
+                       '<h3>'.$lt{'ld'}.'</h3>'.
+                       &Apache::loncommon::start_data_table().
+                       &Apache::loncommon::start_data_table_row().
+                       '<td>'.$authformnop;
+            if ($can_modify) {
+                $outcome .= '</td>'."\n".
+                            &Apache::loncommon::end_data_table_row().
+                            &Apache::loncommon::start_data_table_row().
+                            '<td>'.$authformcurrent.'</td>'.
+                            &Apache::loncommon::end_data_table_row()."\n";
+            } else {
+                $outcome .= '&nbsp;('.$authformcurrent.')</td>'.
+                            &Apache::loncommon::end_data_table_row()."\n";
+            }
+            foreach my $item (@authform_others) { 
+                $outcome .= &Apache::loncommon::start_data_table_row().
+                            '<td>'.$item.'</td>'.
+                            &Apache::loncommon::end_data_table_row()."\n";
+            }
+            $outcome .= &Apache::loncommon::end_data_table();
+        } else {
+            if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {
+                my %lt=&Apache::lonlocal::texthash(
+                           'ccld'  => "Change Current Login Data",
+                           'yodo'  => "You do not have privileges to modify the authentication configuration for this user.",
+                           'ifch'  => "If a change is required, contact a domain coordinator for the domain",
+                );
+                $outcome .= <<ENDNOPRIV;
+<h3>$lt{'ccld'}</h3>
+$lt{'yodo'} $lt{'ifch'}: $ccdomain
+ENDNOPRIV
+            }
+        }
+    }  ## End of "check for bad authentication type" logic
+    return $outcome;
 }
 
 sub modify_login_block {
@@ -1308,14 +1291,14 @@ sub modify_login_block {
     my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
     my ($authnum,%can_assign) =
         &Apache::loncommon::get_assignable_auth($dom);
-    my ($authformcurrent,$authform_other,$show_override_msg);
+    my ($authformcurrent,@authform_others,$show_override_msg);
     if ($currentauth=~/^krb(4|5):/) {
         $authformcurrent=$authformkrb;
         if ($can_assign{'int'}) {
-            $authform_other = "<p>$authformint </p>\n"
+            push(@authform_others,$authformint);
         }
         if ($can_assign{'loc'}) {
-            $authform_other .= "<p>$authformloc </p>\n";
+            push(@authform_others,$authformloc);
         }
         if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
             $show_override_msg = 1;
@@ -1323,10 +1306,10 @@ sub modify_login_block {
     } elsif ($currentauth=~/^internal:/) {
         $authformcurrent=$authformint;
         if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
-            $authform_other = "<p>$authformkrb </p>\n"
+            push(@authform_others,$authformkrb);
         }
         if ($can_assign{'loc'}) {
-            $authform_other .= "<p>$authformloc </p>\n";
+            push(@authform_others,$authformloc);
         }
         if ($can_assign{'int'}) {
             $show_override_msg = 1;
@@ -1334,13 +1317,13 @@ sub modify_login_block {
     } elsif ($currentauth=~/^unix:/) {
         $authformcurrent=$authformfsys;
         if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
-            $authform_other = "<p>$authformkrb </p>\n"
+            push(@authform_others,$authformkrb);
         }
         if ($can_assign{'int'}) {
-            $authform_other .= "<p>$authformint </p>\n"
+            push(@authform_others,$authformint);
         }
         if ($can_assign{'loc'}) {
-            $authform_other .= "<p>$authformloc </p>\n";
+            push(@authform_others,$authformloc);
         }
         if ($can_assign{'fsys'}) {
             $show_override_msg = 1;
@@ -1348,32 +1331,128 @@ sub modify_login_block {
     } elsif ($currentauth=~/^localauth:/) {
         $authformcurrent=$authformloc;
         if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
-            $authform_other = "<p>$authformkrb </p>\n"
+            push(@authform_others,$authformkrb);
         }
         if ($can_assign{'int'}) {
-            $authform_other .= "<p>$authformint </p>\n"
+            push(@authform_others,$authformint);
         }
         if ($can_assign{'loc'}) {
             $show_override_msg = 1;
         }
     }
     if ($show_override_msg) {
-        $authformcurrent.= ' <span class="LC_cusr_emph">'.
+        $authformcurrent = '<table><tr><td colspan="3">'.$authformcurrent.
+                           '</td></tr>'."\n".
+                           '<tr><td>&nbsp;&nbsp;&nbsp;</td>'.
+                           '<td><b>'.&mt('Currently in use').'</b></td>'.
+                           '<td align="right"><span class="LC_cusr_emph">'.
                             &mt('will override current values').
-                            '</span><br />';
+                            '</span></td></tr></table>';
+    }
+    return ($authformcurrent,$show_override_msg,@authform_others); 
+}
+
+sub personal_data_display {
+    my ($ccuname,$ccdomain,$newuser,$context,$inst_results) = @_;
+    my ($output,$showforceid,%userenv,%domconfig);
+    if (!$newuser) {
+        # Get the users information
+        %userenv = &Apache::lonnet::get('environment',
+                   ['firstname','middlename','lastname','generation',
+                    'permanentemail','id'],$ccdomain,$ccuname);
+        %domconfig =
+            &Apache::lonnet::get_dom('configuration',['usermodification'],
+                                     $ccdomain);
+    }
+    my %lt=&Apache::lonlocal::texthash(
+                'pd'             => "Personal Data",
+                'firstname'      => "First Name",
+                'middlename'     => "Middle Name",
+                'lastname'       => "Last Name",
+                'generation'     => "Generation",
+                'permanentemail' => "Permanent e-mail address",
+                'id'             => "ID/Student Number",
+                'lg'             => "Login Data"
+    );
+    my @userinfo = ('firstname','middlename','lastname','generation',
+                    'permanentemail','id');
+    my %textboxsize = (
+                       firstname      => '15',
+                       middlename     => '15',
+                       lastname       => '15',
+                       generation     => '5',
+                       permanentemail => '25',
+                       id             => '15',
+                      );
+    my $genhelp=&Apache::loncommon::help_open_topic('Generation');
+    $output = '<h3>'.$lt{'pd'}.'</h3>'.
+              &Apache::lonhtmlcommon::start_pick_box();
+    foreach my $item (@userinfo) {
+        my $rowtitle = $lt{$item};
+        if ($item eq 'generation') {
+            $rowtitle = $genhelp.$rowtitle;
+        }
+        $output .= &Apache::lonhtmlcommon::row_title($rowtitle,undef,'LC_oddrow_value')."\n";
+        if ($newuser) {
+            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="" />';
+            }
+        } else {
+            my $canmodify = 0;
+            if (&Apache::lonnet::allowed('mau',$ccdomain)) {
+                $canmodify = 1;
+            } else {
+                if (ref($domconfig{'usermodification'}) eq 'HASH') {
+                    if (ref($domconfig{'usermodification'}{$context}) eq 'HASH') {
+                        foreach my $key (keys(%{$domconfig{'usermodification'}{$context}})) {
+                            if (ref($domconfig{'usermodification'}{$context}{$key}) eq 'HASH') {
+                                if ($domconfig{'usermodification'}{$context}{$key}{$item}) { 
+                                    $canmodify = 1;
+                                    last;
+                                }
+                            }
+                        }
+                    }
+                } elsif ($context eq 'course') {
+                    $canmodify = 1;
+                }
+            }
+            if ($canmodify) {
+                $output .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="'.$userenv{$item}.'" />';
+            } else {
+                $output .= $userenv{$item};
+            }
+            if ($item eq 'id') {
+                $showforceid = $canmodify; 
+            } 
+        }
+        $output .= &Apache::lonhtmlcommon::row_closure(1);
+    }
+    $output .= &Apache::lonhtmlcommon::end_pick_box();
+    if (wantarray) {
+        return ($output,$showforceid);
+    } else {
+        return $output;
     }
-    return ($authformcurrent,$authform_other,$show_override_msg); 
 }
 
 # ================================================================= Phase Three
 sub update_user_data {
-    my ($r) = @_; 
+    my ($r,$context) = @_; 
     my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'},
                                           $env{'form.ccdomain'});
     # Error messages
-    my $error     = '<font color="#ff0000">'.&mt('Error').':</font>';
-    my $end       = &Apache::loncommon::end_page();
-
+    my $error     = '<span class="LC_error">'.&mt('Error').': ';
+    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;
     if (exists($env{'form.makeuser'})) {
 	$title='Set Privileges for New User';
@@ -1388,7 +1467,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
@@ -1406,27 +1485,28 @@ sub update_user_data {
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
 
     my %disallowed;
+    $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'})) {
@@ -1462,19 +1542,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('<h2>'.&mt('User [_1] in domain [_2]',
-			 $env{'form.ccuname'}, $env{'form.ccdomain'}).'</h2>');
-
+    $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
@@ -1485,17 +1565,47 @@ 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'},
-             $amode,$genpwd,$env{'form.cfirst'},
-             $env{'form.cmiddle'},$env{'form.clast'},$env{'form.cgen'},
-             undef,$desiredhost,$env{'form.cemail'}
-	     );
+	    ($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,
+             $env{'form.cpermanentemail'});
 	$r->print(&mt('Generating user').': '.$result);
         my $home = &Apache::lonnet::homeserver($env{'form.ccuname'},
                                                $env{'form.ccdomain'});
@@ -1505,7 +1615,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
@@ -1518,7 +1628,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);    
 	}
     }
     ##
@@ -1526,22 +1636,160 @@ 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') {
+        my $no_forceid_alert;
+        # Check to see if user information can be changed
+        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);
+        if ($context eq 'course') {
+            $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+            $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            if ($cnum eq '' || $cdom eq '') {
+                my $cid = $env{'request.course.id'};
+                my %coursehash =
+                     &Apache::lonnet::coursedescription($cid,{'one_time' => 1});
+                $cdom = $coursehash{'domain'};
+                $cnum = $coursehash{'num'};
+            } 
+        } elsif ($context eq 'author') {
+            $auname = $env{'user.name'};
+            $audom = $env{'user.domain'};     
+        }
+        foreach my $item (keys(%roles)) {
+            my ($rolenum,$roledom,$role) = split(/:/,$item);
+            if ($context eq 'course') {
+                if ($cnum ne '' && $cdom ne '') {
+                    if ($rolenum eq $cnum && $roledom eq $cdom) {
+                        if (!grep(/^\Q$role\E$/,@userroles)) {
+                            push(@userroles,$role);
+                        }
+                    }
+                }
+            } elsif ($context eq 'author') {
+                if ($rolenum eq $auname && $roledom eq $audom) {
+                    if (!grep(/^\Q$role\E$/,@userroles)) { 
+                        push(@userroles,$role);
+                    }
+                }
+            }
+        }
+        # Check for course or co-author roles being activated or re-enabled
+        if ($context eq 'author' || $context eq 'course') {
+            foreach my $key (keys(%env)) {
+                if ($context eq 'author') {
+                    if ($key=~/^form\.act_\Q$audom\E_\Q$auname\E_([^_]+)/) {
+                        if (!grep(/^\Q$1\E$/,@userroles)) {
+                            push(@userroles,$1);
+                        }
+                    } elsif ($key =~/^form\.ren\:\Q$audom\E\/\Q$auname\E_([^_]+)/) {
+                        if (!grep(/^\Q$1\E$/,@userroles)) {
+                            push(@userroles,$1);
+                        }
+                    }
+                } elsif ($context eq 'course') {
+                    if ($key=~/^form\.act_\Q$cdom\E_\Q$cnum\E_([^_]+)/) {
+                        if (!grep(/^\Q$1\E$/,@userroles)) {
+                            push(@userroles,$1);
+                        }
+                    } elsif ($key =~/^form\.ren\:\Q$cdom\E\/\Q$cnum\E(\/?\w*)_([^_]+)/) {
+                        if (!grep(/^\Q$1\E$/,@userroles)) {
+                            push(@userroles,$1);
+                        }
+                    }
+                }
+            }
+        }
+        #Check to see if we can change personal data for the user 
+        my (@mod_disallowed,@longroles);
+        foreach my $role (@userroles) {
+            if ($role eq 'cr') {
+                push(@longroles,'Custom');
+            } else {
+                push(@longroles,&Apache::lonnet::plaintext($role)); 
+            }
+        }
+        foreach my $item ('firstname','middlename','lastname','generation','permanentemail','id') {
+            my $canmodify = 0;
+            if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) {
+                $canmodify = 1;
+            } else {
+                if ($context eq 'course' || $context eq 'author') {
+                    if (ref($domconfig{'usermodification'}) eq 'HASH') {
+                        if (ref($domconfig{'usermodification'}{$context}) eq 'HASH') {
+                            foreach my $role (@userroles) {
+                                if (ref($domconfig{'usermodification'}{$context}{$role}) eq 'HASH') {
+                                    if ($domconfig{'usermodification'}{$context}{$role}{$item}) {
+                                        $canmodify = 1;
+                                        last;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } elsif ($context eq 'course') {
+                    if (grep(/^st$/,@userroles)) {
+                        $canmodify = 1;
+                    }
+                }
+            }
             # Strip leading and trailing whitespace
-            $env{'form.c'.$item} =~ s/(\s+$|^\s+)//g; 
+            $env{'form.c'.$item} =~ s/(\s+$|^\s+)//g;
+            if (!$canmodify) {
+                if (defined($env{'form.c'.$item})) {
+                    if ($env{'form.c'.$item} ne $userenv{$item}) {
+                        push(@mod_disallowed,$item);
+                    }
+                }
+                $env{'form.c'.$item} = $userenv{$item};
+            }
+        }
+        # 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 (%alerts,%rulematch,%idinst_results,%curr_rules,%got_rules);
+        my %uidhash = &Apache::lonnet::idrget($env{'form.ccdomain'},
+                                            $env{'form.ccuname'});
+        if (($uidhash{$env{'form.ccuname'}}) && 
+            ($uidhash{$env{'form.ccuname'}}!~/error\:/) && 
+            (!$forceid)) {
+            if ($env{'form.cid'} ne $uidhash{$env{'form.ccuname'}}) {
+                $env{'form.cid'} = $userenv{'id'};
+                $no_forceid_alert = &mt('New student/employeeID does not match existing ID for this user.').'<br />'.&mt('Change is not permitted without checking the \'Force ID change\' checkbox on the previous page.').'<br />'."\n";        
+            }
+        }
+        if ($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') {
+                   $env{'form.cid'} = $userenv{'id'};
+                }
+            }
         }
         my ($quotachanged,$namechanged,$oldportfolioquota,$newportfolioquota,
-            $inststatus,$isdefault,$defquotatext);
+            $inststatus,$oldisdefault,$newisdefault,$olddefquotatext,
+            $newdefquotatext);
         my ($defquota,$settingstatus) = 
             &Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus);
         my %changeHash;
+        $changeHash{'portfolioquota'} = $userenv{'portfolioquota'};
         if ($userenv{'portfolioquota'} ne '') {
             $oldportfolioquota = $userenv{'portfolioquota'};
             if ($env{'form.customquota'} == 1) {
@@ -1551,15 +1799,16 @@ sub update_user_data {
                     $newportfolioquota = $env{'form.portfolioquota'};
                     $newportfolioquota =~ s/[^\d\.]//g;
                 }
-                if ($newportfolioquota != $userenv{'portfolioquota'}) {
+                if ($newportfolioquota != $oldportfolioquota) {
                     $quotachanged = &quota_admin($newportfolioquota,\%changeHash);
                 }
             } else {
                 $quotachanged = &quota_admin('',\%changeHash);
                 $newportfolioquota = $defquota;
-                $isdefault = 1; 
+                $newisdefault = 1; 
             }
         } else {
+            $oldisdefault = 1;
             $oldportfolioquota = $defquota;
             if ($env{'form.customquota'} == 1) {
                 if ($env{'form.portfolioquota'} eq '') {
@@ -1571,41 +1820,47 @@ sub update_user_data {
                 $quotachanged = &quota_admin($newportfolioquota,\%changeHash);
             } else {
                 $newportfolioquota = $defquota;
-                $isdefault = 1;
+                $newisdefault = 1;
             }
         }
-        if ($isdefault) {
-            if ($settingstatus eq '') {
-                $defquotatext = &mt('(default)');
-            } else {
-                my ($usertypes,$order) = 
-                    &Apache::lonnet::retrieve_inst_usertypes($env{'form.ccdomain'});
-                if ($usertypes->{$settingstatus} eq '') {
-                    $defquotatext = &mt('(default)');
-                } else { 
-                    $defquotatext = &mt('(default for [_1])',$usertypes->{$settingstatus});
-                }
-            }
+        if ($oldisdefault) {
+            $olddefquotatext = &get_defaultquota_text($settingstatus);
+        }
+        if ($newisdefault) {
+            $newdefquotatext = &get_defaultquota_text($settingstatus);
         }
-        if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}) && 
-            ($env{'form.cfirstname'}  ne $userenv{'firstname'}  ||
-             $env{'form.cmiddlename'} ne $userenv{'middlename'} ||
-             $env{'form.clastname'}   ne $userenv{'lastname'}   ||
-             $env{'form.cgeneration'} ne $userenv{'generation'} ||
-             $env{'form.cpermanentemail'} ne $userenv{'permanentemail'} )) {
+        if ($env{'form.cfirstname'}  ne $userenv{'firstname'}  ||
+            $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;
         }
-        if ($namechanged) {
-            # Make the change
+        if ($namechanged || $quotachanged) {
             $changeHash{'firstname'}  = $env{'form.cfirstname'};
             $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,
-                 $env{'form.ccdomain'},$env{'form.ccuname'});
-            if ($putresult eq 'ok') {
+            my ($quotachgresult,$namechgresult);
+            if ($quotachanged) {
+                $quotachgresult = 
+                    &Apache::lonnet::put('environment',\%changeHash,
+                                  $env{'form.ccdomain'},$env{'form.ccuname'});
+            }
+            if ($namechanged) {
+            # Make the change
+                $namechgresult =
+                    &Apache::lonnet::modifyuser($env{'form.ccdomain'},
+                        $env{'form.ccuname'},$changeHash{'id'},undef,undef,
+                        $changeHash{'firstname'},$changeHash{'middlename'},
+                        $changeHash{'lastname'},$changeHash{'generation'},
+                        $changeHash{'id'},undef,$changeHash{'permanentemail'});
+            }
+            if (($namechanged && $namechgresult eq 'ok') || 
+                ($quotachanged && $quotachgresult eq 'ok')) {
             # Tell the user we changed the name
 		my %lt=&Apache::lonlocal::texthash(
                              'uic'  => "User Information Changed",             
@@ -1613,38 +1868,70 @@ 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",
                              'chto' => "Changed To"
 						   );
+                $r->print('<h4>'.$lt{'uic'}.'</h4>'.
+                          &Apache::loncommon::start_data_table().
+                          &Apache::loncommon::start_data_table_header_row());
                 $r->print(<<"END");
-<table border="2">
-<caption>$lt{'uic'}</caption>
-<tr><th>&nbsp;</th>
+    <th>&nbsp;</th>
     <th>$lt{'frst'}</th>
     <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>
+    <th>$lt{'disk'}</th>
+END
+                $r->print(&Apache::loncommon::end_data_table_header_row().
+                          &Apache::loncommon::start_data_table_row());
+                $r->print(<<"END");
+    <td><b>$lt{'prvs'}</b></td>
     <td>$userenv{'firstname'}  </td>
     <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>
-<tr><td>$lt{'chto'}</td>
+    <td>$oldportfolioquota Mb $olddefquotatext </td>
+END
+                $r->print(&Apache::loncommon::end_data_table_row().
+                          &Apache::loncommon::start_data_table_row());
+                $r->print(<<"END");
+    <td><b>$lt{'chto'}</b></td>
     <td>$env{'form.cfirstname'}  </td>
     <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>
+    <td>$newportfolioquota Mb $newdefquotatext </td>
 END
+                $r->print(&Apache::loncommon::end_data_table_row().
+                          &Apache::loncommon::end_data_table().'<br />');
+                if ($env{'form.cid'} ne $userenv{'id'}) {
+                    &Apache::lonnet::idput($env{'form.ccdomain'},
+                         ($env{'form.ccuname'} => $env{'form.cid'}));
+                    if (($recurseid) &&
+                        (&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 = 
+                            &Apache::lonuserutils::propagate_id_change(
+                                $env{'form.ccuname'},$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;
@@ -1654,41 +1941,64 @@ END
                     &Apache::lonnet::appenv(%newenvhash);
                 }
             } else { # error occurred
-                $r->print("<h2>".&mt('Unable to successfully change environment for')." ".
-                      $env{'form.ccuname'}." ".&mt('in domain')." ".
-                      $env{'form.ccdomain'}."</h2>");
+                $r->print('<span class="LC_error">'.&mt('Unable to successfully change environment for').' '.
+                      $env{'form.ccuname'}.' '.&mt('in domain').' '.
+                      $env{'form.ccdomain'}.'</span><br />');
             }
         }  else { # End of if ($env ... ) logic
-            my $putresult;
-            if ($quotachanged) {
-                $putresult = &Apache::lonnet::put
-                                 ('environment',\%changeHash,
-                                  $env{'form.ccdomain'},$env{'form.ccuname'});
-            }
-            # They did not want to change the users name but we can
-            # still tell them what the name is
+            # They did not want to change the users name or quota but we can
+            # still tell them what the name and quota are 
 	    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'}</h4>
-<h4>$lt{'mail'}: $userenv{'permanentemail'}</h4>
+<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'}
 END
-            if ($putresult eq 'ok') {
-                if ($oldportfolioquota != $newportfolioquota) {
-                    $r->print('<h4>'.$lt{'disk'}.': '.$newportfolioquota.' Mb '. 
-                              $defquotatext.'</h4>');
-                    &Apache::lonnet::appenv('environment.portfolioquota' => $changeHash{'portfolioquota'});
-                }
+            if ($userenv{'permanentemail'} ne '') {
+                $r->print('<br />['.$lt{'mail'}.': '.
+                          $userenv{'permanentemail'}.']');
+            }
+            $r->print('<br />['.$lt{'disk'}.': '.$oldportfolioquota.' Mb '. 
+                 $olddefquotatext.']</h4>');
+        }
+        if (@mod_disallowed) {
+            my ($rolestr,$contextname);
+            if (@longroles > 0) {
+                $rolestr = join(', ',@longroles);
+            } else {
+                $rolestr = &mt('No roles');
+            }
+            if ($context eq 'course') {
+                $contextname = &mt('course');
+            } elsif ($context eq 'author') {
+                $contextname = &mt('co-author');
+            }
+            $r->print(&mt('The following fields were not updated: ').'<ul>');
+            my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles();
+            foreach my $field (@mod_disallowed) {
+                $r->print('<li>'.$fieldtitles{$field}.'</li>'."\n"); 
+            }
+            $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));
     }
     ##
     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\:([^\_]+)\_([^\_\.]+)$/) {
@@ -1701,12 +2011,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>'.
@@ -1714,6 +2026,7 @@ END
 				  $env{'form.ccuname'},$1,$2,$3,$4).
 		'</b><br />');
 	    }
+            $rolechanges ++;
 	} elsif ($key=~/^form\.del/) {
 	    if ($key=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {
 # Delete standard role
@@ -1725,8 +2038,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);
 		}
             }
@@ -1739,6 +2054,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'};
@@ -1777,6 +2093,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'};
@@ -1880,7 +2197,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')) {  
@@ -1890,48 +2207,57 @@ 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();
-    $r->print('<p><a href="/adm/createuser">'.&mt('Create/Modify Another User').'</a></p>');
-    $r->print('<form name="userupdate" method="post" />'."\n");
-    foreach my $item ('srchby','srchin','srchtype','srchterm','srchdomain','ccuname','ccdomain') {
-        $r->print('<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n");
-    }
-    foreach my $item ('sortby','seluname','seludom') {
-        if (exists($env{'form.'.$item})) {
-            $r->print('<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n");
-        }
+    if (!$rolechanges) {
+        $r->print(&mt('No roles to modify'));
     }
-    $r->print('<input type="hidden" name="phase" value="" />'."\n".
-              '<input type ="hidden" name="currstate" value="" />'."\n".
-              '</form>');
     $r->print(&Apache::loncommon::end_page());
 }
 
-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 get_defaultquota_text {
+    my ($settingstatus) = @_;
+    my $defquotatext; 
+    if ($settingstatus eq '') {
+        $defquotatext = &mt('(default)');
+    } else {
+        my ($usertypes,$order) =
+            &Apache::lonnet::retrieve_inst_usertypes($env{'form.ccdomain'});
+        if ($usertypes->{$settingstatus} eq '') {
+            $defquotatext = &mt('(default)');
+        } else {
+            $defquotatext = &mt('(default for [_1])',$usertypes->{$settingstatus});
+        }
     }
+    return $defquotatext;
 }
 
-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 update_result_form {
+    my ($uhome) = @_;
+    my $outcome = 
+    '<form name="userupdate" method="post" />'."\n";
+    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";
+        }
+    }
+    if ($uhome eq 'no_host') {
+        $outcome .= '<input type="hidden" name="forcenewuser" value="1" />'."\n";
+    }
+    $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 quota_admin {
@@ -1990,7 +2316,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;
     }
@@ -2059,8 +2385,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",
@@ -2103,6 +2429,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".
@@ -2184,23 +2511,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",
@@ -2214,14 +2537,14 @@ sub set_custom_role {
 	&Apache::lonnet::get('roles',["rolesdef_$rolename"]);
 
 # ------------------------------------------------------- Does this role exist?
-    $r->print('<h2>');
+    $r->print('<h3>');
     if (($rdummy ne 'con_lost') && ($roledef ne '')) {
 	$r->print(&mt('Existing Role').' "');
     } else {
 	$r->print(&mt('New Role').' "');
 	$roledef='';
     }
-    $r->print($rolename.'"</h2>');
+    $r->print($rolename.'"</h3>');
 # ------------------------------------------------------- What can be assigned?
     my $sysrole='';
     my $domrole='';
@@ -2263,7 +2586,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());
 }
@@ -2271,75 +2594,355 @@ 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 = 'author';
+    } else {
+        $context = 'domain';
+    }
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+        ['action','state','callingform','roletype','showrole','bulkaction']);
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    if ($env{'form.action'} ne 'dateselect') {
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>"/adm/createuser",
+              text=>"User Management"});
+    }
+    my ($permission,$allowed) = 
+        &Apache::lonuserutils::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,$context));
+        $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,$context);
+        } 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 ($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);
-                   &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') ||
+            ($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') {
+                    $currstate = $env{'form.currstate'};
+                }
+                if ($currstate eq 'select') {
+                    &print_user_selection_page($r,$response,$srch,$results,
+                                               'createuser',\@search,$context);
+                } 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,$context,$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,$context);
+        } else {
+            &print_username_entry_form($r,$context,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'} || $permission->{'cusr'})) {
+        if ($env{'form.phase'} eq 'bulkchange') {
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>'backPage(document.studentform)',
+                  text=>"List Users"});
+            my $setting = $env{'form.roletype'};
+            my $choice = $env{'form.bulkaction'};
+            $r->print(&header());
+            $r->print(&Apache::lonhtmlcommon::breadcrumbs("List Users",
+                                                          'User_Management_List'));
+            if ($permission->{'cusr'}) {
+                &Apache::lonuserutils::update_user_list($r,$context,$setting,$choice);
+            }
+        } else {
+            &Apache::lonhtmlcommon::add_breadcrumb
+                ({href=>'/adm/createuser?action=listusers',
+                  text=>"List Users"});
+            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);
+                $jscript .= &verify_user_display();
+                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(&add_script(&verify_user_display())));
+            }
+            $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,$context);
+        } else {
+            &print_expire_menu($r,$context);
+        }
+        $r->print(&Apache::loncommon::end_page());
+    } elsif ($env{'form.action'} eq 'dateselect') {
+        if ($permission->{'cusr'}) {
+            $r->print(&header(undef,undef,{'no_nav_bar' => 1}).
+                      &Apache::lonuserutils::date_section_selector($context).
+                      &Apache::loncommon::end_page());
+        } else {
+            $r->print(&header().
+                     '<span class="LC_error">'.&mt('You do not have permission to modify dates or sections for users').'</span>'. 
+                     &Apache::loncommon::end_page());
+        }
+    } else {
+        $r->print(&header());
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+        $r->print(&print_main_menu($permission,$context));
+        $r->print(&Apache::loncommon::end_page());
+    }
+    return OK;
+}
+
+sub header {
+    my ($jscript,$loaditems,$args) = @_;
+    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,$args);
+    }
+    return $start_page;
+}
+
+sub add_script {
+    my ($js) = @_;
+    return '<script type="text/javascript">'."\n".$js."\n".'</script>';
+}
+
+sub verify_user_display {
+    my $output = <<"END";
+
+function display_update() {
+    document.studentform.action.value = 'listusers';
+    document.studentform.phase.value = 'display';
+    document.studentform.submit();
+}
+
+END
+    return $output;
+
+}
+
+###############################################################
+###############################################################
+#  Menu Phase One
+sub print_main_menu {
+    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 => $links{$context}{'upload'},
+            help => 'User_Management_Upload',
+            action => 'upload',
+            permission => $permission->{'cusr'},
+            },
+          { text => $links{$context}{'singleuser'}, 
+            help => 'User_Management_Single_User',
+            action => 'singleuser',
+            permission => $permission->{'cusr'},
+            },
+          { text => $links{$context}{'listusers'},
+            help => 'User_Management_List',
+            action => 'listusers',
+            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 = $env{'course.'.$env{'request.course.id'}.'.num'};
+        my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; 
+        my @courselinks = 
+            (
+               { text => 'Automated Enrollment Manager',
+                 permission => (&Apache::lonnet::auto_run($cnum,$cdom)
+                                && $permission->{'cusr'}),
+                 url  => '/adm/populate',
+                 },
+               { 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'});
+        $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 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
@@ -2450,7 +3053,8 @@ sub user_search_result {
 					{&Apache::lonnet::get('environment',
 							     ['firstname',
 							      'lastname',
-							      'permanentemail'])};
+							      'permanentemail'],
+							      $cudomain,$cuname)};
                                 }
                             }
                         }
@@ -2732,6 +3336,10 @@ sub crumb_utilities {
            srchtype => 'selectbox',
            srchdomain => 'selectbox',
        },
+       crtusername => {
+           srchterm => 'text',
+           srchdomain => 'selectbox',
+       },
        docustom => {
            rolename => 'selectbox',
            newrolename => 'textbox',
@@ -2760,7 +3368,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",
@@ -2799,7 +3407,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">
@@ -2839,11 +3449,13 @@ 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 border="0" cellspacing="0" cellpadding="0">'.
-                   '<tr><td valign="top">'.$lt{'exs'}.'<br />'.
-                     $currsec.'</td>'.
+                   '<td><table class="LC_createuser">'.
+                   '<tr class="LC_section_row"><td valign="top">'.
+                   $lt{'exs'}.'<br />'.$currsec.'</td>'.
                    '<td>&nbsp;&nbsp;</td>'.
                    '<td valign="top">&nbsp;'.$lt{'new'}.'<br />'.
                    '<input type="text" name="newsec_'.$customrole.'" value="" /></td>'.
@@ -2868,8 +3480,11 @@ ENDENTRY
     }
     return '' if ($table eq ''); # return nothing if there is nothing 
                                  # in the table
-    my $result = '
-<h4>'.$lt{'crl'}.'</h4>'.
+    my $result;
+    if (!$env{'request.course.id'}) {
+        $result = '<h4>'.$lt{'crl'}.'</h4>'."\n";
+    }
+    $result .= 
 &Apache::loncommon::start_data_table().
 &Apache::loncommon::start_data_table_header_row().
 '<th>'.$lt{'act'}.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.'</th>
@@ -2880,31 +3495,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="" />';