--- loncom/interface/loncreateuser.pm 2004/11/23 18:03:04 1.88
+++ loncom/interface/loncreateuser.pm 2005/02/17 08:29:42 1.100
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.88 2004/11/23 18:03:04 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.100 2005/02/17 08:29:42 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
);
@@ -123,6 +122,7 @@ sub print_username_entry_form {
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
@@ -174,8 +174,8 @@ sub print_user_modification_page {
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);
@@ -211,38 +211,40 @@ sub print_user_modification_page {
return;
}
var userrole = document.cu.role.options[document.cu.role.selectedIndex].value
- var section;
+ var section="";
var numsections = 0;
- if (document.cu.role.value != "cc") {
- for (var i=0; i 1)) {
+ alert("In each course, each user may only have one student role at a time. You had selected "+numsections+" sections.\\nPlease modify your selections so they include no more than one section.")
+ return;
+ }
+ if ((userrole == 'cc') && (numsections > 0)) {
+ alert("Section designations do not apply to Course Coordinator roles.\\nA course coordinator role will be added with access to all sections.");
+ section = "";
+ }
var numcourse = getIndex(document.cu.dccourse);
if (numcourse == "-1") {
alert("There was a problem with your course selection");
@@ -270,8 +272,9 @@ sub print_user_modification_page {
}
ENDSCRIPT
}
+ my $html=&Apache::lonxml::xmlbegin();
my $dochead =<<"ENDDOCHEAD";
-
+$html
The LearningOnline Network with CAPA
ENDDOCHEAD
@@ -335,6 +398,7 @@ ENDFORMINFO
'lg' => "Login Data"
);
my $genhelp=&Apache::loncommon::help_open_topic('Generation');
+ &initialize_authen_forms();
$r->print(<$lt{'cnu'}
@@ -422,13 +486,7 @@ END
'sta' => "Start",
'end' => "End"
);
- $r->print(<
-
$lt{'rer'}
-
-
$lt{'rev'}
$lt{'ren'}
$lt{'del'}
$lt{'rol'}
$lt{'ext'}
$lt{'sta'}
$lt{'end'}
-END
- my (%roletext,%sortrole,%roleclass);
+ my (%roletext,%sortrole,%roleclass,%rolepriv);
foreach my $area (sort { my $a1=join('_',(split('_',$a))[1,0]);
my $b1=join('_',(split('_',$b))[1,0]);
return $a1 cmp $b1;
@@ -567,22 +625,40 @@ END
$sortrole{$sortkey}=$envkey;
$roletext{$envkey}=$row;
$roleclass{$envkey}=$class;
+ $rolepriv{$envkey}=$allowed;
#$r->print($row);
} # end of foreach (table building loop)
+ my $rolesdisplay = 0;
+ my %output = ();
foreach my $type ('Construction Space','Course','Domain','System','Unknown') {
- my $output;
+ $output{$type} = '';
foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) {
- if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) {
- $output.=$roletext{$sortrole{$which}};
+ if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) {
+ $output{$type}.=$roletext{$sortrole{$which}};
}
}
- if (defined($output)) {
- $r->print("
+END
+ foreach my $type ('Construction Space','Course','Domain','System','Unknown') {
+ if ($output{$type}) {
+ $r->print($output{$type}."\n");
+ }
+ }
+ $r->print('
');
+ }
} # End of unless
my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
if ($currentauth=~/^krb(4|5):/) {
@@ -600,6 +676,7 @@ END
$currentauth=~/^localauth:/
) { # bad authentication scheme
if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) {
+ &initialize_authen_forms();
my %lt=&Apache::lonlocal::texthash(
'err' => "ERROR",
'uuas' => "This user has an unrecognized authentication scheme",
@@ -641,6 +718,7 @@ ENDBADAUTH
} else { # Authentication type is valid
my $authformcurrent='';
my $authform_other='';
+ &initialize_authen_forms();
if ($currentauth=~/^krb(4|5):/) {
$authformcurrent=$authformkrb;
$authform_other="