--- loncom/interface/loncreateuser.pm 2003/09/17 17:30:10 1.67 +++ loncom/interface/loncreateuser.pm 2004/12/02 21:32:51 1.90 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.67 2003/09/17 17:30:10 albertel Exp $ +# $Id: loncreateuser.pm,v 1.90 2004/12/02 21:32:51 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -63,6 +63,7 @@ use strict; use Apache::Constants qw(:common :http); use Apache::lonnet; use Apache::loncommon; +use Apache::lonlocal; my $loginscript; # piece of javascript used in two separate instances my $generalrule; @@ -122,14 +123,24 @@ 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 $bodytag =&Apache::loncommon::bodytag( - 'Create Users, Change User Privileges'); + 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 ('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 $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges'); + my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles'); $r->print(<<"ENDDOCUMENT"); @@ -139,19 +150,19 @@ $selscript $bodytag
-

Set Individual User Roles

+

$lt{siur}$helpsiur

- +$lt{'dom'}:
Username: +
$lt{usr}: $sellink
-Domain:$domform
$domform
- +
-

Edit Custom Role Privileges

-Name of Role: $choice
- +

$lt{'ecrp'}$helpecpr

+$lt{'nr'}: $choice
+ ENDDOCUMENT @@ -163,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|_]//gs; + $ccdomain=~s/[\W|_]//gs; unless (($ccuname) && ($ccdomain)) { &print_username_entry_form($r); @@ -186,6 +197,81 @@ sub print_user_modification_page { $ccuname=~s/\W//g; $ccdomain=~s/\W//g; my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition(); + my $dc_setcourse_code = ''; + my $loaditem; + if ($ENV{'request.role'} =~ m-^dc\./(\w+)/$-) { + my $dcdom = $1; + $loaditem = qq|OnLoad="document.cu.coursedesc.value=''"|; + $dc_setcourse_code = <<"ENDSCRIPT"; + function setCourse() { + var course = document.cu.dccourse.value; + if (course != "") { + if (document.cu.dcdomain.value != document.cu.origdom.value) { + alert("You must select a course in the current domain"); + return; + } + var userrole = document.cu.role.options[document.cu.role.selectedIndex].value + var section; + var numsections = 0; + 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"); + return + } + else { + var coursename = "_$dcdom"+"_"+course+"_"+userrole + document.cu.elements[numcourse].name = "act"+coursename + document.cu.elements[numcourse+4].name = "sec"+coursename + document.cu.elements[numcourse+4].value = section + document.cu.elements[numcourse+5].name = "start"+coursename + document.cu.elements[numcourse+6].name = "end"+coursename + } + } + document.cu.submit(); + } + + function getIndex(caller) { + for (var i=0;i @@ -199,6 +285,7 @@ sub print_user_modification_page { } $pjump_def + $dc_setcourse_code function dateset() { eval("document.cu."+document.cu.pres_marker.value+ @@ -206,11 +293,71 @@ sub print_user_modification_page { pclose(); } + function setSections() { + var re1 = /^currsec_/; + for (var i=0;i 0) { + if (document.cu.elements[i+1].value != "" && document.cu.elements[i+1].value != null) { + sections = sections + "," + document.cu.elements[i+1].value; + } + } + else { + sections = document.cu.elements[i+1].value; + } + var newsecs = document.cu.elements[i+1].value; + if (newsecs != null && newsecs != "") { + var numsplit = newsecs.split(/,/g); + numsec = numsec + numsplit.length; + } + if ((role == 'st') && (numsec > 1)) { + alert("In each course, each user may only have one student role at a time. You had selected "+numsec+" sections.\\nPlease modify your selections so they include no more than one section.") + return; + } + else { + document.cu.elements[i+2].value = sections; + } + } + } + } + } + document.cu.submit(); + } ENDDOCHEAD $r->print(&Apache::loncommon::bodytag( - 'Create Users, Change User Privileges')); + 'Create Users, Change User Privileges',undef,$loaditem)); my $forminfo =<<"ENDFORMINFO"; @@ -236,31 +383,45 @@ 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'); $r->print(<Create New User +

$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

