--- loncom/interface/loncreateuser.pm 2006/11/22 16:06:28 1.135
+++ loncom/interface/loncreateuser.pm 2006/12/01 21:00:35 1.140
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.135 2006/11/22 16:06:28 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.140 2006/12/01 21:00:35 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -66,7 +66,7 @@ use Apache::loncommon;
use Apache::lonlocal;
use Apache::longroup;
use lib '/home/httpd/lib/perl/';
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
my $loginscript; # piece of javascript used in two separate instances
my $generalrule;
@@ -216,11 +216,8 @@ END
# =================================================================== Phase two
sub print_user_modification_page {
my $r=shift;
- my $ccuname=$env{'form.ccuname'};
- my $ccdomain=$env{'form.ccdomain'};
-
- $ccuname=~s/\W//g;
- $ccdomain=~s/\W//g;
+ my $ccuname =&LONCAPA::clean_username($env{'form.ccuname'});
+ my $ccdomain=&LONCAPA::clean_domain($env{'form.ccdomain'});
unless (($ccuname) && ($ccdomain)) {
&print_username_entry_form($r);
@@ -238,9 +235,9 @@ sub print_user_modification_page {
);
$loginscript = &Apache::loncommon::authform_header(%param);
$authformkrb = &Apache::loncommon::authform_kerberos(%param);
-
- $ccuname=~s/\W//g;
- $ccdomain=~s/\W//g;
+
+ $ccuname =&LONCAPA::clean_username($ccuname);
+ $ccdomain=&LONCAPA::clean_domain($ccdomain);
my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
my $dc_setcourse_code = '';
my $nondc_setsection_code = '';
@@ -254,7 +251,7 @@ sub print_user_modification_page {
$groupslist = '"'.$groupslist.'"';
}
- if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
+ if ($env{'request.role'} =~ m-^dc\./($match_domain)/$-) {
my $dcdom = $1;
$loaditem{'onload'} = "document.cu.coursedesc.value='';";
my @rolevals = ('st','ta','ep','in','cc');
@@ -493,7 +490,7 @@ ENDFORMINFO
$incdomains{$item}=1;
}
foreach my $key (keys(%env)) {
- if ($key=~/^user\.priv\.cm\.\/(\w+)\/(\w+)/) {
+ if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) {
$inccourses{$1.'_'.$2}=1;
}
}
@@ -622,13 +619,12 @@ END
split(/_/,$role);
# Is this a custom role? Get role owner and title.
my ($croleudom,$croleuname,$croletitle)=
- ($role_code=~/^cr\/(\w+)\/(\w+)\/(\w+)$/);
- my $bgcol='ffffff';
+ ($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$});
my $allowed=0;
my $delallowed=0;
my $sortkey=$role_code;
my $class='Unknown';
- if ($area =~ /^\/(\w+)\/(\d\w+)/ ) {
+ if ($area =~ m{^/($match_domain)/($match_username)} ) {
$class='Course';
my ($coursedom,$coursedir) = ($1,$2);
$sortkey.="\0$coursedom";
@@ -664,10 +660,7 @@ END
}
}
# Compute the background color based on $area
- $bgcol=$1.'_'.$2;
- $bgcol=~s/[^7-9a-e]//g;
- $bgcol=substr($bgcol.$bgcol.$bgcol.'ffffff',2,6);
- if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) {
+ if ($area=~m{^/($match_domain)/($match_username)/(\w+)}) {
$carea.='<br />Section: '.$3;
$sortkey.="\0$3";
}
@@ -675,7 +668,7 @@ END
} else {
$sortkey.="\0".$area;
# Determine if current user is able to revoke privileges
- if ($area=~ /^\/(\w+)\//) {
+ if ($area=~m{^/($match_domain)/}) {
if ((&Apache::lonnet::allowed('c'.$role_code,$1)) ||
(&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) {
$allowed=1;
@@ -699,16 +692,15 @@ END
}
}
if (($role_code eq 'ca') || ($role_code eq 'aa')) {
- $area=~/\/(\w+)\/(\w+)/;
+ $area=~m{/($match_domain)/($match_username)};
if (&authorpriv($2,$1)) {
$allowed=1;
} else {
$allowed=0;
}
}
- $bgcol='77FF77';
my $row = '';
- $row.='<tr bgcolor="#'.$bgcol.'"><td>';
+ $row.= '<td>';
my $active=1;
$active=0 if (($role_end_time) && ($now>$role_end_time));
if (($active) && ($allowed)) {
@@ -745,7 +737,7 @@ END
: ' ' ).
'</td><td>'.($role_end_time ?localtime($role_end_time)
: ' ' )
- ."</td></tr>\n";
+ ."</td>";
$sortrole{$sortkey}=$envkey;
$roletext{$envkey}=$row;
$roleclass{$envkey}=$class;
@@ -758,30 +750,35 @@ END
$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}};
+ $output{$type}.=
+ &Apache::loncommon::start_data_table_row().
+ $roletext{$sortrole{$which}}.
+ &Apache::loncommon::end_data_table_row();
}
}
unless($output{$type} eq '') {
- $output{$type} = "<tr bgcolor='#BBffBB'>".
- "<td align='center' colspan='7'>".&mt($type)."</td>".
+ $output{$type} = '<tr class="LC_info_row">'.
+ "<td align='center' colspan='7'>".&mt($type)."</td></tr>".
$output{$type};
$rolesdisplay = 1;
}
}
if ($rolesdisplay == 1) {
- $r->print(<<END);
+ $r->print('
<hr />
-<h3>$lt{'rer'}</h3>
-<table>
-<tr><th>$lt{'rev'}</th><th>$lt{'ren'}</th><th>$lt{'del'}</th><th>$lt{'rol'}</th><th>$lt{'e
-xt'}</th><th>$lt{'sta'}</th><th>$lt{'end'}</th>
-END
+<h3>'.$lt{'rer'}.'</h3>'.
+&Apache::loncommon::start_data_table("LC_createuser").
+&Apache::loncommon::start_data_table_header_row().
+'<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}.
+'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.
+'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
+&Apache::loncommon::end_data_table_header_row());
foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') {
if ($output{$type}) {
$r->print($output{$type}."\n");
}
}
- $r->print('</table>');
+ $r->print(&Apache::loncommon::end_data_table());
}
} # End of unless
my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
@@ -997,7 +994,7 @@ ENDNOPRIV
# Course and group levels
#
- if ($env{'request.role'} =~ m-^dc\./(\w+)/$-) {
+ if ($env{'request.role'} =~ m{^dc\./($match_domain)/$}) {
$r->print(&course_level_dc($1,'Course'));
$r->print('<hr /><input type="button" value="'.&mt('Modify User').'" onClick="setCourse()">'."\n");
} else {
@@ -1029,7 +1026,8 @@ sub update_user_data {
$r->print($error.&mt('No login name specified').'.'.$end);
return;
}
- if ( $env{'form.ccuname'} =~/\W/) {
+ if ( $env{'form.ccuname'} ne
+ &LONCAPA::clean_username($env{'form.ccuname'}) ) {
$r->print($error.&mt('Invalid login name').'. '.
&mt('Only letters, numbers, and underscores are valid').'.'.
$end);
@@ -1039,9 +1037,10 @@ sub update_user_data {
$r->print($error.&mt('No domain specified').'.'.$end);
return;
}
- if ( $env{'form.ccdomain'} =~/\W/) {
+ if ( $env{'form.ccdomain'} ne
+ &LONCAPA::clean_domain($env{'form.ccdomain'}) ) {
$r->print($error.&mt ('Invalid domain name').'. '.
- &mt('Only letters, numbers, and underscores are valid').'.'.
+ &mt('Only letters, numbers, periods, dashes, and underscores are valid').'.'.
$end);
return;
}
@@ -1175,7 +1174,8 @@ ENDMODIFYUSERHEAD
}
}
} else {
- $oldportfolioquota = &default_quota($env{'form.ccdomain'});
+ $oldportfolioquota =
+ &Apache::loncommon::default_quota($env{'form.ccdomain'});
}
if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}) &&
($env{'form.cfirstname'} ne $userenv{'firstname'} ||
@@ -1274,7 +1274,7 @@ END
&Apache::lonnet::revokerole($env{'form.ccdomain'},
$env{'form.ccuname'},$1,$2).'</b><br />');
if ($2 eq 'st') {
- $1=~/^\/(\w+)\/(\w+)/;
+ $1=~m{^/($match_domain)/($match_username)};
my $cid=$1.'_'.$2;
$r->print(&mt('Drop from classlist').': <b>'.
&Apache::lonnet::critical('put:'.
@@ -1286,10 +1286,10 @@ END
$env{'course.'.$cid.'.home'}).'</b><br />');
}
}
- if ($key=~/^form\.rev\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
+ if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
# Revoke custom role
$r->print(&mt('Revoking custom role:').
- ' '.$4.' by '.$3.'@'.$2.' in '.$1.': <b>'.
+ ' '.$4.' by '.$3.':'.$2.' in '.$1.': <b>'.
&Apache::lonnet::revokecustomrole($env{'form.ccdomain'},
$env{'form.ccuname'},$1,$2,$3,$4).
'</b><br />');
@@ -1301,7 +1301,7 @@ END
&Apache::lonnet::assignrole($env{'form.ccdomain'},
$env{'form.ccuname'},$1,$2,$now,0,1).'<br />');
if ($2 eq 'st') {
- $1=~/^\/(\w+)\/(\w+)/;
+ $1=~m{^/($match_domain)/($match_username)};
my $cid=$1.'_'.$2;
$r->print(&mt('Drop from classlist').': <b>'.
&Apache::lonnet::critical('put:'.
@@ -1313,7 +1313,7 @@ END
$env{'course.'.$cid.'.home'}).'</b><br />');
}
}
- if ($key=~/^form\.del\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
+ if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\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]',
@@ -1332,7 +1332,7 @@ END
my $logmsg;
my $output;
if ($role eq 'st') {
- if ($url =~ m-^/(\w+)/(\w+)/?(\w*)$-) {
+ if ($url =~ m-^/($match_domain)/($match_username)/?(\w*)$-) {
my $result = &Apache::loncommon::commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$1,$2,$3);
if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course')) {
$output = "Error: $result\n";
@@ -1352,7 +1352,7 @@ END
$r->print($output);
}
# Re-enable custom role
- if ($key=~/^form\.ren\:([^\_]+)\_cr\.cr\/(\w+)\/(\w+)\/(\w+)$/) {
+ if ($key=~m{^form\.ren\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4);
my $result = &Apache::lonnet::assigncustomrole(
$env{'form.ccdomain'}, $env{'form.ccuname'},
@@ -1363,7 +1363,7 @@ END
} elsif ($key=~/^form\.act/) {
my $udom = $env{'form.ccdomain'};
my $uname = $env{'form.ccuname'};
- if ($key=~/^form\.act\_([^\_]+)\_([^\_]+)\_cr_cr_([^\_]+)_(\w+)_([^\_]+)$/) {
+ if ($key=~/^form\.act\_($match_domain)\_($match_username)\_cr_cr_($match_domain)_($match_username)_([^\_]+)$/) {
# Activate a custom role
my ($one,$two,$three,$four,$five)=($1,$2,$3,$4,$5);
my $url='/'.$one.'/'.$two;
@@ -1394,7 +1394,7 @@ END
$r->print(&Apache::loncommon::commit_customrole($udom,$uname,$securl,$three,$four,$five,$start,$end));
}
}
- } elsif ($key=~/^form\.act\_([^\_]+)\_(\w+)\_([^\_]+)$/) {
+ } elsif ($key=~/^form\.act\_($match_domain)\_($match_username)\_([^\_]+)$/) {
# 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);
@@ -1755,9 +1755,6 @@ sub course_level_table {
my $area=$coursedata{'description'};
my $type=$coursedata{'type'};
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);
my ($domain,$cnum)=split(/\//,$thiscourse);
my %sections_count;
if (defined($env{'request.course.id'})) {
@@ -1769,18 +1766,17 @@ sub course_level_table {
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\_$role"></td>
-<td>$plrole</td>
-<td>$area<br />Domain: $domain</td>
-ENDEXTENT
+ $table .= &Apache::loncommon::start_data_table_row().
+'<td><input type="checkbox" name="act_'.$protectedcourse.'_'.$role.'"></td>
+<td>'.$plrole.'</td>
+<td>'.$area.'<br />Domain: '.$domain.'</td>'."\n";
if ($role ne 'cc') {
if (%sections_count) {
my $currsec = &course_sections(\%sections_count,$protectedcourse.'_'.$role);
$table .=
- '<td><table border="0" cellspacing="0" cellpadding="0">'.
- '<tr><td valign="top">'.$lt{'exs'}.'<br />'.
+ '<td><table class="LC_createuser">'.
+ '<tr class="LC_section_row">
+ <td valign="top">'.$lt{'exs'}.'<br />'.
$currsec.'</td>'.
'<td> </td>'.
'<td valign="top"> '.$lt{'new'}.'<br />'.
@@ -1803,7 +1799,7 @@ ENDEXTENT
<a href=
"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";
+ $table.= &Apache::loncommon::end_data_table_row();
}
}
foreach my $cust (sort keys %customroles) {
@@ -1811,12 +1807,10 @@ ENDTIMEENTRY
my $plrole=$cust;
my $customrole=$protectedcourse.'_cr_cr_'.$env{'user.domain'}.
'_'.$env{'user.name'}.'_'.$plrole;
- $table .= <<END;
-<tr bgcolor="#$bgcol">
-<td><input type="checkbox" name="act_$customrole"></td>
-<td>$plrole</td>
-<td>$area</td>
-END
+ $table .= &Apache::loncommon::start_data_table_row().
+'<td><input type="checkbox" name="act_'.$customrole.'"></td>
+<td>'.$plrole.'</td>
+<td>'.$area.'</td>'."\n";
if (%sections_count) {
my $currsec = &course_sections(\%sections_count,$customrole);
$table.=
@@ -1839,20 +1833,25 @@ END
"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')">$lt{'sed'}</a></td></tr>
+"javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">$lt{'sed'}</a></td>
ENDENTRY
+ $table .= &Apache::loncommon::end_data_table_row();
}
}
}
return '' if ($table eq ''); # return nothing if there is nothing
# in the table
- my $result = <<ENDTABLE;
-<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
+ my $result = '
+<h4>'.$lt{'crl'}.'</h4>'.
+&Apache::loncommon::start_data_table().
+&Apache::loncommon::start_data_table_header_row().
+'<th>'.$lt{'act'}.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}.'</th>
+<th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
+&Apache::loncommon::end_data_table_header_row().
+&Apache::loncommon::start_data_table_row().
+$table.
+&Apache::loncommon::end_data_table_row().
+&Apache::loncommon::end_data_table();
return $result;
}
@@ -1899,8 +1898,12 @@ sub course_level_dc {
'sed' => "Set End Date"
);
my $header = '<h4>'.&mt('Course Level').'</h4>'.
- '<table border="2"><tr><th>'.$lt{'typ'}.'</th><th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th></tr>';
- my $otheritems = '<tr><td><select name="crstype" onChange="javascript:setType();">'."\n".
+ &Apache::loncommon::start_data_table().
+ &Apache::loncommon::start_data_table_header_row().
+ '<th>'.$lt{'typ'}.'</th><th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
+ &Apache::loncommon::end_data_table_header_row();
+ my $otheritems = &Apache::loncommon::start_data_table_row().
+ '<td><select name="crstype" onChange="javascript:setType();">'."\n".
' <option value="">'.&mt('Please select')."\n".
' <option value="Course">'.&mt('Course')."\n".
' <option value="Non-standard course">'.&mt('Non-standard course')."\n".
@@ -1935,7 +1938,8 @@ sub course_level_dc {
<a href=
"javascript:pjump('date_end','End Date',document.cu.end.value,'end','cu.pres','dateset')">$lt{'sed'}</a></td>
ENDTIMEENTRY
- $otheritems .= "</tr></table>\n";
+ $otheritems .= &Apache::loncommon::end_data_table_row().
+ &Apache::loncommon::end_data_table()."\n";
return $cb_jscript.$header.$hiddenitems.$otheritems;
}