--- loncom/interface/loncreateuser.pm 2006/11/23 00:04:09 1.137
+++ loncom/interface/loncreateuser.pm 2007/03/12 17:06:59 1.148
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.137 2006/11/23 00:04:09 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.148 2007/03/12 17:06:59 albertel 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;
@@ -135,7 +135,6 @@ sub portfolio_quota {
sub print_username_entry_form {
my ($r) = @_;
my $defdom=$env{'request.role.domain'};
- my @domains = &Apache::loncommon::get_domains();
my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
my $selscript=&Apache::loncommon::studentbrowser_javascript();
my $start_page =
@@ -216,11 +215,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 +234,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 +250,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');
@@ -361,36 +357,6 @@ sub print_user_modification_page {
}
return -1;
}
-
- function setType() {
- var crstype = document.cu.crstype.options[document.cu.crstype.selectedIndex].value;
- rolevals = new Array("$rolevalslist");
- if (crstype == 'Group') {
- if (document.cu.currsec.options[0].text == "$pickcrsfirst") {
- document.cu.currsec.options[0].text = "$pickgrpfirst";
- }
- grprolenames = new Array("$grprolenameslist");
- for (var i=0; i<rolevals.length; i++) {
- if (document.cu.role.selectedIndex == i) {
- document.cu.role.options[i] = new Option(grprolenames[i],rolevals[i],true,false);
- } else {
- document.cu.role.options[i] = new Option(grprolenames[i],rolevals[i],false,false);
- }
- }
- } else {
- if (document.cu.currsec.options[0].text == "$pickgrpfirst") {
- document.cu.currsec.options[0].text = "$pickcrsfirst";
- }
- crsrolenames = new Array("$crsrolenameslist");
- for (var i=0; i<rolevals.length; i++) {
- if (document.cu.role.selectedIndex == i) {
- document.cu.role.options[i] = new Option(crsrolenames[i],rolevals[i],true,false);
- } else {
- document.cu.role.options[i] = new Option(crsrolenames[i],rolevals[i],false,false);
- }
- }
- }
- }
ENDSCRIPT
} else {
$nondc_setsection_code = <<"ENDSECCODE";
@@ -487,13 +453,9 @@ ENDSECCODE
<input type="hidden" name="pres_marker" value="" >
ENDFORMINFO
my $uhome=&Apache::lonnet::homeserver($ccuname,$ccdomain);
- my %incdomains;
my %inccourses;
- foreach my $item (values(%Apache::lonnet::hostdom)) {
- $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,12 +584,12 @@ END
split(/_/,$role);
# Is this a custom role? Get role owner and title.
my ($croleudom,$croleuname,$croletitle)=
- ($role_code=~/^cr\/(\w+)\/(\w+)\/(\w+)$/);
+ ($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_courseid)} ) {
$class='Course';
my ($coursedom,$coursedir) = ($1,$2);
$sortkey.="\0$coursedom";
@@ -663,7 +625,7 @@ END
}
}
# Compute the background color based on $area
- if ($area=~/^\/(\w+)\/(\d\w+)\/(\w+)/) {
+ if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) {
$carea.='<br />Section: '.$3;
$sortkey.="\0$3";
}
@@ -671,7 +633,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;
@@ -695,7 +657,7 @@ 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 {
@@ -965,7 +927,7 @@ ENDNOPRIV
&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 $thisdomain (sort(&Apache::lonnet::all_domains())) {
foreach my $role ('dc','li','dg','au','sc') {
if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) {
my $plrole=&Apache::lonnet::plaintext($role);
@@ -997,7 +959,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 +991,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 +1002,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;
}
@@ -1100,8 +1064,8 @@ ENDNEWUSERHEAD
if (lc($desiredhost) eq 'default') {
$desiredhost = undef;
} else {
- my %home_servers = &Apache::loncommon::get_library_servers
- ($env{'form.ccdomain'});
+ my %home_servers =
+ &Apache::lonnet::get_servers($env{'form.ccdomain'},'library');
if (! exists($home_servers{$desiredhost})) {
$r->print($error.&mt('Invalid home server specified'));
return;
@@ -1118,7 +1082,7 @@ ENDNEWUSERHEAD
my $home = &Apache::lonnet::homeserver($env{'form.ccuname'},
$env{'form.ccdomain'});
$r->print('<br />'.&mt('Home server').': '.$home.' '.
- $Apache::lonnet::libserv{$home});
+ &Apache::lonnet::hostname($home));
} elsif (($env{'form.login'} ne 'nochange') &&
($env{'form.login'} ne '' )) {
# Modify user privileges
@@ -1175,7 +1139,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 +1239,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_courseid)};
my $cid=$1.'_'.$2;
$r->print(&mt('Drop from classlist').': <b>'.
&Apache::lonnet::critical('put:'.
@@ -1286,10 +1251,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 +1266,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_courseid)};
my $cid=$1.'_'.$2;
$r->print(&mt('Drop from classlist').': <b>'.
&Apache::lonnet::critical('put:'.
@@ -1313,7 +1278,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 +1297,7 @@ END
my $logmsg;
my $output;
if ($role eq 'st') {
- if ($url =~ m-^/(\w+)/(\w+)/?(\w*)$-) {
+ if ($url =~ m-^/($match_domain)/($match_courseid)/?(\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 +1317,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 +1328,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_courseid)\_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 +1359,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_name)\_([^\_]+)$/) {
# 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);
@@ -1868,7 +1833,7 @@ sub course_sections {
$output = '<select name="currsec_'.$role.'" ';
my $multiple = 4;
if (scalar(@sections) < 4) { $multiple = scalar(@sections); }
- $output .= '"multiple" size="'.$multiple.'">'."\n";
+ $output .= 'multiple="multiple" size="'.$multiple.'">'."\n";
foreach my $sec (@sections) {
$output .= '<option value="'.$sec.'">'.$sec."</option>\n";
}
@@ -1887,7 +1852,6 @@ sub course_level_dc {
('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').'</b>';
my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu');
my %lt=&Apache::lonlocal::texthash(
- 'typ' => "Type",
'rol' => "Role",
'grs' => "Section",
'exs' => "Existing sections",
@@ -1900,14 +1864,9 @@ sub course_level_dc {
my $header = '<h4>'.&mt('Course Level').'</h4>'.
&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>'.
+ '<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".
- '</select>'."\n".
+ my $otheritems = &Apache::loncommon::start_data_table_row()."\n".
'<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
'<td><select name="role">'."\n";
foreach my $role ('st','ta','ep','in','cc') {