--- loncom/interface/loncreateuser.pm 2002/04/04 21:46:44 1.29
+++ loncom/interface/loncreateuser.pm 2002/08/08 19:27:35 1.39
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.29 2002/04/04 21:46:44 matthew Exp $
+# $Id: loncreateuser.pm,v 1.39 2002/08/08 19:27:35 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -47,7 +47,7 @@
# 11/12,11/13,11/15 Scott Harrison
# 02/11/02 Matthew Hall
#
-# $Id: loncreateuser.pm,v 1.29 2002/04/04 21:46:44 matthew Exp $
+# $Id: loncreateuser.pm,v 1.39 2002/08/08 19:27:35 matthew Exp $
###
package Apache::loncreateuser;
@@ -68,119 +68,16 @@ BEGIN {
$ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
my $krbdefdom=$1;
$krbdefdom=~tr/a-z/A-Z/;
- $authformnop=(<<END);
-<p>
-<input type="radio" name="login" value="" 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
+ my %param = ( formname => 'document.cu',
+ kerb_def_dom => $krbdefdom
+ );
+ $loginscript = &Apache::loncommon::authform_header(%param);
+ $generalrule = &Apache::loncommon::authform_authorwarning(%param);
+ $authformnop = &Apache::loncommon::authform_nochange(%param);
+ $authformkrb = &Apache::loncommon::authform_kerberos(%param);
+ $authformint = &Apache::loncommon::authform_internal(%param);
+ $authformfsys = &Apache::loncommon::authform_filesystem(%param);
+ $authformloc = &Apache::loncommon::authform_local(%param);
}
# =================================================================== Phase one
@@ -188,7 +85,9 @@ END
sub phase_one {
my $r=shift;
my $defdom=$ENV{'user.domain'};
- $r->print(<<ENDDOCUMENT);
+ my @domains = &Apache::loncommon::get_domains();
+ my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
+ $r->print(<<"ENDDOCUMENT");
<html>
<head>
<title>The LearningOnline Network with CAPA</title>
@@ -197,8 +96,10 @@ sub phase_one {
<h1>Create User, Change User Privileges</h1>
<form action=/adm/createuser method=post>
<input type=hidden name=phase value=two>
+<p>
Username: <input type=text size=15 name=ccuname><br>
-Domain: <input type=text size=15 name=ccdomain value=$defdom><p>
+Domain: $domform
+</p>
<input type=submit value="Continue">
</form>
</body>
@@ -215,6 +116,10 @@ sub phase_two {
$ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
my $krbdefdom=$1;
$krbdefdom=~tr/a-z/A-Z/;
+ my %param = ( formname => 'document.cu',
+ kerb_def_dom => $krbdefdom
+ );
+ $loginscript = &Apache::loncommon::authform_header(%param);
my $defdom=$ENV{'user.domain'};
@@ -224,7 +129,7 @@ sub phase_two {
<html>
<head>
<title>The LearningOnline Network with CAPA</title>
-<script>
+<script type="text/javascript" language="Javascript">
function pclose() {
parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
@@ -264,7 +169,6 @@ ENDFORMINFO
my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
my %incdomains;
my %inccourses;
- my %home_servers = &get_home_servers($ccdomain);
foreach (%Apache::lonnet::hostdom) {
$incdomains{$_}=1;
}
@@ -275,18 +179,17 @@ ENDFORMINFO
}
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";
- }
+ '<option value="default" selected>default</option>'."\n".
+ &Apache::loncommon::home_server_option_list($ccdomain);
+
$r->print(<<ENDNEWUSER);
$dochead
<h1>Create New User</h1>
$forminfo
<h2>New user "$ccuname" in domain $ccdomain</h2>
+<script type="text/javascript" language="Javascript">
$loginscript
+</script>
<input type='hidden' name='makeuser' value='1' />
<h3>Personal Data</h3>
<p>
@@ -304,11 +207,11 @@ ID/Student Number <input type='text' nam
Home Server: <select name="hserver" size="1"> $home_server_list </select>
<hr />
<h3>Login Data</h3>
-$generalrule
-$authformkrb
-$authformint
-$authformfsys
-$authformloc
+<p>$generalrule </p>
+<p>$authformkrb </p>
+<p>$authformint </p>
+<p>$authformfsys</p>
+<p>$authformloc </p>
ENDNEWUSER
} else { # user already exists
$r->print(<<ENDCHANGEUSER);
@@ -347,65 +250,80 @@ END
my ($tmp) = keys(%rolesdump);
unless ($tmp =~ /^(con_lost|error)/i) {
my $now=time;
- $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>');
+ $r->print(<<END);
+<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>
+END
foreach my $area (keys(%rolesdump)) {
- if ($area!~/^rolesdef/) {
- my $role = $rolesdump{$area};
- my $thisrole=$area;
- $area=~s/\_\w\w$//;
- 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'.$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);
- if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) {
+ next if ($area =~ /^rolesdef/);
+ my $role = $rolesdump{$area};
+ my $thisrole=$area;
+ $area =~ s/\_\w\w$//;
+ my ($role_code,$role_end_time,$role_start_time) =
+ split(/_/,$role);
+ my $bgcol='ffffff';
+ my $allowed=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'.$role_code,$1.'/'.$2)) {
+ $allowed=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);
+ if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) {
$carea.='<br>Section/Group: '.$3;
- }
- $area=$carea;
- } else {
- # Determine if current user is able to revoke privileges
- if ($area=~/^\/(\w+)\//) {
- if (&Apache::lonnet::allowed('c'.$role_code,$1)) {
- $allows=1;
- }
- } else {
- if (&Apache::lonnet::allowed('c'.$role_code,'/')) {
- $allows=1;
- }
- }
- }
- $r->print('<tr bgcolor=#"'.$bgcol.'"><td>');
- my $active=1;
- $active=0 if (($role_end_time) && ($now>$role_end_time));
- if (($active) && ($allows)) {
- $r->print('<input type="checkbox" name="rev:'
- .$thisrole.'">');
- } else {
- $r->print(' ');
- }
- $r->print('</td><td>'.
- &Apache::lonnet::plaintext($role_code).
- '</td><td>'.$area.'</td><td>'.
- ($role_start_time ? localtime($role_start_time)
- : ' ' )
- .'</td><td>'.
- ($role_end_time ? localtime($role_end_time)
- : ' ' )
- ."</td></tr>\n");
- }
+ }
+ $area=$carea;
+ } else {
+ # Determine if current user is able to revoke privileges
+ if ($area=~ /^\/(\w+)\//) {
+ if (&Apache::lonnet::allowed('c'.$role_code,$1)) {
+ $allowed=1;
+ }
+ } else {
+ if (&Apache::lonnet::allowed('c'.$role_code,'/')) {
+ $allowed=1;
+ }
+ }
+ }
+ # I have no idea what the hell the above code does
+ # So the following is a check:
+ if ($allowed) {
+ # If we are looking at a co-author role, make sure it is
+ # for the current users construction space before we let
+ # them revoke it.
+ if (($role_code eq 'ca') &&
+ ($ENV{'request.role'} !~ /^dc/)) {
+ if ($area !~
+ /^\/$ENV{'user.domain'}\/$ENV{'user.name'}/) {
+ $allowed = 0;
+ }
+ }
+ }
+ my $row = '';
+ $row.='<tr bgcolor=#"'.$bgcol.'"><td>';
+ my $active=1;
+ $active=0 if (($role_end_time) && ($now>$role_end_time));
+ if (($active) && ($allowed)) {
+ $row.= '<input type="checkbox" name="rev:'.$thisrole.'">';
+ } else {
+ $row.=' ';
+ }
+ $row.= '</td><td>'.&Apache::lonnet::plaintext($role_code).
+ '</td><td>'.$area.
+ '</td><td>'.($role_start_time?localtime($role_start_time)
+ : ' ' ).
+ '</td><td>'.($role_end_time ?localtime($role_end_time)
+ : ' ' )
+ ."</td></tr>\n";
+ $r->print($row);
} # end of foreach (table building loop)
$r->print('</table>');
} # End of unless
@@ -413,7 +331,10 @@ END
if ($currentauth=~/^krb4:/) {
$currentauth=~/^krb4:(.*)/;
my $krbdefdom2=$1;
- $loginscript=~s/vf\.krbdom\.value='.*?';/vf.krbdom.value='$krbdefdom2';/;
+ my %param = ( formname => 'document.cu',
+ kerb_def_dom => $krbdefdom
+ );
+ $loginscript = &Apache::loncommon::authform_header(%param);
}
# Check for a bad authentication type
unless ($currentauth=~/^krb4:/ or
@@ -424,23 +345,27 @@ END
if (&Apache::lonnet::allowed('mau',$ENV{'user.domain'})) {
$r->print(<<ENDBADAUTH);
<hr />
+<script type="text/javascript" language="Javascript">
$loginscript
+</script>
<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
+<p>$generalrule</p>
+<p>$authformkrb</p>
+<p>$authformint</p>
+<p>$authformfsys</p>
+<p>$authformloc</p>
ENDBADAUTH
} else {
# This user is not allowed to modify the users
# authentication scheme, so just notify them of the problem
$r->print(<<ENDBADAUTH);
<hr />
+<script type="text/javascript" language="Javascript">
$loginscript
+</script>
<font color="#ff0000"> ERROR: </font>
This user has an unrecognized authentication scheme ($currentauth).
Please alert a domain coordinator of this situation.
@@ -452,40 +377,23 @@ ENDBADAUTH
my $authform_other='';
if ($currentauth=~/^krb4:/) {
$authformcurrent=$authformkrb;
- $authform_other=$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
+ $authform_other="<p>$authformint</p>\n".
+ "<p>$authformfsys</p><p>$authformloc</p>";
}
elsif ($currentauth=~/^internal:/) {
$authformcurrent=$authformint;
- $authform_other=$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
+ $authform_other="<p>$authformkrb</p>".
+ "<p>$authformfsys</p><p>$authformloc</p>";
}
elsif ($currentauth=~/^unix:/) {
$authformcurrent=$authformfsys;
- $authform_other=$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
+ $authform_other="<p>$authformkrb</p>".
+ "<p>$authformint</p><p>$authformloc;</p>";
}
elsif ($currentauth=~/^localauth:/) {
$authformcurrent=$authformloc;
- $authform_other=$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
+ $authform_other="<p>$authformkrb</p>".
+ "<p>$authformint</p><p>$authformfsys</p>";
}
$authformcurrent=<<ENDCURRENTAUTH;
<table border='1'>
@@ -501,11 +409,13 @@ ENDCURRENTAUTH
# Current user has login modification privileges
$r->print(<<ENDOTHERAUTHS);
<hr />
+<script type="text/javascript" language="Javascript">
$loginscript
+</script>
<h3>Change Current Login Data</h3>
-$generalrule
-$authformnop
-$authformcurrent
+<p>$generalrule</p>
+<p>$authformnop</p>
+<p>$authformcurrent</p>
<h3>Enter New Login Data</h3>
$authform_other
ENDOTHERAUTHS
@@ -626,17 +536,26 @@ ENDTHREEHEAD
my $genpwd='';
if ($ENV{'form.login'} eq 'krb') {
$amode='krb4';
- $genpwd=$ENV{'form.krbdom'};
+ $genpwd=$ENV{'form.krbarg'};
} elsif ($ENV{'form.login'} eq 'int') {
$amode='internal';
- $genpwd=$ENV{'form.intpwd'};
+ $genpwd=$ENV{'form.intarg'};
} elsif ($ENV{'form.login'} eq 'fsys') {
$amode='unix';
- $genpwd=$ENV{'form.fsyspwd'};
+ $genpwd=$ENV{'form.fsysarg'};
} elsif ($ENV{'form.login'} eq 'loc') {
$amode='localauth';
$genpwd=$ENV{'form.locarg'};
$genpwd=" " if (!$genpwd);
+ } 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
+ # information this will be caught below.
+ } else {
+ $r->print($error.'Invalid login mode or password'.$end);
+ return;
}
if ($ENV{'form.makeuser'}) {
# Create a new user
@@ -654,7 +573,8 @@ ENDNEWUSERHEAD
if (lc($desiredhost) eq 'default') {
$desiredhost = undef;
} else {
- my %home_servers = &get_home_servers($ENV{'form.ccdomain'});
+ my %home_servers = &Apache::loncommon::get_library_servers
+ ($ENV{'form.ccdomain'});
if (! exists($home_servers{$desiredhost})) {
$r->print($error.'Invalid home server specified');
return;
@@ -672,7 +592,8 @@ ENDNEWUSERHEAD
$ENV{'form.ccdomain'});
$r->print('<br>Home server: '.$home.' '.
$Apache::lonnet::libserv{$home});
- } elsif ($ENV{'form.login'} ne '') {
+ } elsif (($ENV{'form.login'} ne 'nochange') &&
+ ($ENV{'form.login'} ne '' )) {
# Modify user privileges
$r->print(<<ENDMODIFYUSERHEAD);
<h1>Change User Privileges</h1>
@@ -683,9 +604,9 @@ ENDMODIFYUSERHEAD
return;
}
# Only allow authentification modification if the person has authority
- if (&Apache::lonnet::allowed('mau',$ENV{'user.domain'})) {
+ if (&Apache::lonnet::allowed('mau',$ENV{'form.ccdomain'})) {
$r->print('Modifying authentication: '.
- &Apache::lonnet::modifyuserauth(
+ &Apache::lonnet::modifyuserauth(
$ENV{'form.ccdomain'},$ENV{'form.ccuname'},
$amode,$genpwd));
$r->print('<br>Home server: '.&Apache::lonnet::homeserver
@@ -934,16 +855,6 @@ ENDTABLE
#---------------------------------------------- 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