--- loncom/interface/loncreateuser.pm	2007/07/20 23:52:55	1.157
+++ loncom/interface/loncreateuser.pm	2007/09/18 23:57:15	1.186
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.157 2007/07/20 23:52:55 albertel Exp $
+# $Id: loncreateuser.pm,v 1.186 2007/09/18 23:57:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,7 +65,6 @@ use Apache::lonnet;
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::longroup;
-use lib '/home/httpd/lib/perl/';
 use LONCAPA qw(:DEFAULT :match);
 
 my $loginscript; # piece of javascript used in two separate instances
@@ -194,46 +193,63 @@ END_SCRIPT
 # =================================================================== Phase one
 
 sub print_username_entry_form {
-    my ($r) = @_;
+    my ($r,$response,$srch,$forcenewuser) = @_;
     my $defdom=$env{'request.role.domain'};
-    my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
-    my $selscript=&Apache::loncommon::studentbrowser_javascript();
+    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('Create Users, Change User Privileges',
-				       $selscript);
+				       $jscript,{'add_entries' => \%loaditems,});
+   &Apache::lonhtmlcommon::add_breadcrumb
+     ({href=>"javascript:backPage(document.crtuser)",
+       text=>"User modify/custom role edit",
+       faq=>282,bug=>'Instructor Interface',});
 
