$lt{'usr'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"
-ENDMODIFYUSERHEAD
if (! $amode || ! $genpwd) {
$r->print($error.'Invalid login mode or password'.$end);
return;
@@ -1518,16 +1512,11 @@ END
# 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",
'mail' => "Permanent e-mail",
'disk' => "Disk space allocated to user's portfolio files",
);
$r->print(<<"END");
-$lt{'usr'} "$env{'form.ccuname'}" $lt{'id'} "$env{'form.ccdomain'}"
-$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'}
-$lt{'gen'}: $userenv{'generation'}
+$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'}
$lt{'mail'}: $userenv{'permanentemail'}
END
if ($putresult eq 'ok') {
@@ -1548,23 +1537,20 @@ END
if ($key=~/^form\.rev/) {
if ($key=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {
# Revoke standard role
- $r->print(&mt('Revoking').' '.$2.' in '.$1.': '.
- &Apache::lonnet::revokerole($env{'form.ccdomain'},
- $env{'form.ccuname'},$1,$2).'
');
- 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]',
- ''.$result.'').'
');
+ 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,''.$result.'').'
');
+ 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.': '.
@@ -1575,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).'
');
- 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]',
- ''.$result.'').'
');
+ 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,
+ ''.$result.'').'
');
+ 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).': '.
&Apache::lonnet::assigncustomrole($env{'form.ccdomain'},
$env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
@@ -1755,7 +1738,7 @@ END
} # End of foreach (keys(%env))
# Flush the course logs so reverse user roles immediately updated
&Apache::lonnet::flushcourselogs();
- $r->print('Create/Modify Another User
');
+ $r->print(''.&mt('Create/Modify Another User').'
');
$r->print(''."\n");
foreach my $item ('srchby','srchin','srchtype','srchterm','srchdomain','ccuname','ccdomain') {
$r->print(''."\n");
@@ -1771,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]',
+ ''.$result.'').'
';
+ }
+}
+
+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;
@@ -1897,7 +1904,7 @@ sub custom_role_editor {
$r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage(document.form1,'','')",
- text=>"User/custom role search",
+ text=>"User modify/custom role edit",
faq=>282,bug=>'Instructor Interface',},
{href=>"javascript:backPage(document.form1,'','')",
text=>"Edit custom role",
@@ -2037,7 +2044,7 @@ sub set_custom_role {
$r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript);
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage(document.customresult,'','')",
- text=>"User/custom role search",
+ text=>"User modify/custom role edit",
faq=>282,bug=>'Instructor Interface',},
{href=>"javascript:backPage(document.customresult,'selected_custom_edit','')",
text=>"Edit custom role",
@@ -2136,7 +2143,6 @@ sub handler {
if ($env{'form.phase'} eq 'get_user_info') {
my ($state,$response,$forcenewuser,$results) =
&user_search_result($srch);
- print STDERR "Got $state,$response,$forcenewuser\n";
if ($state eq 'select') {
&print_user_selection_page($r,$response,$srch,$results);
} elsif ($state eq 'modify') {
@@ -2183,7 +2189,6 @@ sub handler {
#-------------------------------------------------- functions for &phase_two
sub user_search_result {
my ($srch) = @_;
- my @alldomains = sort(&Apache::lonnet::all_domains());
my %allhomes;
my %inst_matches;
my %srch_results;
@@ -2203,7 +2208,7 @@ sub user_search_result {
}
if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'instd')) {
if (($srch->{'srchdomain'} eq '') ||
- (!(grep/^\Q$srch->{'srchdomain'}\E$/,@alldomains))) {
+ ! (&Apache::lonnet::domain($srch->{'srchdomain'}))) {
$response = &mt('You must specify a valid domain when searching in a domain or institutional directory.')
}
}
@@ -2220,7 +2225,7 @@ sub user_search_result {
}
}
if ($response ne '') {
- return ($state,$response);
+ return ($state,''.$response.'');
}
if ($srch->{'srchby'} eq 'uname') {
if (($srch->{'srchin'} eq 'dom') || ($srch->{'srchin'} eq 'crs')) {
@@ -2252,20 +2257,24 @@ sub user_search_result {
&build_search_response($srch,%srch_results);
}
} else {
- my %courseusers = &get_courseusers();
+ my $courseusers = &get_courseusers();
if ($srch->{'srchtype'} eq 'exact') {
- if (exists($courseusers{$srch->{'srchterm'}.':'.$srch->{'srchdomain'}})) {
+ if (exists($courseusers->{$srch->{'srchterm'}.':'.$srch->{'srchdomain'}})) {
$state = 'modify';
} else {
($state,$response,$forcenewuser) =
&build_search_response($srch,%srch_results);
}
} else {
- foreach my $user (keys(%courseusers)) {
+ foreach my $user (keys(%$courseusers)) {
my ($cuname,$cudomain) = split(/:/,$user);
if ($cudomain eq $srch->{'srchdomain'}) {
if ($cuname =~ /\Q$srch->{'srchterm'}\E/i) {
- $srch_results{$user} = '';
+ $srch_results{$user} =
+ {&Apache::lonnet::get('environment',
+ ['firstname',
+ 'lastname',
+ 'permanentemail'])};
}
}
}
@@ -2287,8 +2296,8 @@ sub user_search_result {
($state,$response,$forcenewuser) =
&build_search_response($srch,%srch_results);
} elsif ($srch->{'srchin'} eq 'crs') {
- my %courseusers = &get_courseusers();
- foreach my $user (keys(%courseusers)) {
+ my $courseusers = &get_courseusers();
+ foreach my $user (keys(%$courseusers)) {
my ($uname,$udom) = split(/:/,$user);
my %names = &Apache::loncommon::getnames($uname,$udom);
my %emails = &Apache::loncommon::getemails($uname,$udom);
@@ -2345,11 +2354,11 @@ sub directorysrch_check {
['directorysrch'],$srch->{'srchdomain'});
if (ref($dom_inst_srch{'directorysrch'}) eq 'HASH') {
if (!$dom_inst_srch{'directorysrch'}{'available'}) {
- return &mt('Directory search unavailable in domain: [_1]',$srch->{'srchdomain'});
+ return &mt('Institutional directory search unavailable in domain: [_1]',$srch->{'srchdomain'});
}
if ($dom_inst_srch{'directorysrch'}{'localonly'}) {
if ($env{'request.role.domain'} ne $srch->{'srchdomain'}) {
- return &mt('Directory search in domain: [_1] is only allowed for users with a current role in the domain.',$srch->{'srchdomain'});
+ return &mt('Insitutional directory search in domain: [_1] is only allowed for users with a current role in the domain.',$srch->{'srchdomain'});
}
my @usertypes = split(/:/,$env{'environment.inststatus'});
if (!@usertypes) {
@@ -2379,16 +2388,16 @@ sub directorysrch_check {
return &mt('Directory search has not been configured for domain: [_1]',$srch->{'srchdomain'});
}
my %longtext = &Apache::lonlocal::texthash (
- uname => 'username',
+ uname => 'username',
lastfirst => 'last name, first name',
- lastname => 'last name',
- contains => 'is contained in',
- exact => 'as exact match to'
+ lastname => 'last name',
+ 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'});
@@ -2399,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'}});
}
}
}
@@ -2407,15 +2416,16 @@ sub directorysrch_check {
sub get_courseusers {
my %advhash;
+ my $classlist = &Apache::loncoursedata::get_classlist();
my %coursepersonnel=&Apache::lonnet::get_course_adv_roles();
foreach my $role (sort(keys(%coursepersonnel))) {
foreach my $user (split(/\,/,$coursepersonnel{$role})) {
- $advhash{$user} = '';
+ if (!exists($classlist->{$user})) {
+ $classlist->{$user} = [];
+ }
}
}
- my $classlist = &Apache::loncoursedata::get_classlist();
- my %combined = (%advhash, %{$classlist});
- return %combined;
+ return $classlist;
}
sub build_search_response {
@@ -2445,7 +2455,7 @@ sub build_search_response {
$state = 'modify';
$response = &mt("$single{$srch->{'srchtype'}} was found for this $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}.",$srch->{'srchterm'});
} else {
- $response = &mt("$nomatch{$srch->{'srchtype'}} found for this $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}.",$srch->{'srchterm'});
+ $response = ''.&mt("$nomatch{$srch->{'srchtype'}} found for this $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}.",$srch->{'srchterm'}).'';
if ($srch->{'srchin'} ne 'alc') {
$forcenewuser = 1;
my $cansrchinst = 0;
@@ -2467,7 +2477,6 @@ sub build_search_response {
}
}
}
- $response .= '
'.&mt("To add as a new user:").'- '.&mt("Enter the proposed username in the 'Search for' box").'
- '.&mt("Set 'Make new user if no match found' to Yes").'
- '.&mt("Click 'Search'").'
'.&mt("Note: you can only create new users in the domain of your current role -".$env{'request.role.domain'}).'
';
}
}
}
@@ -2563,10 +2572,10 @@ sub course_level_table {
$table .= ' | ';
}
$table .= <
+
$lt{'ssd'} |
-
+ |
$lt{'sed'} |
ENDTIMEENTRY
@@ -2599,10 +2608,10 @@ ENDTIMEENTRY
'name="sec_'.$customrole.'" />';
}
$table .= <
+
$lt{'ssd'} |
-
+ |
$lt{'sed'} |
ENDENTRY
@@ -2694,10 +2703,10 @@ sub course_level_dc {
''.
'';
$otheritems .= <
+
$lt{'ssd'} |
-
+ |
$lt{'sed'} |
ENDTIMEENTRY