@@ -268,11 +429,20 @@ Home Server: '; + } else { + $row.=' '; + } + $row.=''; if ($delallowed) { $row.= ''; } else { @@ -422,9 +620,43 @@ 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','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','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):/) { @@ -442,15 +674,20 @@ END $currentauth=~/^localauth:/ ) { # bad authentication scheme if (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'})) { + 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

@@ -460,14 +697,18 @@ 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 } @@ -497,22 +738,26 @@ ENDBADAUTH $authformcurrent.=' (will override current values)
'; 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 # @@ -521,20 +766,31 @@ ENDOTHERAUTHS # No sense in assigning co-author role to yourself 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", + 'ssd' => "Set Start Date", + 'sed' => "Set End Date" + ); $r->print(<Construction Space - - +

$lt{'cs'}

+
ActivateRoleExtentStartEnd
+ - - + + - - + +"javascript:pjump('date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset')">$lt{'sed'}
$lt{'act'}$lt{'rol'}$lt{'ext'}$lt{'sta'}$lt{'end'}
Co-Author$lt{'cau'} $cudom\_$cuname + Set Start Date +"javascript:pjump('date_start','Start Date Co-Author',document.cu.start_$cudom\_$cuname\_ca.value,'start_$cudom\_$cuname\_ca','cu.pres','dateset')">$lt{'ssd'} Set End Date
ENDCOAUTH @@ -542,36 +798,53 @@ 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') { + 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 # - $r->print(&course_level_table(%inccourses)); - $r->print("
\n"); + my $num_sections; + + if ($ENV{'request.role'} =~ m-^dc\./(\w+)/$-) { + $r->print(&course_level_dc($1)); + $r->print('
'."\n"); + } else { + $r->print(&course_level_table(%inccourses)); + $r->print('
'."\n"); + } $r->print(""); } @@ -581,7 +854,7 @@ sub update_user_data { my $uhome=&Apache::lonnet::homeserver($ENV{'form.ccuname'}, $ENV{'form.ccdomain'}); # Error messages - my $error = 'Error:'; + my $error = ''.&mt('Error').':'; my $end = ''; # Print header $r->print(<print(&Apache::loncommon::bodytag($title)); # Check Inputs if (! $ENV{'form.ccuname'} ) { - $r->print($error.'No login name specified.'.$end); + $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.'. + $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); + $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.'. + $r->print($error.&mt ('Invalid domain name').'. '. + &mt('Only letters, numbers, and underscores are valid').'.'. $end); return; } 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 '. + $r->print($error.&mt('Unable to determine home server for '). + $ENV{'form.ccuname'}.&mt(' in domain '). $ENV{'form.ccdomain'}.'.'); return; } @@ -651,17 +924,21 @@ ENDTHREEHEAD # 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'}) { # 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 @@ -672,7 +949,7 @@ ENDNEWUSERHEAD my %home_servers = &Apache::loncommon::get_library_servers ($ENV{'form.ccdomain'}); if (! exists($home_servers{$desiredhost})) { - $r->print($error.'Invalid home server specified'); + $r->print($error.&mt('Invalid home server specified')); return; } } @@ -683,16 +960,20 @@ ENDNEWUSERHEAD $ENV{'form.cmiddle'},$ENV{'form.clast'},$ENV{'form.cgen'}, undef,$desiredhost ); - $r->print('Generating user: '.$result); + $r->print(&mt('Generating user').': '.$result); my $home = &Apache::lonnet::homeserver($ENV{'form.ccuname'}, $ENV{'form.ccdomain'}); - $r->print('
Home server: '.$home.' '. + $r->print('
'.&mt('Home server').': '.$home.' '. $Apache::lonnet::libserv{$home}); } 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); @@ -704,12 +985,11 @@ ENDMODIFYUSERHEAD &Apache::lonnet::modifyuserauth( $ENV{'form.ccdomain'},$ENV{'form.ccuname'}, $amode,$genpwd)); - $r->print('
Home server: '.&Apache::lonnet::homeserver + $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').'.'); } } ## @@ -743,20 +1023,29 @@ ENDMODIFYUSERHEAD $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"); - + - - - - - + + + + + - + @@ -764,36 +1053,41 @@ ENDMODIFYUSERHEAD
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
$lt{'chto'} $ENV{'form.cfirstname'} $ENV{'form.cmiddlename'} $ENV{'form.clastname'}
END } else { # error occurred - $r->print("

Unable to successfully change environment for ". - $ENV{'form.ccuname'}." in domain ". + $r->print("

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

"); } } 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

'); + $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.': '. + $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:'. @@ -805,21 +1099,21 @@ END } 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'}, + $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.': '. + $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:'. @@ -829,66 +1123,89 @@ END $ENV{'course.'.$cid.'.home'}).'
'); } } + } elsif ($_=~/^form\.ren/) { + 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,$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); + } } elsif ($_=~/^form\.act/) { - if -($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_cr_cr_([^\_]+)_(\w+)_([^\_]+)$/) { + 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). - '
'); + 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($url,$three,$four,$five,$start,$end)); + } else { + foreach (sort {$a cmp $b} keys %sections) { + my $securl = $url.'/'.$_; + $r->print(&commit_customrole($securl,$three,$four,$five,$start,$end)); + } + } } elsif ($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_([^\_]+)$/) { # 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($url,$three,$start,$end,$one,$two,'')); + } else { + my $emptysec = 0; + foreach my $sec (sort {$a cmp $b} keys %sections) { + $sec =~ s/\W//g; + if ($sec ne '') { + my $securl = $url.'/'.$sec; + $r->print(&commit_standardrole($securl,$three,$start,$end,$one,$two,$sec)); + } else { + $emptysec = 1; + } + } + if ($emptysec) { + $r->print(&commit_standardrole($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 @@ -899,22 +1216,162 @@ END $ENV{'form.end_'.$1.'_'.$2} : 0 ); my $url='/'.$1.'/'; + # 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($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($securl,$2,$start,$end,$1,undef,$sec)); + } else { + $emptysec = 1; + } + } + if ($emptysec) { + $r->print(&commit_standardrole($url,$2,$start,$end,$1,undef,'')); + } + } # Assign the role and report it. - $r->print('Assigning '.$2.' in '.$url.': '. - ($start?', starting '.localtime($start):''). - ($end?', ending '.localtime($end):'').': '. + $r->print(&mt('Assigning').' '.$2.' in '.$url.': '. + ($start?', '.&mt('starting').' '.localtime($start):''). + ($end?', '.&mt('ending').' '.localtime($end):'').': '. &Apache::lonnet::assignrole( $ENV{'form.ccdomain'},$ENV{'form.ccuname'}, $url,$2,$end,$start) .'
'); } else { - $r->print('

