--- loncom/interface/loncreateuser.pm 2003/10/13 21:41:19 1.69 +++ loncom/interface/loncreateuser.pm 2006/06/29 17:41:06 1.127 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.69 2003/10/13 21:41:19 albertel Exp $ +# $Id: loncreateuser.pm,v 1.127 2006/06/29 17:41:06 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -64,6 +64,9 @@ use Apache::Constants qw(:common :http); use Apache::lonnet; use Apache::loncommon; use Apache::lonlocal; +use Apache::longroup; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; my $loginscript; # piece of javascript used in two separate instances my $generalrule; @@ -73,10 +76,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,70 +111,109 @@ 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)) + || (&Apache::lonnet::allowed('caa',$audom.'/'.$auname))) { return ''; } return 1; } # =================================================================== Phase one sub print_username_entry_form { - my $r=shift; - my $defdom=$ENV{'request.role.domain'}; + my ($r) = @_; + 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'); my $selscript=&Apache::loncommon::studentbrowser_javascript(); + my $start_page = + &Apache::loncommon::start_page('Create Users, Change User Privileges', + $selscript); + my $sellink=&Apache::loncommon::selectstudent_link ('crtuser','ccuname','ccdomain'); my %existingroles=&my_custom_roles(); my $choice=&Apache::loncommon::select_form('make new role','rolename', ('make new role' => 'Generate new role ...',%existingroles)); + my %lt=&Apache::lonlocal::texthash( + 'siur' => "Set Individual User Roles", + 'usr' => "Username", + 'dom' => "Domain", + 'usrr' => "User Roles", + 'ecrp' => "Edit Custom Role Privileges", + 'nr' => "Name of Role", + 'cre' => "Custom Role Editor" + ); + my $help = &Apache::loncommon::help_open_menu(undef,undef,282,'Instructor Interface'); + my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges'); + my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles'); $r->print(<<"ENDDOCUMENT"); - - -The LearningOnline Network with CAPA -$selscript - -$bodytag +$start_page
-

Set Individual User Roles

+

$lt{siur}$helpsiur

- +$lt{'dom'}:
Username: +
$lt{usr}: $sellink
-Domain:$domform
$domform
- +
+ENDDOCUMENT + if (&Apache::lonnet::allowed('mcr','/')) { + $r->print(< -

Edit Custom Role Privileges

-Name of Role: $choice
- - - -ENDDOCUMENT +

$lt{'ecrp'}$helpecpr

+$lt{'nr'}: $choice
+ + +ENDCUSTOM + } + $r->print(&Apache::loncommon::end_page()); +} + + +sub user_modification_js { + my ($pjump_def,$dc_setcourse_code,$nondc_setsection_code,$groupslist)=@_; + + return < + + function pclose() { + parmwin=window.open("/adm/rat/empty.html","LONCAPAparms", + "height=350,width=350,scrollbars=no,menubar=no"); + parmwin.close(); + } + + $pjump_def + $dc_setcourse_code + + function dateset() { + eval("document.cu."+document.cu.pres_marker.value+ + ".value=document.cu.pres_value.value"); + pclose(); + } + + $nondc_setsection_code + + +END } # =================================================================== 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); @@ -187,31 +228,233 @@ sub print_user_modification_page { $ccuname=~s/\W//g; $ccdomain=~s/\W//g; my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition(); - my $dochead =<<"ENDDOCHEAD"; - - -The LearningOnline Network with CAPA - - -ENDDOCHEAD - $r->print(&Apache::loncommon::bodytag( - 'Create Users, Change User Privileges')); my $forminfo =<<"ENDFORMINFO";
@@ -227,7 +470,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; } @@ -237,31 +480,46 @@ ENDFORMINFO ''."\n". &Apache::loncommon::home_server_option_list($ccdomain); + my %lt=&Apache::lonlocal::texthash( + 'cnu' => "Create New User", + 'nu' => "New User", + 'id' => "in domain", + 'pd' => "Personal Data", + 'fn' => "First Name", + 'mn' => "Middle Name", + 'ln' => "Last Name", + 'gen' => "Generation", + 'idsn' => "ID/Student Number", + 'hs' => "Home Server", + 'lg' => "Login Data" + ); + my $genhelp=&Apache::loncommon::help_open_topic('Generation'); + &initialize_authen_forms(); $r->print(<Create New User +$start_page +

$lt{'cnu'}

$forminfo -

New user "$ccuname" in domain $ccdomain

+

$lt{'nu'} "$ccuname" $lt{'id'} $ccdomain

-

Personal Data

+

$lt{'pd'}

- + - + - + - +
First Name
$lt{'fn'}
Middle Name
$lt{'mn'}
Last Name
$lt{'ln'}
Generation
$lt{'gen'}$genhelp
-ID/Student Number

-Home Server: +$lt{'idsn'}

+$lt{'hs'}:
-

Login Data

+

$lt{'lg'}

$generalrule

$authformkrb

$authformint

@@ -269,11 +527,20 @@ Home Server: '; + } else { + $row.=' '; + } + $row.=''; if ($delallowed) { $row.= ''; } else { @@ -411,7 +707,7 @@ END } my $plaintext=''; unless ($croletitle) { - $plaintext=&Apache::lonnet::plaintext($role_code); + $plaintext=&Apache::lonnet::plaintext($role_code,$class) } else { $plaintext= "Customrole '$croletitle' defined by $croleuname\@$croleudom"; @@ -423,14 +719,48 @@ END ''.($role_end_time ?localtime($role_end_time) : ' ' ) ."\n"; - $r->print($row); + $sortrole{$sortkey}=$envkey; + $roletext{$envkey}=$row; + $roleclass{$envkey}=$class; + $rolepriv{$envkey}=$allowed; + #$r->print($row); } # end of foreach (table building loop) - $r->print(''); + my $rolesdisplay = 0; + my %output = (); + foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') { + $output{$type} = ''; + foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { + if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) { + $output{$type}.=$roletext{$sortrole{$which}}; + } + } + unless($output{$type} eq '') { + $output{$type} = "". + "".&mt($type)."". + $output{$type}; + $rolesdisplay = 1; + } + } + if ($rolesdisplay == 1) { + $r->print(< +

$lt{'rer'}

+ + +END + foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') { + if ($output{$type}) { + $r->print($output{$type}."\n"); + } + } + $r->print('
$lt{'rev'}$lt{'ren'}$lt{'del'}$lt{'rol'}$lt{'e +xt'}$lt{'sta'}$lt{'end'}
'); + } } # End of unless my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); if ($currentauth=~/^krb(4|5):/) { $currentauth=~/^krb(4|5):(.*)/; - my $krbdefdom=$1; + my $krbdefdom=$2; my %param = ( formname => 'document.cu', kerb_def_dom => $krbdefdom ); @@ -442,16 +772,22 @@ 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", + 'uuas' => "This user has an unrecognized authentication scheme", + 'sldb' => "Please specify login data below", + 'ld' => "Login Data" + ); $r->print(< -ERROR: -This user has an unrecognized authentication scheme ($currentauth). -Please specify login data below. -

Login Data

+$lt{'err'}: +$lt{'uuas'} ($currentauth). $lt{'sldb'}. +

$lt{'ld'}

$generalrule

$authformkrb

$authformint

@@ -461,20 +797,25 @@ ENDBADAUTH } else { # This user is not allowed to modify the users # authentication scheme, so just notify them of the problem + my %lt=&Apache::lonlocal::texthash( + 'err' => "ERROR", + 'uuas' => "This user has an unrecognized authentication scheme", + 'adcs' => "Please alert a domain coordinator of this situation" + ); $r->print(< - ERROR: -This user has an unrecognized authentication scheme ($currentauth). -Please alert a domain coordinator of this situation. + $lt{'err'}: +$lt{'uuas'} ($currentauth). $lt{'adcs'}.
ENDBADAUTH } } else { # Authentication type is valid my $authformcurrent=''; my $authform_other=''; + &initialize_authen_forms(); if ($currentauth=~/^krb(4|5):/) { $authformcurrent=$authformkrb; $authform_other="

$authformint

\n". @@ -496,46 +837,73 @@ 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", + 'enld' => "Enter New Login Data" + ); $r->print(< -

Change Current Login Data

+

$lt{'ccld'}

$generalrule

$authformnop

$authformcurrent

-

Enter New Login Data

+

$lt{'enld'}

$authform_other ENDOTHERAUTHS } } ## End of "check for bad authentication type" logic } ## End of new user/old user logic - $r->print('

