--- loncom/interface/loncreateuser.pm	2005/01/11 22:12:22	1.98
+++ loncom/interface/loncreateuser.pm	2005/06/19 00:41:32	1.105
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.98 2005/01/11 22:12:22 albertel Exp $
+# $Id: loncreateuser.pm,v 1.105 2005/06/19 00:41:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -108,10 +108,8 @@ sub my_custom_roles {
 
 sub authorpriv {
     my ($auname,$audom)=@_;
-    if (($auname ne $ENV{'user.name'}) ||
-        (($audom ne $ENV{'user.domain'}) &&
-         ($audom ne $ENV{'request.role.domain'}))) { return ''; }
-    unless (&Apache::lonnet::allowed('cca',$audom)) { return ''; }
+    unless ((&Apache::lonnet::allowed('cca',$audom.'/'.$auname))
+         || (&Apache::lonnet::allowed('caa',$audom.'/'.$auname))) { return ''; }
     return 1;
 }
 
@@ -119,9 +117,10 @@ sub authorpriv {
 
 sub print_username_entry_form {
     my $r=shift;
-    my $defdom=$ENV{'request.role.domain'};
+    my $defdom=$env{'request.role.domain'};
     my @domains = &Apache::loncommon::get_domains();
     my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
+    my $html=&Apache::lonxml::xmlbegin();
     my $bodytag =&Apache::loncommon::bodytag('Create Users, Change User Privileges').&Apache::loncommon::help_open_menu('',undef,undef,'',282,'Instructor Interface');
     my $selscript=&Apache::loncommon::studentbrowser_javascript();
     my $sellink=&Apache::loncommon::selectstudent_link
@@ -141,7 +140,7 @@ sub print_username_entry_form {
     my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
     my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles');
     $r->print(<<"ENDDOCUMENT");
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 $selscript
@@ -170,8 +169,8 @@ ENDDOCUMENT
 # =================================================================== Phase two
 sub print_user_modification_page {
     my $r=shift;
-    my $ccuname=$ENV{'form.ccuname'};
-    my $ccdomain=$ENV{'form.ccdomain'};
+    my $ccuname=$env{'form.ccuname'};
+    my $ccdomain=$env{'form.ccdomain'};
 
     $ccuname=~s/\W//g;
     $ccdomain=~s/\W//g;
@@ -181,7 +180,7 @@ sub print_user_modification_page {
         return;
     }
 
-    my $defdom=$ENV{'request.role.domain'};
+    my $defdom=$env{'request.role.domain'};
 
     my ($krbdef,$krbdefdom) =
        &Apache::loncommon::get_kerberos_defaults($defdom);
@@ -198,7 +197,7 @@ sub print_user_modification_page {
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
     my $dc_setcourse_code = '';
     my $loaditem;
-    if ($ENV{'request.role'} =~ m-^dc\./(\w+)/$-) {
+    if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
         my $dcdom = $1;
         $loaditem = qq|OnLoad="document.cu.coursedesc.value=''"|;
         $dc_setcourse_code = <<"ENDSCRIPT";
@@ -271,8 +270,9 @@ sub print_user_modification_page {
     }
 ENDSCRIPT
     }
+    my $html=&Apache::lonxml::xmlbegin();
     my $dochead =<<"ENDDOCHEAD";
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 <script type="text/javascript" language="Javascript">
@@ -372,7 +372,7 @@ ENDFORMINFO
     foreach (values(%Apache::lonnet::hostdom)) {
        $incdomains{$_}=1;
     }
-    foreach (keys(%ENV)) {
+    foreach (keys(%env)) {
 	if ($_=~/^user\.priv\.cm\.\/(\w+)\/(\w+)/) {
 	    $inccourses{$1.'_'.$2}=1;
         }
@@ -542,7 +542,7 @@ END
                    $bgcol=~s/[^7-9a-e]//g;
                    $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6);
                    if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) {
-                       $carea.='<br>Section/Group: '.$3;
+                       $carea.='<br />Section/Group: '.$3;
 		       $sortkey.="\0$3";
                    }
                    $area=$carea;
@@ -572,7 +572,7 @@ END
 		       $class='Domain';
 		   }
                }
-               if ($role_code eq 'ca') {
+               if (($role_code eq 'ca') || ($role_code eq 'aa')) {
                    $area=~/\/(\w+)\/(\w+)/;
 		   if (&authorpriv($2,$1)) {
 		       $allowed=1;
@@ -673,7 +673,7 @@ END
 		$currentauth=~/^internal:/ or
 		$currentauth=~/^localauth:/
 		) { # bad authentication scheme
-	    if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) {
+	    if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {
                 &initialize_authen_forms();
 		my %lt=&Apache::lonlocal::texthash(
                                'err'   => "ERROR",
@@ -738,7 +738,7 @@ ENDBADAUTH
                     "<p>$authformint</p><p>$authformfsys</p>";
 	    }
             $authformcurrent.=' <i>(will override current values)</i><br />';
-            if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) {
+            if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {
 		# Current user has login modification privileges
 		my %lt=&Apache::lonlocal::texthash(
                                'ccld'  => "Change Current Login Data",
@@ -763,11 +763,11 @@ ENDOTHERAUTHS
 #
 # Co-Author
 # 
-    if (&authorpriv($ENV{'user.name'},$ENV{'request.role.domain'}) &&
-        ($ENV{'user.name'} ne $ccuname || $ENV{'user.domain'} ne $ccdomain)) {
+    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
-	my $cuname=$ENV{'user.name'};
-        my $cudom=$ENV{'request.role.domain'};
+	my $cuname=$env{'user.name'};
+        my $cudom=$env{'request.role.domain'};
 	   my %lt=&Apache::lonlocal::texthash(
 		    'cs'   => "Construction Space",
                     'act'  => "Activate",                    
@@ -776,6 +776,7 @@ ENDOTHERAUTHS
                     'sta'  => "Start",
                     'end'  => "End",
                     'cau'  => "Co-Author",
+                    'caa'  => "Assistant Co-Author",
                     'ssd'  => "Set Start Date",
                     'sed'  => "Set End Date"
 				       );
@@ -794,6 +795,17 @@ ENDOTHERAUTHS
 <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>
 </tr>
+<tr>
+<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>
+</tr>
 </table>
 ENDCOAUTH
     }
@@ -840,7 +852,7 @@ ENDDROW
 #
     my $num_sections;
 
-    if ($ENV{'request.role'} =~ m-^dc\./(\w+)/$-) {
+    if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
         $r->print(&course_level_dc($1));
         $r->print('<hr /><input type="button" value="'.&mt('Modify User').'" onClick="setCourse()">'."\n");
     } else {
@@ -853,74 +865,75 @@ ENDDROW
 # ================================================================= Phase Three
 sub update_user_data {
     my $r=shift;
-    my $uhome=&Apache::lonnet::homeserver($ENV{'form.ccuname'},
-                                          $ENV{'form.ccdomain'});
+    my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'},
+                                          $env{'form.ccdomain'});
     # Error messages
     my $error     = '<font color="#ff0000">'.&mt('Error').':</font>';
     my $end       = '</body></html>';
     # Print header
+    my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDTHREEHEAD);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 </head>
 ENDTHREEHEAD
     my $title;
-    if (exists($ENV{'form.makeuser'})) {
+    if (exists($env{'form.makeuser'})) {
 	$title='Set Privileges for New User';
     } else {
         $title='Modify User Privileges';
     }
     $r->print(&Apache::loncommon::bodytag($title));
     # Check Inputs
-    if (! $ENV{'form.ccuname'} ) {
+    if (! $env{'form.ccuname'} ) {
 	$r->print($error.&mt('No login name specified').'.'.$end);
 	return;
     }
-    if (  $ENV{'form.ccuname'}  =~/\W/) {
+    if (  $env{'form.ccuname'}  =~/\W/) {
 	$r->print($error.&mt('Invalid login name').'.  '.
 		  &mt('Only letters, numbers, and underscores are valid').'.'.
 		  $end);
 	return;
     }
-    if (! $ENV{'form.ccdomain'}       ) {
+    if (! $env{'form.ccdomain'}       ) {
 	$r->print($error.&mt('No domain specified').'.'.$end);
 	return;
     }
-    if (  $ENV{'form.ccdomain'} =~/\W/) {
+    if (  $env{'form.ccdomain'} =~/\W/) {
 	$r->print($error.&mt ('Invalid domain name').'.  '.
 		  &mt('Only letters, numbers, and underscores are valid').'.'.
 		  $end);
 	return;
     }
-    if (! exists($ENV{'form.makeuser'})) {
+    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'}.'.');
+                      $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') {
+    if ($env{'form.login'} eq 'krb') {
 	$amode='krb';
-	$amode.=$ENV{'form.krbver'};
-	$genpwd=$ENV{'form.krbarg'};
-    } elsif ($ENV{'form.login'} eq 'int') {
+	$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') {
+	$genpwd=$env{'form.intarg'};
+    } elsif ($env{'form.login'} eq 'fsys') {
 	$amode='unix';
-	$genpwd=$ENV{'form.fsysarg'};
-    } elsif ($ENV{'form.login'} eq 'loc') {
+	$genpwd=$env{'form.fsysarg'};
+    } elsif ($env{'form.login'} eq 'loc') {
 	$amode='localauth';
-	$genpwd=$ENV{'form.locarg'};
+	$genpwd=$env{'form.locarg'};
 	$genpwd=" " if (!$genpwd);
-    } elsif (($ENV{'form.login'} eq 'nochange') ||
-             ($ENV{'form.login'} eq ''        )) { 
+    } 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
@@ -929,14 +942,14 @@ ENDTHREEHEAD
 	    $r->print($error.&mt('Invalid login mode or password').$end);    
 	    return;
     }
-    if ($ENV{'form.makeuser'}) {
+    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>
+<h3>$lt{'cru'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"</h3>
 ENDNEWUSERHEAD
         # Check for the authentication mode and password
         if (! $amode || ! $genpwd) {
@@ -944,12 +957,12 @@ ENDNEWUSERHEAD
 	    return;
 	}
         # Determine desired host
-        my $desiredhost = $ENV{'form.hserver'};
+        my $desiredhost = $env{'form.hserver'};
         if (lc($desiredhost) eq 'default') {
             $desiredhost = undef;
         } else {
             my %home_servers = &Apache::loncommon::get_library_servers
-                ($ENV{'form.ccdomain'});  
+                ($env{'form.ccdomain'});  
             if (! exists($home_servers{$desiredhost})) {
                 $r->print($error.&mt('Invalid home server specified'));
                 return;
@@ -957,49 +970,49 @@ ENDNEWUSERHEAD
         }
 	# Call modifyuser
 	my $result = &Apache::lonnet::modifyuser
-	    ($ENV{'form.ccdomain'},$ENV{'form.ccuname'},$ENV{'form.cstid'},
-             $amode,$genpwd,$ENV{'form.cfirst'},
-             $ENV{'form.cmiddle'},$ENV{'form.clast'},$ENV{'form.cgen'},
+	    ($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
 	     );
 	$r->print(&mt('Generating user').': '.$result);
-        my $home = &Apache::lonnet::homeserver($ENV{'form.ccuname'},
-                                               $ENV{'form.ccdomain'});
+        my $home = &Apache::lonnet::homeserver($env{'form.ccuname'},
+                                               $env{'form.ccdomain'});
         $r->print('<br />'.&mt('Home server').': '.$home.' '.
                   $Apache::lonnet::libserv{$home});
-    } elsif (($ENV{'form.login'} ne 'nochange') &&
-             ($ENV{'form.login'} ne ''        )) {
+    } 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>
+<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;
 	}
 	# Only allow authentification modification if the person has authority
-	if (&Apache::lonnet::allowed('mau',$ENV{'form.ccdomain'})) {
+	if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) {
 	    $r->print('Modifying authentication: '.
                       &Apache::lonnet::modifyuserauth(
-		       $ENV{'form.ccdomain'},$ENV{'form.ccuname'},
+		       $env{'form.ccdomain'},$env{'form.ccuname'},
                        $amode,$genpwd));
-            $r->print('<br>'.&mt('Home server').': '.&Apache::lonnet::homeserver
-		  ($ENV{'form.ccuname'},$ENV{'form.ccdomain'}));
+            $r->print('<br />'.&mt('Home server').': '.&Apache::lonnet::homeserver
+		  ($env{'form.ccuname'},$env{'form.ccdomain'}));
 	} else {
 	    # Okay, this is a non-fatal error.
 	    $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.');    
 	}
     }
     ##
-    if (! $ENV{'form.makeuser'} ) {
+    if (! $env{'form.makeuser'} ) {
         # Check for need to change
         my %userenv = &Apache::lonnet::get
             ('environment',['firstname','middlename','lastname','generation'],
-             $ENV{'form.ccdomain'},$ENV{'form.ccuname'});
+             $env{'form.ccdomain'},$env{'form.ccuname'});
         my ($tmp) = keys(%userenv);
         if ($tmp =~ /^(con_lost|error)/i) { 
             %userenv = ();
@@ -1007,22 +1020,22 @@ ENDMODIFYUSERHEAD
         # Check to see if we need to change user information
         foreach ('firstname','middlename','lastname','generation') {
             # Strip leading and trailing whitespace
-            $ENV{'form.c'.$_} =~ s/(\s+$|^\s+)//g; 
+            $env{'form.c'.$_} =~ s/(\s+$|^\s+)//g; 
         }
-        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'} )) {
+        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'} )) {
             # Make the change
             my %changeHash;
-            $changeHash{'firstname'}  = $ENV{'form.cfirstname'};
-            $changeHash{'middlename'} = $ENV{'form.cmiddlename'};
-            $changeHash{'lastname'}   = $ENV{'form.clastname'};
-            $changeHash{'generation'} = $ENV{'form.cgeneration'};
+            $changeHash{'firstname'}  = $env{'form.cfirstname'};
+            $changeHash{'middlename'} = $env{'form.cmiddlename'};
+            $changeHash{'lastname'}   = $env{'form.clastname'};
+            $changeHash{'generation'} = $env{'form.cgeneration'};
             my $putresult = &Apache::lonnet::put
                 ('environment',\%changeHash,
-                 $ENV{'form.ccdomain'},$ENV{'form.ccuname'});
+                 $env{'form.ccdomain'},$env{'form.ccuname'});
             if ($putresult eq 'ok') {
             # Tell the user we changed the name
 		my %lt=&Apache::lonlocal::texthash(
@@ -1048,18 +1061,18 @@ ENDMODIFYUSERHEAD
     <td>$userenv{'lastname'}   </td>
     <td>$userenv{'generation'} </td></tr>
 <tr><td>$lt{'chto'}</td>
-    <td>$ENV{'form.cfirstname'}  </td>
-    <td>$ENV{'form.cmiddlename'} </td>
-    <td>$ENV{'form.clastname'}   </td>
-    <td>$ENV{'form.cgeneration'} </td></tr>
+    <td>$env{'form.cfirstname'}  </td>
+    <td>$env{'form.cmiddlename'} </td>
+    <td>$env{'form.clastname'}   </td>
+    <td>$env{'form.cgeneration'} </td></tr>
 </table>
 END
             } else { # error occurred
                 $r->print("<h2>".&mt('Unable to successfully change environment for')." ".
-                      $ENV{'form.ccuname'}." ".&mt('in domain')." ".
-                      $ENV{'form.ccdomain'}."</h2>");
+                      $env{'form.ccuname'}." ".&mt('in domain')." ".
+                      $env{'form.ccdomain'}."</h2>");
             }
-        }  else { # End of if ($ENV ... ) logic
+        }  else { # End of if ($env ... ) logic
             # They did not want to change the users name but we can
             # still tell them what the name is
 	    my %lt=&Apache::lonlocal::texthash(
@@ -1068,7 +1081,7 @@ END
                            'gen'  => "Generation"
 					       );
                 $r->print(<<"END");
-<h2>$lt{'usr'} "$ENV{'form.ccuname'}" $lt{'id'} "$ENV{'form.ccdomain'}"</h2>
+<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>
 END
@@ -1077,55 +1090,57 @@ END
     ##
     my $now=time;
     $r->print('<h3>'.&mt('Modifying Roles').'</h3>');
-    foreach (keys (%ENV)) {
-	next if (! $ENV{$_});
+    foreach (keys (%env)) {
+	next if (! $env{$_});
 	# Revoke roles
 	if ($_=~/^form\.rev/) {
 	    if ($_=~/^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>');
+                     &Apache::lonnet::revokerole($env{'form.ccdomain'},
+                     $env{'form.ccuname'},$1,$2).'</b><br />');
 		if ($2 eq 'st') {
 		    $1=~/^\/(\w+)\/(\w+)/;
 		    my $cid=$1.'_'.$2;
 		    $r->print(&mt('Drop from classlist').': <b>'.
 			 &Apache::lonnet::critical('put:'.
-                             $ENV{'course.'.$cid.'.domain'}.':'.
-	                     $ENV{'course.'.$cid.'.num'}.':classlist:'.
-                         &Apache::lonnet::escape($ENV{'form.ccuname'}.':'.
-                             $ENV{'form.ccdomain'}).'='.
+                             $env{'course.'.$cid.'.domain'}.':'.
+	                     $env{'course.'.$cid.'.num'}.':classlist:'.
+                         &Apache::lonnet::escape($env{'form.ccuname'}.':'.
+                             $env{'form.ccdomain'}).'='.
                          &Apache::lonnet::escape($now.':'),
-	                     $ENV{'course.'.$cid.'.home'}).'</b><br>');
+	                     $env{'course.'.$cid.'.home'}).'</b><br />');
 		}
 	    } 
 	    if ($_=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
 # 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>');
+                      &Apache::lonnet::revokecustomrole($env{'form.ccdomain'},
+				  $env{'form.ccuname'},$1,$2,$3,$4).
+		'</b><br />');
 	    }
 	} elsif ($_=~/^form\.del/) {
 	    if ($_=~/^form\.del\:([^\_]+)\_([^\_]+)$/) {
 	        $r->print(&mt('Deleting').' '.$2.' in '.$1.': '.
-                     &Apache::lonnet::assignrole($ENV{'form.ccdomain'},
-                     $ENV{'form.ccuname'},$1,$2,$now,0,1).'<br>');
+                     &Apache::lonnet::assignrole($env{'form.ccdomain'},
+                     $env{'form.ccuname'},$1,$2,$now,0,1).'<br />');
 		if ($2 eq 'st') {
 		    $1=~/^\/(\w+)\/(\w+)/;
 		    my $cid=$1.'_'.$2;
 		    $r->print(&mt('Drop from classlist').': <b>'.
 			 &Apache::lonnet::critical('put:'.
-                             $ENV{'course.'.$cid.'.domain'}.':'.
-	                     $ENV{'course.'.$cid.'.num'}.':classlist:'.
-                         &Apache::lonnet::escape($ENV{'form.ccuname'}.':'.
-                             $ENV{'form.ccdomain'}).'='.
+                             $env{'course.'.$cid.'.domain'}.':'.
+	                     $env{'course.'.$cid.'.num'}.':classlist:'.
+                         &Apache::lonnet::escape($env{'form.ccuname'}.':'.
+                             $env{'form.ccdomain'}).'='.
                          &Apache::lonnet::escape($now.':'),
-	                     $ENV{'course.'.$cid.'.home'}).'</b><br>');
+	                     $env{'course.'.$cid.'.home'}).'</b><br />');
 		}
 	    } 
 	} elsif ($_=~/^form\.ren/) {
+            my $udom = $env{'form.ccdomain'};
+            my $uname = $env{'form.ccuname'};
 	    if ($_=~/^form\.ren\:([^\_]+)\_([^\_]+)$/) {
                 my $url = $1;
                 my $role = $2;
@@ -1133,7 +1148,7 @@ END
                 my $output;
                 if ($role eq 'st') {
                     if ($url =~ m-^/(\w+)/(\w+)/?(\w*)$-) {
-                        my $result = &commit_studentrole(\$logmsg,$url,$role,$now,0,$1,$2,$3);
+                        my $result = &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 {
@@ -1144,126 +1159,129 @@ END
                         }
                     }
                 } else {
-		    my $result=&Apache::lonnet::assignrole($ENV{'form.ccdomain'},
-                               $ENV{'form.ccuname'},$url,$role,0,$now);
+		    my $result=&Apache::lonnet::assignrole($env{'form.ccdomain'},
+                               $env{'form.ccuname'},$url,$role,0,$now);
 		    $output = &mt('Re-Enabling [_1] in [_2]: [_3]',
 			      $role,$url,$result).'<br />';
 		}
                 $r->print($output);
 	    } 
 	} elsif ($_=~/^form\.act/) {
+            my $udom = $env{'form.ccdomain'};
+            my $uname = $env{'form.ccuname'};
 	    if ($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_cr_cr_([^\_]+)_(\w+)_([^\_]+)$/) {
                 # 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} :
+                my $start = ( $env{'form.start_'.$full} ?
+                              $env{'form.start_'.$full} :
                               $now );
-                my $end   = ( $ENV{'form.end_'.$full} ?
-                              $ENV{'form.end_'.$full} :
+                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);
+                my $num_sections = &build_roles($env{'form.sec_'.$full},\%sections,$5);
                 if ($num_sections == 0) {
-                    $r->print(&commit_customrole($url,$three,$four,$five,$start,$end));
+                    $r->print(&commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end));
                 } else {
                     foreach (sort {$a cmp $b} keys %sections) {
                         my $securl = $url.'/'.$_;
-		        $r->print(&commit_customrole($securl,$three,$four,$five,$start,$end));
+		        $r->print(&commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end));
                     }
                 }
 	    } elsif ($_=~/^form\.act\_([^\_]+)\_(\w+)\_([^\_]+)$/) {
 		# 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} : 
+		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} :
+		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);
+                my $num_sections = &build_roles($env{'form.sec_'.$one.'_'.$two.'_'.$three},\%sections,$three);
                 if ($num_sections == 0) {
-                    $r->print(&commit_standardrole($url,$three,$start,$end,$one,$two,''));
+                    $r->print(&commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
                 } else {
                     my $emptysec = 0;
                     foreach my $sec (sort {$a cmp $b} keys %sections) {
                         $sec =~ s/\W//g;
                         if ($sec ne '') {  
                             my $securl = $url.'/'.$sec;
-                            $r->print(&commit_standardrole($securl,$three,$start,$end,$one,$two,$sec));
+                            $r->print(&commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec));
                         } else {
                             $emptysec = 1;
                         }
                     }
                     if ($emptysec) {
-                        $r->print(&commit_standardrole($url,$three,$start,$end,$one,$two,''));
+                        $r->print(&commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
                     }
                 } 
 	    } elsif ($_=~/^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} : 
+		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} :
+		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);
+                my $num_sections = &build_roles($env{'form.sec_'.$1.'_'.$2},\%sections,$2);
                 if ($num_sections == 0) {
-                    $r->print(&commit_standardrole($url,$2,$start,$end,$1,undef,''));
+                    $r->print(&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(&commit_standardrole($securl,$2,$start,$end,$1,undef,$sec));
+                            $r->print(&commit_standardrole($udom,$uname,$securl,$2,$start,$end,$1,undef,$sec));
                         } else {
                             $emptysec = 1;
                         }
                     }
                     if ($emptysec) {
-                        $r->print(&commit_standardrole($url,$2,$start,$end,$1,undef,''));
+                        $r->print(&commit_standardrole($udom,$uname,$url,$2,$start,$end,$1,undef,''));
                     }
                 }
 	    } else {
-		$r->print('<p>'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$_.'</tt></p><br>');
+		$r->print('<p>'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$_.'</tt></p><br />');
             }
 	} 
-    } # End of foreach (keys(%ENV))
+    } # 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('</body></html>');
 }
 
 sub commit_customrole {
-    my ($url,$three,$four,$five,$start,$end) = @_;
+    my ($udom,$uname,$url,$three,$four,$five,$start,$end) = @_;
     my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.'@'.$three.' in '.$url.
                          ($start?', '.&mt('starting').' '.localtime($start):'').
                          ($end?', ending '.localtime($end):'').': <b>'.
               &Apache::lonnet::assigncustomrole(
-        $ENV{'form.ccdomain'},$ENV{'form.ccuname'},$url,$three,$four,$five,$end,$start).
-              '</b><br>';
+                 $udom,$uname,$url,$three,$four,$five,$end,$start).
+                 '</b><br />';
     return $output;
 }
 
 sub commit_standardrole {
-    my ($url,$three,$start,$end,$one,$two,$sec) = @_;
+    my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_;
     my $output;
     my $logmsg;
     if ($three eq 'st') {
-        my $result = &commit_studentrole(\$logmsg,$url,$three,$start,$end,$one,$two,$sec);
+        my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec);
         if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) {
             $output = "Error: $result\n"; 
         } else {
@@ -1278,17 +1296,14 @@ sub commit_standardrole {
                ($start?', '.&mt('starting').' '.localtime($start):'').
                ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
                &Apache::lonnet::assignrole(
-                   $ENV{'form.ccdomain'},$ENV{'form.ccuname'},
-                   $url,$three,$end,$start).
-                   '</b><br>';
+                   $udom,$uname,$url,$three,$end,$start).
+                   '</b><br />';
     }
     return $output;
 }
 
 sub commit_studentrole {
-    my ($logmsg,$url,$three,$start,$end,$one,$two,$sec) = @_;
-    my $udom = $ENV{'form.ccdomain'};
-    my $uname = $ENV{'form.ccuname'};
+    my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_;
     my $linefeed =  '<br />'."\n";
     my $result;
     if (defined($one) && defined($two)) {
@@ -1370,10 +1385,10 @@ sub build_roles {
 
 sub custom_role_editor {
     my $r=shift;
-    my $rolename=$ENV{'form.rolename'};
+    my $rolename=$env{'form.rolename'};
 
     if ($rolename eq 'make new role') {
-	$rolename=$ENV{'form.newrolename'};
+	$rolename=$env{'form.newrolename'};
     }
 
     $rolename=~s/[^A-Za-z0-9]//gs;
@@ -1469,7 +1484,7 @@ ENDCCF
 sub set_custom_role {
     my $r=shift;
 
-    my $rolename=$ENV{'form.rolename'};
+    my $rolename=$env{'form.rolename'};
 
     $rolename=~s/[^A-Za-z0-9]//gs;
 
@@ -1498,7 +1513,7 @@ sub set_custom_role {
     foreach (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
 	my ($priv,$restrict)=split(/\&/,$_);
         unless ($restrict) { $restrict=''; }
-        if ($ENV{'form.'.$priv.':c'}) {
+        if ($env{'form.'.$priv.':c'}) {
 	    $courole.=':'.$_;
 	}
     }
@@ -1506,7 +1521,7 @@ sub set_custom_role {
     foreach (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
 	my ($priv,$restrict)=split(/\&/,$_);
         unless ($restrict) { $restrict=''; }
-        if ($ENV{'form.'.$priv.':d'}) {
+        if ($env{'form.'.$priv.':d'}) {
 	    $domrole.=':'.$_;
 	}
     }
@@ -1514,21 +1529,21 @@ sub set_custom_role {
     foreach (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
 	my ($priv,$restrict)=split(/\&/,$_);
         unless ($restrict) { $restrict=''; }
-        if ($ENV{'form.'.$priv.':s'}) {
+        if ($env{'form.'.$priv.':s'}) {
 	    $sysrole.=':'.$_;
 	}
     }
     $r->print('<br />Defining Role: '.
 	   &Apache::lonnet::definerole($rolename,$sysrole,$domrole,$courole));
-    if ($ENV{'request.course.id'}) {
-        my $url='/'.$ENV{'request.course.id'};
+    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'},
+	      &Apache::lonnet::assigncustomrole($env{'user.domain'},
+						$env{'user.name'},
 						$url,
-						$ENV{'user.domain'},
-						$ENV{'user.name'},
+						$env{'user.domain'},
+						$env{'user.name'},
 						$rolename));
     }
     $r->print('</body></html>');
@@ -1544,28 +1559,28 @@ sub handler {
        return OK;
     }
 
-    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{'request.role.domain'})) ||
-        (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'}))) {
+    if ((&Apache::lonnet::allowed('cta',$env{'request.course.id'})) ||
+        (&Apache::lonnet::allowed('cin',$env{'request.course.id'})) || 
+        (&Apache::lonnet::allowed('ccr',$env{'request.course.id'})) || 
+        (&Apache::lonnet::allowed('cep',$env{'request.course.id'})) ||
+	(&authorpriv($env{'user.name'},$env{'request.role.domain'})) ||
+        (&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))) {
        &Apache::loncommon::content_type($r,'text/html');
        $r->send_http_header;
-       unless ($ENV{'form.phase'}) {
+       unless ($env{'form.phase'}) {
 	   &print_username_entry_form($r);
        }
-       if ($ENV{'form.phase'} eq 'get_user_info') {
+       if ($env{'form.phase'} eq 'get_user_info') {
            &print_user_modification_page($r);
-       } elsif ($ENV{'form.phase'} eq 'update_user_data') {
+       } elsif ($env{'form.phase'} eq 'update_user_data') {
            &update_user_data($r);
-       } elsif ($ENV{'form.phase'} eq 'selected_custom_edit') {
+       } elsif ($env{'form.phase'} eq 'selected_custom_edit') {
            &custom_role_editor($r);
-       } elsif ($ENV{'form.phase'} eq 'set_custom_roles') {
+       } elsif ($env{'form.phase'} eq 'set_custom_roles') {
 	   &set_custom_role($r);
        }
    } else {
-      $ENV{'user.error.msg'}=
+      $env{'user.error.msg'}=
         "/adm/createuser:mau:0:0:Cannot modify user data";
       return HTTP_NOT_ACCEPTABLE; 
    }
@@ -1606,8 +1621,8 @@ sub course_level_table {
 	my ($domain,$cnum)=split(/\//,$thiscourse);
         my %sections_count = ();
         my $num_sections = 0;
-        if (defined($ENV{'request.course.id'})) {
-            if ($ENV{'request.course.id'} eq $domain.'_'.$cnum) {
+        if (defined($env{'request.course.id'})) {
+            if ($env{'request.course.id'} eq $domain.'_'.$cnum) {
                 $num_sections = &Apache::loncommon::get_sections($domain,$cnum,\%sections_count);
             }
         }
@@ -1654,8 +1669,8 @@ ENDTIMEENTRY
         foreach (sort keys %customroles) {
 	    if (&Apache::lonnet::allowed('ccr',$thiscourse)) {
 		my $plrole=$_;
-                my $customrole=$protectedcourse.'_cr_cr_'.$ENV{'user.domain'}.
-		    '_'.$ENV{'user.name'}.'_'.$plrole;
+                my $customrole=$protectedcourse.'_cr_cr_'.$env{'user.domain'}.
+		    '_'.$env{'user.name'}.'_'.$plrole;
 		$table .= <<END;
 <tr bgcolor="#$bgcol">
 <td><input type="checkbox" name="act_$customrole"></td>
@@ -1755,8 +1770,8 @@ sub course_level_dc {
     }
     if ( keys %customroles > 0) {
         foreach (sort keys %customroles) {
-            my $custrole='cr_cr_'.$ENV{'user.domain'}.
-                    '_'.$ENV{'user.name'}.'_'.$_;
+            my $custrole='cr_cr_'.$env{'user.domain'}.
+                    '_'.$env{'user.name'}.'_'.$_;
             $otheritems .= '  <option value="'.$custrole.'">'.$_;
         }
     }
