--- loncom/interface/loncreateuser.pm 2002/02/08 19:40:42 1.24
+++ loncom/interface/loncreateuser.pm 2002/02/12 21:42:18 1.27
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.24 2002/02/08 19:40:42 matthew Exp $
+# $Id: loncreateuser.pm,v 1.27 2002/02/12 21:42:18 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -45,8 +45,9 @@
# 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.24 2002/02/08 19:40:42 matthew Exp $
+# $Id: loncreateuser.pm,v 1.27 2002/02/12 21:42:18 matthew Exp $
###
package Apache::loncreateuser;
@@ -69,7 +70,7 @@ BEGIN {
$krbdefdom=~tr/a-z/A-Z/;
$authformnop=(<<END);
<p>
-<input type=radio name=login value=nop checked='checked'
+<input type="radio" name="login" value="" checked="checked"
onClick="clicknop(this.form);">
Do not change login data
</p>
@@ -206,7 +207,6 @@ ENDDOCUMENT
}
# =================================================================== Phase two
-
sub phase_two {
my $r=shift;
my $ccuname=$ENV{'form.ccuname'};
@@ -220,7 +220,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>
@@ -250,19 +250,19 @@ 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;
@@ -275,19 +275,28 @@ ENDENHEAD
}
}
if ($uhome eq 'no_host') {
- $r->print(<<ENDNUSER);
-<h2>New user $ccuname at $ccdomain</h2>
-ENDNUSER
- $r->print(<<ENDNUSER);
+ $r->print(<<ENDNEWUSER);
+$dochead
+<h1>Create New User</h1>
+$forminfo
+<h2>New user "$ccuname" in domain $ccdomain</h2>
$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>
$generalrule
@@ -295,33 +304,38 @@ $authformkrb
$authformint
$authformfsys
$authformloc
-ENDNUSER
- } else {
- $r->print('<h2>Existing user '.$ccuname.' at '.$ccdomain.'</h2>');
-
+ENDNEWUSER
+ } else { # user already exists
+ $r->print(<<ENDCHANGEUSER);
+$dochead
+<h1>Change User Privileges</h1>
+$forminfo
+<h2>User "$ccuname" in domain $ccdomain </h2>
+ENDCHANGEUSER
my $rolesdump=&Apache::lonnet::reply(
"dump:$ccdomain:$ccuname:roles",$uhome);
- unless ($rolesdump eq 'con_lost') {
+ # Build up table of user roles to allow revocation of a role.
+ unless ($rolesdump eq 'con_lost' || $rolesdump =~ m/^error/i) {
my $now=time;
- $r->print('<h4>Revoke Existing Roles</h4>'.
+ $r->print('<hr /><h3>Revoke Existing Roles</h3>'.
'<table border=2><tr><th>Revoke</th><th>Role</th><th>Extent</th>'.
- '<th>Start</th><th>End</th>');
+ '<th>Start</th><th>End</th>');
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;
}
+ # Compute the background color based on $area
$bgcol=$1.'_'.$2;
$bgcol=~s/[^8-9b-e]//g;
$bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',0,6);
@@ -330,35 +344,35 @@ ENDNUSER
}
$area=$carea;
} else {
+ # Determine if current user is able to revoke privileges
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;
}
}
}
+ $r->print('<tr bgcolor=#"'.$bgcol.'"><td>');
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; }
+ 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");
}
}
$r->print('</table>');
@@ -369,18 +383,14 @@ ENDNUSER
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
-
+ # Check for a bad authentication type
unless ($currentauth=~/^krb4:/ or
$currentauth=~/^unix:/ or
$currentauth=~/^internal:/ or
$currentauth=~/^localauth:/
- ) {
- $r->print(<<END);
+ ) { # bad authentication scheme
+ if (&Apache::lonnet::allowed('mau',$ENV{'user.domain'})) {
+ $r->print(<<ENDBADAUTH);
<hr />
$loginscript
<font color='#ff0000'>ERROR:</font>
@@ -392,14 +402,25 @@ $authformkrb
$authformint
$authformfsys
$authformloc
-END
- }
- else {
+ENDBADAUTH
+ } else {
+ # This user is not allowed to modify the users
+ # authentication scheme, so just notify them of the problem
+ $r->print(<<ENDBADAUTH);
+<hr />
+$loginscript
+<font color="#ff0000"> ERROR: </font>
+This user has an unrecognized authentication scheme ($currentauth).
+Please alert a domain coordinator of this situation.
+<hr />
+ENDBADAUTH
+ }
+ } else { # Authentication type is valid
my $authformcurrent='';
- my $authformother='';
+ my $authform_other='';
if ($currentauth=~/^krb4:/) {
$authformcurrent=$authformkrb;
- $authformother=$authformint.$authformfsys.$authformloc;
+ $authform_other=$authformint.$authformfsys.$authformloc;
# embarrassing script hack here
$loginscript=~s/login\[3\]/login\[4\]/; # loc
$loginscript=~s/login\[2\]/login\[3\]/; # fsys
@@ -408,7 +429,7 @@ END
}
elsif ($currentauth=~/^internal:/) {
$authformcurrent=$authformint;
- $authformother=$authformkrb.$authformfsys.$authformloc;
+ $authform_other=$authformkrb.$authformfsys.$authformloc;
# embarrassing script hack here
$loginscript=~s/login\[3\]/login\[4\]/; # loc
$loginscript=~s/login\[2\]/login\[3\]/; # fsys
@@ -417,7 +438,7 @@ END
}
elsif ($currentauth=~/^unix:/) {
$authformcurrent=$authformfsys;
- $authformother=$authformkrb.$authformint.$authformloc;
+ $authform_other=$authformkrb.$authformint.$authformloc;
# embarrassing script hack here
$loginscript=~s/login\[3\]/login\[4\]/; # loc
$loginscript=~s/login\[1\]/login\[3\]/; # int
@@ -426,7 +447,7 @@ END
}
elsif ($currentauth=~/^localauth:/) {
$authformcurrent=$authformloc;
- $authformother=$authformkrb.$authformint.$authformfsys;
+ $authform_other=$authformkrb.$authformint.$authformfsys;
# embarrassing script hack here
$loginscript=~s/login\[3\]/login\[loc\]/; # loc
$loginscript=~s/login\[2\]/login\[4\]/; # fsys
@@ -434,7 +455,7 @@ END
$loginscript=~s/login\[0\]/login\[2\]/; # krb4
$loginscript=~s/login\[loc\]/login\[1\]/; # loc
}
- $authformcurrent=<<END;
+ $authformcurrent=<<ENDCURRENTAUTH;
<table border='1'>
<tr>
<td><font color='#ff0000'>* * * WARNING * * *</font></td>
@@ -443,8 +464,10 @@ END
<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);
+ENDCURRENTAUTH
+ if (&Apache::lonnet::allowed('mau',$ENV{'user.domain'})) {
+ # Current user has login modification privileges
+ $r->print(<<ENDOTHERAUTHS);
<hr />
$loginscript
<h3>Change Current Login Data</h3>
@@ -452,10 +475,11 @@ $generalrule
$authformnop
$authformcurrent
<h3>Enter New Login Data</h3>
-$authformother
-END
- }
- }
+$authform_other
+ENDOTHERAUTHS
+ }
+ } ## End of "check for bad authentication type" logic
+ } ## End of new user/old user logic
$r->print('<hr /><h3>Add Roles</h3>');
#
# Co-Author
@@ -513,195 +537,187 @@ ENDDROW
#
# 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>');
- foreach (sort( keys(%inccourses))) {
- my $thiscourse=$_;
- 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);
- foreach ('st','ta','ep','ad','in','cc') {
- if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) {
- my $plrole=&Apache::lonnet::plaintext($_);
- $r->print("
-<tr bgcolor=#$bgcol>
-<td><input type=checkbox name=\"act_$protectedcourse\_$_\"></td>
-<td>$plrole</td>
-<td>$area</td>
-<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_$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_$protectedcourse\_$_.value,'end_$protectedcourse\_$_','cu.pres','dateset')">Set End Date</a></td>
-</tr>
-ENDROW
- }
- }
- }
- $r->print('</table>');
- $r->print('<input type=submit value="Modify User">');
- $r->print('</form></body></html>');
+ $r->print(&course_level_table(%inccourses));
+ $r->print("<hr /><input type=submit value=\"Modify User\">\n");
+ $r->print("</form></body></html>");
}
# ================================================================= Phase Three
-
sub phase_three {
my $r=shift;
+ # Error messages
+ my $error = '<font color="#ff0000">Error:</font>';
+ my $end = '</body></html>';
+ # Print header
$r->print(<<ENDTHREEHEAD);
<html>
<head>
<title>The LearningOnline Network with CAPA</title>
</head>
<body bgcolor="#FFFFFF">
-<img align=right src=/adm/lonIcons/lonlogos.gif>
-<h1>Create User, Change User Privileges</h1>
+<img align="right" src="/adm/lonIcons/lonlogos.gif">
ENDTHREEHEAD
- $r->print('<h2>'.$ENV{'form.cuname'}.' at '.$ENV{'form.cdomain'}.'</h2>');
- if ($ENV{'form.makeuser'}) {
- $r->print('<h3>Creating User</h3>');
- if (($ENV{'form.cuname'})&&($ENV{'form.cuname'}!~/\W/)&&
- ($ENV{'form.cdomain'})&&($ENV{'form.cdomain'}!~/\W/)) {
- my $amode='';
- my $genpwd='';
- if ($ENV{'form.login'} eq 'krb') {
- $amode='krb4';
- $genpwd=$ENV{'form.krbdom'};
- } elsif ($ENV{'form.login'} eq 'int') {
- $amode='internal';
- $genpwd=$ENV{'form.intpwd'};
- } elsif ($ENV{'form.login'} eq 'fsys') {
- $amode='unix';
- $genpwd=$ENV{'form.fsyspwd'};
- } elsif ($ENV{'form.login'} eq 'loc') {
- $amode='localauth';
- $genpwd=$ENV{'form.locarg'};
- if (!$genpwd) { $genpwd=" "; }
+ # Check Inputs
+ if (! $ENV{'form.cuname'} ) {
+ $r->print($error.'No login name specified.'.$end);
+ return;
+ }
+ if ( $ENV{'form.cuname'} =~/\W/) {
+ $r->print($error.'Invalid login name. '.
+ 'Only letters, numbers, and underscores are valid.'.
+ $end);
+ return;
+ }
+ if (! $ENV{'form.cdomain'} ) {
+ $r->print($error.'No domain specified.'.$end);
+ return;
+ }
+ if ( $ENV{'form.cdomain'} =~/\W/) {
+ $r->print($error.'Invalid domain name. '.
+ 'Only letters, numbers, and underscores are valid.'.
+ $end);
+ return;
+ }
+ # Determine authentication method and password for the user being modified
+ 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'};
+ $genpwd=" " if (!$genpwd);
+ }
+ if ($ENV{'form.makeuser'}) {
+ # Create a new user
+ $r->print(<<ENDNEWUSERHEAD);
+<h1>Create User</h1>
+<h3>Creating user "$ENV{'form.cuname'}" in domain "$ENV{'form.cdomain'}"</h2>
+ENDNEWUSERHEAD
+ # Check for the authentication mode and password
+ if (! $amode || ! $genpwd) {
+ $r->print($error.'Invalid login mode or password'.$end);
+ return;
}
- if (($amode) && ($genpwd)) {
- $r->print('Generating user: '.&Apache::lonnet::modifyuser(
- $ENV{'form.cdomain'},$ENV{'form.cuname'},
- $ENV{'form.cstid'},$amode,$genpwd,
- $ENV{'form.cfirst'},$ENV{'form.cmiddle'},
- $ENV{'form.clast'},$ENV{'form.cgen'}));
- $r->print('<br>Home server: '.&Apache::lonnet::homeserver
- ($ENV{'form.cuname'},$ENV{'form.cdomain'}));
-
- } 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=" "; }
+ # Call modifyuser
+ my $result = &Apache::lonnet::modifyuser
+ ($ENV{'form.cdomain'},$ENV{'form.cuname'},
+ $ENV{'form.cstid'},$amode,$genpwd,
+ $ENV{'form.cfirst'},$ENV{'form.cmiddle'},
+ $ENV{'form.clast'},$ENV{'form.cgen'}
+ );
+ $r->print('Generating user: '.$result);
+ $r->print('<br>Home server: '.&Apache::lonnet::homeserver
+ ($ENV{'form.cuname'},$ENV{'form.cdomain'}));
+ } elsif ($ENV{'form.login'} ne '') {
+ # Modify user privileges
+ $r->print(<<ENDMODIFYUSERHEAD);
+<h1>Change User Privileges</h1>
+<h2>User "$ENV{'form.cuname'}" in domain "$ENV{'form.cdomain'}"</h2>
+ENDMODIFYUSERHEAD
+ if (! $amode || ! $genpwd) {
+ $r->print($error.'Invalid login mode or password'.$end);
+ return;
}
- if (($amode) && ($genpwd)) {
+ # Only allow authentification modification if the person has authority
+ if (&Apache::lonnet::allowed('mau',$ENV{'user.domain'})) {
$r->print('Modifying authentication: '.
- &Apache::lonnet::modifyuserauth(
+ &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'}));
-
+ ($ENV{'form.cuname'},$ENV{'form.cdomain'}));
} else {
- $r->print('Invalid login mode or password');
- }
- } else {
- $r->print('Invalid username or domain');
+ # Okay, this is a non-fatal error.
+ $r->print($error.'You do not have the authority to modify '.
+ 'this users authentification information.');
+ }
}
- }
+ ##
my $now=time;
$r->print('<h3>Modifying Roles</h3>');
foreach (keys (%ENV)) {
- if (($_=~/^form\.rev\:([^\_]+)\_([^\_]+)$/) && ($ENV{$_})) {
- $r->print('Revoking '.$2.' in '.$1.': '.
- &Apache::lonnet::assignrole($ENV{'form.cdomain'},$ENV{'form.cuname'},
- $1,$2,$now).'<br>');
- if ($2 eq 'st') {
- $1=~/^\/(\w+)\/(\w+)/;
- my $cid=$1.'_'.$2;
- $r->print('Drop from classlist: '.
- &Apache::lonnet::critical('put:'.$ENV{'course.'.$cid.'.domain'}.':'.
- $ENV{'course.'.$cid.'.num'}.':classlist:'.
- &Apache::lonnet::escape($ENV{'form.cuname'}.':'.
- $ENV{'form.cdomain'}).'='.
- &Apache::lonnet::escape($now.':'),
- $ENV{'course.'.$cid.'.home'}).'<br>');
- }
- }
- }
- foreach (keys(%ENV)) {
- if (($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_([^\_]+)$/) && ($ENV{$_})) {
- my $url='/'.$1.'/'.$2;
- if ($ENV{'form.sec_'.$1.'_'.$2.'_'.$3}) {
- $url.='/'.$ENV{'form.sec_'.$1.'_'.$2.'_'.$3};
- }
- my $start=$now;
- if ($ENV{'form.start_'.$1.'_'.$2.'_'.$3}) {
- $start=$ENV{'form.start_'.$1.'_'.$2.'_'.$3};
- }
- my $end=0;
- if ($ENV{'form.end_'.$1.'_'.$2.'_'.$3}) {
- $end=$ENV{'form.end_'.$1.'_'.$2.'_'.$3};
- }
- $r->print('Assigning: '.$3.' in '.$url.': '.
- &Apache::lonnet::assignrole($ENV{'form.cdomain'},$ENV{'form.cuname'},
- $url,$3,$end,$start).'<br>');
- if ($3 eq 'st') {
- $url=~/^\/(\w+)\/(\w+)/;
- my $cid=$1.'_'.$2;
- $r->print('Add to classlist: '.
- &Apache::lonnet::critical('put:'.$ENV{'course.'.$cid.'.domain'}.':'.
- $ENV{'course.'.$cid.'.num'}.':classlist:'.
- &Apache::lonnet::escape($ENV{'form.cuname'}.':'.
- $ENV{'form.cdomain'}).'='.
- &Apache::lonnet::escape($end.':'.$start),
- $ENV{'course.'.$cid.'.home'}).'<br>');
+ next if (! $ENV{$_});
+ # Revoke roles
+ if ($_=~/^form\.rev/) {
+ if ($_=~/^form\.rev\:([^\_]+)\_([^\_]+)$/) {
+ $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>');
+ }
+ }
+ } elsif ($_=~/^form\.act/) {
+ if ($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_([^\_]+)$/) {
+ # Activate roles for sections with 3 id numbers
+ # set start, end times, and the url for the class
+ my $start = ( $ENV{'form.start_'.$1.'_'.$2} ?
+ $ENV{'form.start_'.$1.'_'.$2} :
+ $now );
+ my $end = ( $ENV{'form.end_'.$1.'_'.$2} ?
+ $ENV{'form.end_'.$1.'_'.$2} :
+ 0 );
+ my $url='/'.$1.'/'.$2;
+ if ($ENV{'form.sec_'.$1.'_'.$2.'_'.$3}) {
+ $url.='/'.$ENV{'form.sec_'.$1.'_'.$2.'_'.$3};
+ }
+ # Assign the role and report it
+ $r->print('Assigning: '.$3.' in '.$url.': '.
+ &Apache::lonnet::assignrole(
+ $ENV{'form.cdomain'},$ENV{'form.cuname'},
+ $url,$3,$end,$start).
+ '<br>');
+ # Handle students differently
+ 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\_([^\_]+)\_([^\_]+)$/) {
+ # Activate roles for sections with two id numbers
+ # set start, end times, and the url for the class
+ my $start = ( $ENV{'form.start_'.$1.'_'.$2} ?
+ $ENV{'form.start_'.$1.'_'.$2} :
+ $now );
+ my $end = ( $ENV{'form.end_'.$1.'_'.$2} ?
+ $ENV{'form.end_'.$1.'_'.$2} :
+ 0 );
+ my $url='/'.$1.'/';
+ # Assign the role and report it.
+ $r->print('Assigning: '.$2.' in '.$url.': '.
+ &Apache::lonnet::assignrole(
+ $ENV{'form.cdomain'},$ENV{'form.cuname'},
+ $url,$2,$end,$start)
+ .'<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>');
- }
- }
+ }
+ } # End of foreach (keys(%ENV))
$r->print('</body></html>');
}
@@ -739,6 +755,62 @@ sub handler {
return OK;
}
+#-------------------------------------------------- functions for &phase_two
+sub course_level_table {
+ my %inccourses = @_;
+ my $table = '';
+ foreach (sort( keys(%inccourses))) {
+ my $thiscourse=$_;
+ 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);
+ foreach ('st','ta','ep','ad','in','cc') {
+ if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) {
+ my $plrole=&Apache::lonnet::plaintext($_);
+ $table .= <<ENDEXTENT;
+<tr bgcolor="#$bgcol">
+<td><input type="checkbox" name="act_$protectedcourse\_$_"></td>
+<td>$plrole</td>
+<td>$area</td>
+ENDEXTENT
+ if ($_ ne 'cc') {
+ $table .= <<ENDSECTION;
+<td><input type="text" size="5" name="sec_$protectedcourse\_$_"></td>
+ENDSECTION
+ } else {
+ $table .= <<ENDSECTION;
+<td> </td>
+ENDSECTION
+ }
+ $table .= <<ENDTIMEENTRY;
+<td><input type=hidden name="start_$protectedcourse\_$_" value=''>
+<a href=
+"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$_.value,'start_$protectedcourse\_$_','cu.pres','dateset')">Set Start Date</a></td>
+<td><input type=hidden name="end_$protectedcourse\_$_" value=''>
+<a href=
+"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$_.value,'end_$protectedcourse\_$_','cu.pres','dateset')">Set End Date</a></td>
+ENDTIMEENTRY
+ $table.= "</tr>\n";
+ }
+ }
+ }
+ return '' if ($table eq ''); # return nothing if there is nothing
+ # in the table
+ my $result = <<ENDTABLE;
+<h4>Course Level</h4>
+<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>
+<th>Group/Section</th><th>Start</th><th>End</th></tr>
+$table
+</table>
+ENDTABLE
+ return $result;
+}
+#---------------------------------------------- end functions for &phase_two
+
1;
__END__