Add Roles

'); + $r->print('

'.&mt('Add Roles').'

'); # # 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", + 'rol' => "Role", + 'ext' => "Extent", + 'sta' => "Start", + 'end' => "End", + 'cau' => "Co-Author", + 'caa' => "Assistant Co-Author", + 'ssd' => "Set Start Date", + 'sed' => "Set End Date" + ); $r->print(<Construction Space - - +

$lt{'cs'}

+
ActivateRoleExtentStartEnd
+ + + + + + + + - - + + - - + +"javascript:pjump('date_end','End Date Assistant Co-Author',document.cu.end_$cudom\_$cuname\_aa.value,'end_$cudom\_$cuname\_aa','cu.pres','dateset')">$lt{'sed'}
$lt{'act'}$lt{'rol'}$lt{'ext'}$lt{'sta'}$lt{'end'}
$lt{'cau'}$cudom\_$cuname +$lt{'ssd'} +$lt{'sed'}
Co-Author$lt{'caa'} $cudom\_$cuname + Set Start Date +"javascript:pjump('date_start','Start Date Assistant Co-Author',document.cu.start_$cudom\_$cuname\_aa.value,'start_$cudom\_$cuname\_aa','cu.pres','dateset')">$lt{'ssd'} Set End Date
ENDCOAUTH @@ -543,182 +911,200 @@ ENDCOAUTH # # Domain level # - $r->print('

Domain Level

'. - ''. - ''); + my $num_domain_level = 0; + my $domaintext = + '

'.&mt('Domain Level').'

'. + '
ActivateRoleExtentStartEnd
'. + ''; foreach ( sort( keys(%incdomains))) { my $thisdomain=$_; foreach ('dc','li','dg','au','sc') { if (&Apache::lonnet::allowed('c'.$_,$thisdomain)) { my $plrole=&Apache::lonnet::plaintext($_); - $r->print(< "Set Start Date", + 'sed' => "Set End Date" + ); + $num_domain_level ++; + $domaintext .= <<"ENDDROW"; +"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$thisdomain\_$_.value,'start_$thisdomain\_$_','cu.pres','dateset')">$lt{'ssd'} +"javascript:pjump('date_end','End Date $plrole',document.cu.end_$thisdomain\_$_.value,'end_$thisdomain\_$_','cu.pres','dateset')">$lt{'sed'} ENDDROW } } } - $r->print('
'.&mt('Activate').''.&mt('Role').''.&mt('Extent').''.&mt('Start').''.&mt('End').'
$plrole $thisdomain Set Start Date Set End Date
'); + $domaintext.=''; + if ($num_domain_level > 0) { + $r->print($domaintext); + } # -# Course level +# Course and group levels # - $r->print(&course_level_table(%inccourses)); - $r->print("
\n"); - $r->print(""); + + if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) { + $r->print(&course_level_dc($1,'Course')); + $r->print('
'."\n"); + } else { + $r->print(&course_level_table(%inccourses)); + $r->print('
'."\n"); + } + $r->print("".&Apache::loncommon::end_page()); } # ================================================================= 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 = 'Error:'; - my $end = ''; - # Print header - $r->print(< - -The LearningOnline Network with CAPA - -ENDTHREEHEAD + my $error = ''.&mt('Error').':'; + my $end = &Apache::loncommon::end_page(); + my $title; - if (exists($ENV{'form.makeuser'})) { + if (exists($env{'form.makeuser'})) { $title='Set Privileges for New User'; } else { $title='Modify User Privileges'; } - $r->print(&Apache::loncommon::bodytag($title)); + $r->print(&Apache::loncommon::start_page($title)); + my %disallowed; # Check Inputs - if (! $ENV{'form.ccuname'} ) { - $r->print($error.'No login name specified.'.$end); + if (! $env{'form.ccuname'} ) { + $r->print($error.&mt('No login name specified').'.'.$end); return; } - if ( $ENV{'form.ccuname'} =~/\W/) { - $r->print($error.'Invalid login name. '. - 'Only letters, numbers, and underscores are valid.'. + if ( $env{'form.ccuname'} =~/\W/) { + $r->print($error.&mt('Invalid login name').'. '. + &mt('Only letters, numbers, and underscores are valid').'.'. $end); return; } - if (! $ENV{'form.ccdomain'} ) { - $r->print($error.'No domain specified.'.$end); + if (! $env{'form.ccdomain'} ) { + $r->print($error.&mt('No domain specified').'.'.$end); return; } - if ( $ENV{'form.ccdomain'} =~/\W/) { - $r->print($error.'Invalid domain name. '. - 'Only letters, numbers, and underscores are valid.'. + if ( $env{'form.ccdomain'} =~/\W/) { + $r->print($error.&mt ('Invalid domain name').'. '. + &mt('Only letters, numbers, and underscores are valid').'.'. $end); return; } - if (! exists($ENV{'form.makeuser'})) { + if (! exists($env{'form.makeuser'})) { # Modifying an existing user, so check the validity of the name if ($uhome eq 'no_host') { - $r->print($error.'Unable to determine home server for '. - $ENV{'form.ccuname'}.' in domain '. - $ENV{'form.ccdomain'}.'.'); + $r->print($error.&mt('Unable to determine home server for '). + $env{'form.ccuname'}.&mt(' in domain '). + $env{'form.ccdomain'}.'.'); return; } } # Determine authentication method and password for the user being modified my $amode=''; my $genpwd=''; - if ($ENV{'form.login'} eq 'krb') { + if ($env{'form.login'} eq 'krb') { $amode='krb'; - $amode.=$ENV{'form.krbver'}; - $genpwd=$ENV{'form.krbarg'}; - } elsif ($ENV{'form.login'} eq 'int') { + $amode.=$env{'form.krbver'}; + $genpwd=$env{'form.krbarg'}; + } elsif ($env{'form.login'} eq 'int') { $amode='internal'; - $genpwd=$ENV{'form.intarg'}; - } elsif ($ENV{'form.login'} eq 'fsys') { + $genpwd=$env{'form.intarg'}; + } elsif ($env{'form.login'} eq 'fsys') { $amode='unix'; - $genpwd=$ENV{'form.fsysarg'}; - } elsif ($ENV{'form.login'} eq 'loc') { + $genpwd=$env{'form.fsysarg'}; + } elsif ($env{'form.login'} eq 'loc') { $amode='localauth'; - $genpwd=$ENV{'form.locarg'}; + $genpwd=$env{'form.locarg'}; $genpwd=" " if (!$genpwd); - } elsif (($ENV{'form.login'} eq 'nochange') || - ($ENV{'form.login'} eq '' )) { + } 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); + $r->print($error.&mt('Invalid login mode or password').$end); return; } - if ($ENV{'form.makeuser'}) { + if ($env{'form.makeuser'}) { # Create a new user + my %lt=&Apache::lonlocal::texthash( + 'cru' => "Creating user", + 'id' => "in domain" + ); $r->print(<Creating user "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}" +

