--- loncom/interface/loncreateuser.pm 2002/04/18 20:16:43 1.30
+++ loncom/interface/loncreateuser.pm 2002/08/23 19:43:11 1.42
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.30 2002/04/18 20:16:43 matthew Exp $
+# $Id: loncreateuser.pm,v 1.42 2002/08/23 19:43:11 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.30 2002/04/18 20:16:43 matthew Exp $
+# $Id: loncreateuser.pm,v 1.42 2002/08/23 19:43:11 matthew Exp $
###
package Apache::loncreateuser;
@@ -68,135 +68,40 @@ BEGIN {
$ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
my $krbdefdom=$1;
$krbdefdom=~tr/a-z/A-Z/;
- $authformnop=(<<END);
-<p>
-<input type="radio" name="login" value="nochange" checked="checked"
- onclick="changed_radio('nochange',document.cu);">
-Do not change login data
-</p>
-END
- $authformkrb=(<<END);
-<p>
-<input type="radio" name="login" value="krb"
- onclick="changed_radio('krb',document.cu);">
-Kerberos authenticated with domain
-<input type="text" size="10" name="krbarg"
- onclick="changed_text('krb',document.cu);"
- onchange="changed_text('krb',document.cu);">
-</p>
-END
- $authformint=(<<END);
-<p>
-<input type="radio" name="login" value="int"
- onclick="changed_radio('int',document.cu);">
-Internally authenticated (with initial password
-<input type="text" size="10" name="intarg"
- onclick="changed_text('int',document.cu);"
- onchange="changed_text('int',document.cu);">
-</p>
-END
- $authformfsys=(<<END);
-<p>
-<input type="radio" name="login" value="fsys"
- onclick="changed_radio('fsys',document.cu);">
-Filesystem authenticated (with initial password
-<input type="text" size="10" name="fsysarg"
- onclick="changed_text('fsys',document.cu);"
- onchange="changed_text('fsys',document.cu);">
-</p>
-END
- $authformloc=(<<END);
-<p>
-<input type="radio" name="login" value="loc"
- onclick="changed_radio('loc',document.cu);">
-Local Authentication with argument
-<input type="text" size="10" name="locarg"
- onclick="changed_text('loc',document.cu);"
- onchange="changed_text('loc',document.cu);">
-</p>
-END
- $loginscript=(<<ENDLOGINSCRIPT);
-<script>
-
-var authvalues = new Object();
-authvalues.names = new Array('krbarg','intarg','fsysarg','locarg');
-authvalues.defaults = new Array('MSU.EDU','','','');
-
-function changed_radio(choice,currentform) {
- var choicearg = choice + 'arg';
- if (currentform.elements[choicearg].value == '') {
- clear(currentform,authvalues.names);
- for (var i=0; i<authvalues.names.length; i++) {
- if (authvalues.names[i] == choicearg) {
- currentform.elements[choicearg].value = authvalues.defaults[i];
- }
- }
- }
-}
-
-function changed_text(choice,currentform) {
- var choicearg = choice + 'arg';
- if (currentform.elements[choicearg].value !='') {
- // clear the other values
- var keep = currentform.elements[choicearg].value;
- clear(currentform,authvalues.names);
- currentform.elements[choicearg].value = keep;
- // validate our value
- if (choice == 'krb') {
- currentform.elements[choicearg].value = keep.toUpperCase();
- }
- // check the appropriate checkbox
- set_checked('login',choice,currentform);
- }
-}
-
-function clear(currentform,names) {
- for (var i=0; i< currentform.elements.length; i++) {
- for (var j = 0; j< names.length; j++) {
- if (currentform.elements[i].name == names[j]) {
- currentform.elements[i].value = '';
- }
- }
- }
-}
-
-function set_checked(name,choice,currentform) {
- for (var i=0; i< currentform.elements.length; i++) {
- if (currentform.elements[i].name == name) {
- if (currentform.elements[i].value == choice) {
- currentform.elements[i].checked =true;
- }
- }
- }
-}
-
-</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
-sub phase_one {
+sub print_username_entry_form {
my $r=shift;
- my $defdom=$ENV{'user.domain'};
- $r->print(<<ENDDOCUMENT);
+ my $defdom=$ENV{'request.role.domain'};
+ my @domains = &Apache::loncommon::get_domains();
+ my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
+ my $bodytag =&Apache::loncommon::bodytag(
+ 'Create Users, Change User Privileges');
+ $r->print(<<"ENDDOCUMENT");
<html>
<head>
<title>The LearningOnline Network with CAPA</title>
</head>
-<body bgcolor="#FFFFFF">
-<h1>Create User, Change User Privileges</h1>
-<form action=/adm/createuser method=post>
-<input type=hidden name=phase value=two>
-Username: <input type=text size=15 name=ccuname><br>
-Domain: <input type=text size=15 name=ccdomain value=$defdom><p>
-<input type=submit value="Continue">
+$bodytag
+<form action="/adm/createuser" method="post">
+<input type="hidden" name="phase" value="get_user_info">
+<p>
+Username: <input type="text" size="15" name="ccuname"><br>
+Domain: $domform
+</p>
+<input type="submit" value="Continue">
</form>
</body>
</html>
@@ -204,7 +109,7 @@ ENDDOCUMENT
}
# =================================================================== Phase two
-sub phase_two {
+sub print_user_modification_page {
my $r=shift;
my $ccuname=$ENV{'form.ccuname'};
my $ccdomain=$ENV{'form.ccdomain'};
@@ -212,8 +117,12 @@ 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'};
+ my $defdom=$ENV{'request.role.domain'};
$ccuname=~s/\W//g;
$ccdomain=~s/\W//g;
@@ -221,7 +130,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",
@@ -246,12 +155,12 @@ sub phase_two {
</script>
</head>
-<body bgcolor="#FFFFFF">
-<img align="right" src="/adm/lonIcons/lonlogos.gif">
ENDDOCHEAD
+ $r->print(&Apache::loncommon::bodytag(
+ 'Create Users, Change User Privileges'));
my $forminfo =<<"ENDFORMINFO";
<form action="/adm/createuser" method="post" name="cu">
-<input type="hidden" name="phase" value="three">
+<input type="hidden" name="phase" value="update_user_data">
<input type="hidden" name="ccuname" value="$ccuname">
<input type="hidden" name="ccdomain" value="$ccdomain">
<input type="hidden" name="pres_value" value="" >
@@ -261,7 +170,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;
}
@@ -272,18 +180,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>
@@ -301,11 +208,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);
@@ -344,100 +251,122 @@ 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{'request.role.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
my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
- if ($currentauth=~/^krb4:/) {
- $currentauth=~/^krb4:(.*)/;
+ if ($currentauth=~/^krb(4|5):/) {
+ $currentauth=~/^krb(4|5):(.*)/;
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
+ unless ($currentauth=~/^krb(4|5):/ or
$currentauth=~/^unix:/ or
$currentauth=~/^internal:/ or
$currentauth=~/^localauth:/
) { # bad authentication scheme
- if (&Apache::lonnet::allowed('mau',$ENV{'user.domain'})) {
+ if (&Apache::lonnet::allowed('mau',$ENV{'request.role.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.
@@ -447,42 +376,25 @@ ENDBADAUTH
} else { # Authentication type is valid
my $authformcurrent='';
my $authform_other='';
- if ($currentauth=~/^krb4:/) {
+ if ($currentauth=~/^krb(4|5):/) {
$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'>
@@ -494,15 +406,17 @@ ENDBADAUTH
<td bgcolor='#cbbcbb'>Changing this value will overwrite existing authentication for the user; you should notify the user of this change.</td></tr>
</table>
ENDCURRENTAUTH
- if (&Apache::lonnet::allowed('mau',$ENV{'user.domain'})) {
+ if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) {
# 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
@@ -513,10 +427,9 @@ ENDOTHERAUTHS
#
# Co-Author
#
-
- if (&Apache::lonnet::allowed('cca',$ENV{'user.domain'})) {
+ if (&Apache::lonnet::allowed('cca',$ENV{'request.role.domain'})) {
my $cuname=$ENV{'user.name'};
- my $cudom=$ENV{'user.domain'};
+ my $cudom=$ENV{'request.role.domain'};
$r->print(<<ENDCOAUTH);
<h4>Construction Space</h4>
<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>
@@ -572,7 +485,7 @@ ENDDROW
}
# ================================================================= Phase Three
-sub phase_three {
+sub update_user_data {
my $r=shift;
my $uhome=&Apache::lonnet::homeserver($ENV{'form.ccuname'},
$ENV{'form.ccdomain'});
@@ -585,9 +498,14 @@ sub phase_three {
<head>
<title>The LearningOnline Network with CAPA</title>
</head>
-<body bgcolor="#FFFFFF">
-<img align="right" src="/adm/lonIcons/lonlogos.gif">
ENDTHREEHEAD
+ my $title;
+ if (exists($ENV{'form.makeuser'})) {
+ $title='Set Privileges for New User';
+ } else {
+ $title='Modify User Privileges';
+ }
+ $r->print(&Apache::loncommon::bodytag($title));
# Check Inputs
if (! $ENV{'form.ccuname'} ) {
$r->print($error.'No login name specified.'.$end);
@@ -622,7 +540,8 @@ ENDTHREEHEAD
my $amode='';
my $genpwd='';
if ($ENV{'form.login'} eq 'krb') {
- $amode='krb4';
+ $amode='krb';
+ $amode.=$ENV{'form.krbver'};
$genpwd=$ENV{'form.krbarg'};
} elsif ($ENV{'form.login'} eq 'int') {
$amode='internal';
@@ -634,6 +553,12 @@ ENDTHREEHEAD
$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;
@@ -641,7 +566,6 @@ ENDTHREEHEAD
if ($ENV{'form.makeuser'}) {
# Create a new user
$r->print(<<ENDNEWUSERHEAD);
-<h1>Create User</h1>
<h3>Creating user "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h2>
ENDNEWUSERHEAD
# Check for the authentication mode and password
@@ -654,7 +578,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,10 +597,10 @@ 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>
<h2>User "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h2>
ENDMODIFYUSERHEAD
if (! $amode || ! $genpwd) {
@@ -683,9 +608,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
@@ -857,17 +782,17 @@ 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'}))) {
+ (&Apache::lonnet::allowed('cca',$ENV{'request.role.domain'})) ||
+ (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'}))) {
$r->content_type('text/html');
$r->send_http_header;
unless ($ENV{'form.phase'}) {
- &phase_one($r);
+ &print_username_entry_form($r);
}
- if ($ENV{'form.phase'} eq 'two') {
- &phase_two($r);
- } elsif ($ENV{'form.phase'} eq 'three') {
- &phase_three($r);
+ if ($ENV{'form.phase'} eq 'get_user_info') {
+ &print_user_modification_page($r);
+ } elsif ($ENV{'form.phase'} eq 'update_user_data') {
+ &update_user_data($r);
}
} else {
$ENV{'user.error.msg'}=
@@ -934,16 +859,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