--- loncom/interface/loncreateuser.pm 2003/12/10 20:38:09 1.72 +++ loncom/interface/loncreateuser.pm 2004/04/15 22:35:51 1.81 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.72 2003/12/10 20:38:09 sakharuk Exp $ +# $Id: loncreateuser.pm,v 1.81 2004/04/15 22:35:51 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -124,7 +124,9 @@ sub print_username_entry_form { 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'); + 'Create Users, Change User Privileges'). + &Apache::loncommon::help_open_faq(282). + &Apache::loncommon::help_open_bug('Instructor Interface'); my $selscript=&Apache::loncommon::studentbrowser_javascript(); my $sellink=&Apache::loncommon::selectstudent_link ('crtuser','ccuname','ccdomain'); @@ -140,6 +142,8 @@ sub print_username_entry_form { '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"); @@ -149,7 +153,7 @@ $selscript $bodytag
-

$lt{siur}

+

$lt{siur}$helpsiur

-

$lt{'ecrp'}

+

$lt{'ecrp'}$helpecpr

$lt{'nr'}: $choice
@@ -246,7 +250,7 @@ ENDFORMINFO ''."\n". &Apache::loncommon::home_server_option_list($ccdomain); - my %lt=&Apache::lonlocal::texthash( + my %lt=&Apache::lonlocal::texthash( 'cnu' => "Create New User", 'nu' => "New User", 'id' => "in domain", @@ -259,6 +263,7 @@ ENDFORMINFO 'hs' => "Home Server", 'lg' => "Login Data" ); + my $genhelp=&Apache::loncommon::help_open_topic('Generation'); $r->print(<$lt{'cnu'} @@ -277,11 +282,11 @@ $loginscript - +
$lt{usr}: $sellink
@@ -159,7 +163,7 @@ $lt{'dom'}:$domform
$lt{'ln'}
$lt{'gen'}
$lt{'gen'}$genhelp
$lt{'idsn'}

-${'hs'}: +$lt{'hs'}:

$lt{'lg'}

$generalrule

@@ -291,7 +296,7 @@ ${'hs'}: '; + } else { + $row.=' '; + } + $row.=''; if ($delallowed) { $row.= ''; } else { @@ -463,8 +492,24 @@ END ''.($role_end_time ?localtime($role_end_time) : ' ' ) ."\n"; - $r->print($row); + $sortrole{$sortkey}=$envkey; + $roletext{$envkey}=$row; + $roleclass{$envkey}=$class; + #$r->print($row); } # end of foreach (table building loop) + foreach my $type ('Construction Space','Course','Domain','System','Unknown') { + my $output; + foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { + if ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/) { + $output.=$roletext{$sortrole{$which}}; + } + } + if (defined($output)) { + $r->print("". + "".&mt($type).""); + } + $r->print($output); + } $r->print(''); } # End of unless my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); @@ -483,15 +528,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

@@ -501,14 +551,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 } @@ -538,16 +592,20 @@ 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 } @@ -568,23 +626,23 @@ ENDOTHERAUTHS 'rol' => "Role", 'ext' => "Extent", 'sta' => "Start", - 'end' => "End". + 'end' => "End", 'cau' => "Co-Author", 'ssd' => "Set Start Date", 'sed' => "Set End Date" ); $r->print(<$lt{'cs'} - +
${'act'}${'rol'}${'ext'}
- + - - @@ -595,8 +653,8 @@ ENDCOAUTH # Domain level # $r->print('

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

'. - '
$lt{'act'}$lt{'rol'}$lt{'ext'} $lt{'sta'}$lt{'end'}
$lt{'cau'} $cudom\_$cuname + $lt{'ssd'} + $lt{'sed'}
'. - ''); + '
ActivateRoleExtentStartEnd
'. + ''); foreach ( sort( keys(%incdomains))) { my $thisdomain=$_; foreach ('dc','li','dg','au','sc') { @@ -637,7 +695,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; } @@ -707,17 +765,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 @@ -728,7 +790,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; } } @@ -739,16 +801,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); @@ -760,12 +826,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').'.'); } } ## @@ -799,20 +864,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");
'.&mt('Activate').''.&mt('Role').''.&mt('Extent').''.&mt('Start').''.&mt('End').'
- + - - - - - + + + + + - + @@ -820,36 +894,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:'. @@ -861,21 +940,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:'. @@ -885,6 +964,27 @@ END $ENV{'course.'.$cid.'.home'}).'
'); } } + } elsif ($_=~/^form\.ren/) { + if ($_=~/^form\.ren\:([^\_]+)\_([^\_]+)$/) { + my $result=&Apache::lonnet::assignrole($ENV{'form.ccdomain'}, + $ENV{'form.ccuname'},$1,$2,0,$now); + $r->print(&mt('Re-Enabling [_1] in [_2]: [_3]', + $2,$1,$result).'
'); + if ($2 eq 'st') { + $1=~/^\/(\w+)\/(\w+)/; + my $cid=$1.'_'.$2; + $r->print(&mt('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(':'.$now), + $ENV{'course.'.$cid.'.home'}) + .'
'); + } + } } elsif ($_=~/^form\.act/) { if ($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_cr_cr_([^\_]+)_(\w+)_([^\_]+)$/) { @@ -902,8 +1002,8 @@ END $ENV{'form.end_'.$full} : 0 ); - $r->print('Assigning custom role "'.$5.'" by '.$4.'@'.$3.' in '.$url. - ($start?', starting '.localtime($start):''). + $r->print(&mt('Assigning custom role').' "'.$5.'" by '.$4.'@'.$3.' in '.$url. + ($start?', '.&mt('starting').' '.localtime($start):''). ($end?', ending '.localtime($end):'').': '. &Apache::lonnet::assigncustomrole( $ENV{'form.ccdomain'},$ENV{'form.ccuname'},$url,$3,$4,$5,$end,$start). @@ -923,9 +1023,9 @@ END $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):'').': '. + $r->print(&mt('Assigning').' '.$3.' in '.$url. + ($start?', '.&mt('starting').' '.localtime($start):''). + ($end?', '.&mt('ending').' '.localtime($end):'').': '. &Apache::lonnet::assignrole( $ENV{'form.ccdomain'},$ENV{'form.ccuname'}, $url,$3,$end,$start). @@ -934,7 +1034,7 @@ END if ($3 eq 'st') { $url=~/^\/(\w+)\/(\w+)/; my $cid=$1.'_'.$2; - $r->print('Add to classlist: '. + $r->print(&mt('Add to classlist').': '. &Apache::lonnet::critical( 'put:'.$ENV{'course.'.$cid.'.domain'}.':'. $ENV{'course.'.$cid.'.num'}.':classlist:'. @@ -956,18 +1056,20 @@ END 0 ); my $url='/'.$1.'/'; # 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(''); } @@ -997,11 +1099,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.'"'); @@ -1040,14 +1142,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($_).''. @@ -1062,7 +1169,7 @@ ENDCCF '
'); + '
'); } # ---------------------------------------------------------- Call to definerole @@ -1084,9 +1191,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.'"'); @@ -1123,7 +1230,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, @@ -1208,13 +1315,17 @@ ENDSECTION ENDSECTION } + my %lt=&Apache::lonlocal::texthash( + 'ssd' => "Set Start Date", + 'sed' => "Set End Date" + ); $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"; } @@ -1224,6 +1335,10 @@ ENDTIMEENTRY my $plrole=$_; my $customrole=$protectedcourse.'_cr_cr_'.$ENV{'user.domain'}. '_'.$ENV{'user.name'}.'_'.$plrole; + my %lt=&Apache::lonlocal::texthash( + 'ssd' => "Set Start Date", + 'sed' => "Set End Date" + ); $table .= < @@ -1232,20 +1347,29 @@ ENDTIMEENTRY +"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 } } } return '' if ($table eq ''); # return nothing if there is nothing # in the table + my %lt=&Apache::lonlocal::texthash( + 'crl' => "Course Level", + 'act' => "Activate", + 'rol' => "Role", + 'ext' => "Extent", + 'grs' => "Group/Section", + 'sta' => "Start", + 'end' => "End" + ); my $result = <Course Level -
  Set End Date
Set Start Date Set End Date
- +

$lt{'crl'}

+
ActivateRoleExtentGroup/SectionStartEnd
+ $table
$lt{'act'}$lt{'rol'}$lt{'ext'}$lt{'grs'}$lt{'sta'}$lt{'end'}
ENDTABLE