--- loncom/interface/loncreateuser.pm 2005/02/17 08:29:42 1.100
+++ loncom/interface/loncreateuser.pm 2005/06/17 21:04:40 1.104
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.100 2005/02/17 08:29:42 albertel Exp $
+# $Id: loncreateuser.pm,v 1.104 2005/06/17 21:04:40 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -108,10 +108,7 @@ sub my_custom_roles {
sub authorpriv {
my ($auname,$audom)=@_;
- if (($auname ne $ENV{'user.name'}) ||
- (($audom ne $ENV{'user.domain'}) &&
- ($audom ne $ENV{'request.role.domain'}))) { return ''; }
- unless (&Apache::lonnet::allowed('cca',$audom)) { return ''; }
+ unless (&Apache::lonnet::allowed('cca',$audom.'/'.$auname)) { return ''; }
return 1;
}
@@ -119,7 +116,7 @@ sub authorpriv {
sub print_username_entry_form {
my $r=shift;
- my $defdom=$ENV{'request.role.domain'};
+ my $defdom=$env{'request.role.domain'};
my @domains = &Apache::loncommon::get_domains();
my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
my $html=&Apache::lonxml::xmlbegin();
@@ -171,8 +168,8 @@ ENDDOCUMENT
# =================================================================== Phase two
sub print_user_modification_page {
my $r=shift;
- my $ccuname=$ENV{'form.ccuname'};
- my $ccdomain=$ENV{'form.ccdomain'};
+ my $ccuname=$env{'form.ccuname'};
+ my $ccdomain=$env{'form.ccdomain'};
$ccuname=~s/\W//g;
$ccdomain=~s/\W//g;
@@ -182,7 +179,7 @@ sub print_user_modification_page {
return;
}
- my $defdom=$ENV{'request.role.domain'};
+ my $defdom=$env{'request.role.domain'};
my ($krbdef,$krbdefdom) =
&Apache::loncommon::get_kerberos_defaults($defdom);
@@ -199,7 +196,7 @@ sub print_user_modification_page {
my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
my $dc_setcourse_code = '';
my $loaditem;
- if ($ENV{'request.role'} =~ m-^dc\./(\w+)/$-) {
+ if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
my $dcdom = $1;
$loaditem = qq|OnLoad="document.cu.coursedesc.value=''"|;
$dc_setcourse_code = <<"ENDSCRIPT";
@@ -374,7 +371,7 @@ ENDFORMINFO
foreach (values(%Apache::lonnet::hostdom)) {
$incdomains{$_}=1;
}
- foreach (keys(%ENV)) {
+ foreach (keys(%env)) {
if ($_=~/^user\.priv\.cm\.\/(\w+)\/(\w+)/) {
$inccourses{$1.'_'.$2}=1;
}
@@ -544,7 +541,7 @@ END
$bgcol=~s/[^7-9a-e]//g;
$bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6);
if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) {
- $carea.=' Section/Group: '.$3;
+ $carea.=' Section/Group: '.$3;
$sortkey.="\0$3";
}
$area=$carea;
@@ -675,7 +672,7 @@ END
$currentauth=~/^internal:/ or
$currentauth=~/^localauth:/
) { # bad authentication scheme
- if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) {
+ if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {
&initialize_authen_forms();
my %lt=&Apache::lonlocal::texthash(
'err' => "ERROR",
@@ -740,7 +737,7 @@ ENDBADAUTH
"
$authformint
$authformfsys
";
}
$authformcurrent.=' (will override current values) ';
- if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) {
+ if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) {
# Current user has login modification privileges
my %lt=&Apache::lonlocal::texthash(
'ccld' => "Change Current Login Data",
@@ -765,11 +762,11 @@ ENDOTHERAUTHS
#
# Co-Author
#
- if (&authorpriv($ENV{'user.name'},$ENV{'request.role.domain'}) &&
- ($ENV{'user.name'} ne $ccuname || $ENV{'user.domain'} ne $ccdomain)) {
+ if (&authorpriv($env{'user.name'},$env{'request.role.domain'}) &&
+ ($env{'user.name'} ne $ccuname || $env{'user.domain'} ne $ccdomain)) {
# No sense in assigning co-author role to yourself
- my $cuname=$ENV{'user.name'};
- my $cudom=$ENV{'request.role.domain'};
+ my $cuname=$env{'user.name'};
+ my $cudom=$env{'request.role.domain'};
my %lt=&Apache::lonlocal::texthash(
'cs' => "Construction Space",
'act' => "Activate",
@@ -842,7 +839,7 @@ ENDDROW
#
my $num_sections;
- if ($ENV{'request.role'} =~ m-^dc\./(\w+)/$-) {
+ if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
$r->print(&course_level_dc($1));
$r->print(''."\n");
} else {
@@ -855,8 +852,8 @@ ENDDROW
# ================================================================= Phase Three
sub update_user_data {
my $r=shift;
- my $uhome=&Apache::lonnet::homeserver($ENV{'form.ccuname'},
- $ENV{'form.ccdomain'});
+ my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'},
+ $env{'form.ccdomain'});
# Error messages
my $error = ''.&mt('Error').':';
my $end = '