[LON-CAPA-cvs] cvs: loncom /interface loncreateuser.pm
raeburn
lon-capa-cvs@mail.lon-capa.org
Wed, 22 Nov 2006 16:06:31 -0000
This is a MIME encoded message
--raeburn1164211591
Content-Type: text/plain
raeburn Wed Nov 22 11:06:31 2006 EDT
Modified files:
/loncom/interface loncreateuser.pm
Log:
Eliminate $_
Replace tables with Apache::loncommon::data_tables (not complete yet).
--raeburn1164211591
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20061122110631.txt"
Index: loncom/interface/loncreateuser.pm
diff -u loncom/interface/loncreateuser.pm:1.134 loncom/interface/loncreateuser.pm:1.135
--- loncom/interface/loncreateuser.pm:1.134 Tue Nov 21 16:38:44 2006
+++ loncom/interface/loncreateuser.pm Wed Nov 22 11:06:28 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.134 2006/11/21 21:38:44 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.135 2006/11/22 16:06:28 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -99,8 +99,8 @@
sub my_custom_roles {
my %returnhash=();
my %rolehash=&Apache::lonnet::dump('roles');
- foreach (keys %rolehash) {
- if ($_=~/^rolesdef\_(\w+)$/) {
+ foreach my $key (keys %rolehash) {
+ if ($key=~/^rolesdef\_(\w+)$/) {
$returnhash{$1}=$1;
}
}
@@ -489,11 +489,11 @@
my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
my %incdomains;
my %inccourses;
- foreach (values(%Apache::lonnet::hostdom)) {
- $incdomains{$_}=1;
+ foreach my $item (values(%Apache::lonnet::hostdom)) {
+ $incdomains{$item}=1;
}
- foreach (keys(%env)) {
- if ($_=~/^user\.priv\.cm\.\/(\w+)\/(\w+)/) {
+ foreach my $key (keys(%env)) {
+ if ($key=~/^user\.priv\.cm\.\/(\w+)\/(\w+)/) {
$inccourses{$1.'_'.$2}=1;
}
}
@@ -576,27 +576,24 @@
['firstname','middlename','lastname','generation',
'portfolioquota'],$ccdomain,$ccuname);
my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname);
- $r->print(<<END);
-<hr />
-<table border="2">
-<tr>
-<th>$lt{'fn'}</th><th>$lt{'mn'}</th><th>$lt{'ln'}</th><th>$lt{'gen'}</th>
-</tr>
-<tr>
-END
- foreach ('firstname','middlename','lastname','generation') {
+ $r->print('
+<hr />'.
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+'<th>'.$lt{'fn'}.'</th><th>'.$lt{'mn'}.'</th><th>'.$lt{'ln'}.'</th><th>'.$lt{'gen'}.'</th>'.
+ &Apache::loncommon::end_data_table_header_row().
+ &Apache::loncommon::start_data_table_row());
+ foreach my $item ('firstname','middlename','lastname','generation') {
if (&Apache::lonnet::allowed('mau',$ccdomain)) {
- $r->print(<<"END");
-<td><input type="text" name="c$_" value="$userenv{$_}" size="15" /></td>
+ $r->print(<<"END");
+<td><input type="text" name="c$item" value="$userenv{$item}" size="15" /></td>
END
} else {
- $r->print('<td>'.$userenv{$_}.'</td>');
+ $r->print('<td>'.$userenv{$item}.'</td>');
}
}
- $r->print(<<END);
-</tr>
-</table>
-END
+ $r->print(&Apache::loncommon::end_data_table_row().
+ &Apache::loncommon::end_data_table());
# Build up table of user roles to allow revocation of a role.
my ($tmp) = keys(%rolesdump);
unless ($tmp =~ /^(con_lost|error)/i) {
@@ -923,34 +920,38 @@
'ssd' => "Set Start Date",
'sed' => "Set End Date"
);
- $r->print(<<ENDCOAUTH);
-<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>$lt{'cau'}</td>
-<td>$cudom\_$cuname</td>
-<td><input type=hidden name="start_$cudom\_$cuname\_ca" value='' />
+ $r->print('<h4>'.$lt{'cs'}.'</h4>'."\n".
+ &Apache::loncommon::start_data_table()."\n".
+ &Apache::loncommon::start_data_table_header_row()."\n".
+ '<th>'.$lt{'act'}.'</th><th>'.$lt{'rol'}.'</th>'.
+ '<th>'.$lt{'ext'}.'</th><th>'.$lt{'sta'}.'</th>'.
+ '<th>'.$lt{'end'}.'</th>'."\n".
+ &Apache::loncommon::end_data_table_header_row()."\n".
+ &Apache::loncommon::start_data_table_row()."\n".
+ '<td>
+ <input type=checkbox name="act_'.$cudom.'_'.$cuname.'_ca" />
+ </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'".')">'.$lt{'ssd'}.'</a></td>
+<td><input type=hidden name="end_'.$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')">$lt{'ssd'}</a></td>
-<td><input type=hidden name="end_$cudom\_$cuname\_ca" value='' />
+"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>'."\n".
+ &Apache::loncommon::end_data_table_row()."\n".
+ &Apache::loncommon::start_data_table_row()."\n".
+'<td><input type=checkbox name="act_'.$cudom.'_'.$cuname.'_aa" /></td>
+<td>'.$lt{'caa'}.'</td>
+<td>'.$cudom.'_'.$cuname.'</td>
+<td><input type=hidden name="start_'.$cudom.'_'.$cuname.'_aa" 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')">$lt{'sed'}</a></td>
-</tr>
-<tr>
-<td><input type=checkbox name="act_$cudom\_$cuname\_aa" /></td>
-<td>$lt{'caa'}</td>
-<td>$cudom\_$cuname</td>
-<td><input type=hidden name="start_$cudom\_$cuname\_aa" value='' />
-<a href=
-"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'}</a></td>
-<td><input type=hidden name="end_$cudom\_$cuname\_aa" value='' />
+"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'}.'</a></td>
+<td><input type=hidden name="end_'.$cudom.'_'.$cuname.'_aa" value="" />
<a href=
-"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'}</a></td>
-</tr>
-</table>
-ENDCOAUTH
+"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'}.'</a></td>'."\n".
+ &Apache::loncommon::end_data_table_row()."\n".
+ &Apache::loncommon::end_data_table());
}
#
# Domain level
@@ -958,35 +959,37 @@
my $num_domain_level = 0;
my $domaintext =
'<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','sc') {
- if (&Apache::lonnet::allowed('c'.$_,$thisdomain)) {
- my $plrole=&Apache::lonnet::plaintext($_);
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '<th>'.&mt('Activate').'</th><th>'.&mt('Role').'</th><th>'.
+ &mt('Extent').'</th>'.
+ '<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'.
+ &Apache::loncommon::end_data_table_header_row();
+ foreach my $thisdomain ( sort( keys(%incdomains))) {
+ foreach my $role ('dc','li','dg','au','sc') {
+ if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) {
+ my $plrole=&Apache::lonnet::plaintext($role);
my %lt=&Apache::lonlocal::texthash(
'ssd' => "Set Start Date",
'sed' => "Set End Date"
);
$num_domain_level ++;
- $domaintext .= <<"ENDDROW";
-<tr>
-<td><input type=checkbox name="act_$thisdomain\_$_"></td>
-<td>$plrole</td>
-<td>$thisdomain</td>
-<td><input type=hidden name="start_$thisdomain\_$_" value=''>
+ $domaintext .=
+&Apache::loncommon::start_data_table_row().
+'<td><input type=checkbox name="act_'.$thisdomain.'_'.$role.'"></td>
+<td>'.$plrole.'</td>
+<td>'.$thisdomain.'</td>
+<td><input type=hidden name="start_'.$thisdomain.'_'.$role.'" value="">
<a href=
-"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=''>
+"javascript:pjump('."'date_start','Start Date $plrole',document.cu.start_$thisdomain\_$role.value,'start_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'ssd'}.'</a></td>
+<td><input type=hidden name="end_'.$thisdomain.'_'.$role.'" value="">
<a href=
-"javascript:pjump('date_end','End Date $plrole',document.cu.end_$thisdomain\_$_.value,'end_$thisdomain\_$_','cu.pres','dateset')">$lt{'sed'}</a></td>
-</tr>
-ENDDROW
+"javascript:pjump('."'date_end','End Date $plrole',document.cu.end_$thisdomain\_$role.value,'end_$thisdomain\_$role','cu.pres','dateset'".')">'.$lt{'sed'}.'</a></td>'.
+&Apache::loncommon::end_data_table_row();
}
}
}
- $domaintext.='</table>';
+ $domaintext.= &Apache::loncommon::end_data_table();
if ($num_domain_level > 0) {
$r->print($domaintext);
}
@@ -1154,9 +1157,9 @@
%userenv = ();
}
# Check to see if we need to change user information
- foreach ('firstname','middlename','lastname','generation') {
+ foreach my $item ('firstname','middlename','lastname','generation') {
# Strip leading and trailing whitespace
- $env{'form.c'.$_} =~ s/(\s+$|^\s+)//g;
+ $env{'form.c'.$item} =~ s/(\s+$|^\s+)//g;
}
my ($quotachanged,$namechanged,$oldportfolioquota);
my %changeHash;
@@ -1261,11 +1264,11 @@
##
my $now=time;
$r->print('<h3>'.&mt('Modifying Roles').'</h3>');
- foreach (keys (%env)) {
- next if (! $env{$_});
+ foreach my $key (keys (%env)) {
+ next if (! $env{$key});
# Revoke roles
- if ($_=~/^form\.rev/) {
- if ($_=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {
+ if ($key=~/^form\.rev/) {
+ if ($key=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {
# Revoke standard role
$r->print(&mt('Revoking').' '.$2.' in '.$1.': <b>'.
&Apache::lonnet::revokerole($env{'form.ccdomain'},
@@ -1283,7 +1286,7 @@
$env{'course.'.$cid.'.home'}).'</b><br />');
}
}
- if ($_=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
+ if ($key=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
# Revoke custom role
$r->print(&mt('Revoking custom role:').
' '.$4.' by '.$3.'@'.$2.' in '.$1.': <b>'.
@@ -1291,8 +1294,8 @@
$env{'form.ccuname'},$1,$2,$3,$4).
'</b><br />');
}
- } elsif ($_=~/^form\.del/) {
- if ($_=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {
+ } elsif ($key=~/^form\.del/) {
+ if ($key=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {
# Delete standard role
$r->print(&mt('Deleting').' '.$2.' in '.$1.': '.
&Apache::lonnet::assignrole($env{'form.ccdomain'},
@@ -1310,7 +1313,7 @@
$env{'course.'.$cid.'.home'}).'</b><br />');
}
}
- if ($_=~/^form\.del\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
+ if ($key=~/^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]',
@@ -1319,11 +1322,11 @@
$env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
0,1).'</b><br />');
}
- } elsif ($_=~/^form\.ren/) {
+ } elsif ($key=~/^form\.ren/) {
my $udom = $env{'form.ccdomain'};
my $uname = $env{'form.ccuname'};
# Re-enable standard role
- if ($_=~/^form\.ren\:([^\_]+)\_([^\_\.]+)$/) {
+ if ($key=~/^form\.ren\:([^\_]+)\_([^\_\.]+)$/) {
my $url = $1;
my $role = $2;
my $logmsg;
@@ -1349,7 +1352,7 @@
$r->print($output);
}
# Re-enable custom role
- if ($_=~/^form\.ren\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
+ if ($key=~/^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'},
@@ -1357,10 +1360,10 @@
$r->print(&mt('Re-enabling custom role [_1] by [_2]@[_3] in [_4] : <b>[_5]</b>',
$rolename,$rnam,$rdom,$url,$result).'<br />');
}
- } elsif ($_=~/^form\.act/) {
+ } elsif ($key=~/^form\.act/) {
my $udom = $env{'form.ccdomain'};
my $uname = $env{'form.ccuname'};
- if ($_=~/^form\.act\_([^\_]+)\_([^\_]+)\_cr_cr_([^\_]+)_(\w+)_([^\_]+)$/) {
+ if ($key=~/^form\.act\_([^\_]+)\_([^\_]+)\_cr_cr_([^\_]+)_(\w+)_([^\_]+)$/) {
# Activate a custom role
my ($one,$two,$three,$four,$five)=($1,$2,$3,$4,$5);
my $url='/'.$one.'/'.$two;
@@ -1391,7 +1394,7 @@
$r->print(&Apache::loncommon::commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end));
}
}
- } elsif ($_=~/^form\.act\_([^\_]+)\_(\w+)\_([^\_]+)$/) {
+ } elsif ($key=~/^form\.act\_([^\_]+)\_(\w+)\_([^\_]+)$/) {
# Activate roles for sections with 3 id numbers
# set start, end times, and the url for the class
my ($one,$two,$three)=($1,$2,$3);
@@ -1430,7 +1433,7 @@
$r->print(&Apache::loncommon::commit_standardrole($udom,$uname,$url,$three,$start,$end,$one,$two,''));
}
}
- } elsif ($_=~/^form\.act\_([^\_]+)\_([^\_]+)$/) {
+ } elsif ($key=~/^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} ?
@@ -1460,7 +1463,7 @@
}
}
} else {
- $r->print('<p>'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$_.'</tt></p><br />');
+ $r->print('<p>'.&mt('ERROR').': '.&mt('Unknown command').' <tt>'.$key.'</tt></p><br />');
}
foreach my $key (sort(keys(%disallowed))) {
if (($key eq 'none') || ($key eq 'all')) {
@@ -1549,8 +1552,8 @@
my %full=();
my %courselevel=();
my %courselevelcurrent=();
- foreach (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
- my ($priv,$restrict)=split(/\&/,$_);
+ foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
+ my ($priv,$restrict)=split(/\&/,$item);
unless ($restrict) { $restrict='F'; }
$courselevel{$priv}=$restrict;
if ($coursepriv=~/\:$priv/) {
@@ -1560,8 +1563,8 @@
}
my %domainlevel=();
my %domainlevelcurrent=();
- foreach (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
- my ($priv,$restrict)=split(/\&/,$_);
+ foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
+ my ($priv,$restrict)=split(/\&/,$item);
unless ($restrict) { $restrict='F'; }
$domainlevel{$priv}=$restrict;
if ($dompriv=~/\:$priv/) {
@@ -1571,8 +1574,8 @@
}
my %systemlevel=();
my %systemlevelcurrent=();
- foreach (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
- my ($priv,$restrict)=split(/\&/,$_);
+ foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
+ my ($priv,$restrict)=split(/\&/,$item);
unless ($restrict) { $restrict='F'; }
$systemlevel{$priv}=$restrict;
if ($syspriv=~/\:$priv/) {
@@ -1590,13 +1593,16 @@
<form method="post">
<input type="hidden" name="phase" value="set_custom_roles" />
<input type="hidden" name="rolename" value="$rolename" />
-<table border="2">
-<tr><th>$lt{'prv'}</th><th>$lt{'crl'}</th><th>$lt{'dml'}</th>
-<th>$lt{'ssl'}</th></tr>
ENDCCF
+ $r->print(&Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+'<th>'.$lt{'prv'}.'</th><th>'.$lt{'crl'}.'</th><th>'.$lt{'dml'}.
+'</th><th>'.$lt{'ssl'}.'</th>'.
+ &Apache::loncommon::end_data_table_header_row());
foreach my $priv (sort keys %full) {
my $privtext = &Apache::lonnet::plaintext($priv);
- $r->print('<tr><td>'.$privtext.'</td><td>'.
+ $r->print(&Apache::loncommon::start_data_table_row().
+ '<td>'.$privtext.'</td><td>'.
($courselevel{$priv}?'<input type="checkbox" name="'.$priv.':c" '.
($courselevelcurrent{$priv}?'checked="1"':'').' />':' ').
'</td><td>'.
@@ -1605,10 +1611,11 @@
'</td><td>'.
($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.':s" '.
($systemlevelcurrent{$priv}?'checked="1"':'').' />':' ').
- '</td></tr>');
+ '</td>'.
+ &Apache::loncommon::end_data_table_row());
}
- $r->print(
- '<table><input type="submit" value="'.&mt('Define Role').'" /></form>'.
+ $r->print(&Apache::loncommon::end_data_table().
+ '<input type="submit" value="'.&mt('Define Role').'" /></form>'.
&Apache::loncommon::end_page());
}
@@ -1642,27 +1649,27 @@
my $domrole='';
my $courole='';
- foreach (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
- my ($priv,$restrict)=split(/\&/,$_);
+ foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) {
+ my ($priv,$restrict)=split(/\&/,$item);
unless ($restrict) { $restrict=''; }
if ($env{'form.'.$priv.':c'}) {
- $courole.=':'.$_;
+ $courole.=':'.$item;
}
}
- foreach (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
- my ($priv,$restrict)=split(/\&/,$_);
+ foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) {
+ my ($priv,$restrict)=split(/\&/,$item);
unless ($restrict) { $restrict=''; }
if ($env{'form.'.$priv.':d'}) {
- $domrole.=':'.$_;
+ $domrole.=':'.$item;
}
}
- foreach (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
- my ($priv,$restrict)=split(/\&/,$_);
+ foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) {
+ my ($priv,$restrict)=split(/\&/,$item);
unless ($restrict) { $restrict=''; }
if ($env{'form.'.$priv.':s'}) {
- $sysrole.=':'.$_;
+ $sysrole.=':'.$item;
}
}
$r->print('<br />Defining Role: '.
@@ -1741,14 +1748,13 @@
'end' => "End"
);
- foreach (sort( keys(%inccourses))) {
- my $thiscourse=$_;
- my $protectedcourse=$_;
+ foreach my $protectedcourse (sort( keys(%inccourses))) {
+ my $thiscourse=$protectedcourse;
$thiscourse=~s:_:/:g;
my %coursedata=&Apache::lonnet::coursedescription($thiscourse);
my $area=$coursedata{'description'};
my $type=$coursedata{'type'};
- if (!defined($area)) { $area=&mt('Unavailable course').': '.$_; }
+ if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; }
my $bgcol=$thiscourse;
$bgcol=~s/[^7-9a-e]//g;
$bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6);
@@ -1760,49 +1766,49 @@
&Apache::loncommon::get_sections($domain,$cnum);
}
}
- foreach ('st','ta','ep','in','cc') {
- if (&Apache::lonnet::allowed('c'.$_,$thiscourse)) {
- my $plrole=&Apache::lonnet::plaintext($_);
+ foreach my $role ('st','ta','ep','in','cc') {
+ if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) {
+ my $plrole=&Apache::lonnet::plaintext($role);
$table .= <<ENDEXTENT;
<tr bgcolor="#$bgcol">
-<td><input type="checkbox" name="act_$protectedcourse\_$_"></td>
+<td><input type="checkbox" name="act_$protectedcourse\_$role"></td>
<td>$plrole</td>
<td>$area<br />Domain: $domain</td>
ENDEXTENT
- if ($_ ne 'cc') {
+ if ($role ne 'cc') {
if (%sections_count) {
- my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$_);
+ my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$role);
$table .=
'<td><table border="0" cellspacing="0" cellpadding="0">'.
'<tr><td valign="top">'.$lt{'exs'}.'<br />'.
$currsec.'</td>'.
'<td> </td>'.
'<td valign="top"> '.$lt{'new'}.'<br />'.
- '<input type="text" name="newsec_'.$protectedcourse.'_'.$_.'" value="" /></td>'.
+ '<input type="text" name="newsec_'.$protectedcourse.'_'.$role.'" value="" /></td>'.
'<input type="hidden" '.
- 'name="sec_'.$protectedcourse.'_'.$_.'"></td>'.
+ 'name="sec_'.$protectedcourse.'_'.$role.'"></td>'.
'</tr></table></td>';
} else {
$table .= '<td><input type="text" size="10" '.
- 'name="sec_'.$protectedcourse.'_'.$_.'"></td>';
+ 'name="sec_'.$protectedcourse.'_'.$role.'"></td>';
}
} else {
$table .= '<td> </td>';
}
$table .= <<ENDTIMEENTRY;
-<td><input type=hidden name="start_$protectedcourse\_$_" value=''>
+<td><input type=hidden name="start_$protectedcourse\_$role" value=''>
<a href=
-"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=''>
+"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$role.value,'start_$protectedcourse\_$role','cu.pres','dateset')">$lt{'ssd'}</a></td>
+<td><input type=hidden name="end_$protectedcourse\_$role" value=''>
<a href=
-"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$_.value,'end_$protectedcourse\_$_','cu.pres','dateset')">$lt{'sed'}</a></td>
+"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$role.value,'end_$protectedcourse\_$role','cu.pres','dateset')">$lt{'sed'}</a></td>
ENDTIMEENTRY
$table.= "</tr>\n";
}
}
- foreach (sort keys %customroles) {
+ foreach my $cust (sort keys %customroles) {
if (&Apache::lonnet::allowed('ccr',$thiscourse)) {
- my $plrole=$_;
+ my $plrole=$cust;
my $customrole=$protectedcourse.'_cr_cr_'.$env{'user.domain'}.
'_'.$env{'user.name'}.'_'.$plrole;
$table .= <<END;
@@ -1864,8 +1870,8 @@
my $multiple = 4;
if (scalar(@sections) < 4) { $multiple = scalar(@sections); }
$output .= '"multiple" size="'.$multiple.'">'."\n";
- foreach (@sections) {
- $output .= '<option value="'.$_.'">'.$_."</option>\n";
+ foreach my $sec (@sections) {
+ $output .= '<option value="'.$sec.'">'.$sec."</option>\n";
}
}
$output .= '</select>';
@@ -1901,15 +1907,15 @@
'</select>'."\n".
'<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
'<td><select name="role">'."\n";
- foreach ('st','ta','ep','in','cc') {
- my $plrole=&Apache::lonnet::plaintext($_);
- $otheritems .= ' <option value="'.$_.'">'.$plrole;
+ foreach my $role ('st','ta','ep','in','cc') {
+ my $plrole=&Apache::lonnet::plaintext($role);
+ $otheritems .= ' <option value="'.$role.'">'.$plrole;
}
if ( keys %customroles > 0) {
- foreach (sort keys %customroles) {
+ foreach my $cust (sort keys %customroles) {
my $custrole='cr_cr_'.$env{'user.domain'}.
- '_'.$env{'user.name'}.'_'.$_;
- $otheritems .= ' <option value="'.$custrole.'">'.$_;
+ '_'.$env{'user.name'}.'_'.$cust;
+ $otheritems .= ' <option value="'.$custrole.'">'.$cust;
}
}
$otheritems .= '</select></td><td>'.
--raeburn1164211591--