ERROR: Unknown command '.$_.'


'); + $r->print('

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


'); } } } # End of foreach (keys(%ENV)) +# Flush the course logs so reverse user roles immediately updated + &Apache::lonnet::flushcourselogs(); $r->print(''); } +sub commit_customrole { + my ($url,$three,$four,$five,$end,$start) = @_; + my $output = &mt('Assigning custom role').' "'.$five.'" by '.$four.'@'.$three.' in '.$url. + ($start?', '.&mt('starting').' '.localtime($start):''). + ($end?', ending '.localtime($end):'').': '. + &Apache::lonnet::assigncustomrole( + $ENV{'form.ccdomain'},$ENV{'form.ccuname'},$url,$three,$four,$five,$end,$start). + '
'; + return $output; +} + +sub commit_standardrole { + my ($url,$three,$start,$end,$one,$two,$sec) = @_; + my $output; + my $logmsg; + if ($three eq 'st') { + my $result = &commit_studentrole(\$logmsg,$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( + $ENV{'form.ccdomain'},$ENV{'form.ccuname'}, + $url,$three,$end,$start). + '
'); + } + return $output; +} + +sub commit_studentrole { + my ($logmsg,$url,$three,$start,$end,$one,$two,$sec) = @_; + my $udom = $ENV{'form.ccdomain'}; + my $uname = $ENV{'form.ccuname'}; + 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; + } + $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 { @@ -941,11 +1398,11 @@ sub custom_role_editor { &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').' "'); # ------------------------------------------------- Get current role privileges ($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef); } else { - $r->print('New Role "'); + $r->print(&mt('New Role').' "'); $roledef=''; } $r->print($rolename.'"'); @@ -984,13 +1441,19 @@ sub custom_role_editor { } $full{$priv}=1; } + my %lt=&Apache::lonlocal::texthash( + 'prv' => "Privilege", + 'crl' => "Course 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($_).''. @@ -1005,7 +1468,7 @@ ENDCCF '
'); + '
'); } # ---------------------------------------------------------- Call to definerole @@ -1027,9 +1490,9 @@ sub set_custom_role { &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.'"'); @@ -1066,7 +1529,7 @@ sub set_custom_role { if ($ENV{'request.course.id'}) { my $url='/'.$ENV{'request.course.id'}; $url=~s/\_/\//g; - $r->print('
Assigning Role to Self: '. + $r->print('
'.&mt('Assigning Role to Self').': '. &Apache::lonnet::assigncustomrole($ENV{'user.domain'}, $ENV{'user.name'}, $url, @@ -1082,7 +1545,7 @@ sub handler { my $r = shift; if ($r->header_only) { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK; } @@ -1093,7 +1556,7 @@ sub handler { (&Apache::lonnet::allowed('cep',$ENV{'request.course.id'})) || (&Apache::lonnet::allowed('cca',$ENV{'request.role.domain'})) || (&Apache::lonnet::allowed('mau',$ENV{'request.role.domain'}))) { - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; unless ($ENV{'form.phase'}) { &print_username_entry_form($r); @@ -1117,11 +1580,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 Level", + 'act' => "Activate", + 'rol' => "Role", + 'ext' => "Extent", + 'grs' => "Group/Section", + 'sta' => "Start", + 'end' => "End" + ); foreach (sort( keys(%inccourses))) { my $thiscourse=$_; @@ -1129,10 +1605,13 @@ sub course_level_table { $thiscourse=~s:_:/:g; my %coursedata=&Apache::lonnet::coursedescription($thiscourse); my $area=$coursedata{'description'}; - if (!defined($area)) { $area='Unavailable course: '.$_; } + if (!defined($area)) { $area=&mt('Unavailable course').': '.$_; } my $bgcol=$thiscourse; $bgcol=~s/[^7-9a-e]//g; $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6); + my ($domain,$cnum)=split(/\//,$thiscourse); + my %sections_count = (); + my $num_sections = &Apache::loncommon::get_sections($domain,$cnum,\%sections_count); foreach ('st','ta','ep','ad','in','cc') { if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) { my $plrole=&Apache::lonnet::plaintext($_); @@ -1140,24 +1619,35 @@ sub course_level_table { - + ENDEXTENT if ($_ ne 'cc') { - $table .= < -ENDSECTION + if ($num_sections > 0) { + my $currsec = &course_sections($num_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"; } @@ -1167,18 +1657,35 @@ ENDTIMEENTRY my $plrole=$_; my $customrole=$protectedcourse.'_cr_cr_'.$ENV{'user.domain'}. '_'.$ENV{'user.name'}.'_'.$plrole; - $table .= < - +END + if ($num_sections > 0) { + my $currsec = &course_sections($num_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 } } @@ -1186,14 +1693,87 @@ 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 ($num_sections,$sections_count,$role) = @_; + my $output = ''; + my @sections = (sort {$a <=> $b} keys %{$sections_count}); + $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').''; + + my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,$dcdom); + my %lt=&Apache::lonlocal::texthash( + 'crl' => "Course Level", + 'crt' => "Course Title", + 'rol' => "Role", + 'grs' => "Group/Section", + 'exs' => "Existing sections", + 'new' => "Define new section", + 'sta' => "Start", + 'end' => "End", + 'ssd' => "Set Start Date", + 'sed' => "Set End Date" + ); + my $header = '

'.$lt{'crl'}.'

'. + ''; + my $otheritems = ''. + ''; + $otheritems .= < +$lt{'ssd'} + +ENDTIMEENTRY + $otheritems .= "
'.$courseform.''.$lt{'rol'}.''.$lt{'grs'}.''.$lt{'sta'}.''.$lt{'end'}.'
'. + ''. + ''. + ''. + ''. + '
'.$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