--- loncom/interface/loncreateuser.pm 2001/03/02 22:06:43 1.5 +++ loncom/interface/loncreateuser.pm 2002/01/06 01:29:52 1.23 @@ -1,6 +1,30 @@ -# The LearningOnline Network +# The LearningOnline Network with CAPA # Create a user # +# $Id: loncreateuser.pm,v 1.23 2002/01/06 01:29:52 harris41 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,20 +34,154 @@ # 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14, # 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer) # +# YEAR=2001 # 3/1/1 Gerd Kortemeyer) # # 3/1 Gerd Kortemeyer) # # 2/14 Gerd Kortemeyer) # -# 2/14,2/17,2/19,2/20,2/21,2/22,2/23,3/2 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 # +# $Id: loncreateuser.pm,v 1.23 2002/01/06 01:29:52 harris41 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 { @@ -101,12 +259,16 @@ sub phase_two { <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 my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain); my %incdomains; my %inccourses; - $incdomains{$ENV{'user.domain'}}=1; + map { + $incdomains{$_}=1; + } values %Apache::lonnet::hostdom; map { if ($_=~/^user\.priv\.cm\.\/(\w+)\/(\w+)/) { $inccourses{$1.'_'.$2}=1; @@ -114,131 +276,28 @@ ENDENHEAD } %ENV; if ($uhome eq 'no_host') { $r->print(<<ENDNUSER); -<h3>New user $ccuname at $ccdomain</h3> -<script> -function verify(vf) { - var founduname=0; - var foundpwd=0; - var foundname=0; - var foundid=0; - var foundsec=0; - var foundatype=0; - var tw; - var message=''; - if ((vf.cuname.value!=undefined) && (vf.cuname.value!='') && - (vf.cdomain.value!=undefined) && (vf.cdomain.value!='')) { - founduname=1; - } - if ((vf.cfirst.value!=undefined) && (vf.cfirst.value!='') && - (vf.clast.value!=undefined) && (vf.clast.value!='')) { - foundname=1; - } - if ((vf.csec.value!=undefined) && (vf.csec.value!='')) { - foundsec=1; - } - if ((vf.cstid.value!=undefined) && (vf.cstid.value!='')) { - foundid=1; - } - if (founduname==0) { - alert('You need to specify at least the username and domain fields'); - return; - } - if (vf.login[0].checked) { - foundatype=1; - if (vf.krbdom.value=='') { - alert('You need to specify the Kerberos domain'); - return; - } - } - if (vf.login[1].checked) { - foundatype=1; - if ((vf.intpwd.value=='') && (foundpwd==0)) { - alert('You need to specify the initial password'); - return; - } - } - if (foundatype==0) { - alert('You need to set the login type'); - return; - } - if (foundname==0) { message='No first and last name specified. '; } - if (foundid==0) { message+='No ID or student number field specified. '; } - if (foundsec==0) { message+='No section or group field specified. '; } - if (vf.startdate.value=='') { - message+='No starting date set. '; - } - if (vf.enddate.value=='') { - message+='No ending date set. '; - } - if ((vf.enddate.value!='') && (vf.startdate.value!='')) { - if (Math.round(vf.enddate.value)<Math.round(vf.startdate.value)) { - alert('Ending date is before starting date'); - return; - } - } - if (message!='') { - message+='Continue enrollment?'; - if (confirm(message)) { - pclose(); - vf.submit(); - } - } else { - pclose(); - vf.submit(); - } -} - -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> +<h2>New user $ccuname at $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> +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> -ID/Student Number: <input type=text name=cstid size=10><p> - -Group/Section: <input type=text name=csec size=5><p> +ID/Student Number: <input type='text' name='cstid' size='10' /></p> <h3>Login Data</h3> -Username: <input type=text name=cuname size=15><p> -Domain: <input type=text size=10 value=$defdom name=cdomain><p> -Note: login settings below will not take effect if the user already exists<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> -<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('<h3>Existing user '.$ccuname.' at '.$ccdomain.'</h3>'); - $r->print('<input type=hidden name=cuname value='.$ccuname.'>'); - $r->print('<input type=hidden name=cdomain value='.$ccdomain.'>'); + $r->print('<h2>Existing user '.$ccuname.' at '.$ccdomain.'</h2>'); my $rolesdump=&Apache::lonnet::reply( "dump:$ccdomain:$ccuname:roles",$uhome); @@ -260,7 +319,7 @@ ENDNUSER 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'.$trole,$1.'/'.$2)) { $allows=1; } $bgcol=$1.'_'.$2; @@ -271,11 +330,14 @@ ENDNUSER } $area=$carea; } else { - if ($1) { - $incdomains{$1}=1; + if ($area=~/^\/(\w+)\//) { if (&Apache::lonnet::allowed('c'.$trole,$1)) { $allows=1; } + } else { + if (&Apache::lonnet::allowed('c'.$trole,'/')) { + $allows=1; + } } } @@ -301,22 +363,163 @@ ENDNUSER } 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';/; + } + # minor 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 + + 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 + } } - $r->print('<hr><h4>Add Roles</h4><h5>System Level</h5>'); - $r->print('<h5>Domain Level</h5>'); + $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 + } +# +# 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 { my $thisdomain=$_; map { if (&Apache::lonnet::allowed('c'.$_,$thisdomain)) { - $r->print($_.' - '.$thisdomain.'<br>'); + my $plrole=&Apache::lonnet::plaintext($_); + $r->print(<<ENDDROW); +<tr> +<td><input type=checkbox name="act_$thisdomain\_$_"></td> +<td>$plrole</td> +<td>$thisdomain</td> +<td><input type=hidden name="start_$thisdomain\_$_" value=''> +<a href= +"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$thisdomain\_$_.value,'start_$thisdomain\_$_','cu.pres','dateset')">Set Start Date</a></td> +<td><input type=hidden name="end_$thisdomain\_$_" value=''> +<a href= +"javascript:pjump('date_end','End Date $plrole',document.cu.end_$thisdomain\_$_.value,'end_$thisdomain\_$_','cu.pres','dateset')">Set End Date</a></td> +</tr> +ENDDROW } - } ('dc','cc','li','dg','au'); + } ('dc','li','dg','au'); } sort keys %incdomains; - $r->print('<h5>Course Level</h5>'. + $r->print('</table>'); +# +# Course level +# + $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 { my $thiscourse=$_; + my $protectedcourse=$_; + $thiscourse=~s:_:/:g; my %coursedata=&Apache::lonnet::coursedescription($thiscourse); my $area=$coursedata{'description'}; my $bgcol=$thiscourse; @@ -325,26 +528,29 @@ ENDNUSER map { 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'); + } ('st','ta','ep','ad','in','cc'); } sort keys %inccourses; $r->print('</table>'); - $r->print('<input type=submit value="Modify Roles">'); + $r->print('<input type=submit value="Modify User">'); $r->print('</form></body></html>'); } @@ -361,6 +567,7 @@ sub phase_three { <img align=right src=/adm/lonIcons/lonlogos.gif> <h1>Create User, Change User Privileges</h1> ENDTHREEHEAD + $r->print('<h2>'.$ENV{'form.cuname'}.' at '.$ENV{'form.cdomain'}.'</h2>'); if ($ENV{'form.makeuser'}) { $r->print('<h3>Creating User</h3>'); if (($ENV{'form.cuname'})&&($ENV{'form.cuname'}!~/\W/)&& @@ -373,17 +580,58 @@ 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)) { - &dropstudent($ENV{'form.cdomain'},$ENV{'form.cuname'}, - $ENV{'request.course.id'},$ENV{'form.csec'}); - $r->print(&Apache::lonnet::modifystudent( + $r->print('Generating user: '.&Apache::lonnet::modifyuser( $ENV{'form.cdomain'},$ENV{'form.cuname'}, $ENV{'form.cstid'},$amode,$genpwd, $ENV{'form.cfirst'},$ENV{'form.cmiddle'}, - $ENV{'form.clast'},$ENV{'form.cgen'}, - $ENV{'form.csec'},$ENV{'form.enddate'}, - $ENV{'form.startdate'})); + $ENV{'form.clast'},$ENV{'form.cgen'})); + $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'); + } + } + 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'); } @@ -391,15 +639,24 @@ ENDTHREEHEAD $r->print('Invalid username or domain'); } } - $r->print('<h4>'.$ENV{'form.cuname'}.' at '.$ENV{'form.cdomain'}.'</h4>'); my $now=time; -# sub assignrole { -# my ($udom,$uname,$url,$role,$end,$start)=@_; + $r->print('<h3>Modifying Roles</h3>'); map { if (($_=~/^form\.rev\:([^\_]+)\_([^\_]+)$/) && ($ENV{$_})) { $r->print('Revoking '.$2.' in '.$1.': '. &Apache::lonnet::assignrole($ENV{'form.cdomain'},$ENV{'form.cuname'}, $1,$2,$now).'<br>'); + if ($2 eq 'st') { + $1=~/^\/(\w+)\/(\w+)/; + my $cid=$1.'_'.$2; + $r->print('Drop from classlist: '. + &Apache::lonnet::critical('put:'.$ENV{'course.'.$cid.'.domain'}.':'. + $ENV{'course.'.$cid.'.num'}.':classlist:'. + &Apache::lonnet::escape($ENV{'form.cuname'}.':'. + $ENV{'form.cdomain'}).'='. + &Apache::lonnet::escape($now.':'), + $ENV{'course.'.$cid.'.home'}).'<br>'); + } } } keys %ENV; map { @@ -419,7 +676,31 @@ ENDTHREEHEAD $r->print('Assigning: '.$3.' in '.$url.': '. &Apache::lonnet::assignrole($ENV{'form.cdomain'},$ENV{'form.cuname'}, $url,$3,$end,$start).'<br>'); - } + if ($3 eq 'st') { + $url=~/^\/(\w+)\/(\w+)/; + my $cid=$1.'_'.$2; + $r->print('Add to classlist: '. + &Apache::lonnet::critical('put:'.$ENV{'course.'.$cid.'.domain'}.':'. + $ENV{'course.'.$cid.'.num'}.':classlist:'. + &Apache::lonnet::escape($ENV{'form.cuname'}.':'. + $ENV{'form.cdomain'}).'='. + &Apache::lonnet::escape($end.':'.$start), + $ENV{'course.'.$cid.'.home'}).'<br>'); + } + } elsif (($_=~/^form\.act\_([^\_]+)\_([^\_]+)$/) && ($ENV{$_})) { + my $url='/'.$1.'/'; + my $start=$now; + if ($ENV{'form.start_'.$1.'_'.$2}) { + $start=$ENV{'form.start_'.$1.'_'.$2}; + } + my $end=0; + if ($ENV{'form.end_'.$1.'_'.$2}) { + $end=$ENV{'form.end_'.$1.'_'.$2}; + } + $r->print('Assigning: '.$2.' in '.$url.': '. + &Apache::lonnet::assignrole($ENV{'form.cdomain'},$ENV{'form.cuname'}, + $url,$2,$end,$start).'<br>'); + } } keys %ENV; $r->print('</body></html>'); } @@ -438,6 +719,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; @@ -451,7 +733,7 @@ sub handler { } } else { $ENV{'user.error.msg'}= - "/adm/createcourse:mau:0:0:Cannot modify user data"; + "/adm/createuser:mau:0:0:Cannot modify user data"; return HTTP_NOT_ACCEPTABLE; } return OK;