$lt{'cru'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"

ENDNEWUSERHEAD # Check for the authentication mode and password if (! $amode || ! $genpwd) { - $r->print($error.'Invalid login mode or password'.$end); + $r->print($error.&mt('Invalid login mode or password').$end); return; } # Determine desired host - my $desiredhost = $ENV{'form.hserver'}; + my $desiredhost = $env{'form.hserver'}; if (lc($desiredhost) eq 'default') { $desiredhost = undef; } else { my %home_servers = &Apache::loncommon::get_library_servers - ($ENV{'form.ccdomain'}); + ($env{'form.ccdomain'}); if (! exists($home_servers{$desiredhost})) { - $r->print($error.'Invalid home server specified'); + $r->print($error.&mt('Invalid home server specified')); return; } } # Call modifyuser my $result = &Apache::lonnet::modifyuser - ($ENV{'form.ccdomain'},$ENV{'form.ccuname'},$ENV{'form.cstid'}, - $amode,$genpwd,$ENV{'form.cfirst'}, - $ENV{'form.cmiddle'},$ENV{'form.clast'},$ENV{'form.cgen'}, + ($env{'form.ccdomain'},$env{'form.ccuname'},$env{'form.cstid'}, + $amode,$genpwd,$env{'form.cfirst'}, + $env{'form.cmiddle'},$env{'form.clast'},$env{'form.cgen'}, undef,$desiredhost ); - $r->print('Generating user: '.$result); - my $home = &Apache::lonnet::homeserver($ENV{'form.ccuname'}, - $ENV{'form.ccdomain'}); - $r->print('
Home server: '.$home.' '. + $r->print(&mt('Generating user').': '.$result); + my $home = &Apache::lonnet::homeserver($env{'form.ccuname'}, + $env{'form.ccdomain'}); + $r->print('
'.&mt('Home server').': '.$home.' '. $Apache::lonnet::libserv{$home}); - } elsif (($ENV{'form.login'} ne 'nochange') && - ($ENV{'form.login'} ne '' )) { + } elsif (($env{'form.login'} ne 'nochange') && + ($env{'form.login'} ne '' )) { # Modify user privileges + my %lt=&Apache::lonlocal::texthash( + 'usr' => "User", + 'id' => "in domain" + ); $r->print(<User "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}" +

$lt{'usr'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"

ENDMODIFYUSERHEAD if (! $amode || ! $genpwd) { $r->print($error.'Invalid login mode or password'.$end); return; } # Only allow authentification modification if the person has authority - if (&Apache::lonnet::allowed('mau',$ENV{'form.ccdomain'})) { + if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) { $r->print('Modifying authentication: '. &Apache::lonnet::modifyuserauth( - $ENV{'form.ccdomain'},$ENV{'form.ccuname'}, + $env{'form.ccdomain'},$env{'form.ccuname'}, $amode,$genpwd)); - $r->print('
Home server: '.&Apache::lonnet::homeserver - ($ENV{'form.ccuname'},$ENV{'form.ccdomain'})); + $r->print('
'.&mt('Home server').': '.&Apache::lonnet::homeserver + ($env{'form.ccuname'},$env{'form.ccdomain'})); } else { # Okay, this is a non-fatal error. - $r->print($error.'You do not have the authority to modify '. - 'this users authentification information.'); + $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.'); } } ## - if (! $ENV{'form.makeuser'} ) { + if (! $env{'form.makeuser'} ) { # Check for need to change my %userenv = &Apache::lonnet::get ('environment',['firstname','middlename','lastname','generation'], - $ENV{'form.ccdomain'},$ENV{'form.ccuname'}); + $env{'form.ccdomain'},$env{'form.ccuname'}); my ($tmp) = keys(%userenv); if ($tmp =~ /^(con_lost|error)/i) { %userenv = (); @@ -726,204 +1112,417 @@ ENDMODIFYUSERHEAD # Check to see if we need to change user information foreach ('firstname','middlename','lastname','generation') { # Strip leading and trailing whitespace - $ENV{'form.c'.$_} =~ s/(\s+$|^\s+)//g; + $env{'form.c'.$_} =~ s/(\s+$|^\s+)//g; } - if (&Apache::lonnet::allowed('mau',$ENV{'form.ccdomain'}) && - ($ENV{'form.cfirstname'} ne $userenv{'firstname'} || - $ENV{'form.cmiddlename'} ne $userenv{'middlename'} || - $ENV{'form.clastname'} ne $userenv{'lastname'} || - $ENV{'form.cgeneration'} ne $userenv{'generation'} )) { + if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}) && + ($env{'form.cfirstname'} ne $userenv{'firstname'} || + $env{'form.cmiddlename'} ne $userenv{'middlename'} || + $env{'form.clastname'} ne $userenv{'lastname'} || + $env{'form.cgeneration'} ne $userenv{'generation'} )) { # Make the change my %changeHash; - $changeHash{'firstname'} = $ENV{'form.cfirstname'}; - $changeHash{'middlename'} = $ENV{'form.cmiddlename'}; - $changeHash{'lastname'} = $ENV{'form.clastname'}; - $changeHash{'generation'} = $ENV{'form.cgeneration'}; + $changeHash{'firstname'} = $env{'form.cfirstname'}; + $changeHash{'middlename'} = $env{'form.cmiddlename'}; + $changeHash{'lastname'} = $env{'form.clastname'}; + $changeHash{'generation'} = $env{'form.cgeneration'}; my $putresult = &Apache::lonnet::put ('environment',\%changeHash, - $ENV{'form.ccdomain'},$ENV{'form.ccuname'}); + $env{'form.ccdomain'},$env{'form.ccuname'}); if ($putresult eq 'ok') { # Tell the user we changed the name + my %lt=&Apache::lonlocal::texthash( + 'uic' => "User Information Changed", + 'frst' => "first", + 'mddl' => "middle", + 'lst' => "last", + 'gen' => "generation", + 'prvs' => "Previous", + 'chto' => "Changed To" + ); $r->print(<<"END"); - + - - - - - + + + + + - - - - - + + + + +
User Information Changed$lt{'uic'}
 firstmiddlelastgeneration
