--- loncom/interface/loncreateuser.pm 2007/08/10 23:00:13 1.169
+++ loncom/interface/loncreateuser.pm 2007/08/15 16:25:14 1.172
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.169 2007/08/10 23:00:13 albertel Exp $
+# $Id: loncreateuser.pm,v 1.172 2007/08/15 16:25:14 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -216,7 +216,7 @@ sub print_username_entry_form {
$jscript,{'add_entries' => \%loaditems,});
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage(document.crtuser)",
- text=>"User modify/custom role",
+ text=>"User modify/custom role edit",
faq=>282,bug=>'Instructor Interface',});
my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management');
@@ -329,7 +329,7 @@ $jsback
ENDSCRIPT
my %lt=&Apache::lonlocal::texthash(
- 'srch' => "User Search to add/modify roles of",
+ 'srch' => "User Search to add/modify roles",
'username' => "username",
'domain' => "domain",
'lastname' => "last name",
@@ -347,7 +347,7 @@ ENDSCRIPT
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
$r->print("<b>$lt{'srch'}</b><br />");
$r->print(&entry_form($srch->{'srchdomain'},$srch));
- $r->print('<h3>'.&mt('Select a user to add/modify roles of').'</h3>');
+ $r->print('<h3>'.&mt('Select a user to add/modify roles').'</h3>');
$r->print('<form name="usersrchform" method="post">'.
&Apache::loncommon::start_data_table()."\n".
&Apache::loncommon::start_data_table_header_row()."\n".
@@ -1537,23 +1537,20 @@ END
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'},
- $env{'form.ccuname'},$1,$2).'</b><br />');
- if ($2 eq 'st') {
- $1=~m{^/($match_domain)/($match_courseid)};
- my $cid=$1.'_'.$2;
- my $user = $env{'form.ccuname'}.':'.$env{'form.ccdomain'};
- my $result =
- &Apache::lonnet::cput('classlist',
- { $user => $now },
- $env{'course.'.$cid.'.domain'},
- $env{'course.'.$cid.'.num'});
- $r->print(&mt('Drop from classlist: [_1]',
- '<b>'.$result.'</b>').'<br />');
+ my ($scope,$role) = ($1,$2);
+ my $result =
+ &Apache::lonnet::revokerole($env{'form.ccdomain'},
+ $env{'form.ccuname'},
+ $scope,$role);
+ $r->print(&mt('Revoking [_1] in [_2]: [_3]',
+ $role,$scope,'<b>'.$result.'</b>').'<br />');
+ if ($role eq 'st') {
+ my $result = &classlist_drop($scope,$env{'form.ccuname'},
+ $env{'form.ccdomain'},$now);
+ $r->print($result);
}
}
- if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) {
+ if ($key=~m{^form\.rev\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$ }s) {
# Revoke custom role
$r->print(&mt('Revoking custom role:').
' '.$4.' by '.$3.':'.$2.' in '.$1.': <b>'.
@@ -1564,26 +1561,23 @@ END
} elsif ($key=~/^form\.del/) {
if ($key=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {
# Delete standard role
- $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=~m{^/($match_domain)/($match_courseid)};
- my $cid=$1.'_'.$2;
- my $user = $env{'form.ccuname'}.':'.$env{'form.ccdomain'};
- my $result =
- &Apache::lonnet::cput('classlist',
- { $user => $now },
- $env{'course.'.$cid.'.domain'},
- $env{'course.'.$cid.'.num'});
- $r->print(&mt('Drop from classlist: [_1]',
- '<b>'.$result.'</b>').'<br />');
+ my ($scope,$role) = ($1,$2);
+ my $result =
+ &Apache::lonnet::assignrole($env{'form.ccdomain'},
+ $env{'form.ccuname'},
+ $scope,$role,$now,0,1);
+ $r->print(&mt('Deleting [_1] in [_2]: [_3]',$role,$scope,
+ '<b>'.$result.'</b>').'<br />');
+ if ($role eq 'st') {
+ my $result = &classlist_drop($scope,$env{'form.ccuname'},
+ $env{'form.ccdomain'},$now);
+ $r->print($result);
}
}
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]',
+ $r->print(&mt('Deleting custom role [_1] by [_2]:[_3] in [_4]',
$rolename,$rnam,$rdom,$url).': <b>'.
&Apache::lonnet::assigncustomrole($env{'form.ccdomain'},
$env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
@@ -1760,6 +1754,30 @@ END
$r->print(&Apache::loncommon::end_page());
}
+sub classlist_drop {
+ my ($scope,$uname,$udom,$now) = @_;
+ my ($cdom,$cnum) = ($scope=~m{^/($match_domain)/($match_courseid)});
+ my $cid=$cdom.'_'.$cnum;
+ my $user = $uname.':'.$udom;
+ if (!&active_student_roles($cnum,$cdom,$uname,$udom)) {
+ my $result =
+ &Apache::lonnet::cput('classlist',
+ { $user => $now },
+ $env{'course.'.$cid.'.domain'},
+ $env{'course.'.$cid.'.num'});
+ return &mt('Drop from classlist: [_1]',
+ '<b>'.$result.'</b>').'<br />';
+ }
+}
+
+sub active_student_roles {
+ my ($cnum,$cdom,$uname,$udom) = @_;
+ my %roles =
+ &Apache::lonnet::get_my_roles($uname,$udom,'userroles',
+ ['future','active'],['st']);
+ return exists($roles{"$cnum:$cdom:st"});
+}
+
sub quota_admin {
my ($setquota,$changeHash) = @_;
my $quotachanged;
@@ -2373,13 +2391,13 @@ sub directorysrch_check {
uname => 'username',
lastfirst => 'last name, first name',
lastname => 'last name',
- contains => 'is contained in',
+ contains => 'contains',
exact => 'as exact match to'
);
if ($can_search) {
if (ref($dom_inst_srch{'directorysrch'}{'searchby'}) eq 'ARRAY') {
if (!grep(/^\Q$srch->{'srchby'}\E$/,@{$dom_inst_srch{'directorysrch'}{'searchby'}})) {
- return &mt('Directory search in domain: [_1] is not available for searching by [_2]',$srch->{'srchdomain'},$longtext{$srch->{'srchby'}});
+ return &mt('Directory search in domain: [_1] is not available for searching by "[_2]"',$srch->{'srchdomain'},$longtext{$srch->{'srchby'}});
}
} else {
return &mt('Directory search in domain: [_1] is not available.', $srch->{'srchdomain'});
@@ -2390,7 +2408,7 @@ sub directorysrch_check {
($dom_inst_srch{'directorysrch'}{'searchtypes'} eq $srch->{'srchtype'})) {
return 'ok';
} else {
- return &mt('Directory search in domain [_1] is not available for the requested search type: [_2]',$srch->{'srchdomain'},$longtext{$srch->{'srchtype'}});
+ return &mt('Directory search in domain [_1] is not available for the requested search type: "[_2]"',$srch->{'srchdomain'},$longtext{$srch->{'srchtype'}});
}
}
}
@@ -2469,7 +2487,7 @@ sub crumb_utilities {
my %elements = (
crtuser => {
srchterm => 'text',
- srchin => 'radio',
+ srchin => 'selectbox',
srchby => 'selectbox',
srchtype => 'selectbox',
srchdomain => 'selectbox',