--- loncom/interface/loncreateuser.pm	2002/02/11 21:25:07	1.26
+++ loncom/interface/loncreateuser.pm	2007/12/05 21:23:14	1.202
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.26 2002/02/11 21:25:07 matthew Exp $
+# $Id: loncreateuser.pm,v 1.202 2007/12/05 21:23:14 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,206 +25,283 @@
 #
 # http://www.lon-capa.org/
 #
-# (Create a course
-# (My Desk
-#
-# (Internal Server Error Handler
-#
-# (Login Screen
-# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14,
-# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer)
-#
-# YEAR=2001
-# 3/1/1 Gerd Kortemeyer)
-#
-# 3/1 Gerd Kortemeyer)
-#
-# 2/14 Gerd Kortemeyer)
-#
-# 2/14,2/17,2/19,2/20,2/21,2/22,2/23,3/2,3/17,3/24,04/12 Gerd Kortemeyer
-# April Guy Albertelli
-# 05/10,10/16 Gerd Kortemeyer 
-# 11/12,11/13,11/15 Scott Harrison
-# 02/11/02 Matthew Hall
-#
-# $Id: loncreateuser.pm,v 1.26 2002/02/11 21:25:07 matthew Exp $
 ###
 
 package Apache::loncreateuser;
 
+=pod
+
+=head1 NAME
+
+Apache::loncreateuser - handler to create users and custom roles
+
+=head1 SYNOPSIS
+
+Apache::loncreateuser provides an Apache handler for creating users,
+    editing their login parameters, roles, and removing roles, and
+    also creating and assigning custom roles.
+
+=head1 OVERVIEW
+
+=head2 Custom Roles
+
+In LON-CAPA, roles are actually collections of privileges. "Teaching
+Assistant", "Course Coordinator", and other such roles are really just
+collection of privileges that are useful in many circumstances.
+
+Creating custom roles can be done by the Domain Coordinator through
+the Create User functionality. That screen will show all privileges
+that can be assigned to users. For a complete list of privileges,
+please see C</home/httpd/lonTabs/rolesplain.tab>.
+
+Custom role definitions are stored in the C<roles.db> file of the role
+author.
+
+=cut
+
 use strict;
 use Apache::Constants qw(:common :http);
 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
-my $generalrule;
 my $authformnop;
 my $authformkrb;
 my $authformint;
 my $authformfsys;
 my $authformloc;
 
-BEGIN {
-    $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
-    my $krbdefdom=$1;
-    $krbdefdom=~tr/a-z/A-Z/;
-    $authformnop=(<<END);
-<p>
-<input type=radio name=login value=nop checked='checked'
-onClick="clicknop(this.form);">
-Do not change login data
-</p>
-END
-    $authformkrb=(<<END);
-<p>
-<input type=radio name=login value=krb onClick="clickkrb(this.form);">
-Kerberos authenticated with domain
-<input type=text size=10 name=krbdom onChange="setkrb(this.form);">
-</p>
-END
-    $authformint=(<<END);
-<p>
-<input type=radio name=login value=int onClick="clickint(this.form);"> 
-Internally authenticated (with initial password 
-<input type=text size=10 name=intpwd onChange="setint(this.form);">)
-</p>
-END
-    $authformfsys=(<<END);
-<p>
-<input type=radio name=login value=fsys onClick="clickfsys(this.form);"> 
-Filesystem authenticated (with initial password 
-<input type=text size=10 name=fsyspwd onChange="setfsys(this.form);">)
-</p>
-END
-    $authformloc=(<<END);
-<p>
-<input type=radio name=login value=loc onClick="clickloc(this.form);" />
-Local Authentication with argument
-<input type=text size=10 name=locarg onChange="setloc(this.form);" />
-</p>
-END
-    $loginscript=(<<ENDLOGINSCRIPT);
-<script>
-function setkrb(vf) {
-    if (vf.krbdom.value!='') {
-       vf.login[0].checked=true;
-       vf.krbdom.value=vf.krbdom.value.toUpperCase();
-       vf.intpwd.value='';
-       vf.fsyspwd.value='';
-       vf.locarg.value='';
-   }
-}
-
-function setint(vf) {
-    if (vf.intpwd.value!='') {
-       vf.login[1].checked=true;
-       vf.krbdom.value='';
-       vf.fsyspwd.value='';
-       vf.locarg.value='';
-   }
-}
-
-function setfsys(vf) {
-    if (vf.fsyspwd.value!='') {
-       vf.login[2].checked=true;
-       vf.krbdom.value='';
-       vf.intpwd.value='';
-       vf.locarg.value='';
-   }
-}
-
-function setloc(vf) {
-    if (vf.locarg.value!='') {
-       vf.login[3].checked=true;
-       vf.krbdom.value='';
-       vf.intpwd.value='';
-       vf.fsyspwd.value='';
-   }
-}
-
-function clicknop(vf) {
-    vf.krbdom.value='';
-    vf.intpwd.value='';
-    vf.fsyspwd.value='';
-    vf.locarg.value='';
-}
-
-function clickkrb(vf) {
-    vf.krbdom.value='$krbdefdom';
-    vf.intpwd.value='';
-    vf.fsyspwd.value='';
-    vf.locarg.value='';
-}
-
-function clickint(vf) {
-    vf.krbdom.value='';
-    vf.fsyspwd.value='';
-    vf.locarg.value='';
-}
-
-function clickfsys(vf) {
-    vf.krbdom.value='';
-    vf.intpwd.value='';
-    vf.locarg.value='';
-}
-
-function clickloc(vf) {
-    vf.krbdom.value='';
-    vf.intpwd.value='';
-    vf.fsyspwd.value='';
+sub initialize_authen_forms {
+    my ($dom,$curr_authtype) = @_; 
+    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):$/) {
+        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;
+        }
+    }
+# no longer static due to configurable kerberos defaults
+#    $loginscript  = &Apache::loncommon::authform_header(%param);
+    $authformnop  = &Apache::loncommon::authform_nochange(%param);
+# no longer static due to configurable kerberos defaults
+#    $authformkrb  = &Apache::loncommon::authform_kerberos(%param);
+    $authformint  = &Apache::loncommon::authform_internal(%param);
+    $authformfsys = &Apache::loncommon::authform_filesystem(%param);
+    $authformloc  = &Apache::loncommon::authform_local(%param);
+}
+
+sub auth_abbrev {
+    my %abv_auth = (
+                     krb4     => 'krb',
+                     internal => 'int',
+                     localuth => 'loc',
+                     unix     => 'fsys',
+                   );
+    return %abv_auth;
+}
+
+# ==================================================== Figure out author access
+
+sub authorpriv {
+    my ($auname,$audom)=@_;
+    unless ((&Apache::lonnet::allowed('cca',$audom.'/'.$auname))
+         || (&Apache::lonnet::allowed('caa',$audom.'/'.$auname))) { return ''; }
+    return 1;
+}
+
+# ====================================================
+
+sub portfolio_quota {
+    my ($ccuname,$ccdomain) = @_;
+    my %lt = &Apache::lonlocal::texthash(
+                   'disk' => "Disk space allocated to user's portfolio files",
+                   'cuqu' => "Current quota",
+                   'cust' => "Custom quota",
+                   'defa' => "Default",
+                   'chqu' => "Change quota",
+    );
+    my ($currquota,$quotatype,$inststatus,$defquota) = 
+        &Apache::loncommon::get_user_quota($ccuname,$ccdomain);
+    my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($ccdomain);
+    my ($longinsttype,$showquota,$custom_on,$custom_off,$defaultinfo);
+    if ($inststatus ne '') {
+        if ($usertypes->{$inststatus} ne '') {
+            $longinsttype = $usertypes->{$inststatus};
+        }
+    }
+    $custom_on = ' ';
+    $custom_off = ' checked="checked" ';
+    my $quota_javascript = <<"END_SCRIPT";
+<script type="text/javascript">
+function quota_changes(caller) {
+    if (caller == "custom") {
+        if (document.cu.customquota[0].checked) {
+            document.cu.portfolioquota.value = "";
+        }
+    }
+    if (caller == "quota") {
+        document.cu.customquota[1].checked = true;
+    }
 }
 </script>
-ENDLOGINSCRIPT
-    $generalrule=<<END;
-<p>
-<i>As a general rule, only authors or co-authors should be filesystem
-authenticated (which allows access to the server filesystem).</i>
-</p>
-END
+END_SCRIPT
+    if ($quotatype eq 'custom') {
+        $custom_on = $custom_off;
+        $custom_off = ' ';
+        $showquota = $currquota;
+        if ($longinsttype eq '') {
+            $defaultinfo = &mt('For this user, the default quota would be [_1]
+                            Mb.',$defquota);
+        } else {
+            $defaultinfo = &mt("For this user, the default quota would be [_1] 
+                            Mb, as determined by the user's institutional
+                           affiliation ([_2]).",$defquota,$longinsttype);
+        }
+    } else {
+        if ($longinsttype eq '') {
+            $defaultinfo = &mt('For this user, the default quota is [_1]
+                            Mb.',$defquota);
+        } else {
+            $defaultinfo = &mt("For this user, the default quota of [_1]
+                            Mb, is determined by the user's institutional
+                            affiliation ([_2]).",$defquota,$longinsttype);
+        }
+    }
+    my $output = $quota_javascript.
+                 '<h3>'.$lt{'disk'}.'</h3>'.
+                 &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'".')"
+                  />'.$lt{'defa'}.'&nbsp;('.$defquota.' Mb).</label>&nbsp;'.
+                 '&nbsp;<label><input type="radio" name="customquota" value="1" '. 
+                 $custom_on.'  onchange="javascript:quota_changes('."'custom'".')" />'.
+                 $lt{'cust'}.':</label>&nbsp;'.
+                 '<input type="text" name="portfolioquota" size ="5" value="'.
+                 $showquota.'" onfocus="javascript:quota_changes('."'quota'".')" '.
+                 '/>&nbsp;Mb</span></td>'.
+                 &Apache::loncommon::end_data_table_row().
+                 &Apache::loncommon::end_data_table();
+    return $output;
 }
 
 # =================================================================== Phase one
 
-sub phase_one {
-    my $r=shift;
-    my $defdom=$ENV{'user.domain'};
-    $r->print(<<ENDDOCUMENT);
-<html>
-<head>
-<title>The LearningOnline Network with CAPA</title>
-</head>
-<body bgcolor="#FFFFFF">
-<h1>Create User, Change User Privileges</h1>
-<form action=/adm/createuser method=post>
-<input type=hidden name=phase value=two>
-Username: <input type=text size=15 name=ccuname><br>
-Domain: <input type=text size=15 name=ccdomain value=$defdom><p>
-<input type=submit value="Continue">
+sub print_username_entry_form {
+    my ($r,$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'};
+    }
+
+    my ($jsback,$elements) = &crumb_utilities();
+
+    my $jscript = &Apache::loncommon::studentbrowser_javascript()."\n".
+        '<script type="text/javascript">'."\n".
+        &Apache::lonhtmlcommon::set_form_elements($elements->{$formtoset}).
+        '</script>'."\n";
+
+    my %loaditems = (
+                'onload' => "javascript:setFormElements(document.$formtoset)",
+                    );
+    my $start_page =
+	&Apache::loncommon::start_page('User Management',
+				       $jscript,{'add_entries' => \%loaditems,});
+    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=&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",
+		    'usr'  => "Username",
+                    'dom'  => "Domain",
+                    'ecrp' => "Edit Custom Role Privileges",
+                    'nr'   => "Name of Role",
+                    'cre'  => "Custom Role Editor",
+                    'mod'  => "to add/modify roles",
+				       );
+    my $help = &Apache::loncommon::help_open_menu(undef,undef,282,'Instructor Interface');
+    my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
+    my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles');
+    my $sellink=&Apache::loncommon::selectstudent_link('crtuser','srchterm','srchdomain');
+    if ($sellink) {
+        $sellink = "$lt{'or'} ".$sellink;
+    } 
+    $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));
+    } 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" />
+<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 $userpicker = 
+       &Apache::loncommon::user_picker($dom,$srch,$forcenewuser,
+                                       'document.crtuser');
+    my $srchbutton = &mt('Search');
+    my $output = <<"ENDDOCUMENT";
+<form action="/adm/createuser" method="post" name="crtuser">
+<input type="hidden" name="action" value="$env{'form.action'}" />
+<input type="hidden" name="phase" value="get_user_info" />
+$userpicker
+<input name="userrole" type="button" value="$srchbutton" onclick="javascript:validateEntry(document.crtuser)" />
 </form>
-</body>
-</html>
 ENDDOCUMENT
+    return $output;
 }
 