Previous$lt{'frst'}$lt{'mddl'}$lt{'lst'}$lt{'gen'}
$lt{'prvs'} $userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'}
Changed To$ENV{'form.cfirstname'} $ENV{'form.cmiddlename'} $ENV{'form.clastname'} $ENV{'form.cgeneration'}
$lt{'chto'}$env{'form.cfirstname'} $env{'form.cmiddlename'} $env{'form.clastname'} $env{'form.cgeneration'}
END } else { # error occurred - $r->print("

Unable to successfully change environment for ". - $ENV{'form.ccuname'}." in domain ". - $ENV{'form.ccdomain'}."

"); + $r->print("

".&mt('Unable to successfully change environment for')." ". + $env{'form.ccuname'}." ".&mt('in domain')." ". + $env{'form.ccdomain'}."

"); } - } else { # End of if ($ENV ... ) logic + } else { # End of if ($env ... ) logic # They did not want to change the users name but we can # still tell them what the name is + my %lt=&Apache::lonlocal::texthash( + 'usr' => "User", + 'id' => "in domain", + 'gen' => "Generation" + ); $r->print(<<"END"); -

User "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"

+

$lt{'usr'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"

$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'}

-

Generation: $userenv{'generation'}

+

$lt{'gen'}: $userenv{'generation'}

END } } ## my $now=time; - $r->print('

Modifying Roles

'); - foreach (keys (%ENV)) { - next if (! $ENV{$_}); + $r->print('

'.&mt('Modifying Roles').'