-    my $sellink=&Apache::loncommon::selectstudent_link
-                                        ('crtuser','ccuname','ccdomain');
+    my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management');
     my %existingroles=&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(
-		    'siur'   => "Set Individual User Roles",
+                    'srch' => "User Search",
+                     or    => "or",
+		    'siur' => "Set Individual User Roles",
 		    'usr'  => "Username",
                     'dom'  => "Domain",
-                    'usrr' => "User Roles",
                     'ecrp' => "Edit Custom Role Privileges",
                     'nr'   => "Name of Role",
-                    'cre'  => "Custom Role Editor"
+                    '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');
-    $r->print(<<"ENDDOCUMENT");
+    my $sellink=&Apache::loncommon::selectstudent_link('crtuser','srchterm','srchdomain');
+    if ($sellink) {
+        $sellink = "$lt{'or'} ".$sellink;
+    } 
+    $r->print("
 $start_page
-<form action="/adm/createuser" method="post" name="crtuser">
-<input type="hidden" name="phase" value="get_user_info" />
+$crumbs
 <h2>$lt{siur}$helpsiur</h2>
-<table>
-<tr><td>$lt{usr}:</td><td><input type="text" size="15" name="ccuname" />
-</td><td rowspan="2">$sellink</td></tr><tr><td>
-$lt{'dom'}:</td><td>$domform</td></tr>
-</table>
-<input name="userrole" type="submit" value="$lt{usrr}" />
-</form>
-ENDDOCUMENT
-   if (&Apache::lonnet::allowed('mcr','/')) {
-       $r->print(<<ENDCUSTOM);
+<h3>$lt{'srch'} $sellink $lt{'mod'}</h3>
+$response");
+    $r->print(&entry_form($defdom,$srch,$forcenewuser));
+    if (&Apache::lonnet::allowed('mcr','/')) {
+        $r->print(<<ENDCUSTOM);
 <form action="/adm/createuser" method="post" name="docustom">
 <input type="hidden" name="phase" value="selected_custom_edit" />
 <h2>$lt{'ecrp'}$helpecpr</h2>
@@ -245,6 +261,21 @@ 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="phase" value="get_user_info" />
+$userpicker
+<input name="userrole" type="button" value="$srchbutton" onclick="javascript:validateEntry(document.crtuser)" />
+</form>
+ENDDOCUMENT
+    return $output;
+}
 
 sub user_modification_js {
     my ($pjump_def,$dc_setcourse_code,$nondc_setsection_code,$groupslist)=@_;
@@ -274,16 +305,147 @@ END
 }
 
 # =================================================================== Phase two
-sub print_user_modification_page {
-    my $r=shift;
-    my $ccuname =&LONCAPA::clean_username($env{'form.ccuname'});
-    my $ccdomain=&LONCAPA::clean_domain($env{'form.ccdomain'});
+sub print_user_selection_page {
+    my ($r,$response,$srch,$srch_results,$context,$srcharray) = @_;
+    my @fields = ('username','domain','lastname','firstname','permanentemail');
+    my $sortby = $env{'form.sortby'};
 
-    unless (($ccuname) && ($ccdomain)) {
-	&print_username_entry_form($r);
-        return;
+    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>
+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 ($context eq 'createuser') {
+        $r->print(&Apache::loncommon::start_page('Create Users, Change User Privileges',$jscript));
+        &Apache::lonhtmlcommon::add_breadcrumb
+            ({href=>"javascript:backPage(document.usersrchform,'','')",
+              text=>"User modify/custom role edit",
+              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");
+    $r->print($response);
+    if ($context 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) = @_;
+    if (($ccuname eq '') || ($ccdomain eq '')) {
+        my $usermsg = &mt('No username and/or domain provided.'); 
+	&print_username_entry_form($r,$usermsg);
+        return;
+    }
+    my ($instsrch,$rulematch,$rules,%inst_results);
+    my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
+    if ($uhome eq 'no_host') {
+        $instsrch =
+                      {
+                         srchin => 'instd',
+                         srchby => 'uname',
+                         srchtype => 'exact',
+                         srchterm => $ccuname,
+                         srchdomain => $ccdomain,
+                       };
+        (my $usercheckmsg,$rulematch,$rules,%inst_results) = 
+            &Apache::loncommon::username_rule_check($instsrch,'new');
+        if ($usercheckmsg) {
+            &print_username_entry_form($r,$usercheckmsg);
+            return;
+        }
+    }
+    if ($response) {
+        $response = '<br />'.$response
+    }
     my $defdom=$env{'request.role.domain'};
 
     my ($krbdef,$krbdefdom) =
@@ -292,12 +454,10 @@ sub print_user_modification_page {
     my %param = ( formname => 'document.cu',
                   kerb_def_dom => $krbdefdom,
                   kerb_def_auth => $krbdef
-                  );
+                );
     $loginscript  = &Apache::loncommon::authform_header(%param);
     $authformkrb  = &Apache::loncommon::authform_kerberos(%param);
 
-    $ccuname =&LONCAPA::clean_username($ccuname);
-    $ccdomain=&LONCAPA::clean_domain($ccdomain);
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
     my $dc_setcourse_code = '';
     my $nondc_setsection_code = '';                                        
@@ -429,9 +589,8 @@ ENDSCRIPT
             var checkcurr = str.match(re1);
             if (checkcurr != null) {
                 if (document.cu.elements[i-1].checked == true) {
-                    var re2 = /^currsec_[a-zA-Z0-9]+_[a-zA-Z0-9]+_(\\w+)\$/;
-                    match = re2.exec(str);
-                    var role = match[1];
+		    var match = str.split('_');
+                    var role = match[3];
                     if (role == 'cc') {
                         alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections.");
                     }
@@ -500,9 +659,31 @@ ENDSECCODE
     }
     my $js = &user_modification_js($pjump_def,$dc_setcourse_code,
                                    $nondc_setsection_code,$groupslist);
+
+    my ($jsback,$elements) = &crumb_utilities();
+
+    $js .= "\n".
+           '<script type="text/javascript">'."\n".$jsback."\n".'</script>';
+
     my $start_page = 
 	&Apache::loncommon::start_page('Create Users, Change User Privileges',
 				       $js,{'add_entries' => \%loaditem,});
+    &Apache::lonhtmlcommon::add_breadcrumb
+     ({href=>"javascript:backPage(document.cu)",
+       text=>"User modify/custom role edit",
+       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">
@@ -513,7 +694,6 @@ ENDSECCODE
 <input type="hidden" name="pres_type"   value="" />
 <input type="hidden" name="pres_marker" value="" />
 ENDFORMINFO
-    my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
     my %inccourses;
     foreach my $key (keys(%env)) {
 	if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) {
@@ -526,18 +706,36 @@ ENDFORMINFO
                 &Apache::loncommon::home_server_option_list($ccdomain);
         
 	my %lt=&Apache::lonlocal::texthash(
-                    'cnu'  => "Create New User",
-                    'nu'   => "New User",
-                    'id'   => "in domain",
-                    'pd'   => "Personal Data",
-                    'fn'   => "First Name",
-                    'mn'   => "Middle Name",
-                    'ln'   => "Last Name",
-                    'gen'  => "Generation",
-                    'idsn' => "ID/Student Number",
-                    'hs'   => "Home Server",
-                    'lg'   => "Login Data"
+                    'cnu'            => "Create New User",
+                    'nu'             => "New User",
+                    'ind'            => "in domain",
+                    'pd'             => "Personal Data",
+                    'firstname'      => "First Name",
+                    'middlename'     => "Middle Name",
+                    'lastname'       => "Last Name",
+                    'generation'     => "Generation",
+                    'permanentemail' => "Permanent e-mail address",
+                    'id'             => "ID/Student Number",
+                    'hs'             => "Home Server",
+                    'lg'             => "Login Data"
 				       );
+        my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
+        my %textboxsize = (
+                           firstname      => '15',
+                           middlename     => '15',
+                           lastname       => '15',
+                           generation     => '5',
+                           permanentemail => '25',
+                           id             => '15',
+                          );
+        my %element   = (
+                           firstname      => 'cfirst', 
+                           middlename     => 'cmiddle',
+                           lastname       => 'clast',
+                           generation     => 'cgen',
+                           permanentemail => 'cemail',
+                           id             => 'cstid',
+                          );
         my $portfolioform;
         if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
             # Current user has quota modification privileges
@@ -545,39 +743,91 @@ ENDFORMINFO
         }
 	my $genhelp=&Apache::loncommon::help_open_topic('Generation');
         &initialize_authen_forms();
-	$r->print(<<ENDNEWUSER);
+	$r->print(<<ENDTITLE);
 $start_page
+$crumbs
 <h1>$lt{'cnu'}</h1>
+$response
 $forminfo
-<h2>$lt{'nu'} "$ccuname" $lt{'id'} $ccdomain</h2>
+<h2>$lt{'nu'} "$ccuname" $lt{'ind'} $ccdomain</h2>
 <script type="text/javascript" language="Javascript">
 $loginscript
 </script>
 <input type='hidden' name='makeuser' value='1' />
 <h3>$lt{'pd'}</h3>
 <p>
-<table>
-<tr><td>$lt{'fn'}  </td>
-    <td><input type='text' name='cfirst'  size='15' /></td></tr>
-<tr><td>$lt{'mn'} </td> 
-    <td><input type='text' name='cmiddle' size='15' /></td></tr>
-<tr><td>$lt{'ln'}   </td>
-    <td><input type='text' name='clast'   size='15' /></td></tr>
-<tr><td>$lt{'gen'}$genhelp</td>
-    <td><input type='text' name='cgen'    size='5'  /></td></tr>
-</table>
-$lt{'idsn'} <input type='text' name='cstid'   size='15' /></p>
+ENDTITLE
+        $r->print(&Apache::lonhtmlcommon::start_pick_box());
+        foreach my $item (@userinfo) {
+            my $rowtitle = $lt{$item};
+            if ($item eq 'generation') {
+                $rowtitle = $genhelp.$rowtitle;
+            }
+            $r->print(&Apache::lonhtmlcommon::row_title($rowtitle,undef,'LC_oddrow_value')."\n");
+            if ($inst_results{$item} ne '') {
+                $r->print('<input type="hidden" name="'.$element{$item}.'" value="'.$inst_results{$item}.'" />'.$inst_results{$item});
+            } else {
+                $r->print('<input type="text" name="'.$element{$item}.'" size="'.$textboxsize{$item}.'" value="" />');
+            }
+            $r->print(&Apache::lonhtmlcommon::row_closure(1));
+        }
+        $r->print(&Apache::lonhtmlcommon::end_pick_box());
+        $r->print(<<ENDNEWUSER);
+<br />
 $lt{'hs'}: <select name="hserver" size="1"> $home_server_list </select>
+<br />
 <hr />
 <h3>$lt{'lg'}</h3>
-<p>$generalrule </p>
-<p>$authformkrb </p>
-<p>$authformint </p>
-<p>$authformfsys</p>
-<p>$authformloc </p>
+ENDNEWUSER
+        my ($fixedauth,$varauth,$authmsg); 
+        if ($rulematch) {
+            if (ref($rules) eq 'HASH') {
+                if (ref($rules->{$rulematch}) eq 'HASH') {
+                    my $authtype = $rules->{$rulematch}{'authtype'};
+                    if ($authtype !~ /^(krb4|krb5|int|fsys|loc)$/) {
+                        $r->print(&set_login());
+                    } else { 
+                        my $authparm = $rules->{$rulematch}{'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->{$rulematch}{'authmsg'};    
+                            }
+                        } else {
+                            $fixedauth = 
+'<input type="hidden" name="login" value="'.$authtype.'" />'."\n";
+                            if ($rules->{$rulematch}{'authparmfixed'}) {
+                                $fixedauth .=    
+'<input type="hidden" name="'.$authtype.'arg" value="'.$authparm.'" />'."\n";
+                            } else {
+                                $varauth =  
+'<input type="text" name="'.$authtype.'arg" value="" />'."\n";
+                            }
+                        }
+                    }
+                } else {
+                    $r->print(&set_login());
+                }
+            }
+            if ($authmsg) {
+                $r->print(<<ENDAUTH);
+$fixedauth
+$authmsg
+$varauth
+ENDAUTH
+            }
+        } else {
+            $r->print(&set_login()); 
+         }
+         $r->print(<<ENDPORT);
 <hr />
 $portfolioform
-ENDNEWUSER
+ENDPORT
     } else { # user already exists
 	my %lt=&Apache::lonlocal::texthash(
                     'cup'  => "Change User Privileges",
@@ -586,27 +836,30 @@ ENDNEWUSER
                     'fn'   => "first name",
                     'mn'   => "middle name",
                     'ln'   => "last name",
-                    'gen'  => "generation"
+                    'gen'  => "generation",
+                    'email' => "permanent e-mail",
 				       );
 	$r->print(<<ENDCHANGEUSER);
 $start_page
+$crumbs
 <h1>$lt{'cup'}</h1>
 $forminfo
 <h2>$lt{'usr'} "$ccuname" $lt{'id'} "$ccdomain"</h2>
 ENDCHANGEUSER
         # Get the users information
-        my %userenv = &Apache::lonnet::get('environment',
-                          ['firstname','middlename','lastname','generation',
-                           'portfolioquota'],$ccdomain,$ccuname);
+        my %userenv = 
+            &Apache::lonnet::get('environment',
+                ['firstname','middlename','lastname','generation',
+                 'permanentemail','portfolioquota'],$ccdomain,$ccuname);
         my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname);
         $r->print('
 <hr />'.
                   &Apache::loncommon::start_data_table().
                   &Apache::loncommon::start_data_table_header_row().
-'<th>'.$lt{'fn'}.'</th><th>'.$lt{'mn'}.'</th><th>'.$lt{'ln'}.'</th><th>'.$lt{'gen'}.'</th>'.
+'<th>'.$lt{'fn'}.'</th><th>'.$lt{'mn'}.'</th><th>'.$lt{'ln'}.'</th><th>'.$lt{'gen'}.'</th><th>'.$lt{'email'}.'</th>'.
                   &Apache::loncommon::end_data_table_header_row().
                   &Apache::loncommon::start_data_table_row());
-        foreach my $item ('firstname','middlename','lastname','generation') {
+        foreach my $item ('firstname','middlename','lastname','generation','permanentemail') {
            if (&Apache::lonnet::allowed('mau',$ccdomain)) {
               $r->print(<<"END");
 <td><input type="text" name="c$item" value="$userenv{$item}" size="15" /></td>
@@ -817,11 +1070,8 @@ END
             $loginscript  = &Apache::loncommon::authform_header(%param);
 	}
 	# Check for a bad authentication type
-        unless ($currentauth=~/^krb(4|5):/ or
-		$currentauth=~/^unix:/ or
-		$currentauth=~/^internal:/ or
-		$currentauth=~/^localauth:/
-		) { # bad authentication scheme
+        if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) { 
+            # bad authentication scheme
 	    if (&Apache::lonnet::allowed('mau',$ccdomain)) {
                 &initialize_authen_forms();
 		my %lt=&Apache::lonlocal::texthash(
@@ -916,11 +1166,22 @@ $lt{'yodo'} $lt{'ifch'}: $ccdomain
 ENDNOPRIV
                 } 
             }
-            if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
-                # Current user has quota modification privileges
-                $r->print(&portfolio_quota($ccuname,$ccdomain));
-            }
         }  ## End of "check for bad authentication type" logic
+        if (&Apache::lonnet::allowed('mpq',$ccdomain)) {
+            # Current user has quota modification privileges
+            $r->print(&portfolio_quota($ccuname,$ccdomain));
+        } elsif (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) {
+            my %lt=&Apache::lonlocal::texthash(
+                'dska'  => "Disk space allocated to user's portfolio files",
+                'youd'  => "You do not have privileges to modify the portfolio quota for this user.",
+                'ichr'  => "If a change is required, contact a domain coordinator for the domain",
+            );
+            $r->print(<<ENDNOPORTPRIV);
+<hr />
+<h3>$lt{'dska'}</h3>
+$lt{'youd'} $lt{'ichr'}: $ccdomain
+ENDNOPORTPRIV
+        }
     } ## End of new user/old user logic
     $r->print('<hr /><h3>'.&mt('Add Roles').'</h3>');
 #
@@ -959,7 +1220,7 @@ ENDNOPRIV
            <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="" />
+<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".
@@ -967,10 +1228,10 @@ ENDNOPRIV
 '<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="" />
+<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="" />
+<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".
@@ -1002,10 +1263,10 @@ ENDNOPRIV
 '<td><input type=checkbox name="act_'.$thisdomain.'_'.$role.'" /></td>
 <td>'.$plrole.'</td>
 <td>'.$thisdomain.'</td>
-<td><input type=hidden name="start_'.$thisdomain.'_'.$role.'" value="" />
+<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="" />
+<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();
@@ -1027,12 +1288,26 @@ ENDNOPRIV
         $r->print(&course_level_table(%inccourses));
         $r->print('<hr /><input type="button" value="'.&mt('Modify User').'" onClick="setSections()" />'."\n");
     }
+    $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate']));
+    $r->print('<input type="hidden" name="currstate" value="" />');
+    $r->print('<input type="hidden" name="prevphase" value="'.$env{'form.phase'}.'" />');
     $r->print("</form>".&Apache::loncommon::end_page());
 }
 
+sub set_login {
+    my $response = (<<ENDAUTH);
+<p>$generalrule </p>
+<p>$authformkrb </p>
+<p>$authformint </p>
+<p>$authformfsys</p>
+<p>$authformloc </p>
+ENDAUTH
+    return $response;
+}
+
 # ================================================================= Phase Three
 sub update_user_data {
-    my $r=shift;
+    my ($r) = @_; 
     my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'},
                                           $env{'form.ccdomain'});
     # Error messages
@@ -1045,7 +1320,31 @@ sub update_user_data {
     } else {
         $title='Modify User Privileges';
     }
-    $r->print(&Apache::loncommon::start_page($title));
+
+    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=>"User modify/custom role edit",
+         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;
     # Check Inputs
     if (! $env{'form.ccuname'} ) {
@@ -1055,7 +1354,7 @@ sub update_user_data {
     if (  $env{'form.ccuname'} ne 
 	  &LONCAPA::clean_username($env{'form.ccuname'}) ) {
 	$r->print($error.&mt('Invalid login name').'.  '.
-		  &mt('Only letters, numbers, and underscores are valid').'.'.
+		  &mt('Only letters, numbers, periods, dashes, @, and underscores are valid').'.'.
 		  $end);
 	return;
     }
@@ -1106,15 +1405,13 @@ sub update_user_data {
 	    $r->print($error.&mt('Invalid login mode or password').$end);    
 	    return;
     }
+
+
+    $r->print('<h2>'.&mt('User [_1] in domain [_2]',
+			 $env{'form.ccuname'}, $env{'form.ccdomain'}).'</h2>');
+
     if ($env{'form.makeuser'}) {
-        # Create a new user
-	my %lt=&Apache::lonlocal::texthash(
-                    'cru'  => "Creating user",                    
-                    'id'   => "in domain"
-					   );
-	$r->print(<<ENDNEWUSERHEAD);
-<h3>$lt{'cru'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"</h3>
-ENDNEWUSERHEAD
+	$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);    
@@ -1137,7 +1434,7 @@ ENDNEWUSERHEAD
 	    ($env{'form.ccdomain'},$env{'form.ccuname'},$env{'form.cstid'},
              $amode,$genpwd,$env{'form.cfirst'},
              $env{'form.cmiddle'},$env{'form.clast'},$env{'form.cgen'},
-             undef,$desiredhost
+             undef,$desiredhost,$env{'form.cemail'}
 	     );
 	$r->print(&mt('Generating user').': '.$result);
         my $home = &Apache::lonnet::homeserver($env{'form.ccuname'},
@@ -1147,13 +1444,6 @@ ENDNEWUSERHEAD
     } elsif (($env{'form.login'} ne 'nochange') &&
              ($env{'form.login'} ne ''        )) {
 	# Modify user privileges
-    my %lt=&Apache::lonlocal::texthash(
-                    'usr'  => "User",                    
-                    'id'   => "in domain"
-				       );
-	$r->print(<<ENDMODIFYUSERHEAD);
-<h2>$lt{'usr'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"</h2>
-ENDMODIFYUSERHEAD
         if (! $amode || ! $genpwd) {
 	    $r->print($error.'Invalid login mode or password'.$end);    
 	    return;
@@ -1176,14 +1466,14 @@ ENDMODIFYUSERHEAD
         # Check for need to change
         my %userenv = &Apache::lonnet::get
             ('environment',['firstname','middlename','lastname','generation',
-             'portfolioquota','inststatus'],$env{'form.ccdomain'},
-              $env{'form.ccuname'});
+             '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') {
+        foreach my $item ('firstname','middlename','lastname','generation','permanentemail') {
             # Strip leading and trailing whitespace
             $env{'form.c'.$item} =~ s/(\s+$|^\s+)//g; 
         }
@@ -1241,7 +1531,8 @@ ENDMODIFYUSERHEAD
             ($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.cgeneration'} ne $userenv{'generation'} ||
+             $env{'form.cpermanentemail'} ne $userenv{'permanentemail'} )) {
             $namechanged = 1;
         }
         if ($namechanged) {
@@ -1250,6 +1541,7 @@ ENDMODIFYUSERHEAD
             $changeHash{'middlename'} = $env{'form.cmiddlename'};
             $changeHash{'lastname'}   = $env{'form.clastname'};
             $changeHash{'generation'} = $env{'form.cgeneration'};
+            $changeHash{'permanentemail'} = $env{'form.cpermanentemail'};
             my $putresult = &Apache::lonnet::put
                 ('environment',\%changeHash,
                  $env{'form.ccdomain'},$env{'form.ccuname'});
@@ -1261,6 +1553,7 @@ ENDMODIFYUSERHEAD
                              'mddl' => "middle",
                              'lst'  => "last",
 			     'gen'  => "generation",
+                             'mail' => "permanent e-mail",
                              'disk' => "disk space allocated to portfolio files",
                              'prvs' => "Previous",
                              'chto' => "Changed To"
@@ -1273,12 +1566,14 @@ ENDMODIFYUSERHEAD
     <th>$lt{'mddl'}</th>
     <th>$lt{'lst'}</th>
     <th>$lt{'gen'}</th>
-    <th>$lt{'disk'}<th></tr>
+    <th>$lt{'mail'}</th>
+    <th>$lt{'disk'}</th></tr>
 <tr><td>$lt{'prvs'}</td>
     <td>$userenv{'firstname'}  </td>
     <td>$userenv{'middlename'} </td>
     <td>$userenv{'lastname'}   </td>
     <td>$userenv{'generation'} </td>
+    <td>$userenv{'permanentemail'} </td>
     <td>$oldportfolioquota Mb</td>
 </tr>
 <tr><td>$lt{'chto'}</td>
@@ -1286,6 +1581,7 @@ ENDMODIFYUSERHEAD
     <td>$env{'form.cmiddlename'} </td>
     <td>$env{'form.clastname'}   </td>
     <td>$env{'form.cgeneration'} </td>
+    <td>$env{'form.cpermanentemail'} </td>
     <td>$newportfolioquota Mb $defquotatext </td></tr>
 </table>
 END
@@ -1312,15 +1608,12 @@ END
             # They did not want to change the users name but we can
             # still tell them what the name is
 	    my %lt=&Apache::lonlocal::texthash(
-                           'usr'  => "User",                    
-                           'id'   => "in domain",
-                           'gen'  => "Generation",
+                           'mail' => "Permanent e-mail",
                            'disk' => "Disk space allocated to user's portfolio files",
 					       );
             $r->print(<<"END");
-<h2>$lt{'usr'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"</h2>
-<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} </h4>
-<h4>$lt{'gen'}: $userenv{'generation'}</h4>
+<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'}</h4>
+<h4>$lt{'mail'}: $userenv{'permanentemail'}</h4>
 END
             if ($putresult eq 'ok') {
                 if ($oldportfolioquota != $newportfolioquota) {
@@ -1340,23 +1633,20 @@ END
 	if ($key=~/^form\.rev/) {
 	    if ($key=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {
 # Revoke standard role
-	        $r->print(&mt('Revoking').' '.$2.' in '.$1.': <b>'.
-                     &Apache::lonnet::revokerole($env{'form.ccdomain'},
-                     $env{'form.ccuname'},$1,$2).'</b><br />');
-		if ($2 eq 'st') {
-		    $1=~m{^/($match_domain)/($match_courseid)};
-		    my $cid=$1.'_'.$2;
-		    $r->print(&mt('Drop from classlist').': <b>'.
-			 &Apache::lonnet::critical('put:'.
-                             $env{'course.'.$cid.'.domain'}.':'.
-	                     $env{'course.'.$cid.'.num'}.':classlist:'.
-                         &escape($env{'form.ccuname'}.':'.
-                             $env{'form.ccdomain'}).'='.
-                         &escape($now.':'),
-	                     $env{'course.'.$cid.'.home'}).'</b><br />');
+		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 = &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+)$}) {
+	    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>'.
@@ -1367,26 +1657,23 @@ END
 	} elsif ($key=~/^form\.del/) {
 	    if ($key=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {
 # Delete standard role
-	        $r->print(&mt('Deleting').' '.$2.' in '.$1.': '.
-                     &Apache::lonnet::assignrole($env{'form.ccdomain'},
-                     $env{'form.ccuname'},$1,$2,$now,0,1).'<br />');
-		if ($2 eq 'st') {
-		    $1=~m{^/($match_domain)/($match_courseid)};
-		    my $cid=$1.'_'.$2;
-		    $r->print(&mt('Drop from classlist').': <b>'.
-			 &Apache::lonnet::critical('put:'.
-                             $env{'course.'.$cid.'.domain'}.':'.
-	                     $env{'course.'.$cid.'.num'}.':classlist:'.
-                         &escape($env{'form.ccuname'}.':'.
-                             $env{'form.ccdomain'}).'='.
-                         &escape($now.':'),
-	                     $env{'course.'.$cid.'.home'}).'</b><br />');
+		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 = &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]',
+                $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,
@@ -1547,10 +1834,46 @@ END
     } # End of foreach (keys(%env))
 # Flush the course logs so reverse user roles immediately updated
     &Apache::lonnet::flushcourselogs();
-    $r->print('<p><a href="/adm/createuser">Create/Modify Another User</a></p>');
+    $r->print('<p><a href="/adm/createuser">'.&mt('Create/Modify Another User').'</a></p>');
+    $r->print('<form name="userupdate" method="post" />'."\n");
+    foreach my $item ('srchby','srchin','srchtype','srchterm','srchdomain','ccuname','ccdomain') {
+        $r->print('<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n");
+    }
+    foreach my $item ('sortby','seluname','seludom') {
+        if (exists($env{'form.'.$item})) {
+            $r->print('<input type="hidden" name="'.$item.'" value="'.$env{'form.'.$item}.'" />'."\n");
+        }
+    }
+    $r->print('<input type="hidden" name="phase" value="" />'."\n".
+              '<input type ="hidden" name="currstate" value="" />'."\n".
+              '</form>');
     $r->print(&Apache::loncommon::end_page());
 }
 
+sub classlist_drop {
+    my ($scope,$uname,$udom,$now) = @_;
+    my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)});
+    my $cid=$cdom.'_'.$cnum;
+    my $user = $uname.':'.$udom;
+    if (!&active_student_roles($cnum,$cdom,$uname,$udom)) {
+	my $result = 
+	    &Apache::lonnet::cput('classlist',
+				  { $user => $now },
+				  $env{'course.'.$cid.'.domain'},
+				  $env{'course.'.$cid.'.num'});
+	return &mt('Drop from classlist: [_1]',
+		   '<b>'.$result.'</b>').'<br />';
+    }
+}
+
+sub active_student_roles {
+    my ($cnum,$cdom,$uname,$udom) = @_;
+    my %roles = 
+	&Apache::lonnet::get_my_roles($uname,$udom,'userroles',
+				      ['future','active'],['st']);
+    return exists($roles{"$cnum:$cdom:st"});
+}
+
 sub quota_admin {
     my ($setquota,$changeHash) = @_;
     my $quotachanged;
@@ -1598,7 +1921,7 @@ sub build_roles {
 # ========================================================== Custom Role Editor
 
 sub custom_role_editor {
-    my $r=shift;
+    my ($r) = @_;
     my $rolename=$env{'form.rolename'};
 
     if ($rolename eq 'make new role') {
@@ -1664,6 +1987,7 @@ sub custom_role_editor {
 	}
 	$full{$priv}=1;
     }
+    my ($jsback,$elements) = &crumb_utilities();
     my $button_code = "\n";
     my $head_script = "\n";
     $head_script .= '<script type="text/javascript">'."\n";
@@ -1672,8 +1996,17 @@ sub custom_role_editor {
         $head_script .= &make_script_template($role);
         $button_code .= &make_button_code($role);
     }
-    $head_script .= '</script>'."\n";
+    $head_script .= "\n".$jsback."\n".'</script>'."\n";
     $r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
+   &Apache::lonhtmlcommon::add_breadcrumb
+     ({href=>"javascript:backPage(document.form1,'','')",
+       text=>"User modify/custom role edit",
+       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",
@@ -1685,7 +2018,7 @@ sub custom_role_editor {
     $r->print($button_code);
     $r->print('</form>');
     $r->print(<<ENDCCF);
-<form name=form1 method="post">
+<form name="form1" method="post">
 <input type="hidden" name="phase" value="set_custom_roles" />
 <input type="hidden" name="rolename" value="$rolename" />
 ENDCCF
@@ -1710,7 +2043,10 @@ ENDCCF
              &Apache::loncommon::end_data_table_row());
     }
     $r->print(&Apache::loncommon::end_data_table().
-   '<input type="reset" value="'.&mt("Reset").'" /><input type="submit" value="'.&mt('Define Role').'" /></form>'.
+   '<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());
 }
 # --------------------------------------------------------
@@ -1798,11 +2134,27 @@ sub set_custom_role {
         return;
     }
 
-    $r->print(&Apache::loncommon::start_page('Save Custom Role').'<h2>');
+    my ($jsback,$elements) = &crumb_utilities();
+    my $jscript = '<script type="text/javascript">'.$jsback."\n".'</script>';
+
+    $r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript);
+    &Apache::lonhtmlcommon::add_breadcrumb
+        ({href=>"javascript:backPage(document.customresult,'','')",
+          text=>"User modify/custom role edit",
+          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('<h2>');
     if (($rdummy ne 'con_lost') && ($roledef ne '')) {
 	$r->print(&mt('Existing Role').' "');
     } else {
@@ -1851,7 +2203,8 @@ sub set_custom_role {
 						$env{'user.name'},
 						$rolename));
     }
-    $r->print('<p><a href="/adm/createuser">Create another role, or Create/Modify a user.</a></p>');
+    $r->print('<p><a href="/adm/createuser">Create another role, or Create/Modify a user.</a></p><form name="customresult" method="post">');
+    $r->print(&Apache::lonhtmlcommon::echo_form_input([]).'</form>');
     $r->print(&Apache::loncommon::end_page());
 }
 
@@ -1873,17 +2226,53 @@ sub handler {
         (&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))) {
        &Apache::loncommon::content_type($r,'text/html');
        $r->send_http_header;
-       if (!$env{'form.phase'}) {
-	   &print_username_entry_form($r);
-       }
-       if ($env{'form.phase'} eq 'get_user_info') {
-           &print_user_modification_page($r);
+       &Apache::lonhtmlcommon::clear_breadcrumbs();
+      
+       my $phase = $env{'form.phase'};
+       my @search = ('srchterm','srchby','srchin','srchtype','srchdomain');
+
+       if (($phase eq 'get_user_info') || ($phase eq 'userpicked')) {
+           my $srch;
+           foreach my $item (@search) {
+               $srch->{$item} = $env{'form.'.$item};
+           }
+           if ($env{'form.phase'} eq 'get_user_info') {
+               my ($currstate,$response,$forcenewuser,$results) = 
+                   &user_search_result($srch);
+               if ($currstate eq 'select') {
+                   &print_user_selection_page($r,$response,$srch,$results,'createuser',\@search);
+               } elsif ($currstate eq 'modify') {
+                   my ($ccuname,$ccdomain);
+                   if (($srch->{'srchby'} eq 'uname') && 
+                       ($srch->{'srchtype'} eq 'exact')) {
+                       $ccuname = $srch->{'srchterm'};
+                       $ccdomain= $srch->{'srchdomain'};
+                   } else {
+                       my @matchedunames = keys(%{$results});
+                       ($ccuname,$ccdomain) = split(/:/,$matchedunames[0]);
+                   }
+                   $ccuname =&LONCAPA::clean_username($ccuname);
+                   $ccdomain=&LONCAPA::clean_domain($ccdomain);
+                   &print_user_modification_page($r,$ccuname,$ccdomain,$srch,
+                                                 $response);
+               } elsif ($currstate eq 'query') {
+                   &print_user_query_page($r,'createuser');
+               } else {
+                   &print_username_entry_form($r,$response,$srch,$forcenewuser);
+               }
+           } elsif ($env{'form.phase'} eq 'userpicked') {
+               my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
+               my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'});
+               &print_user_modification_page($r,$ccuname,$ccdomain,$srch);
+           }
        } elsif ($env{'form.phase'} eq 'update_user_data') {
            &update_user_data($r);
        } elsif ($env{'form.phase'} eq 'selected_custom_edit') {
            &custom_role_editor($r);
        } elsif ($env{'form.phase'} eq 'set_custom_roles') {
 	   &set_custom_role($r);
+       } else {
+           &print_username_entry_form($r);
        }
    } else {
       $env{'user.error.msg'}=
@@ -1891,9 +2280,421 @@ sub handler {
       return HTTP_NOT_ACCEPTABLE; 
    }
    return OK;
-} 
+}
 
 #-------------------------------------------------- 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'])};
+                                }
+                            }
+                        }
+                        ($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 $table = '';
@@ -1958,10 +2759,10 @@ sub course_level_table {
 		    $table .= '<td>&nbsp</td>';
                 }
 		$table .= <<ENDTIMEENTRY;
-<td><input type=hidden name="start_$protectedcourse\_$role" value='' />
+<td><input type="hidden" name="start_$protectedcourse\_$role" value='' />
 <a href=
 "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='' />
+<td><input type="hidden" name="end_$protectedcourse\_$role" value='' />
 <a href=
 "javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$role.value,'end_$protectedcourse\_$role','cu.pres','dateset')">$lt{'sed'}</a></td>
 ENDTIMEENTRY
@@ -1994,10 +2795,10 @@ ENDTIMEENTRY
                      'name="sec_'.$customrole.'" /></td>';
                 }
                 $table .= <<ENDENTRY;
-<td><input type=hidden name="start_$customrole" value='' />
+<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='' />
+<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
@@ -2089,10 +2890,10 @@ sub course_level_dc {
                      '<input type="hidden" name="groups" value="" /></td>'.
                      '</tr></table></td>';
     $otheritems .= <<ENDTIMEENTRY;
-<td><input type=hidden name="start" value='' />
+<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='' />
+<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