--- loncom/interface/loncreateuser.pm 2004/12/07 00:49:27 1.91
+++ loncom/interface/loncreateuser.pm 2005/06/06 00:06:12 1.102
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.91 2004/12/07 00:49:27 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.102 2005/06/06 00:06:12 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -73,10 +73,9 @@ my $authformint;
my $authformfsys;
my $authformloc;
-BEGIN {
- $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
- my $krbdefdom=$1;
- $krbdefdom=~tr/a-z/A-Z/;
+sub initialize_authen_forms {
+ my ($krbdefdom)=( $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/);
+ $krbdefdom= uc($krbdefdom);
my %param = ( formname => 'document.cu',
kerb_def_dom => $krbdefdom
);
@@ -109,9 +108,9 @@ 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 ''; }
+ 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 ''; }
return 1;
}
@@ -120,9 +119,10 @@ 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();
my $bodytag =&Apache::loncommon::bodytag('Create Users, Change User Privileges').&Apache::loncommon::help_open_menu('',undef,undef,'',282,'Instructor Interface');
my $selscript=&Apache::loncommon::studentbrowser_javascript();
my $sellink=&Apache::loncommon::selectstudent_link
@@ -142,7 +142,7 @@ sub print_username_entry_form {
my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges');
my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles');
$r->print(<<"ENDDOCUMENT");
-
+$html
The LearningOnline Network with CAPA
$selscript
@@ -171,18 +171,18 @@ 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|_]//gs;
- $ccdomain=~s/[\W|_]//gs;
+ $ccuname=~s/\W//g;
+ $ccdomain=~s/\W//g;
unless (($ccuname) && ($ccdomain)) {
&print_username_entry_form($r);
return;
}
- my $defdom=$ENV{'request.role.domain'};
+ my $defdom=$env{'request.role.domain'};
my ($krbdef,$krbdefdom) =
&Apache::loncommon::get_kerberos_defaults($defdom);
@@ -199,7 +199,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";
@@ -272,8 +272,9 @@ sub print_user_modification_page {
}
ENDSCRIPT
}
+ my $html=&Apache::lonxml::xmlbegin();
my $dochead =<<"ENDDOCHEAD";
-
+$html
The LearningOnline Network with CAPA