-# =================================================================== Phase two
-sub phase_two {
-    my $r=shift;
-    my $ccuname=$ENV{'form.ccuname'};
-    my $ccdomain=$ENV{'form.ccdomain'};
-
-    $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
-    my $krbdefdom=$1;
-    $krbdefdom=~tr/a-z/A-Z/;
-
-    my $defdom=$ENV{'user.domain'};
-
-    $ccuname=~s/\W//g;
-    $ccdomain=~s/\W//g;
-    my $dochead =<<"ENDDOCHEAD";
-<html>
-<head>
-<title>The LearningOnline Network with CAPA</title>
-<script>
+sub user_modification_js {
+    my ($pjump_def,$dc_setcourse_code,$nondc_setsection_code,$groupslist)=@_;
+    
+    return <<END;
+<script type="text/javascript" language="Javascript">
 
     function pclose() {
         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
@@ -232,14 +309,8 @@ sub phase_two {
         parmwin.close();
     }
 
-    function pjump(type,dis,value,marker,ret,call) {
-        parmwin=window.open("/adm/rat/parameter.html?type="+escape(type)
-                 +"&value="+escape(value)+"&marker="+escape(marker)
-                 +"&return="+escape(ret)
-                 +"&call="+escape(call)+"&name="+escape(dis),"LONCAPAparms",
-                 "height=350,width=350,scrollbars=no,menubar=no");
-
-    }
+    $pjump_def
+    $dc_setcourse_code
 
     function dateset() {
         eval("document.cu."+document.cu.pres_marker.value+
@@ -247,538 +318,3034 @@ sub phase_two {
         pclose();
     }
 
+    $nondc_setsection_code
+
+</script>
+END
+}
+
+# =================================================================== Phase two
+sub print_user_selection_page {
+    my ($r,$response,$srch,$srch_results,$operation,$srcharray) = @_;
+    my @fields = ('username','domain','lastname','firstname','permanentemail');
+    my $sortby = $env{'form.sortby'};
+
+    if (!grep(/^\Q$sortby\E$/,@fields)) {
+        $sortby = 'lastname';
+    }
+
+    my ($jsback,$elements) = &crumb_utilities();
+
+    my $jscript = (<<ENDSCRIPT);
+<script type="text/javascript">
+function pickuser(uname,udom) {
+    document.usersrchform.seluname.value=uname;
+    document.usersrchform.seludom.value=udom;
+    document.usersrchform.phase.value="userpicked";
+    document.usersrchform.submit();
+}
+
+$jsback
 </script>
-</head>
-<body bgcolor="#FFFFFF">
-<img align="right" src="/adm/lonIcons/lonlogos.gif">
-ENDDOCHEAD
+ENDSCRIPT
+
+    my %lt=&Apache::lonlocal::texthash(
+                                       'usrch'          => "User Search to add/modify roles",
+                                       'stusrch'        => "User Search to enroll student",
+                                       'usel'           => "Select a user to add/modify roles",
+                                       'stusel'         => "Select a user to enroll as a student", 
+                                       'username'       => "username",
+                                       'domain'         => "domain",
+                                       'lastname'       => "last name",
+                                       'firstname'      => "first name",
+                                       'permanentemail' => "permanent e-mail",
+                                      );
+    if ($operation eq 'createuser') {
+        $r->print(&Apache::loncommon::start_page('User Management',$jscript));
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>"javascript:backPage(document.usersrchform,'','')",
+              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('<h3>'.$lt{'usel'}.'</h3>');
+    } else {
+        $r->print($jscript."<b>$lt{'stusrch'}</b><br />");
+        $r->print(&Apache::londropadd::single_user_entry_form($srch->{'srchdomain'},$srch));
+        $r->print('</form><h3>'.$lt{'stusel'}.'</h3>');
+    }
+    $r->print('<form name="usersrchform" method="post">'.
+              &Apache::loncommon::start_data_table()."\n".
+              &Apache::loncommon::start_data_table_header_row()."\n".
+              ' <th> </th>'."\n");
+    foreach my $field (@fields) {
+        $r->print(' <th><a href="javascript:document.usersrchform.sortby.value='.
+                  "'".$field."'".';document.usersrchform.submit();">'.
+                  $lt{$field}.'</a></th>'."\n");
+    }
+    $r->print(&Apache::loncommon::end_data_table_header_row());
+
+    my @sorted_users = sort {
+        lc($srch_results->{$a}->{$sortby})   cmp lc($srch_results->{$b}->{$sortby})
+            ||
+        lc($srch_results->{$a}->{lastname})  cmp lc($srch_results->{$b}->{lastname})
+            ||
+        lc($srch_results->{$a}->{firstname}) cmp lc($srch_results->{$b}->{firstname})
+	    ||
+	lc($a) cmp lc($b)
+        } (keys(%$srch_results));
+
+    foreach my $user (@sorted_users) {
+        my ($uname,$udom) = split(/:/,$user);
+        $r->print(&Apache::loncommon::start_data_table_row().
+                  '<td><input type="button" name="seluser" value="'.&mt('Select').'" onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".')" /></td>'.
+                  '<td><tt>'.$uname.'</tt></td>'.
+                  '<td><tt>'.$udom.'</tt></td>');
+        foreach my $field ('lastname','firstname','permanentemail') {
+            $r->print('<td>'.$srch_results->{$user}->{$field}.'</td>');
+        }
+        $r->print(&Apache::loncommon::end_data_table_row());
+    }
+    $r->print(&Apache::loncommon::end_data_table().'<br /><br />');
+    if (ref($srcharray) eq 'ARRAY') {
+        foreach my $item (@{$srcharray}) {
+            $r->print('<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n");
+        }
+    }
+    $r->print(' <input type="hidden" name="sortby" value="'.$sortby.'" />'."\n".
+              ' <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="action" value="singleuser" />'."\n");
+    $r->print($response);
+    if ($operation eq 'createuser') {
+        $r->print('</form>'.&Apache::loncommon::end_page());
+    } else {
+        $r->print('<input type="hidden" name="action" value="enrollstudent" />'."\n".
+                  '<input type="hidden" name="state" value="gotusername" />'."\n");
+    }
+}
+
+sub print_user_query_page {
+    my ($r,$caller) = @_;
+# FIXME - this is for a network-wide name search (similar to catalog search)
+# To use frames with similar behavior to catalog/portfolio search.
+# To be implemented. 
+    return;
+}
+
+sub print_user_modification_page {
+    my ($r,$ccuname,$ccdomain,$srch,$response,$context) = @_;
+    if (($ccuname eq '') || ($ccdomain eq '')) {
+        my $usermsg = &mt('No username and/or domain provided.'); 
+	&print_username_entry_form($r,$usermsg);
+        return;
+    }
+    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') {
+        $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,$userchkmsg);
+                    return;
+                } 
+            }
+        }
+    } else {
+        $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
+    }
+    my $defdom=$env{'request.role.domain'};
+
+    my ($krbdef,$krbdefdom) =
+       &Apache::loncommon::get_kerberos_defaults($defdom);
+
+    my %param = ( formname => 'document.cu',
+                  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);
+    $authformkrb  = &Apache::loncommon::authform_kerberos(%param);
+
+    my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
+    my $dc_setcourse_code = '';
+    my $nondc_setsection_code = '';                                        
+
+    my %loaditem;
+
+    my $groupslist;
+    my %curr_groups = &Apache::longroup::coursegroups();
+    if (%curr_groups) {
+        $groupslist = join('","',sort(keys(%curr_groups)));
+        $groupslist = '"'.$groupslist.'"';   
+    }
+
+    if ($env{'request.role'} =~ m-^dc\./($match_domain)/$-) {
+        my $dcdom = $1;
+        $loaditem{'onload'} = "document.cu.coursedesc.value='';";
+        my @rolevals = ('st','ta','ep','in','cc');
+        my (@crsroles,@grproles);
+        for (my $i=0; $i<@rolevals; $i++) {
+            $crsroles[$i]=&Apache::lonnet::plaintext($rolevals[$i],'Course');
+            $grproles[$i]=&Apache::lonnet::plaintext($rolevals[$i],'Group');
+        }
+        my $rolevalslist = join('","',@rolevals);
+        my $crsrolenameslist = join('","',@crsroles);
+        my $grprolenameslist = join('","',@grproles);
+        my $pickcrsfirst = '<--'.&mt('Pick course first');
+        my $pickgrpfirst = '<--'.&mt('Pick group first'); 
+        $dc_setcourse_code = <<"ENDSCRIPT";
+    function setCourse() {
+        var course = document.cu.dccourse.value;
+        if (course != "") {
+            if (document.cu.dcdomain.value != document.cu.origdom.value) {
+                alert("You must select a course in the current domain");
+                return;
+            } 
+            var userrole = document.cu.role.options[document.cu.role.selectedIndex].value
+            var section="";
+            var numsections = 0;
+            var newsecs = new Array();
+            for (var i=0; i<document.cu.currsec.length; i++) {
+                if (document.cu.currsec.options[i].selected == true ) {
+                    if (document.cu.currsec.options[i].value != "" && document.cu.currsec.options[i].value != null) { 
+                        if (numsections == 0) {
+                            section = document.cu.currsec.options[i].value
+                            numsections = 1;
+                        }
+                        else {
+                            section = section + "," +  document.cu.currsec.options[i].value
+                            numsections ++;
+                        }
+                    }
+                }
+            }
+            if (document.cu.newsec.value != "" && document.cu.newsec.value != null) {
+                if (numsections == 0) {
+                    section = document.cu.newsec.value
+                }
+                else {
+                    section = section + "," +  document.cu.newsec.value
+                }
+                newsecs = document.cu.newsec.value.split(/,/g);
+                numsections = numsections + newsecs.length;
+            }
+            if ((userrole == 'st') && (numsections > 1)) {
+                alert("In each course, each user may only have one student role at a time. You had selected "+numsections+" sections.\\nPlease modify your selections so they include no more than one section.")
+                return;
+            }
+            for (var j=0; j<newsecs.length; j++) {
+                if ((newsecs[j] == 'all') || (newsecs[j] == 'none')) {
+                    alert("'"+newsecs[j]+"' may not be used as the name for a section, as it is a reserved word.\\nPlease choose a different section name.");
+                    return;
+                }
+                if (document.cu.groups.value != '') {
+                    var groups = document.cu.groups.value.split(/,/g);
+                    for (var k=0; k<groups.length; k++) {
+                        if (newsecs[j] == groups[k]) {
+                            alert("'"+newsecs[j]+"' may not be used as the name for a section, as it is the name of a course group.\\nSection names and group names must be distinct. Please choose a different section name.");
+                            return; 
+                        }
+                    }
+                }
+            }
+            if ((userrole == 'cc') && (numsections > 0)) {
+                alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections.");
+                section = "";
+            }
+            var coursename = "_$dcdom"+"_"+course+"_"+userrole
+            var numcourse = getIndex(document.cu.dccourse);
+            if (numcourse == "-1") {
+                alert("There was a problem with your course selection");
+                return
+            }
+            else {
+                document.cu.elements[numcourse].name = "act"+coursename;
+                var numnewsec = getIndex(document.cu.newsec);
+                if (numnewsec != "-1") {
+                    document.cu.elements[numnewsec].name = "sec"+coursename;
+                    document.cu.elements[numnewsec].value = section;
+                }
+                var numstart = getIndex(document.cu.start);
+                if (numstart != "-1") {
+                    document.cu.elements[numstart].name = "start"+coursename;
+                }
+                var numend = getIndex(document.cu.end);
+                if (numend != "-1") {
+                    document.cu.elements[numend].name = "end"+coursename
+                }
+            }
+        }
+        document.cu.submit();
+    }
+
+    function getIndex(caller) {
+        for (var i=0;i<document.cu.elements.length;i++) {
+            if (document.cu.elements[i] == caller) {
+                return i;
+            }
+        }
+        return -1;
+    }
+ENDSCRIPT
+    } else {
+        $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".
+       $javascript_validations.'</script>';
+    my $start_page = 
+	&Apache::loncommon::start_page('User Management',
+				       $js,{'add_entries' => \%loaditem,});
+    &Apache::lonhtmlcommon::add_breadcrumb
+     ({href=>"javascript:backPage(document.cu)",
+       text=>"Create/modify user",
+       faq=>282,bug=>'Instructor Interface',});
+
+    if ($env{'form.phase'} eq 'userpicked') {
+        &Apache::lonhtmlcommon::add_breadcrumb
+     ({href=>"javascript:backPage(document.cu,'get_user_info','select')",
+       text=>"Select a user",
+       faq=>282,bug=>'Instructor Interface',});
+    }
+    &Apache::lonhtmlcommon::add_breadcrumb
+      ({href=>"javascript:backPage(document.cu,'$env{'form.phase'}','modify')",
+        text=>"Set user role",
+        faq=>282,bug=>'Instructor Interface',});
+    my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management');
+
     my $forminfo =<<"ENDFORMINFO";
 <form action="/adm/createuser" method="post" name="cu">
-<input type="hidden" name="phase"       value="three">
-<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="" >
-<input type="hidden" name="cuname"      value="$ccuname">
-<input type="hidden" name="cdomain"     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="" />
 ENDFORMINFO
-    my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
-    my %incdomains; 
     my %inccourses;
-    foreach (%Apache::lonnet::hostdom) {
-       $incdomains{$_}=1;
-    }
-    foreach (keys(%ENV)) {
-	if ($_=~/^user\.priv\.cm\.\/(\w+)\/(\w+)/) {
+    foreach my $key (keys(%env)) {
+	if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) {
 	    $inccourses{$1.'_'.$2}=1;
         }
     }
     if ($uhome eq 'no_host') {
-	$r->print(<<ENDNEWUSER);
-$dochead
-<h1>Create New User</h1>
+        my $portfolioform;
+        if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
+            # Current user has quota modification privileges
+            $portfolioform = '<br />'.&portfolio_quota($ccuname,$ccdomain);
+        }
+        &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>New user "$ccuname" in domain $ccdomain</h2>
+<script type="text/javascript" language="Javascript">
 $loginscript
+</script>
 <input type='hidden' name='makeuser' value='1' />
-<h3>Personal Data</h3>
-<p>
-<table>
-<tr><td>First Name  </td>
-    <td><input type='text' name='cfirst'  size='15' /></td></tr>
-<tr><td>Middle Name </td> 
-    <td><input type='text' name='cmiddle' size='15' /></td></tr>
-<tr><td>Last Name   </td>
-    <td><input type='text' name='clast'   size='15' /></td></tr>
-<tr><td>Generation  </td>
-    <td><input type='text' name='cgen'    size='5'  /></td></tr>
-</table>
-ID/Student Number <input type='text' name='cstid'   size='15' /></p>
-
-<hr />
-
-<h3>Login Data</h3>
-$generalrule
-$authformkrb
-$authformint
-$authformfsys
-$authformloc
-ENDNEWUSER
+<h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain</h2>
+ENDTITLE
+        $r->print('<div class="LC_left_float">'.
+                  &personal_data_display($ccuname,$ccdomain,$newuser,
+                                         %inst_results));
+        my ($home_server_pick,$numlib) = 
+            &Apache::loncommon::home_server_form_item($ccdomain,'hserver',
+                                                      'default','hide');
+        if ($numlib > 1) {
+            $r->print("
+<br />
+$lt{'hs'}: $home_server_pick
+<br />");
+        } else {
+            $r->print($home_server_pick);
+        }
+        $r->print('</div>'."\n".'<div class="LC_left_float"><h3>'.
+                  $lt{'lg'}.'</h3>');
+        my ($fixedauth,$varauth,$authmsg); 
+        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->{$matchedrule}) eq 'HASH') {
+                    my $authtype = $rules->{$matchedrule}{'authtype'};
+                    if ($authtype !~ /^(krb4|krb5|int|fsys|loc)$/) {
+                        $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc));
+                    } else { 
+                        my $authparm = $rules->{$matchedrule}{'authparm'};
+                        if ($authtype =~ /^krb(4|5)$/) {
+                            my $ver = $1;
+                            if ($authparm ne '') {
+                                $fixedauth = <<"KERB"; 
+<input type="hidden" name="login" value="krb" />
+<input type="hidden" name="krbver" value="$ver" />
+<input type="hidden" name="krbarg" value="$authparm" />
+KERB
+                                $authmsg = $rules->{$matchedrule}{'authmsg'};    
+                            }
+                        } else {
+                            $fixedauth = 
+'<input type="hidden" name="login" value="'.$authtype.'" />'."\n";
+                            if ($rules->{$matchedrule}{'authparmfixed'}) {
+                                $fixedauth .=    
+'<input type="hidden" name="'.$authtype.'arg" value="'.$authparm.'" />'."\n";
+                            } else {
+                                $varauth =  
+'<input type="text" name="'.$authtype.'arg" value="" />'."\n";
+                            }
+                        }
+                    }
+                } else {
+                    $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc));
+                }
+            }
+            if ($authmsg) {
+                $r->print(<<ENDAUTH);
+$fixedauth
+$authmsg
+$varauth
+ENDAUTH
+            }
+        } else {
+            $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc)); 
+        }
+        $r->print(<<ENDPORT);
+        $portfolioform
+</div><div class="LC_clear_float_footer"></div>
+ENDPORT
     } else { # user already exists
+	my %lt=&Apache::lonlocal::texthash(
+                    'cup'  => "Modify existing user: ",
+                    'id'   => "in domain",
+				       );
 	$r->print(<<ENDCHANGEUSER);
-$dochead
-<h1>Change User Privileges</h1>
+$start_page
+$crumbs
 $forminfo
-<h2>User "$ccuname" in domain $ccdomain </h2>
+<h2>$lt{'cup'} "$ccuname" $lt{'id'} "$ccdomain"</h2>
 ENDCHANGEUSER
-        my $rolesdump=&Apache::lonnet::reply(
-                                  "dump:$ccdomain:$ccuname:roles",$uhome);
+        $r->print('<div class="LC_left_float">'.
+                  &personal_data_display($ccuname,$ccdomain,$newuser,
+                                         %inst_results));
+        if ($context eq 'domain') {
+            $r->print(&Apache::lonuserutils::forceid_change());
+        }
+        $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
+        }
+        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.
-        unless ($rolesdump eq 'con_lost' || $rolesdump =~ m/^error/i) { 
+        my ($tmp) = keys(%rolesdump);
+        unless ($tmp =~ /^(con_lost|error)/i) {
            my $now=time;
-           $r->print('<hr /><h3>Revoke Existing Roles</h3>'.
-             '<table border=2><tr><th>Revoke</th><th>Role</th><th>Extent</th>'.
-	     '<th>Start</th><th>End</th>');
-	   foreach (split(/&/,$rolesdump)) {
-             if ($_!~/^rolesdef\&/) {
-              my ($area,$role)=split(/=/,$_);
-              my $thisrole=$area;
-              $area=~s/\_\w\w$//;
-              my ($role_code,$role_end_time,$role_start_time)=split(/_/,$role);
-              my $bgcol='ffffff';
-              my $allows=0;
-              if ($area=~/^\/(\w+)\/(\d\w+)/) {
-                 my %coursedata=&Apache::lonnet::coursedescription($1.'_'.$2);
-                 my $carea='Course: '.$coursedata{'description'};
-                 $inccourses{$1.'_'.$2}=1;
-                 if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2)) {
-		     $allows=1;
-                 }
-		 # Compute the background color based on $area
-                 $bgcol=$1.'_'.$2;
-                 $bgcol=~s/[^8-9b-e]//g;
-                 $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',0,6);
-                 if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) {
-                     $carea.='<br>Section/Group: '.$3;
-		 }
-                 $area=$carea;
-	      } else {
-                 if ($area=~/^\/(\w+)\//) {
-                     if (&Apache::lonnet::allowed('c'.$role_code,$1)) {
-			 $allows=1;
-                     }
-                 } else {
-                     if (&Apache::lonnet::allowed('c'.$role_code,'/')) {
-			 $allows=1;
-                     }
-                 }
-	      }
-
-              $r->print('<tr bgcolor=#"'.$bgcol.'"><td>');
-              my $active=1;
-              if (($role_end_time) && ($now>$role_end_time)) { $active=0; }
-              if (!($active) && ($allows)) {
-		  $r->print('<input type=checkbox name="rev:'.$thisrole.'">');
-              } else {
-                  $r->print('&nbsp;');
-              }
-              $r->print('</td><td>'.&Apache::lonnet::plaintext($role_code).
-                        '</td><td>'.$area.'</td><td>'.
-                        ($role_start_time ? localtime($role_start_time)
-                                          : '&nbsp;' )
-			.'</td><td>'.
-                        ($role_end_time   ? localtime($role_end_time)
-                                          : '&nbsp;' )
-			."</td></tr>\n");
-	     }
-	   } 
-	   $r->print('</table>');
-         }   
-	my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
-	if ($currentauth=~/^krb4:/) {
-	    $currentauth=~/^krb4:(.*)/;
-	    my $krbdefdom2=$1;
-	    $loginscript=~s/vf\.krbdom\.value='.*?';/vf.krbdom.value='$krbdefdom2';/;
-	}
-	# Check for a bad authentication type
-        unless ($currentauth=~/^krb4:/ or
-		$currentauth=~/^unix:/ or
-		$currentauth=~/^internal:/ or
-		$currentauth=~/^localauth:/
-		) { # bad authentication scheme
-	    if (&Apache::lonnet::allowed('mau',$ENV{'user.domain'})) {
-		$r->print(<<ENDBADAUTH);
-<hr />
-$loginscript
-<font color='#ff0000'>ERROR:</font>
-This user has an unrecognized authentication scheme ($currentauth).
-Please specify login data below.
-<h3>Login Data</h3>
-$generalrule
-$authformkrb
-$authformint
-$authformfsys
-$authformloc
-ENDBADAUTH
-            } else { 
-                # This user is not allowed to modify the users 
-                # authentication scheme, so just notify them of the problem
-		$r->print(<<ENDBADAUTH);
-<hr />
-$loginscript
-<font color="#ff0000"> ERROR: </font>
-This user has an unrecognized authentication scheme ($currentauth).
-Please alert a domain coordinator of this situation.
-<hr />
-ENDBADAUTH
-            }
-        } else { # Authentication type is valid
-	    my $authformcurrent='';
-	    my $authform_other='';
-	    if ($currentauth=~/^krb4:/) {
-		$authformcurrent=$authformkrb;
-		$authform_other=$authformint.$authformfsys.$authformloc;
-		# embarrassing script hack here
-		$loginscript=~s/login\[3\]/login\[4\]/; # loc
-		$loginscript=~s/login\[2\]/login\[3\]/; # fsys
-		$loginscript=~s/login\[1\]/login\[2\]/; # int
-		$loginscript=~s/login\[0\]/login\[1\]/; # krb4
-	    }
-	    elsif ($currentauth=~/^internal:/) {
-		$authformcurrent=$authformint;
-		$authform_other=$authformkrb.$authformfsys.$authformloc;
-		# embarrassing script hack here
-		$loginscript=~s/login\[3\]/login\[4\]/; # loc
-		$loginscript=~s/login\[2\]/login\[3\]/; # fsys
-		$loginscript=~s/login\[1\]/login\[1\]/; # int
-		$loginscript=~s/login\[0\]/login\[2\]/; # krb4
-	    }
-	    elsif ($currentauth=~/^unix:/) {
-		$authformcurrent=$authformfsys;
-		$authform_other=$authformkrb.$authformint.$authformloc;
-		# embarrassing script hack here
-		$loginscript=~s/login\[3\]/login\[4\]/; # loc
-		$loginscript=~s/login\[1\]/login\[3\]/; # int
-		$loginscript=~s/login\[2\]/login\[1\]/; # fsys
-		$loginscript=~s/login\[0\]/login\[2\]/; # krb4
-	    }
-	    elsif ($currentauth=~/^localauth:/) {
-		$authformcurrent=$authformloc;
-		$authform_other=$authformkrb.$authformint.$authformfsys;
-		# embarrassing script hack here
-		$loginscript=~s/login\[3\]/login\[loc\]/; # loc
-		$loginscript=~s/login\[2\]/login\[4\]/; # fsys
-		$loginscript=~s/login\[1\]/login\[3\]/; # int
-		$loginscript=~s/login\[0\]/login\[2\]/; # krb4
-		$loginscript=~s/login\[loc\]/login\[1\]/; # loc
-	    }
-	    $authformcurrent=<<ENDCURRENTAUTH;
-<table border='1'>
-<tr>
-<td><font color='#ff0000'>* * * WARNING * * *</font></td>
-<td><font color='#ff0000'>* * * WARNING * * *</font></td>
-</tr>
-<tr><td bgcolor='#cbbcbb'>$authformcurrent</td>
-<td bgcolor='#cbbcbb'>Changing this value will overwrite existing authentication for the user; you should notify the user of this change.</td></tr>
-</table>
-ENDCURRENTAUTH
-            if (&Apache::lonnet::allowed('mau',$ENV{'user.domain'})) {
-		# Current user has login modification privileges
-		$r->print(<<ENDOTHERAUTHS);
-<hr />
-$loginscript
-<h3>Change Current Login Data</h3>
-$generalrule
-$authformnop
-$authformcurrent
-<h3>Enter New Login Data</h3>
-$authform_other
-ENDOTHERAUTHS
-            }
-        }  ## End of "check for bad authentication type" logic
+	   my %lt=&Apache::lonlocal::texthash(
+		    'rer'  => "Existing Roles",
+                    'rev'  => "Revoke",                    
+                    'del'  => "Delete",
+		    'ren'  => "Re-Enable",
+                    'rol'  => "Role",
+                    'ext'  => "Extent",
+                    'sta'  => "Start",
+                    'end'  => "End"
+				       );
+           my (%roletext,%sortrole,%roleclass,%rolepriv);
+	   foreach my $area (sort { my $a1=join('_',(split('_',$a))[1,0]);
+				    my $b1=join('_',(split('_',$b))[1,0]);
+				    return $a1 cmp $b1;
+				} keys(%rolesdump)) {
+               next if ($area =~ /^rolesdef/);
+	       my $envkey=$area;
+               my $role = $rolesdump{$area};
+               my $thisrole=$area;
+               $area =~ s/\_\w\w$//;
+               my ($role_code,$role_end_time,$role_start_time) = 
+                   split(/_/,$role);
+# Is this a custom role? Get role owner and title.
+	       my ($croleudom,$croleuname,$croletitle)=
+	           ($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$});
+               my $allowed=0;
+               my $delallowed=0;
+	       my $sortkey=$role_code;
+	       my $class='Unknown';
+               if ($area =~ m{^/($match_domain)/($match_courseid)} ) {
+		   $class='Course';
+                   my ($coursedom,$coursedir) = ($1,$2);
+		   $sortkey.="\0$coursedom";
+                   # $1.'_'.$2 is the course id (eg. 103_12345abcef103l3).
+                   my %coursedata=
+                       &Apache::lonnet::coursedescription($1.'_'.$2);
+		   my $carea;
+		   if (defined($coursedata{'description'})) {
+		       $carea=$coursedata{'description'}.
+                           '<br />'.&mt('Domain').': '.$coursedom.('&nbsp;'x8).
+     &Apache::loncommon::syllabuswrapper('Syllabus',$coursedir,$coursedom);
+		       $sortkey.="\0".$coursedata{'description'};
+                       $class=$coursedata{'type'};
+		   } else {
+		       $carea=&mt('Unavailable course').': '.$area;
+		       $sortkey.="\0".&mt('Unavailable course').': '.$area;
+		   }
+		   $sortkey.="\0$coursedir";
+                   $inccourses{$1.'_'.$2}=1;
+                   if ((&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2)) ||
+                       (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
+                       $allowed=1;
+                   }
+                   if ((&Apache::lonnet::allowed('dro',$1)) ||
+                       (&Apache::lonnet::allowed('dro',$ccdomain))) {
+                       $delallowed=1;
+                   }
+# - custom role. Needs more info, too
+		   if ($croletitle) {
+		       if (&Apache::lonnet::allowed('ccr',$1.'/'.$2)) {
+			   $allowed=1;
+			   $thisrole.='.'.$role_code;
+		       }
+		   }
+                   # Compute the background color based on $area
+                   if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) {
+                       $carea.='<br />Section: '.$3;
+		       $sortkey.="\0$3";
+                   }
+                   $area=$carea;
+               } else {
+		   $sortkey.="\0".$area;
+                   # Determine if current user is able to revoke privileges
+                   if ($area=~m{^/($match_domain)/}) {
+                       if ((&Apache::lonnet::allowed('c'.$role_code,$1)) ||
+                       (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
+                           $allowed=1;
+                       }
+                       if (((&Apache::lonnet::allowed('dro',$1))  ||
+                            (&Apache::lonnet::allowed('dro',$ccdomain))) &&
+                           ($role_code ne 'dc')) {
+                           $delallowed=1;
+                       }
+                   } else {
+                       if (&Apache::lonnet::allowed('c'.$role_code,'/')) {
+                           $allowed=1;
+                       }
+                   }
+		   if ($role_code eq 'ca' || $role_code eq 'au') {
+		       $class='Construction Space';
+		   } elsif ($role_code eq 'su') {
+		       $class='System';
+		   } else {
+		       $class='Domain';
+		   }
+               }
+               if (($role_code eq 'ca') || ($role_code eq 'aa')) {
+                   $area=~m{/($match_domain)/($match_username)};
+		   if (&authorpriv($2,$1)) {
+		       $allowed=1;
+                   } else {
+                       $allowed=0;
+                   }
+               }
+               my $row = '';
+               $row.= '<td>';
+               my $active=1;
+               $active=0 if (($role_end_time) && ($now>$role_end_time));
+               if (($active) && ($allowed)) {
+                   $row.= '<input type="checkbox" name="rev:'.$thisrole.'" />';
+               } else {
+                   if ($active) {
+                      $row.='&nbsp;';
+		   } else {
+                      $row.=&mt('expired or revoked');
+		   }
+               }
+	       $row.='</td><td>';
+               if ($allowed && !$active) {
+                   $row.= '<input type="checkbox" name="ren:'.$thisrole.'" />';
+               } else {
+                   $row.='&nbsp;';
+               }
+	       $row.='</td><td>';
+               if ($delallowed) {
+                   $row.= '<input type="checkbox" name="del:'.$thisrole.'" />';
+               } else {
+                   $row.='&nbsp;';
+               }
+	       my $plaintext='';
+	       if (!$croletitle) {
+                   $plaintext=&Apache::lonnet::plaintext($role_code,$class)
+	       } else {
+	           $plaintext=
+		"Customrole '$croletitle'<br />defined by $croleuname\@$croleudom";
+	       }
+               $row.= '</td><td>'.$plaintext.
+                      '</td><td>'.$area.
+                      '</td><td>'.($role_start_time?localtime($role_start_time)
+                                                   : '&nbsp;' ).
+                      '</td><td>'.($role_end_time  ?localtime($role_end_time)
+                                                   : '&nbsp;' )
+                      ."</td>";
+	       $sortrole{$sortkey}=$envkey;
+	       $roletext{$envkey}=$row;
+	       $roleclass{$envkey}=$class;
+               $rolepriv{$envkey}=$allowed;
+               #$r->print($row);
+           } # end of foreach        (table building loop)
+           my $rolesdisplay = 0;
+           my %output = ();
+	   foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
+	       $output{$type} = '';
+	       foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
+		   if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) { 
+		       $output{$type}.=
+                             &Apache::loncommon::start_data_table_row().
+                             $roletext{$sortrole{$which}}.
+                             &Apache::loncommon::end_data_table_row();
+		   }
+	       }
+	       unless($output{$type} eq '') {
+		   $output{$type} = '<tr class="LC_info_row">'.
+			     "<td align='center' colspan='7'>".&mt($type)."</td></tr>".
+                              $output{$type};
+                   $rolesdisplay = 1;
+	       }
+	   }
+           if ($rolesdisplay == 1) {
+               $r->print('
+<h3>'.$lt{'rer'}.'</h3>'.
+&Apache::loncommon::start_data_table("LC_createuser").
+&Apache::loncommon::start_data_table_header_row().
+'<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}.
+'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.
+'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
+&Apache::loncommon::end_data_table_header_row());
+               foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
+                   if ($output{$type}) {
+                       $r->print($output{$type}."\n");
+                   }
+               }
+	       $r->print(&Apache::loncommon::end_data_table());
+           }
+        }  # End of unless
     } ## End of new user/old user logic
