version 1.28, 2002/03/22 22:23:23
|
version 1.29, 2002/04/04 21:46:44
|
Line 260 ENDDOCHEAD
|
Line 260 ENDDOCHEAD
|
<input type="hidden" name="pres_value" value="" > |
<input type="hidden" name="pres_value" value="" > |
<input type="hidden" name="pres_type" value="" > |
<input type="hidden" name="pres_type" value="" > |
<input type="hidden" name="pres_marker" value="" > |
<input type="hidden" name="pres_marker" value="" > |
<input type="hidden" name="cuname" value="$ccuname"> |
|
<input type="hidden" name="cdomain" value="$ccdomain"> |
|
ENDFORMINFO |
ENDFORMINFO |
my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain); |
my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain); |
my %incdomains; |
my %incdomains; |
my %inccourses; |
my %inccourses; |
|
my %home_servers = &get_home_servers($ccdomain); |
foreach (%Apache::lonnet::hostdom) { |
foreach (%Apache::lonnet::hostdom) { |
$incdomains{$_}=1; |
$incdomains{$_}=1; |
} |
} |
Line 275 ENDFORMINFO
|
Line 274 ENDFORMINFO
|
} |
} |
} |
} |
if ($uhome eq 'no_host') { |
if ($uhome eq 'no_host') { |
|
my $home_server_list= |
|
'<option value="default" selected>default</option>'."\n"; |
|
foreach (sort keys(%home_servers)) { |
|
$home_server_list.= |
|
'<option value="'.$_.'">'.$_.' '. |
|
$home_servers{$_}."</option>\n"; |
|
} |
$r->print(<<ENDNEWUSER); |
$r->print(<<ENDNEWUSER); |
$dochead |
$dochead |
<h1>Create New User</h1> |
<h1>Create New User</h1> |
Line 295 $loginscript
|
Line 301 $loginscript
|
<td><input type='text' name='cgen' size='5' /></td></tr> |
<td><input type='text' name='cgen' size='5' /></td></tr> |
</table> |
</table> |
ID/Student Number <input type='text' name='cstid' size='15' /></p> |
ID/Student Number <input type='text' name='cstid' size='15' /></p> |
|
Home Server: <select name="hserver" size="1"> $home_server_list </select> |
<hr /> |
<hr /> |
<h3>Login Data</h3> |
<h3>Login Data</h3> |
$generalrule |
$generalrule |
Line 570 ENDDROW
|
Line 577 ENDDROW
|
# ================================================================= Phase Three |
# ================================================================= Phase Three |
sub phase_three { |
sub phase_three { |
my $r=shift; |
my $r=shift; |
|
my $uhome=&Apache::lonnet::homeserver($ENV{'form.ccuname'}, |
|
$ENV{'form.ccdomain'}); |
# Error messages |
# Error messages |
my $error = '<font color="#ff0000">Error:</font>'; |
my $error = '<font color="#ff0000">Error:</font>'; |
my $end = '</body></html>'; |
my $end = '</body></html>'; |
Line 583 sub phase_three {
|
Line 592 sub phase_three {
|
<img align="right" src="/adm/lonIcons/lonlogos.gif"> |
<img align="right" src="/adm/lonIcons/lonlogos.gif"> |
ENDTHREEHEAD |
ENDTHREEHEAD |
# Check Inputs |
# Check Inputs |
if (! $ENV{'form.cuname'} ) { |
if (! $ENV{'form.ccuname'} ) { |
$r->print($error.'No login name specified.'.$end); |
$r->print($error.'No login name specified.'.$end); |
return; |
return; |
} |
} |
if ( $ENV{'form.cuname'} =~/\W/) { |
if ( $ENV{'form.ccuname'} =~/\W/) { |
$r->print($error.'Invalid login name. '. |
$r->print($error.'Invalid login name. '. |
'Only letters, numbers, and underscores are valid.'. |
'Only letters, numbers, and underscores are valid.'. |
$end); |
$end); |
return; |
return; |
} |
} |
if (! $ENV{'form.cdomain'} ) { |
if (! $ENV{'form.ccdomain'} ) { |
$r->print($error.'No domain specified.'.$end); |
$r->print($error.'No domain specified.'.$end); |
return; |
return; |
} |
} |
if ( $ENV{'form.cdomain'} =~/\W/) { |
if ( $ENV{'form.ccdomain'} =~/\W/) { |
$r->print($error.'Invalid domain name. '. |
$r->print($error.'Invalid domain name. '. |
'Only letters, numbers, and underscores are valid.'. |
'Only letters, numbers, and underscores are valid.'. |
$end); |
$end); |
return; |
return; |
} |
} |
|
if (! exists($ENV{'form.makeuser'})) { |
|
# Modifying an existing user, so check the validity of the name |
|
if ($uhome eq 'no_host') { |
|
$r->print($error.'Unable to determine home server for '. |
|
$ENV{'form.ccuname'}.' in domain '. |
|
$ENV{'form.ccdomain'}.'.'); |
|
return; |
|
} |
|
} |
# Determine authentication method and password for the user being modified |
# Determine authentication method and password for the user being modified |
my $amode=''; |
my $amode=''; |
my $genpwd=''; |
my $genpwd=''; |
Line 624 ENDTHREEHEAD
|
Line 642 ENDTHREEHEAD
|
# Create a new user |
# Create a new user |
$r->print(<<ENDNEWUSERHEAD); |
$r->print(<<ENDNEWUSERHEAD); |
<h1>Create User</h1> |
<h1>Create User</h1> |
<h3>Creating user "$ENV{'form.cuname'}" in domain "$ENV{'form.cdomain'}"</h2> |
<h3>Creating user "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h2> |
ENDNEWUSERHEAD |
ENDNEWUSERHEAD |
# Check for the authentication mode and password |
# Check for the authentication mode and password |
if (! $amode || ! $genpwd) { |
if (! $amode || ! $genpwd) { |
$r->print($error.'Invalid login mode or password'.$end); |
$r->print($error.'Invalid login mode or password'.$end); |
return; |
return; |
} |
} |
|
# Determine desired host |
|
my $desiredhost = $ENV{'form.hserver'}; |
|
if (lc($desiredhost) eq 'default') { |
|
$desiredhost = undef; |
|
} else { |
|
my %home_servers = &get_home_servers($ENV{'form.ccdomain'}); |
|
if (! exists($home_servers{$desiredhost})) { |
|
$r->print($error.'Invalid home server specified'); |
|
return; |
|
} |
|
} |
# Call modifyuser |
# Call modifyuser |
my $result = &Apache::lonnet::modifyuser |
my $result = &Apache::lonnet::modifyuser |
($ENV{'form.cdomain'},$ENV{'form.cuname'}, |
($ENV{'form.ccdomain'},$ENV{'form.ccuname'},$ENV{'form.cstid'}, |
$ENV{'form.cstid'},$amode,$genpwd, |
$amode,$genpwd,$ENV{'form.cfirst'}, |
$ENV{'form.cfirst'},$ENV{'form.cmiddle'}, |
$ENV{'form.cmiddle'},$ENV{'form.clast'},$ENV{'form.cgen'}, |
$ENV{'form.clast'},$ENV{'form.cgen'} |
undef,$desiredhost |
); |
); |
$r->print('Generating user: '.$result); |
$r->print('Generating user: '.$result); |
$r->print('<br>Home server: '.&Apache::lonnet::homeserver |
my $home = &Apache::lonnet::homeserver($ENV{'form.ccuname'}, |
($ENV{'form.cuname'},$ENV{'form.cdomain'})); |
$ENV{'form.ccdomain'}); |
|
$r->print('<br>Home server: '.$home.' '. |
|
$Apache::lonnet::libserv{$home}); |
} elsif ($ENV{'form.login'} ne '') { |
} elsif ($ENV{'form.login'} ne '') { |
# Modify user privileges |
# Modify user privileges |
$r->print(<<ENDMODIFYUSERHEAD); |
$r->print(<<ENDMODIFYUSERHEAD); |
<h1>Change User Privileges</h1> |
<h1>Change User Privileges</h1> |
<h2>User "$ENV{'form.cuname'}" in domain "$ENV{'form.cdomain'}"</h2> |
<h2>User "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h2> |
ENDMODIFYUSERHEAD |
ENDMODIFYUSERHEAD |
if (! $amode || ! $genpwd) { |
if (! $amode || ! $genpwd) { |
$r->print($error.'Invalid login mode or password'.$end); |
$r->print($error.'Invalid login mode or password'.$end); |
Line 655 ENDMODIFYUSERHEAD
|
Line 686 ENDMODIFYUSERHEAD
|
if (&Apache::lonnet::allowed('mau',$ENV{'user.domain'})) { |
if (&Apache::lonnet::allowed('mau',$ENV{'user.domain'})) { |
$r->print('Modifying authentication: '. |
$r->print('Modifying authentication: '. |
&Apache::lonnet::modifyuserauth( |
&Apache::lonnet::modifyuserauth( |
$ENV{'form.cdomain'},$ENV{'form.cuname'}, |
$ENV{'form.ccdomain'},$ENV{'form.ccuname'}, |
$amode,$genpwd)); |
$amode,$genpwd)); |
$r->print('<br>Home server: '.&Apache::lonnet::homeserver |
$r->print('<br>Home server: '.&Apache::lonnet::homeserver |
($ENV{'form.cuname'},$ENV{'form.cdomain'})); |
($ENV{'form.ccuname'},$ENV{'form.ccdomain'})); |
} else { |
} else { |
# Okay, this is a non-fatal error. |
# Okay, this is a non-fatal error. |
$r->print($error.'You do not have the authority to modify '. |
$r->print($error.'You do not have the authority to modify '. |
Line 670 ENDMODIFYUSERHEAD
|
Line 701 ENDMODIFYUSERHEAD
|
# Check for need to change |
# Check for need to change |
my %userenv = &Apache::lonnet::get |
my %userenv = &Apache::lonnet::get |
('environment',['firstname','middlename','lastname','generation'], |
('environment',['firstname','middlename','lastname','generation'], |
$ENV{'form.cdomain'},$ENV{'form.cuname'}); |
$ENV{'form.ccdomain'},$ENV{'form.ccuname'}); |
my ($tmp) = keys(%userenv); |
my ($tmp) = keys(%userenv); |
if ($tmp =~ /^(con_lost|error)/i) { |
if ($tmp =~ /^(con_lost|error)/i) { |
%userenv = (); |
%userenv = (); |
Line 680 ENDMODIFYUSERHEAD
|
Line 711 ENDMODIFYUSERHEAD
|
# Strip leading and trailing whitespace |
# 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.cdomain'}) && |
if (&Apache::lonnet::allowed('mau',$ENV{'form.ccdomain'}) && |
($ENV{'form.cfirstname'} ne $userenv{'firstname'} || |
($ENV{'form.cfirstname'} ne $userenv{'firstname'} || |
$ENV{'form.cmiddlename'} ne $userenv{'middlename'} || |
$ENV{'form.cmiddlename'} ne $userenv{'middlename'} || |
$ENV{'form.clastname'} ne $userenv{'lastname'} || |
$ENV{'form.clastname'} ne $userenv{'lastname'} || |
Line 693 ENDMODIFYUSERHEAD
|
Line 724 ENDMODIFYUSERHEAD
|
$changeHash{'generation'} = $ENV{'form.cgeneration'}; |
$changeHash{'generation'} = $ENV{'form.cgeneration'}; |
my $putresult = &Apache::lonnet::put |
my $putresult = &Apache::lonnet::put |
('environment',\%changeHash, |
('environment',\%changeHash, |
$ENV{'form.cdomain'},$ENV{'form.cuname'}); |
$ENV{'form.ccdomain'},$ENV{'form.ccuname'}); |
if ($putresult eq 'ok') { |
if ($putresult eq 'ok') { |
# Tell the user we changed the name |
# Tell the user we changed the name |
$r->print(<<"END"); |
$r->print(<<"END"); |
Line 718 ENDMODIFYUSERHEAD
|
Line 749 ENDMODIFYUSERHEAD
|
END |
END |
} else { # error occurred |
} else { # error occurred |
$r->print("<h2>Unable to successfully change environment for ". |
$r->print("<h2>Unable to successfully change environment for ". |
$ENV{'form.cuname'}." in domain ". |
$ENV{'form.ccuname'}." in domain ". |
$ENV{'form.cdomain'}."</h2>"); |
$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 |
# They did not want to change the users name but we can |
# still tell them what the name is |
# still tell them what the name is |
$r->print(<<"END"); |
$r->print(<<"END"); |
<h2>User "$ENV{'form.cuname'}" in domain "$ENV{'form.cdomain'}"</h2> |
<h2>User "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h2> |
<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} </h4> |
<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} </h4> |
<h4>Generation: $userenv{'generation'}</h4> |
<h4>Generation: $userenv{'generation'}</h4> |
END |
END |
Line 740 END
|
Line 771 END
|
if ($_=~/^form\.rev/) { |
if ($_=~/^form\.rev/) { |
if ($_=~/^form\.rev\:([^\_]+)\_([^\_]+)$/) { |
if ($_=~/^form\.rev\:([^\_]+)\_([^\_]+)$/) { |
$r->print('Revoking '.$2.' in '.$1.': '. |
$r->print('Revoking '.$2.' in '.$1.': '. |
&Apache::lonnet::assignrole($ENV{'form.cdomain'}, |
&Apache::lonnet::assignrole($ENV{'form.ccdomain'}, |
$ENV{'form.cuname'},$1,$2,$now).'<br>'); |
$ENV{'form.ccuname'},$1,$2,$now).'<br>'); |
if ($2 eq 'st') { |
if ($2 eq 'st') { |
$1=~/^\/(\w+)\/(\w+)/; |
$1=~/^\/(\w+)\/(\w+)/; |
my $cid=$1.'_'.$2; |
my $cid=$1.'_'.$2; |
Line 749 END
|
Line 780 END
|
&Apache::lonnet::critical('put:'. |
&Apache::lonnet::critical('put:'. |
$ENV{'course.'.$cid.'.domain'}.':'. |
$ENV{'course.'.$cid.'.domain'}.':'. |
$ENV{'course.'.$cid.'.num'}.':classlist:'. |
$ENV{'course.'.$cid.'.num'}.':classlist:'. |
&Apache::lonnet::escape($ENV{'form.cuname'}.':'. |
&Apache::lonnet::escape($ENV{'form.ccuname'}.':'. |
$ENV{'form.cdomain'}).'='. |
$ENV{'form.ccdomain'}).'='. |
&Apache::lonnet::escape($now.':'), |
&Apache::lonnet::escape($now.':'), |
$ENV{'course.'.$cid.'.home'}).'<br>'); |
$ENV{'course.'.$cid.'.home'}).'<br>'); |
} |
} |
Line 772 END
|
Line 803 END
|
# Assign the role and report it |
# Assign the role and report it |
$r->print('Assigning: '.$3.' in '.$url.': '. |
$r->print('Assigning: '.$3.' in '.$url.': '. |
&Apache::lonnet::assignrole( |
&Apache::lonnet::assignrole( |
$ENV{'form.cdomain'},$ENV{'form.cuname'}, |
$ENV{'form.ccdomain'},$ENV{'form.ccuname'}, |
$url,$3,$end,$start). |
$url,$3,$end,$start). |
'<br>'); |
'<br>'); |
# Handle students differently |
# Handle students differently |
Line 784 END
|
Line 815 END
|
'put:'.$ENV{'course.'.$cid.'.domain'}.':'. |
'put:'.$ENV{'course.'.$cid.'.domain'}.':'. |
$ENV{'course.'.$cid.'.num'}.':classlist:'. |
$ENV{'course.'.$cid.'.num'}.':classlist:'. |
&Apache::lonnet::escape( |
&Apache::lonnet::escape( |
$ENV{'form.cuname'}.':'. |
$ENV{'form.ccuname'}.':'. |
$ENV{'form.cdomain'} ).'='. |
$ENV{'form.ccdomain'} ).'='. |
&Apache::lonnet::escape($end.':'.$start), |
&Apache::lonnet::escape($end.':'.$start), |
$ENV{'course.'.$cid.'.home'}) |
$ENV{'course.'.$cid.'.home'}) |
.'<br>'); |
.'<br>'); |
Line 803 END
|
Line 834 END
|
# Assign the role and report it. |
# Assign the role and report it. |
$r->print('Assigning: '.$2.' in '.$url.': '. |
$r->print('Assigning: '.$2.' in '.$url.': '. |
&Apache::lonnet::assignrole( |
&Apache::lonnet::assignrole( |
$ENV{'form.cdomain'},$ENV{'form.cuname'}, |
$ENV{'form.ccdomain'},$ENV{'form.ccuname'}, |
$url,$2,$end,$start) |
$url,$2,$end,$start) |
.'<br>'); |
.'<br>'); |
} |
} |
Line 902 ENDTABLE
|
Line 933 ENDTABLE
|
} |
} |
#---------------------------------------------- end functions for &phase_two |
#---------------------------------------------- end functions for &phase_two |
|
|
|
#--------------------------------- functions for &phase_two and &phase_three |
|
sub get_home_servers { |
|
my $domain = shift; |
|
my %home_servers; |
|
foreach (keys(%Apache::lonnet::libserv)) { |
|
if ($Apache::lonnet::hostdom{$_} eq $domain) { |
|
$home_servers{$_} = $Apache::lonnet::hostname{$_}; |
|
} |
|
} |
|
return %home_servers; |
|
} |
|
|
|
#--------------------------end of functions for &phase_two and &phase_three |
|
|
1; |
1; |
__END__ |
__END__ |
|
|