'); + foreach (keys (%env)) { + next if (! $env{$_}); # Revoke roles if ($_=~/^form\.rev/) { if ($_=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) { # Revoke standard role - $r->print('Revoking '.$2.' in '.$1.': '. - &Apache::lonnet::revokerole($ENV{'form.ccdomain'}, - $ENV{'form.ccuname'},$1,$2).'
'); + $r->print(&mt('Revoking').' '.$2.' in '.$1.': '. + &Apache::lonnet::revokerole($env{'form.ccdomain'}, + $env{'form.ccuname'},$1,$2).'
'); if ($2 eq 'st') { $1=~/^\/(\w+)\/(\w+)/; my $cid=$1.'_'.$2; - $r->print('Drop from classlist: '. + $r->print(&mt('Drop from classlist').': '. &Apache::lonnet::critical('put:'. - $ENV{'course.'.$cid.'.domain'}.':'. - $ENV{'course.'.$cid.'.num'}.':classlist:'. - &Apache::lonnet::escape($ENV{'form.ccuname'}.':'. - $ENV{'form.ccdomain'}).'='. - &Apache::lonnet::escape($now.':'), - $ENV{'course.'.$cid.'.home'}).'
'); + $env{'course.'.$cid.'.domain'}.':'. + $env{'course.'.$cid.'.num'}.':classlist:'. + &escape($env{'form.ccuname'}.':'. + $env{'form.ccdomain'}).'='. + &escape($now.':'), + $env{'course.'.$cid.'.home'}).'
'); } } if ($_=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) { # Revoke custom role - $r->print( - 'Revoking custom role '.$4.' by '.$3.'@'.$2.' in '.$1.': '. -&Apache::lonnet::revokecustomrole($ENV{'form.ccdomain'}, - $ENV{'form.ccuname'},$1,$2,$3,$4). - '
'); + $r->print(&mt('Revoking custom role:'). + ' '.$4.' by '.$3.'@'.$2.' in '.$1.': '. + &Apache::lonnet::revokecustomrole($env{'form.ccdomain'}, + $env{'form.ccuname'},$1,$2,$3,$4). + '
'); } } elsif ($_=~/^form\.del/) { - if ($_=~/^form\.del\:([^\_]+)\_([^\_]+)$/) { - $r->print('Deleting '.$2.' in '.$1.': '. - &Apache::lonnet::assignrole($ENV{'form.ccdomain'}, - $ENV{'form.ccuname'},$1,$2,$now,0,1).'
'); + if ($_=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) { +# Delete standard role + $r->print(&mt('Deleting').' '.$2.' in '.$1.': '. + &Apache::lonnet::assignrole($env{'form.ccdomain'}, + $env{'form.ccuname'},$1,$2,$now,0,1).'
'); if ($2 eq 'st') { $1=~/^\/(\w+)\/(\w+)/; my $cid=$1.'_'.$2; - $r->print('Drop from classlist: '. + $r->print(&mt('Drop from classlist').': '. &Apache::lonnet::critical('put:'. - $ENV{'course.'.$cid.'.domain'}.':'. - $ENV{'course.'.$cid.'.num'}.':classlist:'. - &Apache::lonnet::escape($ENV{'form.ccuname'}.':'. - $ENV{'form.ccdomain'}).'='. - &Apache::lonnet::escape($now.':'), - $ENV{'course.'.$cid.'.home'}).'
'); + $env{'course.'.$cid.'.domain'}.':'. + $env{'course.'.$cid.'.num'}.':classlist:'. + &escape($env{'form.ccuname'}.':'. + $env{'form.ccdomain'}).'='. + &escape($now.':'), + $env{'course.'.$cid.'.home'}).'
'); } - } + } + if ($_=~/^form\.del\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) { + my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4); +# Delete custom role + $r->print(&mt('Deleting custom role [_1] by [_2]@[_3] in [_4]', + $rolename,$rnam,$rdom,$url).': '. + &Apache::lonnet::assigncustomrole($env{'form.ccdomain'}, + $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now, + 0,1).'
'); + } + } elsif ($_=~/^form\.ren/) { + my $udom = $env{'form.ccdomain'}; + my $uname = $env{'form.ccuname'}; +# Re-enable standard role + if ($_=~/^form\.ren\:([^\_]+)\_([^\_\.]+)$/) { + my $url = $1; + my $role = $2; + my $logmsg; + my $output; + if ($role eq 'st') { + if ($url =~ m-^/(\w+)/(\w+)/?(\w*)$-) { + my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$1,$2,$3); + if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) { + $output = "Error: $result\n"; + } else { + $output = &mt('Assigning').' '.$role.' in '.$url. + &mt('starting').' '.localtime($now). + ':
'.$logmsg.'
'. + &mt('Add to classlist').': ok
'; + } + } + } else { + my $result=&Apache::lonnet::assignrole($env{'form.ccdomain'}, + $env{'form.ccuname'},$url,$role,0,$now); + $output = &mt('Re-enabling [_1] in [_2]: [_3]', + $role,$url,$result).'
'; + } + $r->print($output); + } +# Re-enable custom role + if ($_=~/^form\.ren\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) { + my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4); + my $result = &Apache::lonnet::assigncustomrole( + $env{'form.ccdomain'}, $env{'form.ccuname'}, + $url,$rdom,$rnam,$rolename,0,$now); + $r->print(&mt('Re-enabling custom role [_1] by [_2]@[_3] in [_4] : [_5]', + $rolename,$rnam,$rdom,$url,$result).'
'); + } } elsif ($_=~/^form\.act/) { - if -($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_cr_cr_([^\_]+)_(\w+)_([^\_]+)$/) { + my $udom = $env{'form.ccdomain'}; + my $uname = $env{'form.ccuname'}; + if ($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_cr_cr_([^\_]+)_(\w+)_([^\_]+)$/) { # Activate a custom role - my $url='/'.$1.'/'.$2; - my $full=$1.'_'.$2.'_cr_cr_'.$3.'_'.$4.'_'.$5; - if ($ENV{'form.sec_'.$full}) { - $url.='/'.$ENV{'form.sec_'.$full}; - } - - my $start = ( $ENV{'form.start_'.$full} ? - $ENV{'form.start_'.$full} : - $now ); - my $end = ( $ENV{'form.end_'.$full} ? - $ENV{'form.end_'.$full} : - 0 ); - - $r->print('Assigning custom role "'.$5.'" by '.$4.'@'.$3.' in '.$url. - ($start?', starting '.localtime($start):''). - ($end?', ending '.localtime($end):'').': '. - &Apache::lonnet::assigncustomrole( - $ENV{'form.ccdomain'},$ENV{'form.ccuname'},$url,$3,$4,$5,$end,$start). - '
'); - } elsif ($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_([^\_]+)$/) { + my ($one,$two,$three,$four,$five)=($1,$2,$3,$4,$5); + my $url='/'.$one.'/'.$two; + my $full=$one.'_'.$two.'_cr_cr_'.$three.'_'.$four.'_'.$five; + + my $start = ( $env{'form.start_'.$full} ? + $env{'form.start_'.$full} : + $now ); + my $end = ( $env{'form.end_'.$full} ? + $env{'form.end_'.$full} : + 0 ); + + # split multiple sections + my %sections = (); + my $num_sections = &build_roles($env{'form.sec_'.$full},\%sections,$5); + if ($num_sections == 0) { + $r->print(&commit_customrole($udom,$uname,$url,$three,$four,$five,$start,$end)); + } else { + my %curr_groups = + &Apache::longroup::coursegroups($one,$two); + foreach my $sec (sort {$a cmp $b} keys %sections) { + if (($sec eq 'none') || ($sec eq 'all') || + exists($curr_groups{$sec})) { + $disallowed{$sec} = $url; + next; + } + my $securl = $url.'/'.$sec; + $r->print(&commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end)); + } + } + } elsif ($_=~/^form\.act\_([^\_]+)\_(\w+)\_([^\_]+)$/) { # Activate roles for sections with 3 id numbers # set start, end times, and the url for the class - - my $start = ( $ENV{'form.start_'.$1.'_'.$2.'_'.$3} ? - $ENV{'form.start_'.$1.'_'.$2.'_'.$3} : + my ($one,$two,$three)=($1,$2,$3); + my $start = ( $env{'form.start_'.$one.'_'.$two.'_'.$three} ? + $env{'form.start_'.$one.'_'.$two.'_'.$three} : $now ); - my $end = ( $ENV{'form.end_'.$1.'_'.$2.'_'.$3} ? - $ENV{'form.end_'.$1.'_'.$2.'_'.$3} : + my $end = ( $env{'form.end_'.$one.'_'.$two.'_'.$three} ? + $env{'form.end_'.$one.'_'.$two.'_'.$three} : 0 ); - my $url='/'.$1.'/'.$2; - if ($ENV{'form.sec_'.$1.'_'.$2.'_'.$3}) { - $url.='/'.$ENV{'form.sec_'.$1.'_'.$2.'_'.$3}; - } - # Assign the role and report it - $r->print('Assigning '.$3.' in '.$url. - ($start?', starting '.localtime($start):''). - ($end?', ending '.localtime($end):'').': '. - &Apache::lonnet::assignrole( - $ENV{'form.ccdomain'},$ENV{'form.ccuname'}, - $url,$3,$end,$start). - '
'); - # Handle students differently - if ($3 eq 'st') { - $url=~/^\/(\w+)\/(\w+)/; - my $cid=$1.'_'.$2; - $r->print('Add to classlist: '. - &Apache::lonnet::critical( - 'put:'.$ENV{'course.'.$cid.'.domain'}.':'. - $ENV{'course.'.$cid.'.num'}.':classlist:'. - &Apache::lonnet::escape( - $ENV{'form.ccuname'}.':'. - $ENV{'form.ccdomain'} ).'='. - &Apache::lonnet::escape($end.':'.$start), - $ENV{'course.'.$cid.'.home'}) - .'
'); - } + my $url='/'.$one.'/'.$two; + my $type = 'three'; + # split multiple sections + my %sections = (); + my $num_sections = &build_roles($env{'form.sec_'.$one.'_'.$two.'_'.$three},\%sections,$three); + if ($num_sections == 0) { + $r->print(&commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,'')); + } else { + my %curr_groups = + &Apache::longroup::coursegroups($one,$two); + my $emptysec = 0; + foreach my $sec (sort {$a cmp $b} keys %sections) { + $sec =~ s/\W//g; + if ($sec ne '') { + if (($sec eq 'none') || ($sec eq 'all') || + exists($curr_groups{$sec})) { + $disallowed{$sec} = $url; + next; + } + my $securl = $url.'/'.$sec; + $r->print(&commit_standardrole($udom,$uname,$securl,$three,$start,$end,$one,$two,$sec)); + } else { + $emptysec = 1; + } + } + if ($emptysec) { + $r->print(&commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,'')); + } + } } elsif ($_=~/^form\.act\_([^\_]+)\_([^\_]+)$/) { # Activate roles for sections with two id numbers # set start, end times, and the url for the class - my $start = ( $ENV{'form.start_'.$1.'_'.$2} ? - $ENV{'form.start_'.$1.'_'.$2} : + my $start = ( $env{'form.start_'.$1.'_'.$2} ? + $env{'form.start_'.$1.'_'.$2} : $now ); - my $end = ( $ENV{'form.end_'.$1.'_'.$2} ? - $ENV{'form.end_'.$1.'_'.$2} : + my $end = ( $env{'form.end_'.$1.'_'.$2} ? + $env{'form.end_'.$1.'_'.$2} : 0 ); my $url='/'.$1.'/'; - # Assign the role and report it. - $r->print('Assigning '.$2.' in '.$url.': '. - ($start?', starting '.localtime($start):''). - ($end?', ending '.localtime($end):'').': '. - &Apache::lonnet::assignrole( - $ENV{'form.ccdomain'},$ENV{'form.ccuname'}, - $url,$2,$end,$start) - .'
'); + # split multiple sections + my %sections = (); + my $num_sections = &build_roles($env{'form.sec_'.$1.'_'.$2},\%sections,$2); + if ($num_sections == 0) { + $r->print(&commit_standardrole($udom,$uname,$url,$2,$start,$end,$1,undef,'')); + } else { + my $emptysec = 0; + foreach my $sec (sort {$a cmp $b} keys %sections) { + if ($sec ne '') { + my $securl = $url.'/'.$sec; + $r->print(&commit_standardrole($udom,$uname,$securl,$2,$start,$end,$1,undef,$sec)); + } else { + $emptysec = 1; + } + } + if ($emptysec) { + $r->print(&commit_standardrole($udom,$uname,$url,$2,$start,$end,$1,undef,'')); + } + } } else { - $r->print('