-    $r->print('<hr /><h3>Add Roles</h3>');
+    my $addrolesdisplay = 0;
+    $r->print('<h3>'.&mt('Add Roles').'</h3>');
 #
 # Co-Author
 # 
-
-    if (&Apache::lonnet::allowed('cca',$ENV{'user.domain'})) {
-	my $cuname=$ENV{'user.name'};
-        my $cudom=$ENV{'user.domain'};
-       $r->print(<<ENDCOAUTH);
-<h4>Construction Space</h4>
-<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>
-<th>Start</th><th>End</th></tr>
-<tr>
-<td><input type=checkbox name="act_$cudom\_$cuname\_ca"></td>
-<td>Co-Author</td>
-<td>$cudom\_$cuname</td>
-<td><input type=hidden name="start_$cudom\_$cuname\_ca" value=''>
-<a href=
-"javascript:pjump('date_start','Start Date Co-Author',document.cu.start_$cudom\_$cuname\_ca.value,'start_$cudom\_$cuname\_ca','cu.pres','dateset')">Set Start Date</a></td>
-<td><input type=hidden name="end_$cudom\_$cuname\_ca" value=''>
-<a href=
-"javascript:pjump('date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset')">Set End Date</a></td>
-</tr>
-</table>
-ENDCOAUTH
+    if (&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(
+		    'cs'   => "Construction Space",
+                    'act'  => "Activate",                    
+                    'rol'  => "Role",
+                    'ext'  => "Extent",
+                    'sta'  => "Start",
+                    'end'  => "End",
+                    'cau'  => "Co-Author",
+                    'caa'  => "Assistant Co-Author",
+                    'ssd'  => "Set Start Date",
+                    'sed'  => "Set End Date"
+				       );
+       $r->print('<h4>'.$lt{'cs'}.'</h4>'."\n". 
+           &Apache::loncommon::start_data_table()."\n".
+           &Apache::loncommon::start_data_table_header_row()."\n".
+           '<th>'.$lt{'act'}.'</th><th>'.$lt{'rol'}.'</th>'.
+           '<th>'.$lt{'ext'}.'</th><th>'.$lt{'sta'}.'</th>'.
+           '<th>'.$lt{'end'}.'</th>'."\n".
+           &Apache::loncommon::end_data_table_header_row()."\n".
+           &Apache::loncommon::start_data_table_row()."\n".
+           '<td>
+            <input type=checkbox name="act_'.$cudom.'_'.$cuname.'_ca" />
+           </td>
+           <td>'.$lt{'cau'}.'</td>
+           <td>'.$cudom.'_'.$cuname.'</td>
+           <td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_ca" value="" />
+             <a href=
+"javascript:pjump('."'date_start','Start Date Co-Author',document.cu.start_$cudom\_$cuname\_ca.value,'start_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
+<td><input type="hidden" name="end_'.$cudom.'_'.$cuname.'_ca" value="" />
+<a href=
+"javascript:pjump('."'date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'."\n".
+          &Apache::loncommon::end_data_table_row()."\n".
+          &Apache::loncommon::start_data_table_row()."\n".
+'<td><input type=checkbox name="act_'.$cudom.'_'.$cuname.'_aa" /></td>
+<td>'.$lt{'caa'}.'</td>
+<td>'.$cudom.'_'.$cuname.'</td>
+<td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_aa" value="" />
+<a href=
+"javascript:pjump('."'date_start','Start Date Assistant Co-Author',document.cu.start_$cudom\_$cuname\_aa.value,'start_$cudom\_$cuname\_aa','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
+<td><input type="hidden" name="end_'.$cudom.'_'.$cuname.'_aa" value="" />
+<a href=
+"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 (!(&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
 #
-    $r->print('<h4>Domain Level</h4>'.
-    '<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>'.
-    '<th>Start</th><th>End</th></tr>');
-    foreach ( sort( keys(%incdomains))) {
-	my $thisdomain=$_;
-        foreach ('dc','li','dg','au') {
-            if (&Apache::lonnet::allowed('c'.$_,$thisdomain)) {
-               my $plrole=&Apache::lonnet::plaintext($_);
-               $r->print(<<ENDDROW);
-<tr>
-<td><input type=checkbox name="act_$thisdomain\_$_"></td>
-<td>$plrole</td>
-<td>$thisdomain</td>
-<td><input type=hidden name="start_$thisdomain\_$_" value=''>
-<a href=
-"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$thisdomain\_$_.value,'start_$thisdomain\_$_','cu.pres','dateset')">Set Start Date</a></td>
-<td><input type=hidden name="end_$thisdomain\_$_" value=''>
-<a href=
-"javascript:pjump('date_end','End Date $plrole',document.cu.end_$thisdomain\_$_.value,'end_$thisdomain\_$_','cu.pres','dateset')">Set End Date</a></td>
-</tr>
-ENDDROW
+    my $num_domain_level = 0;
+    my $domaintext = 
+    '<h4>'.&mt('Domain Level').'</h4>'.
+    &Apache::loncommon::start_data_table().
+    &Apache::loncommon::start_data_table_header_row().
+    '<th>'.&mt('Activate').'</th><th>'.&mt('Role').'</th><th>'.
+    &mt('Extent').'</th>'.
+    '<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'.
+    &Apache::loncommon::end_data_table_header_row();
+    foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) {
+        foreach my $role ('dc','li','dg','au','sc') {
+            if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) {
+               my $plrole=&Apache::lonnet::plaintext($role);
+	       my %lt=&Apache::lonlocal::texthash(
+                    'ssd'  => "Set Start Date",
+                    'sed'  => "Set End Date"
+				       );
+               $num_domain_level ++;
+               $domaintext .= 
+&Apache::loncommon::start_data_table_row().
+'<td><input type=checkbox name="act_'.$thisdomain.'_'.$role.'" /></td>
+<td>'.$plrole.'</td>
+<td>'.$thisdomain.'</td>
+<td><input type="hidden" name="start_'.$thisdomain.'_'.$role.'" value="" />
+<a href=
+"javascript:pjump('."'date_start','Start Date $plrole',document.cu.start_$thisdomain\_$role.value,'start_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
+<td><input type="hidden" name="end_'.$thisdomain.'_'.$role.'" value="" />
+<a href=
+"javascript:pjump('."'date_end','End Date $plrole',document.cu.end_$thisdomain\_$role.value,'end_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'.
+&Apache::loncommon::end_data_table_row();
             }
         } 
     }
-    $r->print('</table>');
+    $domaintext.= &Apache::loncommon::end_data_table();
+    if ($num_domain_level > 0) {
+        $r->print($domaintext);
+        $addrolesdisplay = 1;
+    }
 #
 # Course level
 #
-    $r->print(&course_level_table(%inccourses));
-    $r->print("<hr /><input type=submit value=\"Modify User\">\n");
-    $r->print("</form></body></html>");
+
+    if ($env{'request.role'} =~ m{^dc\./($match_domain)/$}) {
+        $r->print(&course_level_dc($1,'Course'));
+        $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('<br /><input type="button" value="'.&mt('Modify User').'" onClick="setSections(this.form)" />'."\n");
+    }
+    $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
+    $r->print('<input type="hidden" name="currstate" value="" />');
+    $r->print('<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />');
+    $r->print("</form>".&Apache::loncommon::end_page());
+}
+
+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);
+    }
+    # 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);
+        my $authformnop_row;      
+        if (&Apache::lonnet::allowed('mau',$ccdomain)) {
+            $authformnop_row = &Apache::loncommon::start_data_table_row();
+        }
+        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 (
+                           '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().
+                       $authformnop_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";
+            }
+            if ($authform_other ne '') {
+                $outcome .= $authform_other;
+            }
+            $outcome .= &Apache::loncommon::end_data_table_row().
+                        &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 {
+    my ($dom,$currentauth) = @_;
+    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);
+    if ($currentauth=~/^krb(4|5):/) {
+        $authformcurrent=$authformkrb;
+        if ($can_assign{'int'}) {
+            $authform_other = &Apache::loncommon::start_data_table_row().
+                              '<td>'.$authformint.'</td>'.
+                              &Apache::loncommon::end_data_table_row()."\n"
+        }
+        if ($can_assign{'loc'}) {
+            $authform_other .= &Apache::loncommon::start_data_table_row().
+                               '<td>'.$authformloc.'</td>'.
+                               &Apache::loncommon::end_data_table_row()."\n";
+        }
+        if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
+            $show_override_msg = 1;
+        }
+    } elsif ($currentauth=~/^internal:/) {
+        $authformcurrent=$authformint;
+        if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
+            $authform_other = &Apache::loncommon::start_data_table_row().
+                              '<td>'.$authformkrb.'</td>'.
+                              &Apache::loncommon::end_data_table_row()."\n";
+        }
+        if ($can_assign{'loc'}) {
+            $authform_other .= &Apache::loncommon::start_data_table_row().
+                               '<td>'.$authformloc.'</td>'.
+                               &Apache::loncommon::end_data_table_row()."\n";
+        }
+        if ($can_assign{'int'}) {
+            $show_override_msg = 1;
+        }
+    } elsif ($currentauth=~/^unix:/) {
+        $authformcurrent=$authformfsys;
+        if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
+            $authform_other = &Apache::loncommon::start_data_table_row().
+                              '<td>'.$authformkrb.'</td>'.
+                              &Apache::loncommon::end_data_table_row()."\n";
+        }
+        if ($can_assign{'int'}) {
+            $authform_other .= &Apache::loncommon::start_data_table_row().
+                               '<td>'.$authformint.'</td>'.
+                               &Apache::loncommon::end_data_table_row()."\n"
+        }
+        if ($can_assign{'loc'}) {
+            $authform_other .= &Apache::loncommon::start_data_table_row().
+                               '<td>'.$authformloc.'</td>'.
+                               &Apache::loncommon::end_data_table_row()."\n";
+        }
+        if ($can_assign{'fsys'}) {
+            $show_override_msg = 1;
+        }
+    } elsif ($currentauth=~/^localauth:/) {
+        $authformcurrent=$authformloc;
+        if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
+            $authform_other = &Apache::loncommon::start_data_table_row().
+                              '<td>'.$authformkrb.'</td>'.
+                              &Apache::loncommon::end_data_table_row()."\n";
+        }
+        if ($can_assign{'int'}) {
+            $authform_other .= &Apache::loncommon::start_data_table_row().
+                               '<td>'.$authformint.'</td>'.
+                               &Apache::loncommon::end_data_table_row()."\n"
+        }
+        if ($can_assign{'loc'}) {
+            $show_override_msg = 1;
+        }
+    }
+    if ($show_override_msg) {
+        $authformcurrent.= ' <span class="LC_cusr_emph">'.
+                            &mt('will override current values').
+                            '</span><br />';
+    }
+    return ($authformcurrent,$authform_other,$show_override_msg); 
+}
+
+sub personal_data_display {
+    my ($ccuname,$ccdomain,$newuser,%inst_results) = @_; 
+    my ($output,%userenv);
+    if (!$newuser) {
+        # Get the users information
+        %userenv = &Apache::lonnet::get('environment',
+                   ['firstname','middlename','lastname','generation',
+                    'permanentemail','id'],$ccdomain,$ccuname);
+    }
+    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 ($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 {
+            if (&Apache::lonnet::allowed('mau',$ccdomain)) {
+                $output .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="'.$userenv{$item}.'" />';
+            } else {
+                $output .= $userenv{$item};
+            }
+        }
+        $output .= &Apache::lonhtmlcommon::row_closure(1);
+    }
+    $output .= &Apache::lonhtmlcommon::end_pick_box();
+    return $output;
 }
 
 # ================================================================= Phase Three
