--- loncom/interface/loncreateuser.pm 2003/09/17 17:30:10 1.67
+++ loncom/interface/loncreateuser.pm 2004/01/15 03:18:19 1.76
@@ -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.76 2004/01/15 03:18:19 www 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;
@@ -123,13 +124,26 @@ 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');
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");
<html>
<head>
@@ -139,19 +153,19 @@ $selscript
$bodytag
<form action="/adm/createuser" method="post" name="crtuser">
<input type="hidden" name="phase" value="get_user_info">
-<h2>Set Individual User Roles</h2>
+<h2>$lt{siur}$helpsiur</h2>
<table>
-<tr><td>Username:</td><td><input type="text" size="15" name="ccuname">
+<tr><td>$lt{usr}:</td><td><input type="text" size="15" name="ccuname">
</td><td rowspan="2">$sellink</td></tr><tr><td>
-Domain:</td><td>$domform</td></tr>
+$lt{'dom'}:</td><td>$domform</td></tr>
</table>
-<input name="userrole" type="submit" value="User Roles" />
+<input name="userrole" type="submit" value="$lt{usrr}" />
</form>
<form action="/adm/createuser" method="post" name="docustom">
<input type="hidden" name="phase" value="selected_custom_edit">
-<h2>Edit Custom Role Privileges</h2>
-Name of Role: $choice <input type="text" size="15" name="newrolename" /><br />
-<input name="customeditor" type="submit" value="Custom Role Editor" />
+<h2>$lt{'ecrp'}$helpecpr</h2>
+$lt{'nr'}: $choice <input type="text" size="15" name="newrolename" /><br />
+<input name="customeditor" type="submit" value="$lt{'cre'}" />
</body>
</html>
ENDDOCUMENT
@@ -236,31 +250,44 @@ ENDFORMINFO
'<option value="default" selected>default</option>'."\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"
+ );
$r->print(<<ENDNEWUSER);
$dochead
-<h1>Create New User</h1>
+<h1>$lt{'cnu'}</h1>
$forminfo
-<h2>New user "$ccuname" in domain $ccdomain</h2>
+<h2>$lt{'nu'} "$ccuname" $lt{'id'} $ccdomain</h2>
<script type="text/javascript" language="Javascript">
$loginscript
</script>
<input type='hidden' name='makeuser' value='1' />
-<h3>Personal Data</h3>
+<h3>$lt{'pd'}</h3>
<p>
<table>
-<tr><td>First Name </td>
+<tr><td>$lt{'fn'} </td>
<td><input type='text' name='cfirst' size='15' /></td></tr>
-<tr><td>Middle Name </td>
+<tr><td>$lt{'mn'} </td>
<td><input type='text' name='cmiddle' size='15' /></td></tr>
-<tr><td>Last Name </td>
+<tr><td>$lt{'ln'} </td>
<td><input type='text' name='clast' size='15' /></td></tr>
-<tr><td>Generation </td>
+<tr><td>$lt{'gen'} </td>
<td><input type='text' name='cgen' size='5' /></td></tr>
</table>
-ID/Student Number <input type='text' name='cstid' size='15' /></p>
-Home Server: <select name="hserver" size="1"> $home_server_list </select>
+$lt{'idsn'} <input type='text' name='cstid' size='15' /></p>
+$lt{'hs'}: <select name="hserver" size="1"> $home_server_list </select>
<hr />
-<h3>Login Data</h3>
+<h3>$lt{'lg'}</h3>
<p>$generalrule </p>
<p>$authformkrb </p>
<p>$authformint </p>
@@ -268,11 +295,20 @@ Home Server: <select name="hserver" size
<p>$authformloc </p>
ENDNEWUSER
} else { # user already exists
+ my %lt=&Apache::lonlocal::texthash(
+ 'cup' => "Change User Privileges",
+ 'usr' => "User",
+ 'id' => "in domain",
+ 'fn' => "first name",
+ 'mn' => "middle name",
+ 'ln' => "last name",
+ 'gen' => "generation"
+ );
$r->print(<<ENDCHANGEUSER);
$dochead
-<h1>Change User Privileges</h1>
+<h1>$lt{'cup'}</h1>
$forminfo
-<h2>User "$ccuname" in domain "$ccdomain"</h2>
+<h2>$lt{'usr'} "$ccuname" $lt{'id'} "$ccdomain"</h2>
ENDCHANGEUSER
# Get the users information
my %userenv = &Apache::lonnet::get('environment',
@@ -283,7 +319,7 @@ ENDCHANGEUSER
<hr />
<table border="2">
<tr>
-<th>first name</th><th>middle name</th><th>last name</th><th>generation</th>
+<th>$lt{'fn'}</th><th>$lt{'mn'}</th><th>$lt{'ln'}</th><th>$lt{'gen'}</th>
</tr>
<tr>
END
@@ -296,7 +332,7 @@ END
$r->print('<td>'.$userenv{$_}.'</td>');
}
}
- $r->print(<<END);
+ $r->print(<<END);
</tr>
</table>
END
@@ -304,11 +340,20 @@ END
my ($tmp) = keys(%rolesdump);
unless ($tmp =~ /^(con_lost|error)/i) {
my $now=time;
+ my %lt=&Apache::lonlocal::texthash(
+ 'rer' => "Revoke Existing Roles",
+ 'rev' => "Revoke",
+ 'del' => "Delete",
+ 'rol' => "Role",
+ 'ext' => "Extent",
+ 'sta' => "Start",
+ 'end' => "End"
+ );
$r->print(<<END);
<hr />
-<h3>Revoke Existing Roles</h3>
+<h3>$lt{'rer'}</h3>
<table border=2>
-<tr><th>Revoke</th><th>Delete</th><th>Role</th><th>Extent</th><th>Start</th><th>End</th>
+<tr><th>$lt{'rev'}</th><th>$lt{'del'}</th><th>$lt{'rol'}</th><th>$lt{'ext'}</th><th>$lt{'sta'}</th><th>$lt{'end'}</th>
END
foreach my $area (sort { my $a1=join('_',(split('_',$a))[1,0]);
my $b1=join('_',(split('_',$b))[1,0]);
@@ -333,11 +378,11 @@ END
&Apache::lonnet::coursedescription($1.'_'.$2);
my $carea;
if (defined($coursedata{'description'})) {
- $carea='Course: '.$coursedata{'description'}.
- '<br />Domain: '.$coursedom.(' 'x8).
+ $carea=&mt('Course').': '.$coursedata{'description'}.
+ '<br />'.&mt('Domain').': '.$coursedom.(' 'x8).
&Apache::loncommon::syllabuswrapper('Syllabus',$coursedir,$coursedom);
} else {
- $carea='Unavailable course: '.$area;
+ $carea=&mt('Unavailable course').': '.$area;
}
$inccourses{$1.'_'.$2}=1;
if ((&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2)) ||
@@ -399,7 +444,7 @@ END
if ($active) {
$row.=' ';
} else {
- $row.='expired or revoked';
+ $row.=&mt('expired or revoked');
}
}
$row.='</td><td>';
@@ -442,15 +487,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(<<ENDBADAUTH);
<hr />
<script type="text/javascript" language="Javascript">
$loginscript
</script>
-<font color='#ff0000'>ERROR:</font>
-This user has an unrecognized authentication scheme ($currentauth).
-Please specify login data below.
-<h3>Login Data</h3>
+<font color='#ff0000'>$lt{'err'}:</font>
+$lt{'uuas'} ($currentauth). $lt{'sldb'}.
+<h3>$lt{'ld'}</h3>
<p>$generalrule</p>
<p>$authformkrb</p>
<p>$authformint</p>
@@ -460,14 +510,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(<<ENDBADAUTH);
<hr />
<script type="text/javascript" language="Javascript">
$loginscript
</script>
-<font color="#ff0000"> ERROR: </font>
-This user has an unrecognized authentication scheme ($currentauth).
-Please alert a domain coordinator of this situation.
+<font color="#ff0000"> $lt{'err'}: </font>
+$lt{'uuas'} ($currentauth). $lt{'adcs'}.
<hr />
ENDBADAUTH
}
@@ -497,22 +551,26 @@ ENDBADAUTH
$authformcurrent.=' <i>(will override current values)</i><br />';
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(<<ENDOTHERAUTHS);
<hr />
<script type="text/javascript" language="Javascript">
$loginscript
</script>
-<h3>Change Current Login Data</h3>
+<h3>$lt{'ccld'}</h3>
<p>$generalrule</p>
<p>$authformnop</p>
<p>$authformcurrent</p>
-<h3>Enter New Login Data</h3>
+<h3>$lt{'enld'}</h3>
$authform_other
ENDOTHERAUTHS
}
} ## End of "check for bad authentication type" logic
} ## End of new user/old user logic
- $r->print('<hr /><h3>Add Roles</h3>');
+ $r->print('<hr /><h3>'.&mt('Add Roles').'</h3>');
#
# Co-Author
#
@@ -521,20 +579,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(<<ENDCOAUTH);
-<h4>Construction Space</h4>
-<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>
-<th>Start</th><th>End</th></tr>
+<h4>$lt{'cs'}</h4>
+<table border=2><tr><th>$lt{'act'}</th><th>$lt{'rol'}</th><th>$lt{'ext'}</th>
+<th>$lt{'sta'}</th><th>$lt{'end'}</th></tr>
<tr>
<td><input type=checkbox name="act_$cudom\_$cuname\_ca"></td>
-<td>Co-Author</td>
+<td>$lt{'cau'}</td>
<td>$cudom\_$cuname</td>
<td><input type=hidden name="start_$cudom\_$cuname\_ca" value=''>
<a href=
-"javascript:pjump('date_start','Start Date Co-Author',document.cu.start_$cudom\_$cuname\_ca.value,'start_$cudom\_$cuname\_ca','cu.pres','dateset')">Set Start Date</a></td>
+"javascript:pjump('date_start','Start Date Co-Author',document.cu.start_$cudom\_$cuname\_ca.value,'start_$cudom\_$cuname\_ca','cu.pres','dateset')">$lt{'ssd'}</a></td>
<td><input type=hidden name="end_$cudom\_$cuname\_ca" value=''>
<a href=
-"javascript:pjump('date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset')">Set End Date</a></td>
+"javascript:pjump('date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset')">$lt{'sed'}</a></td>
</tr>
</table>
ENDCOAUTH
@@ -542,14 +611,18 @@ ENDCOAUTH
#
# Domain level
#
- $r->print('<h4>Domain Level</h4>'.
- '<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>'.
- '<th>Start</th><th>End</th></tr>');
+ $r->print('<h4>'.&mt('Domain Level').'</h4>'.
+ '<table border=2><tr><th>'.&mt('Activate').'</th><th>'.&mt('Role').'</th><th>'.&mt('Extent').'</th>'.
+ '<th>'.&mt('Start').'</th><th>'.&mt('End').'</th></tr>');
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($_);
+ my %lt=&Apache::lonlocal::texthash(
+ 'ssd' => "Set Start Date",
+ 'sed' => "Set End Date"
+ );
$r->print(<<ENDDROW);
<tr>
<td><input type=checkbox name="act_$thisdomain\_$_"></td>
@@ -557,10 +630,10 @@ ENDCOAUTH
<td>$thisdomain</td>
<td><input type=hidden name="start_$thisdomain\_$_" value=''>
<a href=
-"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$thisdomain\_$_.value,'start_$thisdomain\_$_','cu.pres','dateset')">Set Start Date</a></td>
+"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$thisdomain\_$_.value,'start_$thisdomain\_$_','cu.pres','dateset')">$lt{'ssd'}</a></td>
<td><input type=hidden name="end_$thisdomain\_$_" value=''>
<a href=
-"javascript:pjump('date_end','End Date $plrole',document.cu.end_$thisdomain\_$_.value,'end_$thisdomain\_$_','cu.pres','dateset')">Set End Date</a></td>
+"javascript:pjump('date_end','End Date $plrole',document.cu.end_$thisdomain\_$_.value,'end_$thisdomain\_$_','cu.pres','dateset')">$lt{'sed'}</a></td>
</tr>
ENDDROW
}
@@ -571,7 +644,7 @@ ENDDROW
# Course level
#
$r->print(&course_level_table(%inccourses));
- $r->print("<hr /><input type=submit value=\"Modify User\">\n");
+ $r->print("<hr /><input type=submit value=\"".&mt('Modify User')."\">\n");
$r->print("</form></body></html>");
}
@@ -581,7 +654,7 @@ sub update_user_data {
my $uhome=&Apache::lonnet::homeserver($ENV{'form.ccuname'},
$ENV{'form.ccdomain'});
# Error messages
- my $error = '<font color="#ff0000">Error:</font>';
+ my $error = '<font color="#ff0000">'.&mt('Error').':</font>';
my $end = '</body></html>';
# Print header
$r->print(<<ENDTHREEHEAD);
@@ -599,30 +672,30 @@ ENDTHREEHEAD
$r->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 +724,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(<<ENDNEWUSERHEAD);
-<h3>Creating user "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h2>
+<h3>$lt{'cru'} "$ENV{'form.ccuname'}" $lt{'id'} "$ENV{'form.ccdomain'}"</h3>
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 +749,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;
}
}
@@ -686,13 +763,17 @@ ENDNEWUSERHEAD
$r->print('Generating user: '.$result);
my $home = &Apache::lonnet::homeserver($ENV{'form.ccuname'},
$ENV{'form.ccdomain'});
- $r->print('<br>Home server: '.$home.' '.
+ $r->print('<br />'&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(<<ENDMODIFYUSERHEAD);
-<h2>User "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h2>
+<h2>$lt{'usr'} "$ENV{'form.ccuname'}" $lt{'id'} "$ENV{'form.ccdomain'}"</h2>
ENDMODIFYUSERHEAD
if (! $amode || ! $genpwd) {
$r->print($error.'Invalid login mode or password'.$end);
@@ -704,12 +785,11 @@ ENDMODIFYUSERHEAD
&Apache::lonnet::modifyuserauth(
$ENV{'form.ccdomain'},$ENV{'form.ccuname'},
$amode,$genpwd));
- $r->print('<br>Home server: '.&Apache::lonnet::homeserver
+ $r->print('<br>'.&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 +823,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");
<table border="2">
-<caption>User Information Changed</caption>
+<caption>$lt{'uic'}</caption>
<tr><th> </th>
- <th>first</th>
- <th>middle</th>
- <th>last</th>
- <th>generation</th></tr>
-<tr><td>Previous</td>
+ <th>$lt{'frst'}</th>
+ <th>$lt{'mddl'}</th>
+ <th>$lt{'lst'}</th>
+ <th>$lt{'gen'}</th></tr>
+<tr><td>$lt{'prvs'}</td>
<td>$userenv{'firstname'} </td>
<td>$userenv{'middlename'} </td>
<td>$userenv{'lastname'} </td>
<td>$userenv{'generation'} </td></tr>
-<tr><td>Changed To</td>
+<tr><td>$lt{'chto'}</td>
<td>$ENV{'form.cfirstname'} </td>
<td>$ENV{'form.cmiddlename'} </td>
<td>$ENV{'form.clastname'} </td>
@@ -764,36 +853,41 @@ ENDMODIFYUSERHEAD
</table>
END
} else { # error occurred
- $r->print("<h2>Unable to successfully change environment for ".
- $ENV{'form.ccuname'}." in domain ".
+ $r->print("<h2>".&mt('Unable to successfully change environment for')." ".
+ $ENV{'form.ccuname'}." ".&mt('in domain')." ".
$ENV{'form.ccdomain'}."</h2>");
}
} 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");
-<h2>User "$ENV{'form.ccuname'}" in domain "$ENV{'form.ccdomain'}"</h2>
+<h2>$lt{'usr'} "$ENV{'form.ccuname'}" $lt{'id'} "$ENV{'form.ccdomain'}"</h2>
<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} </h4>
-<h4>Generation: $userenv{'generation'}</h4>
+<h4>$lt{'gen'}: $userenv{'generation'}</h4>
END
}
}
##
my $now=time;
- $r->print('<h3>Modifying Roles</h3>');
+ $r->print('<h3>'.&mt('Modifying Roles').'</h3>');
foreach (keys (%ENV)) {
next if (! $ENV{$_});
# Revoke roles
if ($_=~/^form\.rev/) {
if ($_=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {
# Revoke standard role
- $r->print('Revoking '.$2.' in '.$1.': <b>'.
+ $r->print(&mt('Revoking').' '.$2.' in '.$1.': <b>'.
&Apache::lonnet::revokerole($ENV{'form.ccdomain'},
$ENV{'form.ccuname'},$1,$2).'</b><br>');
if ($2 eq 'st') {
$1=~/^\/(\w+)\/(\w+)/;
my $cid=$1.'_'.$2;
- $r->print('Drop from classlist: <b>'.
+ $r->print(&mt('Drop from classlist').': <b>'.
&Apache::lonnet::critical('put:'.
$ENV{'course.'.$cid.'.domain'}.':'.
$ENV{'course.'.$cid.'.num'}.':classlist:'.
@@ -805,21 +899,21 @@ END
}
if ($_=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
# Revoke custom role
- $r->print(
- 'Revoking custom role '.$4.' by '.$3.'@'.$2.' in '.$1.': <b>'.
-&Apache::lonnet::revokecustomrole($ENV{'form.ccdomain'},
+ $r->print(&mt('Revoking custom role').
+ ' '.$4.' by '.$3.'@'.$2.' in '.$1.': <b>'.
+ &Apache::lonnet::revokecustomrole($ENV{'form.ccdomain'},
$ENV{'form.ccuname'},$1,$2,$3,$4).
'</b><br>');
}
} 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).'<br>');
if ($2 eq 'st') {
$1=~/^\/(\w+)\/(\w+)/;
my $cid=$1.'_'.$2;
- $r->print('Drop from classlist: <b>'.
+ $r->print(&mt('Drop from classlist').': <b>'.
&Apache::lonnet::critical('put:'.
$ENV{'course.'.$cid.'.domain'}.':'.
$ENV{'course.'.$cid.'.num'}.':classlist:'.
@@ -846,8 +940,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):'').': <b>'.
&Apache::lonnet::assigncustomrole(
$ENV{'form.ccdomain'},$ENV{'form.ccuname'},$url,$3,$4,$5,$end,$start).
@@ -867,9 +961,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):'').': <b>'.
+ $r->print(&mt('Assigning').' '.$3.' in '.$url.
+ ($start?', '.&mt('starting').' '.localtime($start):'').
+ ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
&Apache::lonnet::assignrole(
$ENV{'form.ccdomain'},$ENV{'form.ccuname'},
$url,$3,$end,$start).
@@ -878,7 +972,7 @@ END
if ($3 eq 'st') {
$url=~/^\/(\w+)\/(\w+)/;
my $cid=$1.'_'.$2;
- $r->print('Add to classlist: <b>'.
+ $r->print(&mt('Add to classlist').': <b>'.
&Apache::lonnet::critical(
'put:'.$ENV{'course.'.$cid.'.domain'}.':'.
$ENV{'course.'.$cid.'.num'}.':classlist:'.
@@ -900,18 +994,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):'').': <b>'.
+ $r->print(&mt('Assigning').' '.$2.' in '.$url.': '.
+ ($start?', '.&mt('starting').' '.localtime($start):'').
+ ($end?', '.&mt('ending').' '.localtime($end):'').': <b>'.
&Apache::lonnet::assignrole(
$ENV{'form.ccdomain'},$ENV{'form.ccuname'},
$url,$2,$end,$start)
.'</b><br>');
} else {
- $r->print('<p>ERROR: Unknown command <tt>'.$_.'</tt></p><br>');
+ $r->print('<p>'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$_.'</tt></p><br>');
}
}
} # End of foreach (keys(%ENV))
+# Flush the course logs so reverse user roles immediately updated
+ &Apache::lonnet::flushcourselogs();
$r->print('</body></html>');
}
@@ -941,11 +1037,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.'"</h2>');
@@ -984,13 +1080,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);
<form method="post">
<input type="hidden" name="phase" value="set_custom_roles" />
<input type="hidden" name="rolename" value="$rolename" />
<table border="2">
-<tr><th>Privilege</th><th>Course Level</th><th>Domain Level</th>
-<th>System Level</th></tr>
+<tr><th>$lt{'prv'}</th><th>$lt{'crl'}</th><th>$lt{'dml'}</th>
+<th>$lt{'ssl'}</th></tr>
ENDCCF
foreach (sort keys %full) {
$r->print('<tr><td>'.&Apache::lonnet::plaintext($_).'</td><td>'.
@@ -1005,7 +1107,7 @@ ENDCCF
'</td></tr>');
}
$r->print(
- '<table><input type="submit" value="Define Role" /></form></body></html>');
+ '<table><input type="submit" value="'.&mt('Define Role').'" /></form></body></html>');
}
# ---------------------------------------------------------- Call to definerole
@@ -1027,9 +1129,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.'"</h2>');
@@ -1066,7 +1168,7 @@ sub set_custom_role {
if ($ENV{'request.course.id'}) {
my $url='/'.$ENV{'request.course.id'};
$url=~s/\_/\//g;
- $r->print('<br />Assigning Role to Self: '.
+ $r->print('<br />'.&mt('Assigning Role to Self').': '.
&Apache::lonnet::assigncustomrole($ENV{'user.domain'},
$ENV{'user.name'},
$url,
@@ -1082,7 +1184,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 +1195,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);
@@ -1129,7 +1231,7 @@ 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);
@@ -1151,13 +1253,17 @@ ENDSECTION
<td> </td>
ENDSECTION
}
+ my %lt=&Apache::lonlocal::texthash(
+ 'ssd' => "Set Start Date",
+ 'sed' => "Set End Date"
+ );
$table .= <<ENDTIMEENTRY;
<td><input type=hidden name="start_$protectedcourse\_$_" value=''>
<a href=
-"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$_.value,'start_$protectedcourse\_$_','cu.pres','dateset')">Set Start Date</a></td>
+"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$_.value,'start_$protectedcourse\_$_','cu.pres','dateset')">$lt{'ssd'}</a></td>
<td><input type=hidden name="end_$protectedcourse\_$_" value=''>
<a href=
-"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$_.value,'end_$protectedcourse\_$_','cu.pres','dateset')">Set End Date</a></td>
+"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$_.value,'end_$protectedcourse\_$_','cu.pres','dateset')">$lt{'sed'}</a></td>
ENDTIMEENTRY
$table.= "</tr>\n";
}
@@ -1167,6 +1273,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 .= <<ENDENTRY;
<tr bgcolor="#$bgcol">
<td><input type="checkbox" name="act_$customrole"></td>
@@ -1175,20 +1285,29 @@ ENDTIMEENTRY
<td><input type="text" size="5" name="sec_$customrole"></td>
<td><input type=hidden name="start_$customrole" value=''>
<a href=
-"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$customrole.value,'start_$customrole','cu.pres','dateset')">Set Start Date</a></td>
+"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$customrole.value,'start_$customrole','cu.pres','dateset')">$lt{'ssd'}</a></td>
<td><input type=hidden name="end_$customrole" value=''>
<a href=
-"javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">Set End Date</a></td></tr>
+"javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">$lt{'sed'}</a></td></tr>
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 = <<ENDTABLE;
-<h4>Course Level</h4>
-<table border=2><tr><th>Activate</th><th>Role</th><th>Extent</th>
-<th>Group/Section</th><th>Start</th><th>End</th></tr>
+<h4>$lt{'crl'}</h4>
+<table border=2><tr><th>$lt{'act'}</th><th>$lt{'rol'}</th><th>$lt{'ext'}</th>
+<th>$lt{'grs'}</th><th>$lt{'sta'}</th><th>$lt{'end'}</th></tr>
$table
</table>
ENDTABLE