ERROR: Unknown command '.$_.'


'); + $r->print('

'.&mt('ERROR').': '.&mt('Unknown command').' '.$_.'


'); + } + foreach my $key (sort(keys(%disallowed))) { + if (($key eq 'none') || ($key eq 'all')) { + $r->print('

'.&mt('[_1] may not be used as the name for a section, as it is a reserved word.',$key)); + } else { + $r->print('

'.&mt('[_1] may not be used as the name for a section, as it is the name of a course group.',$key)); + } + $r->print(' '.&mt('Please go back and choose a different section name.').'


'); + } + } + } # End of foreach (keys(%env)) +# Flush the course logs so reverse user roles immediately updated + &Apache::lonnet::flushcourselogs(); + $r->print('

Create/Modify Another User

'); + $r->print(&Apache::loncommon::end_page()); +} + +sub commit_customrole { + my ($udom,$uname,$url,$three,$four,$five,$start,$end) = @_; + my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.'@'.$three.' in '.$url. + ($start?', '.&mt('starting').' '.localtime($start):''). + ($end?', ending '.localtime($end):'').': '. + &Apache::lonnet::assigncustomrole( + $udom,$uname,$url,$three,$four,$five,$end,$start). + '
'; + return $output; +} + +sub commit_standardrole { + my ($udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_; + my $output; + my $logmsg; + if ($three eq 'st') { + my $result = &commit_studentrole(\$logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec); + if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) { + $output = "Error: $result\n"; + } else { + $output = &mt('Assigning').' '.$three.' in '.$url. + ($start?', '.&mt('starting').' '.localtime($start):''). + ($end?', '.&mt('ending').' '.localtime($end):''). + ': '.$result.'
'. + &mt('Add to classlist').': ok
'; + } + } else { + $output = &mt('Assigning').' '.$three.' in '.$url. + ($start?', '.&mt('starting').' '.localtime($start):''). + ($end?', '.&mt('ending').' '.localtime($end):'').': '. + &Apache::lonnet::assignrole( + $udom,$uname,$url,$three,$end,$start). + '
'; + } + return $output; +} + +sub commit_studentrole { + my ($logmsg,$udom,$uname,$url,$three,$start,$end,$one,$two,$sec) = @_; + my $linefeed = '
'."\n"; + my $result; + if (defined($one) && defined($two)) { + my $cid=$one.'_'.$two; + my $oldsec=&Apache::lonnet::getsection($udom,$uname,$cid); + my $secchange = 0; + my $expire_role_result; + my $modify_section_result; + unless ($oldsec eq '-1') { + unless ($sec eq $oldsec) { + $secchange = 1; + my $uurl='/'.$cid; + $uurl=~s/\_/\//g; + if ($oldsec) { + $uurl.='/'.$oldsec; + } + $expire_role_result = &Apache::lonnet::assignrole($udom,$uname,$uurl,'st',time); + $result = $expire_role_result; + } + } + if (($expire_role_result eq 'ok') || ($secchange == 0)) { + $modify_section_result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,'','',$cid); + if ($modify_section_result =~ /^ok/) { + if ($secchange == 1) { + $$logmsg .= "Section for $uname switched from old section: $oldsec to new section: $sec".$linefeed; + } elsif ($oldsec eq '-1') { + $$logmsg .= "New student role for $uname in section $sec in course $cid".$linefeed; + } else { + $$logmsg .= "Student $uname assigned to unchanged section $sec in course $cid".$linefeed; + } + } else { + $$logmsg .= "Error when attempting section change for $uname from old section $oldsec to new section: $sec in course $cid -error: $modify_section_result".$linefeed; } - } - } # End of foreach (keys(%ENV)) - $r->print(''); + $result = $modify_section_result; + } elsif ($secchange == 1) { + $$logmsg .= "Error when attempting to expire role for $uname in old section $oldsec in course $cid -error: $expire_role_result".$linefeed; + } + } else { + $$logmsg .= "Incomplete course id defined. Addition of user $uname from domain $udom to course $one\_$two, section $sec not completed.$linefeed"; + $result = "error: incomplete course id\n"; + } + return $result; +} + +sub build_roles { + my ($sectionstr,$sections,$role) = @_; + my $num_sections = 0; + if ($sectionstr=~ /,/) { + my @secnums = split/,/,$sectionstr; + if ($role eq 'st') { + $secnums[0] =~ s/\W//g; + $$sections{$secnums[0]} = 1; + $num_sections = 1; + } else { + foreach my $sec (@secnums) { + $sec =~ ~s/\W//g; + unless ($sec eq "") { + if (exists($$sections{$sec})) { + $$sections{$sec} ++; + } else { + $$sections{$sec} = 1; + $num_sections ++; + } + } + } + } + } else { + $sectionstr=~s/\W//g; + unless ($sectionstr eq '') { + $$sections{$sectionstr} = 1; + $num_sections ++; + } + } + + return $num_sections; } # ========================================================== Custom Role Editor sub custom_role_editor { my $r=shift; - my $rolename=$ENV{'form.rolename'}; + my $rolename=$env{'form.rolename'}; if ($rolename eq 'make new role') { - $rolename=$ENV{'form.newrolename'}; + $rolename=$env{'form.newrolename'}; } $rolename=~s/[^A-Za-z0-9]//gs; @@ -933,20 +1532,20 @@ sub custom_role_editor { return; } - $r->print(&Apache::loncommon::bodytag( - 'Create Users, Change User Privileges').'