-sub phase_three {
-    my $r=shift;
-    $r->print(<<ENDTHREEHEAD);
-<html>
-<head>
-<title>The LearningOnline Network with CAPA</title>
-</head>
-<body bgcolor="#FFFFFF">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
-<h1>Create User, Change User Privileges</h1>
-ENDTHREEHEAD
-   $r->print('<h2>'.$ENV{'form.cuname'}.' at '.$ENV{'form.cdomain'}.'</h2>');
-   if ($ENV{'form.makeuser'}) {
-    $r->print('<h3>Creating User</h3>');
-    if (($ENV{'form.cuname'})&&($ENV{'form.cuname'}!~/\W/)&&
-        ($ENV{'form.cdomain'})&&($ENV{'form.cdomain'}!~/\W/)) {
-	my $amode='';
-        my $genpwd='';
-        if ($ENV{'form.login'} eq 'krb') {
-           $amode='krb4';
-           $genpwd=$ENV{'form.krbdom'};
-        } elsif ($ENV{'form.login'} eq 'int') {
-           $amode='internal';
-           $genpwd=$ENV{'form.intpwd'};
-        } elsif ($ENV{'form.login'} eq 'fsys') {
-           $amode='unix';
-           $genpwd=$ENV{'form.fsyspwd'};
-        } elsif ($ENV{'form.login'} eq 'loc') {
-	    $amode='localauth';
-	    $genpwd=$ENV{'form.locarg'};
-	    if (!$genpwd) { $genpwd=" "; }
-	}
-        if (($amode) && ($genpwd)) {
-          $r->print('Generating user: '.&Apache::lonnet::modifyuser(
-                      $ENV{'form.cdomain'},$ENV{'form.cuname'},
-                      $ENV{'form.cstid'},$amode,$genpwd,
- 	              $ENV{'form.cfirst'},$ENV{'form.cmiddle'},
-                      $ENV{'form.clast'},$ENV{'form.cgen'}));
-          $r->print('<br>Home server: '.&Apache::lonnet::homeserver
-                      ($ENV{'form.cuname'},$ENV{'form.cdomain'}));
+sub update_user_data {
+    my ($r) = @_; 
+    my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'},
+                                          $env{'form.ccdomain'});
+    # Error messages
+    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';
+    } else {
+        $title='Modify User Privileges';
+    }
 
-	} else {
-           $r->print('Invalid login mode or password');    
-        }          
+    my ($jsback,$elements) = &crumb_utilities();
+    my $jscript = '<script type="text/javascript">'."\n".
+                  $jsback."\n".'</script>'."\n";
+
+    $r->print(&Apache::loncommon::start_page($title,$jscript));
+    &Apache::lonhtmlcommon::add_breadcrumb
+       ({href=>"javascript:backPage(document.userupdate)",
+         text=>"Create/modify user",
+         faq=>282,bug=>'Instructor Interface',});
+    if ($env{'form.prevphase'} eq 'userpicked') {
+        &Apache::lonhtmlcommon::add_breadcrumb
+           ({href=>"javascript:backPage(document.userupdate,'get_user_info','select')",
+             text=>"Select a user",
+             faq=>282,bug=>'Instructor Interface',});
+    }
+    &Apache::lonhtmlcommon::add_breadcrumb
+       ({href=>"javascript:backPage(document.userupdate,'$env{'form.prevphase'}','modify')",
+         text=>"Set user role",
+         faq=>282,bug=>'Instructor Interface',},
+        {href=>"/adm/createuser",
+         text=>"Result",
+         faq=>282,bug=>'Instructor Interface',});
+    $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.$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.$rtnlink);
+	return;
+    }
+    if (! $env{'form.ccdomain'}       ) {
+	$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.$rtnlink);
+	return;
+    }
+    if (! exists($env{'form.makeuser'})) {
+        # Modifying an existing user, so check the validity of the name
+        if ($uhome eq 'no_host') {
+            $r->print($error.&mt('Unable to determine home server for ').
+                      $env{'form.ccuname'}.&mt(' in domain ').
+                      $env{'form.ccdomain'}.'.');
+            return;
+        }
+    }
+    # Determine authentication method and password for the user being modified
+    my $amode='';
+    my $genpwd='';
+    if ($env{'form.login'} eq 'krb') {
+	$amode='krb';
+	$amode.=$env{'form.krbver'};
+	$genpwd=$env{'form.krbarg'};
+    } elsif ($env{'form.login'} eq 'int') {
+	$amode='internal';
+	$genpwd=$env{'form.intarg'};
+    } elsif ($env{'form.login'} eq 'fsys') {
+	$amode='unix';
+	$genpwd=$env{'form.fsysarg'};
+    } elsif ($env{'form.login'} eq 'loc') {
+	$amode='localauth';
+	$genpwd=$env{'form.locarg'};
+	$genpwd=" " if (!$genpwd);
+    } elsif (($env{'form.login'} eq 'nochange') ||
+             ($env{'form.login'} eq ''        )) { 
+        # There is no need to tell the user we did not change what they
+        # did not ask us to change.
+        # If they are creating a new user but have not specified login
+        # information this will be caught below.
     } else {
-        $r->print('Invalid username or domain');
+	    $r->print($error.&mt('Invalid login mode or password').$end.$rtnlink);    
+	    return;
     }
