--- loncom/interface/loncreateuser.pm 2001/04/24 15:01:25 1.14 +++ loncom/interface/loncreateuser.pm 2002/02/11 15:37:58 1.25 @@ -1,6 +1,30 @@ -# The LearningOnline Network +# The LearningOnline Network with CAPA # Create a user # +# $Id: loncreateuser.pm,v 1.25 2002/02/11 15:37:58 matthew Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# # (Create a course # (My Desk # @@ -10,6 +34,7 @@ # 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14, # 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer) # +# YEAR=2001 # 3/1/1 Gerd Kortemeyer) # # 3/1 Gerd Kortemeyer) @@ -17,13 +42,147 @@ # 2/14 Gerd Kortemeyer) # # 2/14,2/17,2/19,2/20,2/21,2/22,2/23,3/2,3/17,3/24,04/12 Gerd Kortemeyer +# April Guy Albertelli +# 05/10,10/16 Gerd Kortemeyer +# 11/12,11/13,11/15 Scott Harrison +# 02/11/02 Matthew Hall # +# $Id: loncreateuser.pm,v 1.25 2002/02/11 15:37:58 matthew Exp $ +### + package Apache::loncreateuser; use strict; use Apache::Constants qw(:common :http); use Apache::lonnet; +my $loginscript; # piece of javascript used in two separate instances +my $generalrule; +my $authformnop; +my $authformkrb; +my $authformint; +my $authformfsys; +my $authformloc; + +BEGIN { + $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/; + my $krbdefdom=$1; + $krbdefdom=~tr/a-z/A-Z/; + $authformnop=(<<END); +<p> +<input type=radio name=login value=nop checked='checked' +onClick="clicknop(this.form);"> +Do not change login data +</p> +END + $authformkrb=(<<END); +<p> +<input type=radio name=login value=krb onClick="clickkrb(this.form);"> +Kerberos authenticated with domain +<input type=text size=10 name=krbdom onChange="setkrb(this.form);"> +</p> +END + $authformint=(<<END); +<p> +<input type=radio name=login value=int onClick="clickint(this.form);"> +Internally authenticated (with initial password +<input type=text size=10 name=intpwd onChange="setint(this.form);">) +</p> +END + $authformfsys=(<<END); +<p> +<input type=radio name=login value=fsys onClick="clickfsys(this.form);"> +Filesystem authenticated (with initial password +<input type=text size=10 name=fsyspwd onChange="setfsys(this.form);">) +</p> +END + $authformloc=(<<END); +<p> +<input type=radio name=login value=loc onClick="clickloc(this.form);" /> +Local Authentication with argument +<input type=text size=10 name=locarg onChange="setloc(this.form);" /> +</p> +END + $loginscript=(<<ENDLOGINSCRIPT); +<script> +function setkrb(vf) { + if (vf.krbdom.value!='') { + vf.login[0].checked=true; + vf.krbdom.value=vf.krbdom.value.toUpperCase(); + vf.intpwd.value=''; + vf.fsyspwd.value=''; + vf.locarg.value=''; + } +} + +function setint(vf) { + if (vf.intpwd.value!='') { + vf.login[1].checked=true; + vf.krbdom.value=''; + vf.fsyspwd.value=''; + vf.locarg.value=''; + } +} + +function setfsys(vf) { + if (vf.fsyspwd.value!='') { + vf.login[2].checked=true; + vf.krbdom.value=''; + vf.intpwd.value=''; + vf.locarg.value=''; + } +} + +function setloc(vf) { + if (vf.locarg.value!='') { + vf.login[3].checked=true; + vf.krbdom.value=''; + vf.intpwd.value=''; + vf.fsyspwd.value=''; + } +} + +function clicknop(vf) { + vf.krbdom.value=''; + vf.intpwd.value=''; + vf.fsyspwd.value=''; + vf.locarg.value=''; +} + +function clickkrb(vf) { + vf.krbdom.value='$krbdefdom'; + vf.intpwd.value=''; + vf.fsyspwd.value=''; + vf.locarg.value=''; +} + +function clickint(vf) { + vf.krbdom.value=''; + vf.fsyspwd.value=''; + vf.locarg.value=''; +} + +function clickfsys(vf) { + vf.krbdom.value=''; + vf.intpwd.value=''; + vf.locarg.value=''; +} + +function clickloc(vf) { + vf.krbdom.value=''; + vf.intpwd.value=''; + vf.fsyspwd.value=''; +} +</script> +ENDLOGINSCRIPT + $generalrule=<<END; +<p> +<i>As a general rule, only authors or co-authors should be filesystem +authenticated (which allows access to the server filesystem).</i> +</p> +END +} + # =================================================================== Phase one sub phase_one { @@ -62,7 +221,7 @@ sub phase_two { $ccuname=~s/\W//g; $ccdomain=~s/\W//g; - $r->print(<<ENDENHEAD); + my $dochead =<<"ENDDOCHEAD"; <html> <head> <title>The LearningOnline Network with CAPA</title> @@ -92,101 +251,97 @@ sub phase_two { </script> </head> <body bgcolor="#FFFFFF"> -<img align=right src=/adm/lonIcons/lonlogos.gif> -<h1>Create User, Change User Privileges</h1> -<form action=/adm/createuser method=post name=cu> -<input type=hidden name=phase value=three> -<input type=hidden name=ccuname value=$ccuname> -<input type=hidden name=ccdomain value=$ccdomain> -<input type="hidden" value='' name="pres_value"> -<input type="hidden" value='' name="pres_type"> -<input type="hidden" value='' name="pres_marker"> -<input type=hidden name=cuname value="$ccuname"> -<input type=hidden name=cdomain value="$ccdomain"> - -ENDENHEAD +<img align="right" src="/adm/lonIcons/lonlogos.gif"> +ENDDOCHEAD + my $forminfo =<<"ENDFORMINFO"; +<form action="/adm/createuser" method="post" name="cu"> +<input type="hidden" name="phase" value="three"> +<input type="hidden" name="ccuname" value="$ccuname"> +<input type="hidden" name="ccdomain" value="$ccdomain"> +<input type="hidden" name="pres_value" value="" > +<input type="hidden" name="pres_type" value="" > +<input type="hidden" name="pres_marker" value="" > +<input type="hidden" name="cuname" value="$ccuname"> +<input type="hidden" name="cdomain" value="$ccdomain"> +ENDFORMINFO my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain); my %incdomains; my %inccourses; - map { + foreach (%Apache::lonnet::hostdom) { $incdomains{$_}=1; - } %Apache::lonnet::hostdom; - map { + } + foreach (keys(%ENV)) { if ($_=~/^user\.priv\.cm\.\/(\w+)\/(\w+)/) { $inccourses{$1.'_'.$2}=1; } - } %ENV; + } if ($uhome eq 'no_host') { $r->print(<<ENDNUSER); -<h2>New user $ccuname at $ccdomain</h2> -<script> -function setkrb(vf) { - if (vf.krbdom.value!='') { - vf.login[0].checked=true; - vf.krbdom.value=vf.krbdom.value.toUpperCase(); - vf.intpwd.value=''; - } -} - -function setint(vf) { - if (vf.intpwd.value!='') { - vf.login[1].checked=true; - vf.krbdom.value=''; - } -} - -function clickkrb(vf) { - vf.krbdom.value='$krbdefdom'; - vf.intpwd.value=''; -} - -function clickint(vf) { - vf.krbdom.value=''; -} -</script> -<input type=hidden name=makeuser value=1> +$dochead +<h1>Create New User</h1> +$forminfo +<h2>New user "$ccuname" in domain $ccdomain</h2> +ENDNUSER + $r->print(<<ENDNUSER); +$loginscript +<input type='hidden' name='makeuser' value='1' /> <h3>Personal Data</h3> -First Name: <input type=text name=cfirst size=15><br> -Middle Name: <input type=text name=cmiddle size=15><br> -Last Name: <input type=text name=clast size=15><br> -Generation: <input type=text name=cgen size=5><p> +<p> +<table> +<tr><td>First Name </td> + <td><input type='text' name='cfirst' size='15' /></td></tr> +<tr><td>Middle Name </td> + <td><input type='text' name='cmiddle' size='15' /></td></tr> +<tr><td>Last Name </td> + <td><input type='text' name='clast' size='15' /></td></tr> +<tr><td>Generation </td> + <td><input type='text' name='cgen' size='5' /></td></tr> +</table> +ID/Student Number <input type='text' name='cstid' size='15' /></p> -ID/Student Number: <input type=text name=cstid size=10><p> +<hr /> <h3>Login Data</h3> -<input type=radio name=login value=krb onClick="clickkrb(this.form);"> -Kerberos authenticated with domain -<input type=text size=10 name=krbdom onChange="setkrb(this.form);"><p> -<input type=radio name=login value=int onClick="clickint(this.form);"> -Internally authenticated (with initial password -<input type=text size=10 name=intpwd onChange="setint(this.form);">) +$generalrule +$authformkrb +$authformint +$authformfsys +$authformloc ENDNUSER - } else { - $r->print('<h2>Existing user '.$ccuname.' at '.$ccdomain.'</h2>'); - + } else { # user already exists + $r->print(<<ENDCHUSER); +$dochead +<h1>Change User Privileges</h1> +$forminfo +<h2>User "$ccuname" in domain $ccdomain </h2> +ENDCHUSER my $rolesdump=&Apache::lonnet::reply( "dump:$ccdomain:$ccuname:roles",$uhome); + # Build up table of user roles to allow revocation of a role. unless ($rolesdump eq 'con_lost') { my $now=time; $r->print('<h4>Revoke Existing Roles</h4>'. '<table border=2><tr><th>Revoke</th><th>Role</th><th>Extent</th>'. '<th>Start</th><th>End</th>'); - map { + foreach (split(/&/,$rolesdump)) { if ($_!~/^rolesdef\&/) { - my ($area,$role)=split(/=/,$_); my $thisrole=$area; $area=~s/\_\w\w$//; - my ($trole,$tend,$tstart)=split(/_/,$role); + my ($role_code,$role_end_time,$role_start_time)=split(/_/,$role); my $bgcol='ffffff'; my $allows=0; if ($area=~/^\/(\w+)\/(\d\w+)/) { my %coursedata=&Apache::lonnet::coursedescription($1.'_'.$2); my $carea='Course: '.$coursedata{'description'}; $inccourses{$1.'_'.$2}=1; - if (&Apache::lonnet::allowed('c'.$trole,$1.'/'.$2)) { + if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2)) { $allows=1; } + # What follows is an odd computation. It seems the value + # of the $area variable above is used to compute the + # background color. This makes sense, but I can't make + # heads or tail of the computation at this point.. $bgcol=$1.'_'.$2; $bgcol=~s/[^8-9b-e]//g; $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',0,6); @@ -196,49 +351,162 @@ ENDNUSER $area=$carea; } else { if ($area=~/^\/(\w+)\//) { - if (&Apache::lonnet::allowed('c'.$trole,$1)) { + if (&Apache::lonnet::allowed('c'.$role_code,$1)) { $allows=1; } } else { - if (&Apache::lonnet::allowed('c'.$trole,'/')) { + if (&Apache::lonnet::allowed('c'.$role_code,'/')) { $allows=1; } } } my $active=1; - if (($tend) && ($now>$tend)) { $active=0; } - - $r->print('<tr bgcolor=#'.$bgcol.'><td>'); - if ($active) { - if ($allows) { - $r->print( - '<input type=checkbox name="rev:'.$thisrole.'">'); - } else { - $r->print(' '); - } + if (($role_end_time) && ($now>$role_end_time)) { $active=0; } + $r->print('<tr bgcolor=#"'.$bgcol.'"><td>'); + if (!($active) && ($allows)) { + $r->print('<input type=checkbox name="rev:'.$thisrole.'">'); } else { $r->print(' '); } - $r->print('</td><td>'.&Apache::lonnet::plaintext($trole). + $r->print('</td><td>'.&Apache::lonnet::plaintext($role_code). '</td><td>'.$area.'</td><td>'. - ($tstart?localtime($tstart):' ').'</td><td>'. - ($tend?localtime($tend):' ')."</td></tr>\n"); + ($role_start_time ? localtime($role_start_time) + : ' ' ) + .'</td><td>'. + ($role_end_time ? localtime($role_end_time) + : ' ' ) + ."</td></tr>\n"); } - } split(/&/,$rolesdump); + } $r->print('</table>'); } + my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); + if ($currentauth=~/^krb4:/) { + $currentauth=~/^krb4:(.*)/; + my $krbdefdom2=$1; + $loginscript=~s/vf\.krbdom\.value='.*?';/vf.krbdom.value='$krbdefdom2';/; + } + # Here is where we'll have to check against the permissions of the + # user attempting to modify this users data. Only users with + # MAU (Modify Authentication User) permissions should be able to + # make these changes. I think a subroutine would be in order here. + unless ($currentauth=~/^krb4:/ or + $currentauth=~/^unix:/ or + $currentauth=~/^internal:/ or + $currentauth=~/^localauth:/ + ) { + $r->print(<<END); +<hr /> +$loginscript +<font color='#ff0000'>ERROR:</font> +This user has an unrecognized authentication scheme ($currentauth). +Please specify login data below. +<h3>Login Data</h3> +$generalrule +$authformkrb +$authformint +$authformfsys +$authformloc +END + } + else { + my $authformcurrent=''; + my $authformother=''; + if ($currentauth=~/^krb4:/) { + $authformcurrent=$authformkrb; + $authformother=$authformint.$authformfsys.$authformloc; + # embarrassing script hack here + $loginscript=~s/login\[3\]/login\[4\]/; # loc + $loginscript=~s/login\[2\]/login\[3\]/; # fsys + $loginscript=~s/login\[1\]/login\[2\]/; # int + $loginscript=~s/login\[0\]/login\[1\]/; # krb4 + } + elsif ($currentauth=~/^internal:/) { + $authformcurrent=$authformint; + $authformother=$authformkrb.$authformfsys.$authformloc; + # embarrassing script hack here + $loginscript=~s/login\[3\]/login\[4\]/; # loc + $loginscript=~s/login\[2\]/login\[3\]/; # fsys + $loginscript=~s/login\[1\]/login\[1\]/; # int + $loginscript=~s/login\[0\]/login\[2\]/; # krb4 + } + elsif ($currentauth=~/^unix:/) { + $authformcurrent=$authformfsys; + $authformother=$authformkrb.$authformint.$authformloc; + # embarrassing script hack here + $loginscript=~s/login\[3\]/login\[4\]/; # loc + $loginscript=~s/login\[1\]/login\[3\]/; # int + $loginscript=~s/login\[2\]/login\[1\]/; # fsys + $loginscript=~s/login\[0\]/login\[2\]/; # krb4 + } + elsif ($currentauth=~/^localauth:/) { + $authformcurrent=$authformloc; + $authformother=$authformkrb.$authformint.$authformfsys; + # embarrassing script hack here + $loginscript=~s/login\[3\]/login\[loc\]/; # loc + $loginscript=~s/login\[2\]/login\[4\]/; # fsys + $loginscript=~s/login\[1\]/login\[3\]/; # int + $loginscript=~s/login\[0\]/login\[2\]/; # krb4 + $loginscript=~s/login\[loc\]/login\[1\]/; # loc + } + $authformcurrent=<<END; +<table border='1'> +<tr> +<td><font color='#ff0000'>* * * WARNING * * *</font></td> +<td><font color='#ff0000'>* * * WARNING * * *</font></td> +</tr> +<tr><td bgcolor='#cbbcbb'>$authformcurrent</td> +<td bgcolor='#cbbcbb'>Changing this value will overwrite existing authentication for the user; you should notify the user of this change.</td></tr> +</table> +END + $r->print(<<END); +<hr /> +$loginscript +<h3>Change Current Login Data</h3> +$generalrule +$authformnop +$authformcurrent +<h3>Enter New Login Data</h3> +$authformother +END + } + } ## End of new user/old user logic + $r->print('<hr /><h3>Add Roles</h3>'); +# +# Co-Author +# + + if (&Apache::lonnet::allowed('cca',$ENV{'user.domain'})) { + my $cuname=$ENV{'user.name'}; + my $cudom=$ENV{'user.domain'}; + $r->print(<<ENDCOAUTH); +<h4>Construction Space</h4> +<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th> +<th>Start</th><th>End</th></tr> +<tr> +<td><input type=checkbox name="act_$cudom\_$cuname\_ca"></td> +<td>Co-Author</td> +<td>$cudom\_$cuname</td> +<td><input type=hidden name="start_$cudom\_$cuname\_ca" value=''> +<a href= +"javascript:pjump('date_start','Start Date Co-Author',document.cu.start_$cudom\_$cuname\_ca.value,'start_$cudom\_$cuname\_ca','cu.pres','dateset')">Set Start Date</a></td> +<td><input type=hidden name="end_$cudom\_$cuname\_ca" value=''> +<a href= +"javascript:pjump('date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset')">Set End Date</a></td> +</tr> +</table> +ENDCOAUTH } - $r->print('<hr><h3>Add Roles</h3>'); # # Domain level # $r->print('<h4>Domain Level</h4>'. '<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>'. '<th>Start</th><th>End</th></tr>'); - map { + foreach ( sort( keys(%incdomains))) { my $thisdomain=$_; - map { + foreach ('dc','li','dg','au') { if (&Apache::lonnet::allowed('c'.$_,$thisdomain)) { my $plrole=&Apache::lonnet::plaintext($_); $r->print(<<ENDDROW); @@ -255,8 +523,8 @@ ENDNUSER </tr> ENDDROW } - } ('dc','li','dg','au'); - } sort keys %incdomains; + } + } $r->print('</table>'); # # Course level @@ -264,35 +532,39 @@ ENDDROW $r->print('<h4>Course Level</h4>'. '<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>'. '<th>Group/Section</th><th>Start</th><th>End</th></tr>'); - map { + foreach (sort( keys(%inccourses))) { my $thiscourse=$_; - $thiscourse=~s:/:_:g; + my $protectedcourse=$_; + $thiscourse=~s:_:/:g; my %coursedata=&Apache::lonnet::coursedescription($thiscourse); my $area=$coursedata{'description'}; my $bgcol=$thiscourse; $bgcol=~s/[^8-9b-e]//g; $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',0,6); - map { + foreach ('st','ta','ep','ad','in','cc') { if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) { my $plrole=&Apache::lonnet::plaintext($_); - $r->print(<<ENDROW); + $r->print(" <tr bgcolor=#$bgcol> -<td><input type=checkbox name="act_$thiscourse\_$_"></td> +<td><input type=checkbox name=\"act_$protectedcourse\_$_\"></td> <td>$plrole</td> <td>$area</td> -<td><input type=text size=5 name="sec_$thiscourse\_$_"></td> -<td><input type=hidden name="start_$thiscourse\_$_" value=''> +<td>"); + if ($_ ne 'cc') { + $r->print("<input type=text size=5 name=\"sec_$protectedcourse\_$_\">"); + } else { $r->print(" "); } + $r->print(<<ENDROW); +<td><input type=hidden name="start_$protectedcourse\_$_" value=''> <a href= -"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$thiscourse\_$_.value,'start_$thiscourse\_$_','cu.pres','dateset')">Set Start Date</a></td> -<td><input type=hidden name="end_$thiscourse\_$_" value=''> +"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$_.value,'start_$protectedcourse\_$_','cu.pres','dateset')">Set Start Date</a></td> +<td><input type=hidden name="end_$protectedcourse\_$_" value=''> <a href= -"javascript:pjump('date_end','End Date $plrole',document.cu.end_$thiscourse\_$_.value,'end_$thiscourse\_$_','cu.pres','dateset')">Set End Date</a></td> +"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$_.value,'end_$protectedcourse\_$_','cu.pres','dateset')">Set End Date</a></td> </tr> ENDROW - } - } ('st','ta','ep','ad','in','cc'); - } sort keys %inccourses; + } + } $r->print('</table>'); $r->print('<input type=submit value="Modify User">'); $r->print('</form></body></html>'); @@ -324,7 +596,14 @@ ENDTHREEHEAD } elsif ($ENV{'form.login'} eq 'int') { $amode='internal'; $genpwd=$ENV{'form.intpwd'}; - } + } elsif ($ENV{'form.login'} eq 'fsys') { + $amode='unix'; + $genpwd=$ENV{'form.fsyspwd'}; + } elsif ($ENV{'form.login'} eq 'loc') { + $amode='localauth'; + $genpwd=$ENV{'form.locarg'}; + if (!$genpwd) { $genpwd=" "; } + } if (($amode) && ($genpwd)) { $r->print('Generating user: '.&Apache::lonnet::modifyuser( $ENV{'form.cdomain'},$ENV{'form.cuname'}, @@ -341,9 +620,44 @@ ENDTHREEHEAD $r->print('Invalid username or domain'); } } + if (!$ENV{'form.makeuser'} and $ENV{'form.login'} ne 'nop') { + $r->print('<h3>Changing User Login Data</h3>'); + if (($ENV{'form.cuname'})&&($ENV{'form.cuname'}!~/\W/)&& + ($ENV{'form.cdomain'})&&($ENV{'form.cdomain'}!~/\W/)) { + my $amode=''; + my $genpwd=''; + if ($ENV{'form.login'} eq 'krb') { + $amode='krb4'; + $genpwd=$ENV{'form.krbdom'}; + } elsif ($ENV{'form.login'} eq 'int') { + $amode='internal'; + $genpwd=$ENV{'form.intpwd'}; + } elsif ($ENV{'form.login'} eq 'fsys') { + $amode='unix'; + $genpwd=$ENV{'form.fsyspwd'}; + } elsif ($ENV{'form.login'} eq 'loc') { + $amode='localauth'; + $genpwd=$ENV{'form.locarg'}; + if (!$genpwd) { $genpwd=" "; } + } + if (($amode) && ($genpwd)) { + $r->print('Modifying authentication: '. + &Apache::lonnet::modifyuserauth( + $ENV{'form.cdomain'},$ENV{'form.cuname'}, + $amode,$genpwd)); + $r->print('<br>Home server: '.&Apache::lonnet::homeserver + ($ENV{'form.cuname'},$ENV{'form.cdomain'})); + + } else { + $r->print('Invalid login mode or password'); + } + } else { + $r->print('Invalid username or domain'); + } + } my $now=time; $r->print('<h3>Modifying Roles</h3>'); - map { + foreach (keys (%ENV)) { if (($_=~/^form\.rev\:([^\_]+)\_([^\_]+)$/) && ($ENV{$_})) { $r->print('Revoking '.$2.' in '.$1.': '. &Apache::lonnet::assignrole($ENV{'form.cdomain'},$ENV{'form.cuname'}, @@ -360,8 +674,8 @@ ENDTHREEHEAD $ENV{'course.'.$cid.'.home'}).'<br>'); } } - } keys %ENV; - map { + } + foreach (keys(%ENV)) { if (($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_([^\_]+)$/) && ($ENV{$_})) { my $url='/'.$1.'/'.$2; if ($ENV{'form.sec_'.$1.'_'.$2.'_'.$3}) { @@ -403,7 +717,7 @@ ENDTHREEHEAD &Apache::lonnet::assignrole($ENV{'form.cdomain'},$ENV{'form.cuname'}, $url,$2,$end,$start).'<br>'); } - } keys %ENV; + } $r->print('</body></html>'); } @@ -421,6 +735,7 @@ sub handler { (&Apache::lonnet::allowed('cin',$ENV{'request.course.id'})) || (&Apache::lonnet::allowed('ccr',$ENV{'request.course.id'})) || (&Apache::lonnet::allowed('cep',$ENV{'request.course.id'})) || + (&Apache::lonnet::allowed('cca',$ENV{'user.domain'})) || (&Apache::lonnet::allowed('mau',$ENV{'user.domain'}))) { $r->content_type('text/html'); $r->send_http_header;