'); + $r->print(&Apache::loncommon::start_page('Custom Role Editor')); my $syspriv=''; my $dompriv=''; my $coursepriv=''; my ($rdummy,$roledef)= &Apache::lonnet::get('roles',["rolesdef_$rolename"]); # ------------------------------------------------------- Does this role exist? + $r->print('

'); if (($rdummy ne 'con_lost') && ($roledef ne '')) { - $r->print('Existing Role "'); + $r->print(&mt('Existing Role').' "'); # ------------------------------------------------- Get current role privileges ($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef); } else { - $r->print('New Role "'); + $r->print(&mt('New Role').' "'); $roledef=''; } $r->print($rolename.'"

'); @@ -985,35 +1584,43 @@ sub custom_role_editor { } $full{$priv}=1; } + my %lt=&Apache::lonlocal::texthash( + 'prv' => "Privilege", + 'crl' => "Course/Group Level", + 'dml' => "Domain Level", + 'ssl' => "System Level" + ); $r->print(< - - + + ENDCCF - foreach (sort keys %full) { - $r->print(''); } $r->print( - '
PrivilegeCourse LevelDomain LevelSystem Level
$lt{'prv'}$lt{'crl'}$lt{'dml'}$lt{'ssl'}
'.&Apache::lonnet::plaintext($_).''. - ($courselevel{$_}?'':' '). + foreach my $priv (sort keys %full) { + my $privtext = &Apache::lonnet::plaintext($priv); + $r->print('
'.$privtext.''. + ($courselevel{$priv}?'':' '). ''. - ($domainlevel{$_}?'':' '). + ($domainlevel{$priv}?'':' '). ''. - ($systemlevel{$_}?'':' '). + ($systemlevel{$priv}?'':' '). '
'); + '
'. + &Apache::loncommon::end_page()); } # ---------------------------------------------------------- Call to definerole sub set_custom_role { - my $r=shift; + my ($r) = @_; - my $rolename=$ENV{'form.rolename'}; + my $rolename=$env{'form.rolename'}; $rolename=~s/[^A-Za-z0-9]//gs; @@ -1022,15 +1629,15 @@ sub set_custom_role { return; } - $r->print(&Apache::loncommon::bodytag( - 'Create Users, Change User Privileges').'

'); + $r->print(&Apache::loncommon::start_page('Save Custom Role').'

'); my ($rdummy,$roledef)= - &Apache::lonnet::get('roles',["rolesdef_$rolename"]); + &Apache::lonnet::get('roles',["rolesdef_$rolename"]); + # ------------------------------------------------------- Does this role exist? if (($rdummy ne 'con_lost') && ($roledef ne '')) { - $r->print('Existing Role "'); + $r->print(&mt('Existing Role').' "'); } else { - $r->print('New Role "'); + $r->print(&mt('New Role').' "'); $roledef=''; } $r->print($rolename.'"

'); @@ -1042,7 +1649,7 @@ sub set_custom_role { foreach (split(/\:/,$Apache::lonnet::pr{'cr:c'})) { my ($priv,$restrict)=split(/\&/,$_); unless ($restrict) { $restrict=''; } - if ($ENV{'form.'.$priv.':c'}) { + if ($env{'form.'.$priv.':c'}) { $courole.=':'.$_; } } @@ -1050,7 +1657,7 @@ sub set_custom_role { foreach (split(/\:/,$Apache::lonnet::pr{'cr:d'})) { my ($priv,$restrict)=split(/\&/,$_); unless ($restrict) { $restrict=''; } - if ($ENV{'form.'.$priv.':d'}) { + if ($env{'form.'.$priv.':d'}) { $domrole.=':'.$_; } } @@ -1058,24 +1665,25 @@ sub set_custom_role { foreach (split(/\:/,$Apache::lonnet::pr{'cr:s'})) { my ($priv,$restrict)=split(/\&/,$_); unless ($restrict) { $restrict=''; } - if ($ENV{'form.'.$priv.':s'}) { + if ($env{'form.'.$priv.':s'}) { $sysrole.=':'.$_; } } $r->print('
Defining Role: '. &Apache::lonnet::definerole($rolename,$sysrole,$domrole,$courole)); - if ($ENV{'request.course.id'}) { - my $url='/'.$ENV{'request.course.id'}; + if ($env{'request.course.id'}) { + my $url='/'.$env{'request.course.id'}; $url=~s/\_/\//g; - $r->print('
Assigning Role to Self: '. - &Apache::lonnet::assigncustomrole($ENV{'user.domain'}, - $ENV{'user.name'}, + $r->print('
'.&mt('Assigning Role to Self').': '. + &Apache::lonnet::assigncustomrole($env{'user.domain'}, + $env{'user.name'}, $url, - $ENV{'user.domain'}, - $ENV{'user.name'}, + $env{'user.domain'}, + $env{'user.name'}, $rolename)); } - $r->print(''); + $r->print('

Create another role, or Create/Modify a user.