-   }
-   if (!$ENV{'form.makeuser'} and $ENV{'form.login'} ne 'nop') {
-    $r->print('<h3>Changing User Login Data</h3>');
-    if (($ENV{'form.cuname'})&&($ENV{'form.cuname'}!~/\W/)&&
-        ($ENV{'form.cdomain'})&&($ENV{'form.cdomain'}!~/\W/)) {
-	my $amode='';
-        my $genpwd='';
-        if ($ENV{'form.login'} eq 'krb') {
-           $amode='krb4';
-           $genpwd=$ENV{'form.krbdom'};
-        } elsif ($ENV{'form.login'} eq 'int') {
-           $amode='internal';
-           $genpwd=$ENV{'form.intpwd'};
-        } elsif ($ENV{'form.login'} eq 'fsys') {
-           $amode='unix';
-           $genpwd=$ENV{'form.fsyspwd'};
-        } elsif ($ENV{'form.login'} eq 'loc') {
-	    $amode='localauth';
-	    $genpwd=$ENV{'form.locarg'};
-	    if (!$genpwd) { $genpwd=" "; }
+
+
+    $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.$rtnlink);    
+	    return;
 	}
-        if (($amode) && ($genpwd)) {
+        # Determine desired host
+        my $desiredhost = $env{'form.hserver'};
+        if (lc($desiredhost) eq 'default') {
+            $desiredhost = undef;
+        } else {
+            my %home_servers = 
+		&Apache::lonnet::get_servers($env{'form.ccdomain'},'library');
+            if (! exists($home_servers{$desiredhost})) {
+                $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.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'});
+        $r->print('<br />'.&mt('Home server').': '.$home.' '.
+                  &Apache::lonnet::hostname($home));
+    } elsif (($env{'form.login'} ne 'nochange') &&
+             ($env{'form.login'} ne ''        )) {
+	# Modify user privileges
+        if (! $amode || ! $genpwd) {
+	    $r->print($error.'Invalid login mode or password'.$end.$rtnlink);    
+	    return;
+	}
+	# Only allow authentification modification if the person has authority
+	if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) {
 	    $r->print('Modifying authentication: '.
-		 &Apache::lonnet::modifyuserauth(
-		       $ENV{'form.cdomain'},$ENV{'form.cuname'},
+                      &Apache::lonnet::modifyuserauth(
+		       $env{'form.ccdomain'},$env{'form.ccuname'},
                        $amode,$genpwd));
-            $r->print('<br>Home server: '.&Apache::lonnet::homeserver
-                      ($ENV{'form.cuname'},$ENV{'form.cdomain'}));
-
+            $r->print('<br />'.&mt('Home server').': '.&Apache::lonnet::homeserver
+		  ($env{'form.ccuname'},$env{'form.ccdomain'}));
 	} else {
-           $r->print('Invalid login mode or password');    
-        }          
-    } else {
-        $r->print('Invalid username or domain');
+	    # Okay, this is a non-fatal error.
+	    $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.'.$end);    
+	}
     }
-   }
+    ##
+    if (! $env{'form.makeuser'} ) {
+        # Check for need to change
+        my %userenv = &Apache::lonnet::get
+            ('environment',['firstname','middlename','lastname','generation',
+             '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','id') {
+            # Strip leading and trailing whitespace
+            $env{'form.c'.$item} =~ s/(\s+$|^\s+)//g; 
+        }
+        # Check to see if we can change the ID/student number
+        my $forceid = $env{'form.forceid'};
+        my $recurseid = $env{'form.recurseid'};
+        my $newuser = 0;
+        my $disallowed_id = 0;
+        my (%alerts,%rulematch,%idinst_results,%curr_rules,%got_rules);
+        if (!$forceid) {
+            $env{'form.cid'} = $userenv{'id'};
+        } elsif ($env{'form.cid'} ne $userenv{'id'}) {
+            my $checkhash;
+            my $checks = { 'id' => 1 };
+            $checkhash->{$env{'form.ccuname'}.':'.$env{'form.ccdomain'}} = 
+                   { 'newuser' => $newuser,
+                     'id'  => $env{'form.cid'}, 
+                   };
+            &Apache::loncommon::user_rule_check($checkhash,$checks,
+                \%alerts,\%rulematch,\%idinst_results,\%curr_rules,\%got_rules);
+            if (ref($alerts{'id'}) eq 'HASH') {
+                if (ref($alerts{'id'}{$env{'form.ccdomain'}}) eq 'HASH') {
+                   $disallowed_id = 1;
+                }
+            }
+        }
+        my ($quotachanged,$namechanged,$oldportfolioquota,$newportfolioquota,
+            $inststatus,$isdefault,$defquotatext);
+        my ($defquota,$settingstatus) = 
+            &Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus);
+        my %changeHash;
+        if ($userenv{'portfolioquota'} ne '') {
+            $oldportfolioquota = $userenv{'portfolioquota'};
+            if ($env{'form.customquota'} == 1) {
+                if ($env{'form.portfolioquota'} eq '') {
+                    $newportfolioquota = 0;
+                } else {
+                    $newportfolioquota = $env{'form.portfolioquota'};
+                    $newportfolioquota =~ s/[^\d\.]//g;
+                }
+                if ($newportfolioquota != $userenv{'portfolioquota'}) {
+                    $quotachanged = &quota_admin($newportfolioquota,\%changeHash);
+                }
+            } else {
+                $quotachanged = &quota_admin('',\%changeHash);
+                $newportfolioquota = $defquota;
+                $isdefault = 1; 
+            }
+        } else {
+            $oldportfolioquota = $defquota;
+            if ($env{'form.customquota'} == 1) {
+                if ($env{'form.portfolioquota'} eq '') {
+                    $newportfolioquota = 0;
+                } else {
+                    $newportfolioquota = $env{'form.portfolioquota'};
+                    $newportfolioquota =~ s/[^\d\.]//g;
+                }
+                $quotachanged = &quota_admin($newportfolioquota,\%changeHash);
+            } else {
+                $newportfolioquota = $defquota;
+                $isdefault = 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 (&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.cid'} ne $userenv{'id'}                 ||
+             $env{'form.cpermanentemail'} ne $userenv{'permanentemail'} )) {
+            $namechanged = 1;
+        }
+        if ($namechanged) {
+            # Make the change
+            $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') {
+            # Tell the user we changed the name
+		my %lt=&Apache::lonlocal::texthash(
+                             'uic'  => "User Information Changed",             
+                             'frst' => "first",
+                             '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");
+    <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>
+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>
+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>
+END
+                $r->print(&Apache::loncommon::end_data_table_row().
+                          &Apache::loncommon::end_data_table());
+                if (($forceid) && ($recurseid) && (!$disallowed_id) &&
+                    (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) {
+                    my %userupdate = (
+                                  lastname   => $env{'form.clasaname'},
+                                  middlename => $env{'form.cmiddlename'},
+                                  firstname  => $env{'form.cfirstname'},
+                                  generation => $env{'fora.cgeneration'},
+                                  id         => $env{'form.cid'},
+                             );
+                    my $idresult = &propagate_id_change($env{'form.ccname'},
+                                    $env{'form.ccdomain'},\%userupdate);
+                    $r->print('<br />'.$idresult.'<br />');
+                }
+                if (($env{'form.ccdomain'} eq $env{'user.domain'}) && 
+                    ($env{'form.ccuname'} eq $env{'user.name'})) {
+                    my %newenvhash;
+                    foreach my $key (keys(%changeHash)) {
+                        $newenvhash{'environment.'.$key} = $changeHash{$key};
+                    }
+                    &Apache::lonnet::appenv(%newenvhash);
+                }
+            } else { # error occurred
+                $r->print('<span class="LC_error">'.&mt('Unable to successfully change environment for').' '.
+                      $env{'form.ccuname'}.' '.&mt('in domain').' '.
+                      $env{'form.ccdomain'}.'</span>');
+            }
+        }  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
+	    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'}
+END
+            if ($userenv{'permanentemail'} eq '') {
+                $r->print('</h4>');
+            } else {
+                $r->print('&nbsp;&nbsp;('.$lt{'mail'}.': '.
+                          $userenv{'permanentemail'}.')</h4>');
+            }
+            if ($putresult eq 'ok') {
+                if ($oldportfolioquota != $newportfolioquota) {
+                    $r->print('<h4>'.$lt{'disk'}.': '.$newportfolioquota.' Mb '. 
+                              $defquotatext.'</h4>');
+                    &Apache::lonnet::appenv('environment.portfolioquota' => $changeHash{'portfolioquota'});
+                }
+            }
+        }
+    }
+    ##
     my $now=time;
-    $r->print('<h3>Modifying Roles</h3>');
-    foreach (keys (%ENV)) {
-	if (($_=~/^form\.rev\:([^\_]+)\_([^\_]+)$/) && ($ENV{$_})) {
-           $r->print('Revoking '.$2.' in '.$1.': '.
-          &Apache::lonnet::assignrole($ENV{'form.cdomain'},$ENV{'form.cuname'},
-                                      $1,$2,$now).'<br>');
-           if ($2 eq 'st') {
-               $1=~/^\/(\w+)\/(\w+)/;
-               my $cid=$1.'_'.$2;
-	       $r->print('Drop from classlist: '.
-          &Apache::lonnet::critical('put:'.$ENV{'course.'.$cid.'.domain'}.':'.
-	              $ENV{'course.'.$cid.'.num'}.':classlist:'.
-                      &Apache::lonnet::escape($ENV{'form.cuname'}.':'.
-                                              $ENV{'form.cdomain'}).'='.
-                      &Apache::lonnet::escape($now.':'),
-	              $ENV{'course.'.$cid.'.home'}).'<br>');
-           }
-	}
-    } 
-    foreach (keys(%ENV)) {
-	if (($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_([^\_]+)$/) && ($ENV{$_})) {
-            my $url='/'.$1.'/'.$2;
-            if ($ENV{'form.sec_'.$1.'_'.$2.'_'.$3}) {
-		$url.='/'.$ENV{'form.sec_'.$1.'_'.$2.'_'.$3};
-            }
-            my $start=$now;
-            if ($ENV{'form.start_'.$1.'_'.$2.'_'.$3}) {
-		$start=$ENV{'form.start_'.$1.'_'.$2.'_'.$3};
-            }
-            my $end=0;
-            if ($ENV{'form.end_'.$1.'_'.$2.'_'.$3}) {
-		$end=$ENV{'form.end_'.$1.'_'.$2.'_'.$3};
-            }
-            $r->print('Assigning: '.$3.' in '.$url.': '.
-          &Apache::lonnet::assignrole($ENV{'form.cdomain'},$ENV{'form.cuname'},
-                                      $url,$3,$end,$start).'<br>');
-            if ($3 eq 'st') {
-		$url=~/^\/(\w+)\/(\w+)/;
-                my $cid=$1.'_'.$2;
-               $r->print('Add to classlist: '.
-          &Apache::lonnet::critical('put:'.$ENV{'course.'.$cid.'.domain'}.':'.
-	              $ENV{'course.'.$cid.'.num'}.':classlist:'.
-                      &Apache::lonnet::escape($ENV{'form.cuname'}.':'.
-                                              $ENV{'form.cdomain'}).'='.
-                      &Apache::lonnet::escape($end.':'.$start),
-	              $ENV{'course.'.$cid.'.home'}).'<br>');
+    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\:([^\_]+)\_([^\_\.]+)$/) {
+# Revoke standard role
+		my ($scope,$role) = ($1,$2);
+		my $result =
+		    &Apache::lonnet::revokerole($env{'form.ccdomain'},
+						$env{'form.ccuname'},
+						$scope,$role);
+	        $r->print(&mt('Revoking [_1] in [_2]: [_3]',
+			      $role,$scope,'<b>'.$result.'</b>').'<br />');
+		if ($role eq 'st') {
+		    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) {
+# Revoke custom role
+		$r->print(&mt('Revoking custom role:').
+                      ' '.$4.' by '.$3.':'.$2.' in '.$1.': <b>'.
+                      &Apache::lonnet::revokecustomrole($env{'form.ccdomain'},
+				  $env{'form.ccuname'},$1,$2,$3,$4).
+		'</b><br />');
+	    }
+            $rolechanges ++;
+	} elsif ($key=~/^form\.del/) {
+	    if ($key=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {
+# Delete standard role
+		my ($scope,$role) = ($1,$2);
+		my $result =
+		    &Apache::lonnet::assignrole($env{'form.ccdomain'},
+						$env{'form.ccuname'},
+						$scope,$role,$now,0,1);
+	        $r->print(&mt('Deleting [_1] in [_2]: [_3]',$role,$scope,
+			      '<b>'.$result.'</b>').'<br />');
+		if ($role eq 'st') {
+		    my $result = 
+                        &Apache::lonuserutils::classlist_drop($scope,
+                            $env{'form.ccuname'},$env{'form.ccdomain'},
+			    $now);
+		    $r->print($result);
+		}
+            }
+	    if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
+                my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
+# Delete custom role
+                $r->print(&mt('Deleting custom role [_1] by [_2]:[_3] in [_4]',
+                      $rolename,$rnam,$rdom,$url).': <b>'.
+                      &Apache::lonnet::assigncustomrole($env{'form.ccdomain'},
+                         $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'};
+# Re-enable standard role
+	    if ($key=~/^form\.ren\:([^\_]+)\_([^\_\.]+)$/) {
+                my $url = $1;
+                my $role = $2;
+                my $logmsg;
+                my $output;
+                if ($role eq 'st') {
+                    if ($url =~ m-^/($match_domain)/($match_courseid)/?(\w*)$-) {
+                        my $result = &Apache::loncommon::commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$1,$2,$3);
+                        if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) {
+                            $output = "Error: $result\n";
+                        } else {
+                            $output = &mt('Assigning').' '.$role.' in '.$url.
+                                      &mt('starting').' '.localtime($now).
+                                      ': <br />'.$logmsg.'<br />'.
+                                      &mt('Add to classlist').': <b>ok</b><br />';
+                        }
+                    }
+                } else {
+		    my $result=&Apache::lonnet::assignrole($env{'form.ccdomain'},
+                               $env{'form.ccuname'},$url,$role,0,$now);
+		    $output = &mt('Re-enabling [_1] in [_2]: <b>[_3]</b>',
+			      $role,$url,$result).'<br />';
+		}
+                $r->print($output);
 	    }
-	} elsif (($_=~/^form\.act\_([^\_]+)\_([^\_]+)$/) && ($ENV{$_})) {
-            my $url='/'.$1.'/';
-            my $start=$now;
-            if ($ENV{'form.start_'.$1.'_'.$2}) {
-		$start=$ENV{'form.start_'.$1.'_'.$2};
-            }
-            my $end=0;
-            if ($ENV{'form.end_'.$1.'_'.$2}) {
-		$end=$ENV{'form.end_'.$1.'_'.$2};
-            }
-            $r->print('Assigning: '.$2.' in '.$url.': '.
-          &Apache::lonnet::assignrole($ENV{'form.cdomain'},$ENV{'form.cuname'},
-                                      $url,$2,$end,$start).'<br>');
+# Re-enable custom role
+	    if ($key=~m{^form\.ren\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
+                my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
+                my $result = &Apache::lonnet::assigncustomrole(
+                               $env{'form.ccdomain'}, $env{'form.ccuname'},
+                               $url,$rdom,$rnam,$rolename,0,$now);
+                $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'};
+	    if ($key=~/^form\.act\_($match_domain)\_($match_courseid)\_cr_cr_($match_domain)_($match_username)_([^\_]+)$/) {
+                # Activate a custom role
+		my ($one,$two,$three,$four,$five)=($1,$2,$3,$4,$5);
+		my $url='/'.$one.'/'.$two;
+		my $full=$one.'_'.$two.'_cr_cr_'.$three.'_'.$four.'_'.$five;
+
+                my $start = ( $env{'form.start_'.$full} ?
+                              $env{'form.start_'.$full} :
+                              $now );
+                my $end   = ( $env{'form.end_'.$full} ?
+                              $env{'form.end_'.$full} :
+                              0 );
+                                                                                     
+                # split multiple sections
+                my %sections = ();
+                my $num_sections = &build_roles($env{'form.sec_'.$full},\%sections,$5);
+                if ($num_sections == 0) {
+                    $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end));
+                } else {
+		    my %curr_groups =
+			&Apache::longroup::coursegroups($one,$two);
+                    foreach my $sec (sort {$a cmp $b} keys %sections) {
+                        if (($sec eq 'none') || ($sec eq 'all') || 
+                            exists($curr_groups{$sec})) {
+                            $disallowed{$sec} = $url;
+                            next;
+                        }
+                        my $securl = $url.'/'.$sec;
+		        $r->print(&Apache::loncommon::commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end));
+                    }
+                }
+	    } elsif ($key=~/^form\.act\_($match_domain)\_($match_name)\_([^\_]+)$/) {
+		# Activate roles for sections with 3 id numbers
+		# set start, end times, and the url for the class
+		my ($one,$two,$three)=($1,$2,$3);
+		my $start = ( $env{'form.start_'.$one.'_'.$two.'_'.$three} ? 
+			      $env{'form.start_'.$one.'_'.$two.'_'.$three} : 
+			      $now );
+		my $end   = ( $env{'form.end_'.$one.'_'.$two.'_'.$three} ? 
+			      $env{'form.end_'.$one.'_'.$two.'_'.$three} :
+			      0 );
+		my $url='/'.$one.'/'.$two;
+                my $type = 'three';
+                # split multiple sections
+                my %sections = ();
+                my $num_sections = &build_roles($env{'form.sec_'.$one.'_'.$two.'_'.$three},\%sections,$three);
+                if ($num_sections == 0) {
+                    $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
+                } else {
+                    my %curr_groups = 
+			&Apache::longroup::coursegroups($one,$two);
+                    my $emptysec = 0;
+                    foreach my $sec (sort {$a cmp $b} keys %sections) {
+                        $sec =~ s/\W//g;
+                        if ($sec ne '') {
+                            if (($sec eq 'none') || ($sec eq 'all') || 
+                                exists($curr_groups{$sec})) {
+                                $disallowed{$sec} = $url;
+                                next;
+                            }
+                            my $securl = $url.'/'.$sec;
+                            $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec));
+                        } else {
+                            $emptysec = 1;
+                        }
+                    }
+                    if ($emptysec) {
+                        $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
+                    }
+                } 
+	    } elsif ($key=~/^form\.act\_([^\_]+)\_([^\_]+)$/) {
+		# Activate roles for sections with two id numbers
+		# set start, end times, and the url for the class
+		my $start = ( $env{'form.start_'.$1.'_'.$2} ? 
+			      $env{'form.start_'.$1.'_'.$2} : 
+			      $now );
+		my $end   = ( $env{'form.end_'.$1.'_'.$2} ? 
+			      $env{'form.end_'.$1.'_'.$2} :
+			      0 );
+		my $url='/'.$1.'/';
+                # split multiple sections
+                my %sections = ();
+                my $num_sections = &build_roles($env{'form.sec_'.$1.'_'.$2},\%sections,$2);
+                if ($num_sections == 0) {
+                    $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$2,$start,$end,$1,undef,''));
+                } else {
+                    my $emptysec = 0;
+                    foreach my $sec (sort {$a cmp $b} keys %sections) {
+                        if ($sec ne '') {
+                            my $securl = $url.'/'.$sec;
+                            $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$securl,$2,$start,$end,$1,undef,$sec));
+                        } else {
+                            $emptysec = 1;
+                        }
+                    }
+                    if ($emptysec) {
+                        $r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$2,$start,$end,$1,undef,''));
+                    }
+                }
+	    } else {
+		$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')) {  
+                    $r->print('<p>'.&mt('[_1] may not be used as the name for a section, as it is a reserved word.',$key));
+                } else {
+                    $r->print('<p>'.&mt('[_1] may not be used as the name for a section, as it is the name of a course group.',$key));
+                }
+                $r->print(' '.&mt('Please <a href="javascript:history.go(-1)">go back</a> and choose a different section name.').'</p><br />');
+            }
+            $rolechanges ++;
+	}
+    } # End of foreach (keys(%env))
+# Flush the course logs so reverse user roles immediately updated
+    &Apache::lonnet::flushcourselogs();
+    if (!$rolechanges) {
+        $r->print(&mt('No roles to modify'));
+    }
+    $r->print(&Apache::loncommon::end_page());
+}
+
+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";
+    }
+    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 {
+    my ($setquota,$changeHash) = @_;
+    my $quotachanged;
+    if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
+        # Current user has quota modification privileges
+        $quotachanged = 1;
+        $changeHash->{'portfolioquota'} = $setquota;
+    }
+    return $quotachanged;
+}
+
+sub build_roles {
+    my ($sectionstr,$sections,$role) = @_;
+    my $num_sections = 0;
+    if ($sectionstr=~ /,/) {
+        my @secnums = split/,/,$sectionstr;
+        if ($role eq 'st') {
+            $secnums[0] =~ s/\W//g;
+            $$sections{$secnums[0]} = 1;
+            $num_sections = 1;
+        } else {
+            foreach my $sec (@secnums) {
+                $sec =~ ~s/\W//g;
+                if (!($sec eq "")) {
+                    if (exists($$sections{$sec})) {
+                        $$sections{$sec} ++;
+                    } else {
+                        $$sections{$sec} = 1;
+                        $num_sections ++;
+                    }
+                }
+            }
+        }
+    } else {
+        $sectionstr=~s/\W//g;
+        unless ($sectionstr eq '') {
+            $$sections{$sectionstr} = 1;
+            $num_sections ++;
+        }
+    }
+
+    return $num_sections;
+}
+
+# ========================================================== Custom Role Editor
+
+sub custom_role_editor {
+    my ($r) = @_;
+    my $rolename=$env{'form.rolename'};
+
+    if ($rolename eq 'make new role') {
+	$rolename=$env{'form.newrolename'};
+    }
+
+    $rolename=~s/[^A-Za-z0-9]//gs;
+
+    if (!$rolename || $env{'form.phase'} eq 'pickrole') {
+	&print_username_entry_form($r);
+        return;
+    }
+# ------------------------------------------------------- What can be assigned?
+    my %full=();
+    my %courselevel=();
+    my %courselevelcurrent=();
+    my $syspriv='';
+    my $dompriv='';
+    my $coursepriv='';
+    my $body_top;
+    my ($disp_dummy,$disp_roles) = &Apache::lonnet::get('roles',["st"]);
+    my ($rdummy,$roledef)=
+			 &Apache::lonnet::get('roles',["rolesdef_$rolename"]);
+# ------------------------------------------------------- Does this role exist?
+    $body_top .= '<h2>';
+    if (($rdummy ne 'con_lost') && ($roledef ne '')) {
+	$body_top .= &mt('Existing Role').' "';
+# ------------------------------------------------- Get current role privileges
+	($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef);
+    } else {
+	$body_top .= &mt('New Role').' "';
+	$roledef='';
+    }
+    $body_top .= $rolename.'"</h2>';
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
+	my ($priv,$restrict)=split(/\&/,$item);
+        if (!$restrict) { $restrict='F'; }
+        $courselevel{$priv}=$restrict;
+        if ($coursepriv=~/\:$priv/) {
+	    $courselevelcurrent{$priv}=1;
+	}
+	$full{$priv}=1;
+    }
+    my %domainlevel=();
+    my %domainlevelcurrent=();
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
+	my ($priv,$restrict)=split(/\&/,$item);
+        if (!$restrict) { $restrict='F'; }
+        $domainlevel{$priv}=$restrict;
+        if ($dompriv=~/\:$priv/) {
+	    $domainlevelcurrent{$priv}=1;
+	}
+	$full{$priv}=1;
+    }
+    my %systemlevel=();
+    my %systemlevelcurrent=();
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
+	my ($priv,$restrict)=split(/\&/,$item);
+        if (!$restrict) { $restrict='F'; }
+        $systemlevel{$priv}=$restrict;
+        if ($syspriv=~/\:$priv/) {
+	    $systemlevelcurrent{$priv}=1;
+	}
+	$full{$priv}=1;
+    }
+    my ($jsback,$elements) = &crumb_utilities();
+    my $button_code = "\n";
+    my $head_script = "\n";
+    $head_script .= '<script type="text/javascript">'."\n";
+    my @template_roles = ("cc","in","ta","ep","st");
+    foreach my $role (@template_roles) {
+        $head_script .= &make_script_template($role);
+        $button_code .= &make_button_code($role);
+    }
+    $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,'pickrole','')",
+       text=>"Pick custom role",
+       faq=>282,bug=>'Instructor Interface',},
+      {href=>"javascript:backPage(document.form1,'','')",
+         text=>"Edit custom role",
+         faq=>282,bug=>'Instructor Interface',});
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+
+    $r->print($body_top);
+    my %lt=&Apache::lonlocal::texthash(
+		    'prv'  => "Privilege",
+		    'crl'  => "Course Level",
+                    'dml'  => "Domain Level",
+                    'ssl'  => "System Level");
+    $r->print('Select a Template<br />');
+    $r->print('<form action="">');
+    $r->print($button_code);
+    $r->print('</form>');
+    $r->print(<<ENDCCF);
+<form name="form1" method="post">
+<input type="hidden" name="phase" value="set_custom_roles" />
+<input type="hidden" name="rolename" value="$rolename" />
+ENDCCF
+    $r->print(&Apache::loncommon::start_data_table().
+              &Apache::loncommon::start_data_table_header_row(). 
+'<th>'.$lt{'prv'}.'</th><th>'.$lt{'crl'}.'</th><th>'.$lt{'dml'}.
+'</th><th>'.$lt{'ssl'}.'</th>'.
+              &Apache::loncommon::end_data_table_header_row());
+    foreach my $priv (sort keys %full) {
+        my $privtext = &Apache::lonnet::plaintext($priv);
+        $r->print(&Apache::loncommon::start_data_table_row().
+	          '<td>'.$privtext.'</td><td>'.
+    ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c" '.
+    ($courselevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
+    '</td><td>'.
+    ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d" '.
+    ($domainlevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
+    '</td><td>'.
+    ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s" '.
+    ($systemlevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
+    '</td>'.
+             &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".
+   '<input type="submit" value="'.&mt('Define Role').'" /></form>'.
+	      &Apache::loncommon::end_page());
+}
+# --------------------------------------------------------
+sub make_script_template {
+    my ($role) = @_;
+    my %full_c=();
+    my %full_d=();
+    my %full_s=();
+    my $return_script;
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
+        my ($priv,$restrict)=split(/\&/,$item);
+        $full_c{$priv}=1;
+    }
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
+        my ($priv,$restrict)=split(/\&/,$item);
+        $full_d{$priv}=1;
+    }
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
+        my ($priv,$restrict)=split(/\&/,$item);
+        $full_s{$priv}=1;
+    }
+    $return_script .= 'function set_'.$role.'() {'."\n";
+    my @temp = split(/:/,$Apache::lonnet::pr{$role.':c'});
+    my %role_c;
+    foreach my $priv (@temp) {
+        my ($priv_item, $dummy) = split(/\&/,$priv);
+        $role_c{$priv_item} = 1;
+    }
+    foreach my $priv_item (keys(%full_c)) {
+        my ($priv, $dummy) = split(/\&/,$priv_item);
+        if (exists($role_c{$priv})) {
+            $return_script .= "document.form1.$priv"."_c.checked = true;\n";
+        } else {
+            $return_script .= "document.form1.$priv"."_c.checked = false;\n";
+        }
+    }
+    my %role_d;
+    @temp = split(/:/,$Apache::lonnet::pr{$role.':d'});
+    foreach my $priv(@temp) {
+        my ($priv_item, $dummy) = split(/\&/,$priv);
+        $role_d{$priv_item} = 1;
+    }
+    foreach my $priv_item (keys(%full_d)) {
+        my ($priv, $dummy) = split(/\&/,$priv_item);
+        if (exists($role_d{$priv})) {
+            $return_script .= "document.form1.$priv"."_d.checked = true;\n";
+        } else {
+            $return_script .= "document.form1.$priv"."_d.checked = false;\n";
+        }
+    }
+    my %role_s;
+    @temp = split(/:/,$Apache::lonnet::pr{$role.':s'});
+    foreach my $priv(@temp) {
+        my ($priv_item, $dummy) = split(/\&/,$priv);
+        $role_s{$priv_item} = 1;
+    }
+    foreach my $priv_item (keys(%full_s)) {
+        my ($priv, $dummy) = split(/\&/,$priv_item);
+        if (exists($role_s{$priv})) {
+            $return_script .= "document.form1.$priv"."_s.checked = true;\n";
+        } else {
+            $return_script .= "document.form1.$priv"."_s.checked = false;\n";
         }
     }
-    $r->print('</body></html>');
+    $return_script .= '}'."\n";
+    return ($return_script);
+}
+# ----------------------------------------------------------
+sub make_button_code {
+    my ($role) = @_;
+    my $label = &Apache::lonnet::plaintext($role);
+    my $button_code = '<input type="button" onClick="set_'.$role.'()" value="'.$label.'" />';    
+    return ($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) {
+	&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,'pickrole','')",
+          text=>"Pick custom role",
+          faq=>282,bug=>'Instructor Interface',},
+         {href=>"javascript:backPage(document.customresult,'selected_custom_edit','')",
+          text=>"Edit custom role",
+          faq=>282,bug=>'Instructor Interface',},
+         {href=>"javascript:backPage(document.customresult,'set_custom_roles','')",
+          text=>"Result",
+          faq=>282,bug=>'Instructor Interface',});
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+
+    my ($rdummy,$roledef)=
+	&Apache::lonnet::get('roles',["rolesdef_$rolename"]);
+
+# ------------------------------------------------------- Does this role exist?
+    $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.'"</h3>');
+# ------------------------------------------------------- What can be assigned?
+    my $sysrole='';
+    my $domrole='';
+    my $courole='';
+
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
+	my ($priv,$restrict)=split(/\&/,$item);
+        if (!$restrict) { $restrict=''; }
+        if ($env{'form.'.$priv.'_c'}) {
+	    $courole.=':'.$item;
+	}
+    }
+
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
+	my ($priv,$restrict)=split(/\&/,$item);
+        if (!$restrict) { $restrict=''; }
+        if ($env{'form.'.$priv.'_d'}) {
+	    $domrole.=':'.$item;
+	}
+    }
+
+    foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
+	my ($priv,$restrict)=split(/\&/,$item);
+        if (!$restrict) { $restrict=''; }
+        if ($env{'form.'.$priv.'_s'}) {
+	    $sysrole.=':'.$item;
+	}
+    }
+    $r->print('<br />Defining Role: '.
+	   &Apache::lonnet::definerole($rolename,$sysrole,$domrole,$courole));
+    if ($env{'request.course.id'}) {
+        my $url='/'.$env{'request.course.id'};
+        $url=~s/\_/\//g;
+	$r->print('<br />'.&mt('Assigning Role to Self').': '.
+	      &Apache::lonnet::assigncustomrole($env{'user.domain'},
+						$env{'user.name'},
+						$url,
+						$env{'user.domain'},
+						$env{'user.name'},
+						$rolename));
+    }
+    $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());
 }
 
 # ================================================================ Main Handler
 sub handler {
     my $r = shift;
-
     if ($r->header_only) {
-       $r->content_type('text/html');
+       &Apache::loncommon::content_type($r,'text/html');
        $r->send_http_header;
        return OK;
     }
+    my $context;
+    if ($env{'request.course.id'}) {
+        $context = 'course';
+    } elsif ($env{'request.role'} =~ /^au\./) {
+        $context = 'construction_space';
+    } else {
+        $context = 'domain';
+    }
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+        ['action','state','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) = &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;
+    }
 
-    if ((&Apache::lonnet::allowed('cta',$ENV{'request.course.id'})) ||
-        (&Apache::lonnet::allowed('cin',$ENV{'request.course.id'})) || 
-        (&Apache::lonnet::allowed('ccr',$ENV{'request.course.id'})) || 
-        (&Apache::lonnet::allowed('cep',$ENV{'request.course.id'})) ||
-        (&Apache::lonnet::allowed('cca',$ENV{'user.domain'})) ||
-        (&Apache::lonnet::allowed('mau',$ENV{'user.domain'}))) {
-       $r->content_type('text/html');
-       $r->send_http_header;
-       unless ($ENV{'form.phase'}) {
-	   &phase_one($r);
-       }
-       if ($ENV{'form.phase'} eq 'two') {
-           &phase_two($r);
-       } elsif ($ENV{'form.phase'} eq 'three') {
-           &phase_three($r);
-       }
-   } else {
-      $ENV{'user.error.msg'}=
-        "/adm/createuser:mau:0:0:Cannot modify user data";
-      return HTTP_NOT_ACCEPTABLE; 
-   }
-   return OK;
-} 
+    &Apache::loncommon::content_type($r,'text/html');
+    $r->send_http_header;
+
+    # Main switch on form.action and form.state, as appropriate
+    if (! exists($env{'form.action'})) {
+        $r->print(&header());
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+        $r->print(&print_main_menu($permission));
+        $r->print(&Apache::loncommon::end_page());
+    } elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) {
+        $r->print(&header());
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/createuser?action=upload&state=',
+              text=>"Upload Users List"});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Upload Users List',
+                                                   'User_Management_Upload'));
+        $r->print('<form name="studentform" method="post" '.
+                  'enctype="multipart/form-data" '.
+                  ' action="/adm/createuser">'."\n");
+        if (! exists($env{'form.state'})) {
+            &Apache::lonuserutils::print_first_users_upload_form($r,$context);
+        } elsif ($env{'form.state'} eq 'got_file') {
+            &Apache::lonuserutils::print_upload_manager_form($r,$context);
+        } elsif ($env{'form.state'} eq 'enrolling') {
+            if ($env{'form.datatoken'}) {
+                &Apache::lonuserutils::upfile_drop_add($r,$context);
+            }
+        } else {
+            &Apache::lonuserutils::print_first_users_upload_form($r,$context);
+        }
+        $r->print('</form>'.&Apache::loncommon::end_page());
+    } elsif ($env{'form.action'} eq 'expire' && $permission->{'cusr'}) {
+        $r->print(&header());
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>'/adm/createuser?action=expire',
+              text=>"Expire User Roles"});
+        $r->print(&Apache::lonhtmlcommon::breadcrumbs('Expire User Roles',
+                                                      'User_Management_Drops'));
+        if (! exists($env{'form.state'})) {
+            &Apache::lonuserutils::print_expire_menu($r,$context);
+        } elsif ($env{'form.state'} eq 'done') {
+            &Apache::lonuserutils::expire_user_list($r,$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 (($phase eq 'get_user_info') || ($phase eq 'userpicked')) {
+            if ($env{'form.phase'} eq 'get_user_info') {
+                my ($currstate,$response,$forcenewuser,$results) = 
+                    &user_search_result($srch);
+                if ($env{'form.currstate'} eq 'modify') {
+                    $currstate = $env{'form.currstate'};
+                }
+                if ($currstate eq 'select') {
+                    &print_user_selection_page($r,$response,$srch,$results,
+                                               'createuser',\@search);
+                } elsif ($currstate eq 'modify') {
+                    my ($ccuname,$ccdomain);
+                    if (($srch->{'srchby'} eq 'uname') && 
+                        ($srch->{'srchtype'} eq 'exact')) {
+                        $ccuname = $srch->{'srchterm'};
+                        $ccdomain= $srch->{'srchdomain'};
+                    } else {
+                        my @matchedunames = keys(%{$results});
+                        ($ccuname,$ccdomain) = split(/:/,$matchedunames[0]);
+                    }
+                    $ccuname =&LONCAPA::clean_username($ccuname);
+                    $ccdomain=&LONCAPA::clean_domain($ccdomain);
+                    if ($env{'form.forcenewuser'}) {
+                        $response = '';
+                    }
+                    &print_user_modification_page($r,$ccuname,$ccdomain,
+                                                  $srch,$response,$context);
+                } elsif ($currstate eq 'query') {
+                    &print_user_query_page($r,'createuser');
+                } else {
+                    &print_username_entry_form($r,$response,$srch,
+                                               $forcenewuser);
+                }
+            } elsif ($env{'form.phase'} eq 'userpicked') {
+                my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
+                my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'});
+                &print_user_modification_page($r,$ccuname,$ccdomain,$srch,'',
+                                              $context);
+            }
+        } elsif ($env{'form.phase'} eq 'update_user_data') {
+            &update_user_data($r);
+        } else {
+            &print_username_entry_form($r,undef,$srch);
+        }
+    } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
+        if ($env{'form.phase'} eq 'set_custom_roles') {
+            &set_custom_role($r);
+        } else {
+            &custom_role_editor($r);
+        }
+    } elsif ($env{'form.action'} eq 'listusers' && $permission->{'view'}) {
+        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));
+        $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) = @_;
+    my @menu =
+        (
+          { text => 'Upload a File of Users to Modify/Create Users and/or Add roles',
+            help => 'User_Management_Upload',
+            action => 'upload',
+            permission => $permission->{'cusr'},
+            },
+          { text => 'Create User/Set User Roles for a single user',
+            help => 'User_Management_Single_User',
+            action => 'singleuser',
+            permission => $permission->{'cusr'},
+            },
+          { text => 'Display Lists of Users',
+            help => 'User_Management_List',
+            action => 'listusers',
+            permission => $permission->{'view'},
+            },
+#          { text => 'Expire User Roles',
+#            help => 'User_Management_Drops',
+#            action => 'expire',
+#            permission => $permission->{'cusr'},
+#            },
+          { text => 'Edit Custom Roles',
+            help => 'Custom_Role_Edit',
+            action => 'custom',
+            permission => $permission->{'custom'},
+          },
+        );
+    my $menu_html = '';
+    foreach my $menu_item (@menu) {
+        next if (! $menu_item->{'permission'});
+        $menu_html.='<p>';
+        $menu_html.='<font size="+1">';
+        if (exists($menu_item->{'url'})) {
+            $menu_html.=qq{<a href="$menu_item->{'url'}">};
+        } else {
+            $menu_html.=
+                qq{<a href="/adm/createuser?action=$menu_item->{'action'}">};
+        }
+        $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
+        if (exists($menu_item->{'help'})) {
+            $menu_html.=
+                &Apache::loncommon::help_open_topic($menu_item->{'help'});
+        }
+        $menu_html.='</p>';
+    }
+    return $menu_html;
+}
+
+sub get_permission {
+    my ($context) = @_;
+    my %permission;
+    if ($context eq 'course') {
+        if ((&Apache::lonnet::allowed('cta',$env{'request.course.id'})) ||
+            (&Apache::lonnet::allowed('cin',$env{'request.course.id'})) ||
+            (&Apache::lonnet::allowed('ccr',$env{'request.course.id'})) ||
+            (&Apache::lonnet::allowed('cep',$env{'request.course.id'})) ||
+            (&Apache::lonnet::allowed('cst',$env{'request.course.id'}))) {
+            $permission{'cusr'} = 1;
+            $permission{'view'} =
+                 &Apache::lonnet::allowed('vcl',$env{'request.course.id'});
+
+        }
+        if (&Apache::lonnet::allowed('ccr',$env{'request.course.id'})) {
+            $permission{'custom'} = 1;
+        }
+        if (&Apache::lonnet::allowed('vcl',$env{'request.course.id'})) {
+            $permission{'view'} = 1;
+            if (!$permission{'view'}) {
+                my $scope = $env{'request.course.id'}.'/'.$env{'request.course.sec'};
+                $permission{'view'} =  &Apache::lonnet::allowed('vcl',$scope);
+                if ($permission{'view'}) {
+                    $permission{'view_section'} = $env{'request.course.sec'};
+                }
+            }
+        }
+    } elsif ($context eq 'construction_space') {
+        $permission{'cusr'} = &authorpriv($env{'user.name'},$env{'request.role.domain'});
+        $permission{'view'} = $permission{'cusr'};
+    } else {
+        if ((&Apache::lonnet::allowed('cad',$env{'request.role.domain'})) ||
+            (&Apache::lonnet::allowed('cli',$env{'request.role.domain'})) ||
+            (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) ||
+            (&Apache::lonnet::allowed('csc',$env{'request.role.domain'})) ||
+            (&Apache::lonnet::allowed('cdg',$env{'request.role.domain'})) || 
+            (&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))) {
+            $permission{'cusr'} = 1;
+        }
+        if (&Apache::lonnet::allowed('ccr',$env{'request.role.domain'})) {
+            $permission{'custom'} = 1;
+        }
+        $permission{'view'} = $permission{'cusr'};
+    }
+    my $allowed = 0;
+    foreach my $perm (values(%permission)) {
+        if ($perm) { $allowed=1; last; }
+    }
+    return (\%permission,$allowed);
+}
+
+sub restore_prev_selections {
+    my %saveable_parameters = ('srchby'   => 'scalar',
+			       'srchin'   => 'scalar',
+			       'srchtype' => 'scalar',
+			       );
+    &Apache::loncommon::store_settings('user','user_picker',
+				       \%saveable_parameters);
+    &Apache::loncommon::restore_settings('user','user_picker',
+					 \%saveable_parameters);
+}
+
+#-------------------------------------------------- functions for &phase_two
+sub user_search_result {
+    my ($srch) = @_;
+    my %allhomes;
+    my %inst_matches;
+    my %srch_results;
+    my ($response,$currstate,$forcenewuser,$dirsrchres);
+    $srch->{'srchterm'} =~ s/\s+/ /g;
+    if ($srch->{'srchby'} !~ /^(uname|lastname|lastfirst)$/) {
+        $response = &mt('Invalid search.');
+    }
+    if ($srch->{'srchin'} !~ /^(crs|dom|alc|instd)$/) {
+        $response = &mt('Invalid search.');
+    }
+    if ($srch->{'srchtype'} !~ /^(exact|contains|begins)$/) {
+        $response = &mt('Invalid search.');
+    }
+    if ($srch->{'srchterm'} eq '') {
+        $response = &mt('You must enter a search term.');
+    }
+    if ($srch->{'srchterm'} =~ /^\s+$/) {
+        $response = &mt('Your search term must contain more than just spaces.');
+    }
+    if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'instd')) {
+        if (($srch->{'srchdomain'} eq '') || 
+	    ! (&Apache::lonnet::domain($srch->{'srchdomain'}))) {
+            $response = &mt('You must specify a valid domain when searching in a domain or institutional directory.')
+        }
+    }
+    if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'crs') ||
+        ($srch->{'srchin'} eq 'alc')) {
+        if ($srch->{'srchby'} eq 'uname') {
+            if ($srch->{'srchterm'} !~ /^$match_username$/) {
+                $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @');
+            }
+        }
+    }
+    if ($response ne '') {
+        $response = '<span class="LC_warning">'.$response.'</span>';
+    }
+    if ($srch->{'srchin'} eq 'instd') {
+        my $instd_chk = &directorysrch_check($srch);
+        if ($instd_chk ne 'ok') {
+            $response = '<span class="LC_warning">'.$instd_chk.'</span>'.
+                        '<br />'.&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').'<br /><br />';
+        }
+    }
+    if ($response ne '') {
+        return ($currstate,$response);
+    }
+    if ($srch->{'srchby'} eq 'uname') {
+        if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'crs')) {
+            if ($env{'form.forcenew'}) {
+                if ($srch->{'srchdomain'} ne $env{'request.role.domain'}) {
+                    my $uhome=&Apache::lonnet::homeserver($srch->{'srchterm'},$srch->{'srchdomain'});
+                    if ($uhome eq 'no_host') {
+                        my $domdesc = &Apache::lonnet::domain($env{'request.role.domain'},'description');
+                        my $showdom = &display_domain_info($env{'request.role.domain'});
+                        $response = &mt('New users can only be created in the domain to which your current role belongs - [_1].',$showdom);
+                    } else {
+                        $currstate = 'modify';
+                    }
+                } else {
+                    $currstate = 'modify';
+                }
+            } else {
+                if ($srch->{'srchin'} eq 'dom') {
+                    if ($srch->{'srchtype'} eq 'exact') {
+                        my $uhome=&Apache::lonnet::homeserver($srch->{'srchterm'},$srch->{'srchdomain'});
+                        if ($uhome eq 'no_host') {
+                            ($currstate,$response,$forcenewuser) =
+                                &build_search_response($srch,%srch_results);
+                        } else {
+                            $currstate = 'modify';
+                        }
+                    } else {
+                        %srch_results = &Apache::lonnet::usersearch($srch);
+                        ($currstate,$response,$forcenewuser) =
+                            &build_search_response($srch,%srch_results);
+                    }
+                } else {
+                    my $courseusers = &get_courseusers();
+                    if ($srch->{'srchtype'} eq 'exact') {
+                        if (exists($courseusers->{$srch->{'srchterm'}.':'.$srch->{'srchdomain'}})) {
+                            $currstate = 'modify';
+                        } else {
+                            ($currstate,$response,$forcenewuser) =
+                                &build_search_response($srch,%srch_results);
+                        }
+                    } else {
+                        foreach my $user (keys(%$courseusers)) {
+                            my ($cuname,$cudomain) = split(/:/,$user);
+                            if ($cudomain eq $srch->{'srchdomain'}) {
+                                my $matched = 0;
+                                if ($srch->{'srchtype'} eq 'begins') {
+                                    if ($cuname =~ /^\Q$srch->{'srchterm'}\E/i) {
+                                        $matched = 1;
+                                    }
+                                } else {
+                                    if ($cuname =~ /\Q$srch->{'srchterm'}\E/i) {
+                                        $matched = 1;
+                                    }
+                                }
+                                if ($matched) {
+                                    $srch_results{$user} = 
+					{&Apache::lonnet::get('environment',
+							     ['firstname',
+							      'lastname',
+							      'permanentemail'],
+							      $cudomain,$cuname)};
+                                }
+                            }
+                        }
+                        ($currstate,$response,$forcenewuser) =
+                            &build_search_response($srch,%srch_results);
+                    }
+                }
+            }
+        } elsif ($srch->{'srchin'} eq 'alc') {
+            $currstate = 'query';
+        } elsif ($srch->{'srchin'} eq 'instd') {
+            ($dirsrchres,%srch_results) = &Apache::lonnet::inst_directory_query($srch);
+            if ($dirsrchres eq 'ok') {
+                ($currstate,$response,$forcenewuser) = 
+                    &build_search_response($srch,%srch_results);
+            } else {
+                my $showdom = &display_domain_info($srch->{'srchdomain'});
+                $response = '<span class="LC_warning">'.
+                    &mt('Institutional directory search is not available in domain: [_1]',$showdom).
+                    '</span><br />'.
+                    &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').
+                    '<br /><br />'; 
+            }
+        }
+    } else {
+        if ($srch->{'srchin'} eq 'dom') {
+            %srch_results = &Apache::lonnet::usersearch($srch);
+            ($currstate,$response,$forcenewuser) = 
+                &build_search_response($srch,%srch_results); 
+        } elsif ($srch->{'srchin'} eq 'crs') {
+            my $courseusers = &get_courseusers(); 
+            foreach my $user (keys(%$courseusers)) {
+                my ($uname,$udom) = split(/:/,$user);
+                my %names = &Apache::loncommon::getnames($uname,$udom);
+                my %emails = &Apache::loncommon::getemails($uname,$udom);
+                if ($srch->{'srchby'} eq 'lastname') {
+                    if ((($srch->{'srchtype'} eq 'exact') && 
+                         ($names{'lastname'} eq $srch->{'srchterm'})) || 
+                        (($srch->{'srchtype'} eq 'begins') &&
+                         ($names{'lastname'} =~ /^\Q$srch->{'srchterm'}\E/i)) ||
+                        (($srch->{'srchtype'} eq 'contains') &&
+                         ($names{'lastname'} =~ /\Q$srch->{'srchterm'}\E/i))) {
+                        $srch_results{$user} = {firstname => $names{'firstname'},
+                                            lastname => $names{'lastname'},
+                                            permanentemail => $emails{'permanentemail'},
+                                           };
+                    }
+                } elsif ($srch->{'srchby'} eq 'lastfirst') {
+                    my ($srchlast,$srchfirst) = split(/,/,$srch->{'srchterm'});
+                    $srchlast =~ s/\s+$//;
+                    $srchfirst =~ s/^\s+//;
+                    if ($srch->{'srchtype'} eq 'exact') {
+                        if (($names{'lastname'} eq $srchlast) &&
+                            ($names{'firstname'} eq $srchfirst)) {
+                            $srch_results{$user} = {firstname => $names{'firstname'},
+                                                lastname => $names{'lastname'},
+                                                permanentemail => $emails{'permanentemail'},
+
+                                           };
+                        }
+                    } elsif ($srch->{'srchtype'} eq 'begins') {
+                        if (($names{'lastname'} =~ /^\Q$srchlast\E/i) &&
+                            ($names{'firstname'} =~ /^\Q$srchfirst\E/i)) {
+                            $srch_results{$user} = {firstname => $names{'firstname'},
+                                                lastname => $names{'lastname'},
+                                                permanentemail => $emails{'permanentemail'},
+                                               };
+                        }
+                    } else {
+                        if (($names{'lastname'} =~ /\Q$srchlast\E/i) && 
+                            ($names{'firstname'} =~ /\Q$srchfirst\E/i)) {
+                            $srch_results{$user} = {firstname => $names{'firstname'},
+                                                lastname => $names{'lastname'},
+                                                permanentemail => $emails{'permanentemail'},
+                                               };
+                        }
+                    }
+                }
+            }
+            ($currstate,$response,$forcenewuser) = 
+                &build_search_response($srch,%srch_results); 
+        } elsif ($srch->{'srchin'} eq 'alc') {
+            $currstate = 'query';
+        } elsif ($srch->{'srchin'} eq 'instd') {
+            ($dirsrchres,%srch_results) = &Apache::lonnet::inst_directory_query($srch); 
+            if ($dirsrchres eq 'ok') {
+                ($currstate,$response,$forcenewuser) = 
+                    &build_search_response($srch,%srch_results);
+            } else {
+                my $showdom = &display_domain_info($srch->{'srchdomain'});                $response = '<span class="LC_warning">'.
+                    &mt('Institutional directory search is not available in domain: [_1]',$showdom).
+                    '</span><br />'.
+                    &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').
+                    '<br /><br />';
+            }
+        }
+    }
+    return ($currstate,$response,$forcenewuser,\%srch_results);
+}
+
+sub directorysrch_check {
+    my ($srch) = @_;
+    my $can_search = 0;
+    my $response;
+    my %dom_inst_srch = &Apache::lonnet::get_dom('configuration',
+                                             ['directorysrch'],$srch->{'srchdomain'});
+    my $showdom = &display_domain_info($srch->{'srchdomain'});
+    if (ref($dom_inst_srch{'directorysrch'}) eq 'HASH') {
+        if (!$dom_inst_srch{'directorysrch'}{'available'}) {
+            return &mt('Institutional directory search is not available in domain: [_1]',$showdom); 
+        }
+        if ($dom_inst_srch{'directorysrch'}{'localonly'}) {
+            if ($env{'request.role.domain'} ne $srch->{'srchdomain'}) {
+                return &mt('Institutional directory search in domain: [_1] is only allowed for users with a current role in the domain.',$showdom); 
+            }
+            my @usertypes = split(/:/,$env{'environment.inststatus'});
+            if (!@usertypes) {
+                push(@usertypes,'default');
+            }
+            if (ref($dom_inst_srch{'directorysrch'}{'cansearch'}) eq 'ARRAY') {
+                foreach my $type (@usertypes) {
+                    if (grep(/^\Q$type\E$/,@{$dom_inst_srch{'directorysrch'}{'cansearch'}})) {
+                        $can_search = 1;
+                        last;
+                    }
+                }
+            }
+            if (!$can_search) {
+                my ($insttypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($srch->{'srchdomain'});
+                my @longtypes; 
+                foreach my $item (@usertypes) {
+                    push (@longtypes,$insttypes->{$item});
+                }
+                my $insttype_str = join(', ',@longtypes); 
+                return &mt('Institutional directory search in domain: [_1] is not available to your user type: ',$showdom).$insttype_str;
+            } 
+        } else {
+            $can_search = 1;
+        }
+    } else {
+        return &mt('Institutional directory search has not been configured for domain: [_1]',$showdom);
+    }
+    my %longtext = &Apache::lonlocal::texthash (
+                       uname     => 'username',
+                       lastfirst => 'last name, first name',
+                       lastname  => 'last name',
+                       contains  => 'contains',
+                       exact     => 'as exact match to',
+                       begins    => 'begins with',
+                   );
+    if ($can_search) {
+        if (ref($dom_inst_srch{'directorysrch'}{'searchby'}) eq 'ARRAY') {
+            if (!grep(/^\Q$srch->{'srchby'}\E$/,@{$dom_inst_srch{'directorysrch'}{'searchby'}})) {
+                return &mt('Institutional directory search in domain: [_1] is not available for searching by "[_2]"',$showdom,$longtext{$srch->{'srchby'}});
+            }
+        } else {
+            return &mt('Institutional directory search in domain: [_1] is not available.', $showdom);
+        }
+    }
+    if ($can_search) {
+        if (ref($dom_inst_srch{'directorysrch'}{'searchtypes'}) eq 'ARRAY') {
+            if (grep(/^\Q$srch->{'srchtype'}\E/,@{$dom_inst_srch{'directorysrch'}{'searchtypes'}})) {
+                return 'ok';
+            } else {
+                return &mt('Institutional directory search in domain [_1] is not available for the requested search type: "[_2]"',$showdom,$longtext{$srch->{'srchtype'}});
+            }
+        } else {
+            if ((($dom_inst_srch{'directorysrch'}{'searchtypes'} eq 'specify') &&
+                 ($srch->{'srchtype'} eq 'exact' || $srch->{'srchtype'} eq 'contains')) ||
+                ($dom_inst_srch{'directorysrch'}{'searchtypes'} eq $srch->{'srchtype'})) {
+                return 'ok';
+            } else {
+                return &mt('Institutional directory search in domain [_1] is not available for the requested search type: "[_2]"',$showdom,$longtext{$srch->{'srchtype'}});
+            }
+        }
+    }
+}
+
+sub get_courseusers {
+    my %advhash;
+    my $classlist = &Apache::loncoursedata::get_classlist();
+    my %coursepersonnel=&Apache::lonnet::get_course_adv_roles();
+    foreach my $role (sort(keys(%coursepersonnel))) {
+        foreach my $user (split(/\,/,$coursepersonnel{$role})) {
+	    if (!exists($classlist->{$user})) {
+		$classlist->{$user} = [];
+	    }
+        }
+    }
+    return $classlist;
+}
+
+sub build_search_response {
+    my ($srch,%srch_results) = @_;
+    my ($currstate,$response,$forcenewuser);
+    my %names = (
+          'uname' => 'username',
+          'lastname' => 'last name',
+          'lastfirst' => 'last name, first name',
+          'crs' => 'this course',
+          'dom' => 'LON-CAPA domain: ',
+          'instd' => 'the institutional directory for domain: ',
+    );
+
+    my %single = (
+                   begins   => 'A match',
+                   contains => 'A match',
+                   exact    => 'An exact match',
+                 );
+    my %nomatch = (
+                   begins   => 'No match',
+                   contains => 'No match',
+                   exact    => 'No exact match',
+                  );
+    if (keys(%srch_results) > 1) {
+        $currstate = 'select';
+    } else {
+        if (keys(%srch_results) == 1) {
+            $currstate = 'modify';
+            $response = &mt("$single{$srch->{'srchtype'}} was found for the $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}.",$srch->{'srchterm'});
+            if ($srch->{'srchin'} eq 'dom' || $srch->{'srchin'} eq 'instd') {
+                $response .= &display_domain_info($srch->{'srchdomain'});
+            }
+        } else {
+            $response = '<span class="LC_warning">'.&mt("$nomatch{$srch->{'srchtype'}} found for the $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}",$srch->{'srchterm'});
+            if ($srch->{'srchin'} eq 'dom' || $srch->{'srchin'} eq 'instd') {
+                $response .= &display_domain_info($srch->{'srchdomain'});
+            }
+            $response .= '</span>';
+            if ($srch->{'srchin'} ne 'alc') {
+                $forcenewuser = 1;
+                my $cansrchinst = 0; 
+                if ($srch->{'srchdomain'}) {
+                    my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$srch->{'srchdomain'});
+                    if (ref($domconfig{'directorysrch'}) eq 'HASH') {
+                        if ($domconfig{'directorysrch'}{'available'}) {
+                            $cansrchinst = 1;
+                        } 
+                    }
+                }
+                if ((($srch->{'srchby'} eq 'lastfirst') || 
+                     ($srch->{'srchby'} eq 'lastname')) &&
+                    ($srch->{'srchin'} eq 'dom')) {
+                    if ($cansrchinst) {
+                        $response .= '<br />'.&mt('You may want to broaden your search to a search of the institutional directory for the domain.');
+                    }
+                }
+                if ($srch->{'srchin'} eq 'crs') {
+                    $response .= '<br />'.&mt('You may want to broaden your search to the selected LON-CAPA domain.');
+                }
+            }
+            if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $env{'request.role.domain'})) {
+                my $showdom = &display_domain_info($env{'request.role.domain'}); 
+                $response .= '<br /><br />'.&mt("<b>To add a new user</b> (you can only create new users in your current role's domain - <span class=\"LC_cusr_emph\">[_1]</span>):",$env{'request.role.domain'}).'<ul><li>'.&mt("Set 'Domain/institution to search' to: <span class=\"LC_cusr_emph\">[_1]</span>",$showdom).'<li>'.&mt("Set 'Search criteria' to: <span class=\"LC_cusr_emph\">'username is ...... in selected LON-CAPA domain'").'</span></li><li>'.&mt('Provide the proposed username').'</li><li>'.&mt('Search').'</li></ul><br />';
+            }
+        }
+    }
+    return ($currstate,$response,$forcenewuser);
+}
+
+sub display_domain_info {
+    my ($dom) = @_;
+    my $output = $dom;
+    if ($dom ne '') { 
+        my $domdesc = &Apache::lonnet::domain($dom,'description');
+        if ($domdesc ne '') {
+            $output .= ' <span class="LC_cusr_emph">('.$domdesc.')</span>';
+        }
+    }
+    return $output;
+}
+
+sub crumb_utilities {
+    my %elements = (
+       crtuser => {
+           srchterm => 'text',
+           srchin => 'selectbox',
+           srchby => 'selectbox',
+           srchtype => 'selectbox',
+           srchdomain => 'selectbox',
+       },
+       docustom => {
+           rolename => 'selectbox',
+           newrolename => 'textbox',
+       },
+       studentform => {
+           srchterm => 'text',
+           srchin => 'selectbox',
+           srchby => 'selectbox',
+           srchtype => 'selectbox',
+           srchdomain => 'selectbox',
+       },
+    );
+
+    my $jsback .= qq|
+function backPage(formname,prevphase,prevstate) {
+    formname.phase.value = prevphase;
+    formname.currstate.value = prevstate;
+    formname.submit();
+}
+|;
+    return ($jsback,\%elements);
+}
 
 sub course_level_table {
-    my %inccourses = @_;
+    my (%inccourses) = @_;
     my $table = '';
-    foreach (sort( keys(%inccourses))) {
-	my $thiscourse=$_;
-	my $protectedcourse=$_;
+# Custom Roles?
+
+    my %customroles=&Apache::lonuserutils::my_custom_roles();
+    my %lt=&Apache::lonlocal::texthash(
+            'exs'  => "Existing sections",
+            'new'  => "Define new section",
+            'ssd'  => "Set Start Date",
+            'sed'  => "Set End Date",
+            'crl'  => "Course Level",
+            'act'  => "Activate",
+            'rol'  => "Role",
+            'ext'  => "Extent",
+            'grs'  => "Section",
+            'sta'  => "Start",
+            'end'  => "End"
+    );
+
+    foreach my $protectedcourse (sort( keys(%inccourses))) {
+	my $thiscourse=$protectedcourse;
 	$thiscourse=~s:_:/:g;
 	my %coursedata=&Apache::lonnet::coursedescription($thiscourse);
 	my $area=$coursedata{'description'};
-	my $bgcol=$thiscourse;
-	$bgcol=~s/[^8-9b-e]//g;
-	$bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',0,6);
-	foreach  ('st','ta','ep','ad','in','cc') {
-	    if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) {
-		my $plrole=&Apache::lonnet::plaintext($_);
-		$table .= <<ENDEXTENT;
-<tr bgcolor="#$bgcol">
-<td><input type="checkbox" name="act_$protectedcourse\_$_"></td>
-<td>$plrole</td>
-<td>$area</td>
-ENDEXTENT
-	        if ($_ ne 'cc') {
-		    $table .= <<ENDSECTION;
-<td><input type="text" size="5" name="sec_$protectedcourse\_$_"></td>
-ENDSECTION
+        my $type=$coursedata{'type'};
+	if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; }
+	my ($domain,$cnum)=split(/\//,$thiscourse);
+        my %sections_count;
+        if (defined($env{'request.course.id'})) {
+            if ($env{'request.course.id'} eq $domain.'_'.$cnum) {
+                %sections_count = 
+		    &Apache::loncommon::get_sections($domain,$cnum);
+            }
+        }
+	foreach my $role ('st','ta','ep','in','cc') {
+	    if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) {
+		my $plrole=&Apache::lonnet::plaintext($role);
+		$table .= &Apache::loncommon::start_data_table_row().
+'<td><input type="checkbox" name="act_'.$protectedcourse.'_'.$role.'" /></td>
+<td>'.$plrole.'</td>
+<td>'.$area.'<br />Domain: '.$domain.'</td>'."\n";
+	        if ($role ne 'cc') {
+                    if (%sections_count) {
+                        my $currsec = 
+                            &Apache::lonuserutils::course_sections(\%sections_count,
+                                                        $protectedcourse.'_'.$role);
+                        $table .= 
+                    '<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_'.$protectedcourse.'_'.$role.'" value="" />'.
+                     '<input type="hidden" '.
+                     'name="sec_'.$protectedcourse.'_'.$role.'" /></td>'.
+                     '</tr></table></td>';
+                    } else {
+                        $table .= '<td><input type="text" size="10" '.
+                     'name="sec_'.$protectedcourse.'_'.$role.'" /></td>';
+                    }
                 } else { 
-		    $table .= <<ENDSECTION;
-<td>&nbsp</td> 
-ENDSECTION
+		    $table .= '<td>&nbsp</td>';
                 }
 		$table .= <<ENDTIMEENTRY;
-<td><input type=hidden name="start_$protectedcourse\_$_" value=''>
+<td><input type="hidden" name="start_$protectedcourse\_$role" value='' />
 <a href=
-"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$_.value,'start_$protectedcourse\_$_','cu.pres','dateset')">Set Start Date</a></td>
-<td><input type=hidden name="end_$protectedcourse\_$_" value=''>
+"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$role.value,'start_$protectedcourse\_$role','cu.pres','dateset')">$lt{'ssd'}</a></td>
+<td><input type="hidden" name="end_$protectedcourse\_$role" value='' />
 <a href=
-"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$_.value,'end_$protectedcourse\_$_','cu.pres','dateset')">Set End Date</a></td>
+"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$role.value,'end_$protectedcourse\_$role','cu.pres','dateset')">$lt{'sed'}</a></td>
 ENDTIMEENTRY
-                $table.= "</tr>\n";
+                $table.= &Apache::loncommon::end_data_table_row();
             }
         }
+        foreach my $cust (sort keys %customroles) {
+	    if (&Apache::lonnet::allowed('ccr',$thiscourse)) {
+		my $plrole=$cust;
+                my $customrole=$protectedcourse.'_cr_cr_'.$env{'user.domain'}.
+		    '_'.$env{'user.name'}.'_'.$plrole;
+		$table .= &Apache::loncommon::start_data_table_row().
+'<td><input type="checkbox" name="act_'.$customrole.'" /></td>
+<td>'.$plrole.'</td>
+<td>'.$area.'</td>'."\n";
+                if (%sections_count) {
+                    my $currsec = 
+                        &Apache::lonuserutils::course_sections(\%sections_count,
+                                                               $customrole);
+                    $table.=
+                   '<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>'.
+                   '<input type="hidden" '.
+                   'name="sec_'.$customrole.'" /></td>'.
+                   '</tr></table></td>';
+                } else {
+                    $table .= '<td><input type="text" size="10" '.
+                     'name="sec_'.$customrole.'" /></td>';
+                }
+                $table .= <<ENDENTRY;
+<td><input type="hidden" name="start_$customrole" value='' />
+<a href=
+"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$customrole.value,'start_$customrole','cu.pres','dateset')">$lt{'ssd'}</a></td>
+<td><input type="hidden" name="end_$customrole" value='' />
+<a href=
+"javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">$lt{'sed'}</a></td>
+ENDENTRY
+               $table .= &Apache::loncommon::end_data_table_row();
+           }
+	}
     }
     return '' if ($table eq ''); # return nothing if there is nothing 
                                  # in the table
-    my $result = <<ENDTABLE;
-<h4>Course Level</h4>
-<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>
-<th>Group/Section</th><th>Start</th><th>End</th></tr>
-$table
-</table>
-ENDTABLE
+    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>
+<th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
+&Apache::loncommon::end_data_table_header_row().
+$table.
+&Apache::loncommon::end_data_table();
     return $result;
 }
 
+sub course_level_dc {
+    my ($dcdom) = @_;
+    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="" />';
+    my $courseform='<b>'.&Apache::loncommon::selectcourse_link
+            ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').'</b>';
+    my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu');
+    my %lt=&Apache::lonlocal::texthash(
+                    'rol'  => "Role",
+                    'grs'  => "Section",
+                    'exs'  => "Existing sections",
+                    'new'  => "Define new section", 
+                    'sta'  => "Start",
+                    'end'  => "End",
+                    'ssd'  => "Set Start Date",
+                    'sed'  => "Set End Date"
+                  );
+    my $header = '<h4>'.&mt('Course Level').'</h4>'.
+                 &Apache::loncommon::start_data_table().
+                 &Apache::loncommon::start_data_table_header_row().
+                 '<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
+                 &Apache::loncommon::end_data_table_header_row();
+    my $otheritems = &Apache::loncommon::start_data_table_row()."\n".
+                     '<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
+                     '<td><select name="role">'."\n";
+    foreach  my $role ('st','ta','ep','in','cc') {
+        my $plrole=&Apache::lonnet::plaintext($role);
+        $otheritems .= '  <option value="'.$role.'">'.$plrole;
+    }
+    if ( keys %customroles > 0) {
+        foreach my $cust (sort keys %customroles) {
+            my $custrole='cr_cr_'.$env{'user.domain'}.
+                    '_'.$env{'user.name'}.'_'.$cust;
+            $otheritems .= '  <option value="'.$custrole.'">'.$cust;
+        }
+    }
+    $otheritems .= '</select></td><td>'.
+                     '<table border="0" cellspacing="0" cellpadding="0">'.
+                     '<tr><td valign="top"><b>'.$lt{'exs'}.'</b><br /><select name="currsec">'.
+                     ' <option value=""><--'.&mt('Pick course first').'</select></td>'.
+                     '<td>&nbsp;&nbsp;</td>'.
+                     '<td valign="top">&nbsp;<b>'.$lt{'new'}.'</b><br />'.
+                     '<input type="text" name="newsec" value="" />'.
+                     '<input type="hidden" name="groups" value="" /></td>'.
+                     '</tr></table></td>';
+    $otheritems .= <<ENDTIMEENTRY;
+<td><input type="hidden" name="start" value='' />
+<a href=
+"javascript:pjump('date_start','Start Date',document.cu.start.value,'start','cu.pres','dateset')">$lt{'ssd'}</a></td>
+<td><input type="hidden" name="end" value='' />
+<a href=
+"javascript:pjump('date_end','End Date',document.cu.end.value,'end','cu.pres','dateset')">$lt{'sed'}</a></td>
+ENDTIMEENTRY
+    $otheritems .= &Apache::loncommon::end_data_table_row().
+                   &Apache::loncommon::end_data_table()."\n";
+    return $cb_jscript.$header.$hiddenitems.$otheritems;
+}
+
+#---------------------------------------------- end functions for &phase_two
+
+#--------------------------------- functions for &phase_two and &phase_three
+
+#--------------------------end of functions for &phase_two and &phase_three
+
 1;
 __END__