'); + $r->print(&Apache::loncommon::end_page()); } # ================================================================ Main Handler @@ -1088,28 +1696,28 @@ sub handler { return OK; } - if ((&Apache::lonnet::allowed('cta',$ENV{'request.course.id'})) || - (&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{'request.role.domain'})) || - (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'}))) { + if ((&Apache::lonnet::allowed('cta',$env{'request.course.id'})) || + (&Apache::lonnet::allowed('cin',$env{'request.course.id'})) || + (&Apache::lonnet::allowed('ccr',$env{'request.course.id'})) || + (&Apache::lonnet::allowed('cep',$env{'request.course.id'})) || + (&authorpriv($env{'user.name'},$env{'request.role.domain'})) || + (&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))) { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - unless ($ENV{'form.phase'}) { + unless ($env{'form.phase'}) { &print_username_entry_form($r); } - if ($ENV{'form.phase'} eq 'get_user_info') { + if ($env{'form.phase'} eq 'get_user_info') { &print_user_modification_page($r); - } elsif ($ENV{'form.phase'} eq 'update_user_data') { + } elsif ($env{'form.phase'} eq 'update_user_data') { &update_user_data($r); - } elsif ($ENV{'form.phase'} eq 'selected_custom_edit') { + } elsif ($env{'form.phase'} eq 'selected_custom_edit') { &custom_role_editor($r); - } elsif ($ENV{'form.phase'} eq 'set_custom_roles') { + } elsif ($env{'form.phase'} eq 'set_custom_roles') { &set_custom_role($r); } } else { - $ENV{'user.error.msg'}= + $env{'user.error.msg'}= "/adm/createuser:mau:0:0:Cannot modify user data"; return HTTP_NOT_ACCEPTABLE; } @@ -1118,11 +1726,24 @@ sub handler { #-------------------------------------------------- functions for &phase_two sub course_level_table { - my %inccourses = @_; + my (%inccourses) = @_; my $table = ''; # Custom Roles? my %customroles=&my_custom_roles(); + my %lt=&Apache::lonlocal::texthash( + 'exs' => "Existing sections", + 'new' => "Define new section", + 'ssd' => "Set Start Date", + 'sed' => "Set End Date", + 'crl' => "Course/Group Level", + 'act' => "Activate", + 'rol' => "Role", + 'ext' => "Extent", + 'grs' => "Section", + 'sta' => "Start", + 'end' => "End" + ); foreach (sort( keys(%inccourses))) { my $thiscourse=$_; @@ -1130,35 +1751,55 @@ sub course_level_table { $thiscourse=~s:_:/:g; my %coursedata=&Apache::lonnet::coursedescription($thiscourse); my $area=$coursedata{'description'}; - if (!defined($area)) { $area='Unavailable course: '.$_; } + my $type=$coursedata{'type'}; + if (!defined($area)) { $area=&mt('Unavailable course').': '.$_; } my $bgcol=$thiscourse; $bgcol=~s/[^7-9a-e]//g; $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6); - foreach ('st','ta','ep','ad','in','cc') { + my ($domain,$cnum)=split(/\//,$thiscourse); + my %sections_count; + if (defined($env{'request.course.id'})) { + if ($env{'request.course.id'} eq $domain.'_'.$cnum) { + %sections_count = + &Apache::loncommon::get_sections($domain,$cnum); + } + } + foreach ('st','ta','ep','in','cc') { if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) { my $plrole=&Apache::lonnet::plaintext($_); $table .= < - + ENDEXTENT if ($_ ne 'cc') { - $table .= < -ENDSECTION + if (%sections_count) { + my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$_); + $table .= + ''; + } else { + $table .= ''; + } } else { - $table .= <  -ENDSECTION + $table .= ''; } $table .= < Set Start Date +"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$_.value,'start_$protectedcourse\_$_','cu.pres','dateset')">$lt{'ssd'} +"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$_.value,'end_$protectedcourse\_$_','cu.pres','dateset')">$lt{'sed'} ENDTIMEENTRY $table.= "\n"; } @@ -1166,20 +1807,37 @@ ENDTIMEENTRY foreach (sort keys %customroles) { if (&Apache::lonnet::allowed('ccr',$thiscourse)) { my $plrole=$_; - my $customrole=$protectedcourse.'_cr_cr_'.$ENV{'user.domain'}. - '_'.$ENV{'user.name'}.'_'.$plrole; - $table .= < - +END + if (%sections_count) { + my $currsec = &course_sections(\%sections_count,$customrole); + $table.= + ''; + } else { + $table .= ''; + } + $table .= < Set Start Date +"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$customrole.value,'start_$customrole','cu.pres','dateset')">$lt{'ssd'} +"javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">$lt{'sed'} ENDENTRY } } @@ -1187,14 +1845,98 @@ ENDENTRY return '' if ($table eq ''); # return nothing if there is nothing # in the table my $result = <Course Level -
$plrole$area$area
Domain: $domain		'. + ''. + ''. + ''. + ''. + '
'.$lt{'exs'}.'
'. + $currsec.'		   '.$lt{'new'}.'
'. + '
  Set End Date
$plrole $area'. + ''. + ''. + ''. + ''. + '
'.$lt{'exs'}.'
'. + $currsec.'		   '.$lt{'new'}.'
'. + '
 Set End Date
- +

$lt{'crl'}

+
ActivateRoleExtentGroup/SectionStartEnd
+ $table
$lt{'act'}$lt{'rol'}$lt{'ext'}$lt{'grs'}$lt{'sta'}$lt{'end'}
ENDTABLE return $result; } + +sub course_sections { + my ($sections_count,$role) = @_; + my $output = ''; + my @sections = (sort {$a <=> $b} keys %{$sections_count}); + if (scalar(@sections) == 1) { + $output = ''."\n"; + foreach (@sections) { + $output .= '\n"; + } + } + $output .= ''; + return $output; +} + +sub course_level_dc { + my ($dcdom) = @_; + my %customroles=&my_custom_roles(); + my $hiddenitems = ''. + ''. + ''; + my $courseform=''.&Apache::loncommon::selectcourse_link + ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course/Group').''; + my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom); + my %lt=&Apache::lonlocal::texthash( + 'typ' => "Type", + 'rol' => "Role", + 'grs' => "Section", + 'exs' => "Existing sections", + 'new' => "Define new section", + 'sta' => "Start", + 'end' => "End", + 'ssd' => "Set Start Date", + 'sed' => "Set End Date" + ); + my $header = '

'.&mt('Course/Group Level').'

'. + ''; + my $otheritems = ''."\n". + ''; + $otheritems .= < +$lt{'ssd'} + +ENDTIMEENTRY + $otheritems .= "
'.$lt{'typ'}.''.$courseform.''.$lt{'rol'}.''.$lt{'grs'}.''.$lt{'sta'}.''.$lt{'end'}.'
'."\n". + ''. + ''. + ''. + ''. + ''. + '
'.$lt{'exs'}.'
   '.$lt{'new'}.'
'. + ''. + '
 +$lt{'sed'}
\n"; + return $cb_jscript.$header.$hiddenitems.$otheritems; +} + #---------------------------------------------- end functions for &phase_two #--------------------------------- functions for &phase_two and &phase_three