--- loncom/interface/lonuserutils.pm 2014/04/04 23:06:31 1.166
+++ loncom/interface/lonuserutils.pm 2017/01/02 19:44:07 1.180
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.166 2014/04/04 23:06:31 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.180 2017/01/02 19:44:07 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -30,12 +30,29 @@
package Apache::lonuserutils;
+=pod
+
+=head1 NAME
+
+Apache::lonuserutils.pm
+
+=head1 SYNOPSIS
+
+ Utilities for management of users and custom roles
+
+ Provides subroutines called by loncreateuser.pm
+
+=head1 OVERVIEW
+
+=cut
+
use strict;
use Apache::lonnet;
use Apache::loncommon();
use Apache::lonhtmlcommon;
use Apache::lonlocal;
use Apache::longroup;
+use HTML::Entities;
use LONCAPA qw(:DEFAULT :match);
###############################################################
@@ -450,6 +467,7 @@ sub javascript_validations {
if (($mode eq 'upload') && ($context eq 'domain')) {
$alert{'inststatus'} = &mt('The optional affiliation field was not specified');
}
+ &js_escape(\%alert);
my $function_name = <<"END";
$setsections_js
@@ -642,8 +660,9 @@ sub upload_manager_javascript_forward_as
$numbuttons ++;
}
if (!$can_assign->{'int'}) {
- my $warning = &mt('You may not specify an initial password for each user, as this is only available when new users use LON-CAPA internal authentication.').'\n'.
+ my $warning = &mt('You may not specify an initial password for each user, as this is only available when new users use LON-CAPA internal authentication.')."\n".
&mt('Your current role does not have rights to create users with that authentication type.');
+ &js_escape(\$warning);
$auth_update = <<"END";
// Currently the initial password field is only supported for internal auth
// (see bug 6368).
@@ -781,6 +800,7 @@ sub upload_manager_javascript_reverse_as
if (!$can_assign->{'int'}) {
my $warning = &mt('You may not specify an initial password, as this is only available when new users use LON-CAPA internal authentication.\n').
&mt('Your current role does not have rights to create users with that authentication type.');
+ &js_escape(\$warning);
$auth_update = <<"END";
// Currently the initial password field is only supported for internal auth
// (see bug 6368).
@@ -1527,10 +1547,10 @@ sub curr_role_permissions {
# ======================================================= Existing Custom Roles
sub my_custom_roles {
- my ($crstype) = @_;
+ my ($crstype,$udom,$uname) = @_;
my %returnhash=();
my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1});
- my %rolehash=&Apache::lonnet::dump('roles');
+ my %rolehash=&Apache::lonnet::dump('roles',$udom,$uname);
foreach my $key (keys(%rolehash)) {
if ($key=~/^rolesdef\_(\w+)$/) {
if ($crstype eq 'Community') {
@@ -2410,6 +2430,7 @@ sub make_keylist_array {
$index->{'photo'} = &Apache::loncoursedata::CL_PHOTO();
$index->{'thumbnail'} = &Apache::loncoursedata::CL_THUMBNAIL();
$index->{'credits'} = &Apache::loncoursedata::CL_CREDITS();
+ $index->{'instsec'} = &Apache::loncoursedata::CL_INSTSEC();
$index->{'authorquota'} = &Apache::loncoursedata::CL_AUTHORQUOTA();
$index->{'authorusage'} = &Apache::loncoursedata::CL_AUTHORUSAGE();
foreach my $key (keys(%{$index})) {
@@ -2542,14 +2563,22 @@ $verify_action_js
function username_display_launch(username,domain) {
var target;
- for (var i=0; i<document.$formname.usernamelink.length; i++) {
- if (document.$formname.usernamelink[i].checked) {
- target = document.$formname.usernamelink[i].value;
+ if (!document.$formname.usernamelink.length) {
+ target = document.$formname.usernamelink.value;
+ } else {
+ for (var i=0; i<document.$formname.usernamelink.length; i++) {
+ if (document.$formname.usernamelink[i].checked) {
+ target = document.$formname.usernamelink[i].value;
+ }
}
}
- if (target == 'modify') {
+ if ((target == 'modify') || (target == 'activity')) {
+ var nextaction = 'singleuser';
+ if (target == 'activity') {
+ nextaction = 'accesslogs';
+ }
if (document.$formname.userwin.checked == true) {
- var url = '/adm/createuser?srchterm='+username+'&srchdomain='+domain+'&phase=get_user_info&action=singleuser&srchin=dom&srchby=uname&srchtype=exact&popup=1';
+ var url = '/adm/createuser?srchterm='+username+'&srchdomain='+domain+'&phase=get_user_info&srchin=dom&srchby=uname&srchtype=exact&popup=1&action='+nextaction;
var options = 'height=600,width=800,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no';
modifywin = window.open(url,'',options,1);
modifywin.focus();
@@ -2558,7 +2587,7 @@ function username_display_launch(usernam
document.$formname.srchterm.value=username;
document.$formname.srchdomain.value=domain;
document.$formname.phase.value='get_user_info';
- document.$formname.action.value = 'singleuser';
+ document.$formname.action.value = nextaction;
document.$formname.submit();
}
}
@@ -2604,6 +2633,7 @@ END
'owin' => "Open in a new window",
'modify' => "Modify a user's information",
'track' => "View a user's recent activity",
+ 'activity' => "View a user's access log",
);
my %lt = (%coltxt,%acttxt);
my $rolefilter = $env{'form.showrole'};
@@ -2694,12 +2724,17 @@ END
if ($permission->{'cusr'}) {
unshift (@linkdests,'modify');
}
- if (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) ||
- &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'.
- $env{'request.course.sec'})) {
- push(@linkdests,'track');
+ if ($context eq 'course') {
+ if (&Apache::lonnet::allowed('vsa', $env{'request.course.id'}) ||
+ &Apache::lonnet::allowed('vsa', $env{'request.course.id'}.'/'.
+ $env{'request.course.sec'})) {
+ push(@linkdests,'track');
+ }
+ } elsif ($context eq 'domain') {
+ if (&Apache::lonnet::allowed('vac',$env{'request.role.domain'})) {
+ push(@linkdests,'activity');
+ }
}
-
$output .= '<td>';
my $usernamelink = $env{'form.usernamelink'};
if ($usernamelink eq '') {
@@ -2968,6 +3003,12 @@ END
} (keys(%$userlist));
}
my $rowcount = 0;
+ my $disabled;
+ if ($mode eq 'autoenroll') {
+ unless ($permission->{'cusr'}) {
+ $disabled = ' disabled="disabled"';
+ }
+ }
foreach my $user (@sorted_users) {
my %in;
my $sdata = $userlist->{$user};
@@ -3004,16 +3045,16 @@ END
if ($mode eq 'autoenroll') {
my $cellentry;
if ($in{'type'} eq 'auto') {
- $cellentry = '<b>'.&mt('auto').'</b> <label><input type="checkbox" name="chgauto" value="'.$in{'username'}.':'.$in{'domain'}.'" /> '.&mt('Change').'</label>';
+ $cellentry = '<b>'.&mt('auto').'</b> <label><input type="checkbox" name="chgauto" value="'.$in{'username'}.':'.$in{'domain'}.'"'.$disabled.' /> '.&mt('Change').'</label>';
$autocount ++;
} else {
- $cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><span class="LC_nobreak"><label><input type="checkbox" name="chgmanual" value="'.$in{'username'}.':'.$in{'domain'}.'" /> '.&mt('Change').'</label></span></td></tr><tr><td><span class="LC_nobreak">';
+ $cellentry = '<table border="0" cellspacing="0"><tr><td rowspan="2"><b>'.&mt('manual').'</b></td><td><span class="LC_nobreak"><label><input type="checkbox" name="chgmanual" value="'.$in{'username'}.':'.$in{'domain'}.'"'.$disabled.' /> '.&mt('Change').'</label></span></td></tr><tr><td><span class="LC_nobreak">';
$manualcount ++;
if ($in{'lockedtype'}) {
- $cellentry .= '<label><input type="checkbox" name="unlockchg" value="'.$in{'username'}.':'.$in{'domain'}.'" /> '.&mt('Unlock').'</label>';
+ $cellentry .= '<label><input type="checkbox" name="unlockchg" value="'.$in{'username'}.':'.$in{'domain'}.'"'.$disabled.' /> '.&mt('Unlock').'</label>';
$unlockcount ++;
} else {
- $cellentry .= '<label><input type="checkbox" name="lockchg" value="'.$in{'username'}.':'.$in{'domain'}.'" /> '.&mt('Lock').'</label>';
+ $cellentry .= '<label><input type="checkbox" name="lockchg" value="'.$in{'username'}.':'.$in{'domain'}.'"'.$disabled.' /> '.&mt('Lock').'</label>';
$lockcount ++;
}
$cellentry .= '</span></td></tr></table>';
@@ -3053,13 +3094,14 @@ END
if ($role eq 'st') {
$checkval .= ':'.$in{'type'}.':'.
$in{'lockedtype'}.':'.
- $in{'credits'};
+ $in{'credits'}.':'.
+ &escape($in{'instsec'});
}
}
}
if ($showcheckbox) {
$r->print('<td><input type="checkbox" name="'.
- 'actionlist" value="'.$checkval.'" /></td>');
+ 'actionlist" value="'.&HTML::Entities::encode($checkval,'&<>"').'" /></td>');
} else {
$r->print('<td> </td>');
}
@@ -3074,7 +3116,7 @@ END
if ($item eq 'username') {
$r->print('<td>'.&print_username_link($mode,\%in).'</td>');
} elsif (($item eq 'start' || $item eq 'end') && ($actionselect)) {
- $r->print('<td>'.$in{$item}.'<input type="hidden" name="'.$checkval.'_'.$item.'" value="'.$sdata->[$index{$item}].'" /></td>'."\n");
+ $r->print('<td>'.$in{$item}.'<input type="hidden" name="'.&HTML::Entities::encode($checkval.'_'.$item.'" value="'.$sdata->[$index{$item}],'&<>"').'" /></td>'."\n");
} elsif ($item eq 'status') {
my $showitem = $in{$item};
if (defined($ltstatus{$in{$item}})) {
@@ -3173,6 +3215,10 @@ sub bulkaction_javascript {
my $noaction = &mt("You need to select an action to take for the user(s) you have selected");
my $singconfirm = &mt(' for a single user?');
my $multconfirm = &mt(' for multiple users?');
+ &js_escape(\$alert);
+ &js_escape(\$noaction);
+ &js_escape(\$singconfirm);
+ &js_escape(\$multconfirm);
my $output = <<"ENDJS";
function verify_action (field) {
var numchecked = 0;
@@ -4290,7 +4336,10 @@ sub upfile_drop_add {
my $newuserdom = $env{'request.role.domain'};
map { $cancreate{$_} = &can_create_user($newuserdom,$context,$_); } keys(%longtypes);
# Get new users list
+ my (%existinguser,%userinfo,%disallow,%rulematch,%inst_results,%alerts,%checkuname);
+ my $counter = -1;
foreach my $line (@userdata) {
+ $counter ++;
my @secs;
my %entries=&Apache::loncommon::record_sep($line);
# Determine user name
@@ -4322,23 +4371,20 @@ sub upfile_drop_add {
if ($entries{$fields{'username'}} =~ /\s/) {
$nowhitespace = ' - '.&mt('usernames may not contain spaces.');
}
- $r->print(
- '<br />'.
+ $disallow{$counter} =
&mt('Unacceptable username [_1] for user [_2] [_3] [_4] [_5]',
- '"<b>'.$entries{$fields{'username'}}.'</b>"',
- $fname,$mname,$lname,$gen).
- $nowhitespace);
+ '"<b>'.$entries{$fields{'username'}}.'</b>"',
+ $fname,$mname,$lname,$gen).$nowhitespace;
next;
} else {
$entries{$fields{'domain'}} =~ s/^\s+|\s+$//g;
if ($entries{$fields{'domain'}}
ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) {
- $r->print(
- '<br />'.
+ $disallow{$counter} =
&mt('Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]',
- '"<b>'.$entries{$fields{'domain'}}.'</b>"',
- $fname,$mname,$lname,$gen));
- next;
+ '"<b>'.$entries{$fields{'domain'}}.'</b>"',
+ $fname,$mname,$lname,$gen);
+ next;
}
my $username = $entries{$fields{'username'}};
my $userdomain = $entries{$fields{'domain'}};
@@ -4350,10 +4396,15 @@ sub upfile_drop_add {
$entries{$fields{'sec'}} =~ s/\W//g;
my $item = $entries{$fields{'sec'}};
if ($item eq "none" || $item eq 'all') {
- $r->print('<br />'.&mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a reserved word.','<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$item));
+ $disallow{$counter} =
+ &mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a reserved word.',
+ '<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$item);
next;
} elsif (exists($curr_groups{$item})) {
- $r->print('<br />'.&mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a course group.','<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$item).' '.&mt('Section names and group names must be distinct.'));
+ $disallow{$counter} =
+ &mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]" - this is a course group.',
+ '<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$item).' '.
+ &mt('Section names and group names must be distinct.');
next;
} else {
push(@secs,$item);
@@ -4365,14 +4416,21 @@ sub upfile_drop_add {
if (ref($userlist{$username.':'.$userdomain}) eq 'ARRAY') {
my $currsec = $userlist{$username.':'.$userdomain}[$secidx];
if ($currsec ne $env{'request.course.sec'}) {
- $r->print('<br />'.&mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]".','<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$secs[0]).'<br />');
+ $disallow{$counter} =
+ &mt('[_1]: Unable to enroll user [_2] [_3] [_4] [_5] in a section named "[_6]".',
+ '<b>'.$username.'</b>',$fname,$mname,$lname,$gen,$secs[0]);
if ($currsec eq '') {
- $r->print(&mt('This user already has an active/future student role in the course, unaffiliated to any section.'));
+ $disallow{$counter} .=
+ &mt('This user already has an active/future student role in the course, unaffiliated to any section.');
} else {
- $r->print(&mt('This user already has an active/future role in section "[_1]" of the course.',$currsec));
+ $disallow{$counter} .=
+ &mt('This user already has an active/future role in section "[_1]" of the course.',$currsec);
}
- $r->print('<br />'.&mt('Although your current role has privileges to add students to section "[_1]", you do not have privileges to modify existing enrollments in other sections.',$secs[0]).'<br />');
+ $disallow{$counter} .=
+ '<br />'.
+ &mt('Although your current role has privileges to add students to section "[_1]", you do not have privileges to modify existing enrollments in other sections.',
+ $secs[0]);
next;
}
}
@@ -4424,13 +4482,12 @@ sub upfile_drop_add {
}
if ($role eq '') {
my $rolestr = join(', ',@permitted_roles);
- $r->print('<br />'
- .&mt('[_1]: You do not have permission to add the requested role [_2] for the user.'
- ,'<b>'.$entries{$fields{'username'}}.'</b>'
- ,$entries{$fields{'role'}})
- .'<br />'
- .&mt('Allowable role(s) is/are: [_1].',$rolestr)."\n"
- );
+ $disallow{$counter} =
+ &mt('[_1]: You do not have permission to add the requested role [_2] for the user.'
+ ,'<b>'.$entries{$fields{'username'}}.'</b>'
+ ,$entries{$fields{'role'}})
+ .'<br />'
+ .&mt('Allowable role(s) is/are: [_1].',$rolestr);
next;
}
}
@@ -4460,55 +4517,36 @@ sub upfile_drop_add {
# check against rules
my $checkid = 0;
my $newuser = 0;
- my (%rulematch,%inst_results,%idinst_results);
my $uhome=&Apache::lonnet::homeserver($username,$userdomain);
if ($uhome eq 'no_host') {
if ($userdomain ne $newuserdom) {
if ($context eq 'course') {
- $r->print('<br />'.
- &mt('[_1]: The domain specified ([_2]) is different to that of the course.',
- '<b>'.$username.'</b>',$userdomain).'<br />');
+ $disallow{$counter} =
+ &mt('[_1]: The domain specified ([_2]) is different to that of the course.',
+ '<b>'.$username.'</b>',$userdomain);
} elsif ($context eq 'author') {
- $r->print(&mt('[_1]: The domain specified ([_2]) is different to that of the author.',
- '<b>'.$username.'</b>',$userdomain).'<br />');
+ $disallow{$counter} =
+ &mt('[_1]: The domain specified ([_2]) is different to that of the author.',
+ '<b>'.$username.'</b>',$userdomain);
} else {
- $r->print(&mt('[_1]: The domain specified ([_2]) is different to that of your current role.',
- '<b>'.$username.'</b>',$userdomain).'<br />');
+ $disallow{$counter} =
+ &mt('[_1]: The domain specified ([_2]) is different to that of your current role.',
+ '<b>'.$username.'</b>',$userdomain);
}
- $r->print(&mt('The user does not already exist, and you may not create a new user in a different domain.'));
+ $disallow{$counter} .=
+ &mt('The user does not already exist, and you may not create a new user in a different domain.');
next;
+ } else {
+ unless ($password || $env{'form.login'} eq 'loc') {
+ $disallow{$counter} =
+ &mt('[_1]: This is a new user but no default password was provided, and the authentication type requires one.',
+ '<b>'.$username.'</b>');
+ next;
+ }
}
$checkid = 1;
$newuser = 1;
- my $user = $username.':'.$newuserdom;
- my $checkhash;
- my $checks = { 'username' => 1 };
- $checkhash->{$username.':'.$newuserdom} = { 'newuser' => 1, };
- &Apache::loncommon::user_rule_check($checkhash,$checks,
- \%alerts,\%rulematch,\%inst_results,\%curr_rules,
- \%got_rules);
- if (ref($alerts{'username'}) eq 'HASH') {
- if (ref($alerts{'username'}{$newuserdom}) eq 'HASH') {
- if ($alerts{'username'}{$newuserdom}{$username}) {
- $r->print('<br />'.
- &mt('[_1]: matches the username format at your institution, but is not known to your directory service.','<b>'.$username.'</b>').'<br />'.
- &mt('Consequently, the user was not created.'));
- next;
- }
- }
- }
- my $usertype = 'unofficial';
- if (ref($rulematch{$user}) eq 'HASH') {
- if ($rulematch{$user}{'username'}) {
- $usertype = 'official';
- }
- }
- unless ($cancreate{$usertype}) {
- my $showtype = $longtypes{$usertype};
- $r->print('<br />'.
- &mt('[_1]: The user does not exist, and you are not permitted to create users of type: [_2].','<b>'.$username.'</b>',$showtype));
- next;
- }
+ $checkuname{$username.':'.$newuserdom} = { 'newuser' => $newuser, 'id' => $id };
} else {
if ($context eq 'course' || $context eq 'author') {
if ($userdomain eq $domain ) {
@@ -4541,77 +4579,205 @@ sub upfile_drop_add {
}
}
}
+ if ($id) {
+ $existinguser{$userdomain}{$username} = $id;
+ }
+ }
+ $userinfo{$counter} = {
+ username => $username,
+ domain => $userdomain,
+ fname => $fname,
+ mname => $mname,
+ lname => $lname,
+ gen => $gen,
+ email => $email,
+ id => $id,
+ password => $password,
+ inststatus => $inststatus,
+ role => $role,
+ sections => \@secs,
+ credits => $credits,
+ newuser => $newuser,
+ checkid => $checkid,
+ };
+ }
+ }
+ } # end of foreach (@userdata)
+ if ($counter > -1) {
+ my $total = $counter + 1;
+ my %checkids;
+ if ((keys(%existinguser)) || (keys(%checkuname))) {
+ $r->print(&mt('Please be patient -- checking for institutional data ...'));
+ $r->rflush();
+ if (keys(%existinguser)) {
+ foreach my $dom (keys(%existinguser)) {
+ if (ref($existinguser{$dom}) eq 'HASH') {
+ my %idhash = &Apache::lonnet::idrget($dom,keys(%{$existinguser{$dom}}));
+ foreach my $username (keys(%{$existinguser{$dom}})) {
+ if ($idhash{$username} ne $existinguser{$dom}{$username}) {
+ $checkids{$username.':'.$dom} = {
+ 'id' => $existinguser{$dom}{$username},
+ };
+ }
+ }
+ if (keys(%checkids)) {
+ &Apache::loncommon::user_rule_check(\%checkids,{ 'id' => 1 },
+ \%alerts,\%rulematch,
+ \%inst_results,\%curr_rules,
+ \%got_rules);
+ }
+ }
}
- if ($id ne '') {
- if (!$newuser) {
- my %idhash = &Apache::lonnet::idrget($userdomain,($username));
- if ($idhash{$username} ne $id) {
- $checkid = 1;
+ }
+ if (keys(%checkuname)) {
+ &Apache::loncommon::user_rule_check(\%checkuname,{ 'username' => 1, 'id' => 1, },
+ \%alerts,\%rulematch,\%inst_results,
+ \%curr_rules,\%got_rules);
+ }
+ $r->print(' '.&mt('done').'<br /><br />');
+ $r->rflush();
+ }
+ my %prog_state = &Apache::lonhtmlcommon::Create_PrgWin($r,$total);
+ $r->print('<ul>');
+ for (my $i=0; $i<=$counter; $i++) {
+ if ($disallow{$i}) {
+ $r->print('<li>'.$disallow{$i}.'</li>');
+ } elsif (ref($userinfo{$i}) eq 'HASH') {
+ my $password = $userinfo{$i}{'password'};
+ my $newuser = $userinfo{$i}{'newuser'};
+ my $checkid = $userinfo{$i}{'checkid'};
+ my $id = $userinfo{$i}{'id'};
+ my $role = $userinfo{$i}{'role'};
+ my @secs;
+ if (ref($userinfo{$i}{'sections'}) eq 'ARRAY') {
+ @secs = @{$userinfo{$i}{'sections'}};
+ }
+ my $fname = $userinfo{$i}{'fname'};
+ my $mname = $userinfo{$i}{'mname'};
+ my $lname = $userinfo{$i}{'lname'};
+ my $gen = $userinfo{$i}{'gen'};
+ my $email = $userinfo{$i}{'email'};
+ my $inststatus = $userinfo{$i}{'inststatus'};
+ my $credits = $userinfo{$i}{'credits'};
+ my $username = $userinfo{$i}{'username'};
+ my $userdomain = $userinfo{$i}{'domain'};
+ my $user = $username.':'.$userdomain;
+ if ($newuser) {
+ if (ref($alerts{'username'}) eq 'HASH') {
+ if (ref($alerts{'username'}{$userdomain}) eq 'HASH') {
+ if ($alerts{'username'}{$userdomain}{$username}) {
+ $r->print('<li>'.
+ &mt('[_1]: matches the username format at your institution, but is not known to your directory service.','<b>'.$username.'</b>').'<br />'.
+ &mt('Consequently, the user was not created.').'</li>');
+ next;
+ }
}
}
- if ($checkid) {
- my $checkhash;
- my $checks = { 'id' => 1 };
- $checkhash->{$username.':'.$userdomain} = { 'newuser' => $newuser,
- 'id' => $id };
- &Apache::loncommon::user_rule_check($checkhash,$checks,
- \%alerts,\%rulematch,\%idinst_results,\%curr_rules,
- \%got_rules);
+ if (ref($inst_results{$user}) eq 'HASH') {
+ if ($inst_results{$user}{'firstname'} ne '') {
+ $fname = $inst_results{$user}{'firstname'};
+ }
+ if ($inst_results{$user}{'middlename'} ne '') {
+ $mname = $inst_results{$user}{'middlename'};
+ }
+ if ($inst_results{$user}{'lasttname'} ne '') {
+ $lname = $inst_results{$user}{'lastname'};
+ }
+ if ($inst_results{$user}{'permanentemail'} ne '') {
+ $email = $inst_results{$user}{'permanentemail'};
+ }
+ if ($inst_results{$user}{'id'} ne '') {
+ $id = $inst_results{$user}{'id'};
+ $checkid = 0;
+ }
+ if (ref($inst_results{$user}{'inststatus'}) eq 'ARRAY') {
+ $inststatus = join(':',@{$inst_results{$user}{'inststatus'}});
+ }
+ }
+ if (($checkid) && ($id ne '')) {
if (ref($alerts{'id'}) eq 'HASH') {
if (ref($alerts{'id'}{$userdomain}) eq 'HASH') {
- if ($alerts{'id'}{$userdomain}{$id}) {
- $r->print(&mt('[_1]: has a student/employee ID matching the format at your institution, but the ID is found by your directory service.',
+ if ($alerts{'id'}{$userdomain}{$username}) {
+ $r->print('<li>'.
+ &mt('[_1]: has a student/employee ID matching the format at your institution, but the ID is not found by your directory service.',
'<b>'.$username.'</b>').'<br />'.
- &mt('Consequently, the user was not created.'));
+ &mt('Consequently, the user was not created.').'</li>');
next;
}
}
}
}
+ my $usertype = 'unofficial';
+ if (ref($rulematch{$user}) eq 'HASH') {
+ if ($rulematch{$user}{'username'}) {
+ $usertype = 'official';
+ }
+ }
+ unless ($cancreate{$usertype}) {
+ my $showtype = $longtypes{$usertype};
+ $r->print('<li>'.
+ &mt('[_1]: The user does not exist, and you are not permitted to create users of type: [_2].','<b>'.$username.'</b>',$showtype).'</li>');
+ next;
+ }
+ } elsif ($id ne '') {
+ if (exists($checkids{$user})) {
+ $checkid = 1;
+ if (ref($alerts{'id'}) eq 'HASH') {
+ if (ref($alerts{'id'}{$userdomain}) eq 'HASH') {
+ if ($alerts{'id'}{$userdomain}{$username}) {
+ $r->print('<li>'.
+ &mt('[_1]: has a student/employee ID matching the format at your institution, but the ID is not found by your directory service.',
+ '<b>'.$username.'</b>').'<br />'.
+ &mt('Consequently, the ID was not changed.').'</li>');
+ $id = '';
+ }
+ }
+ }
+ }
}
- if ($password || $env{'form.login'} eq 'loc') {
- my $multiple = 0;
- my ($userresult,$authresult,$roleresult,$idresult);
- my (%userres,%authres,%roleres,%idres);
- my $singlesec = '';
- if ($role eq 'st') {
- my $sec;
+ my $multiple = 0;
+ my ($userresult,$authresult,$roleresult,$idresult);
+ my (%userres,%authres,%roleres,%idres);
+ my $singlesec = '';
+ if ($role eq 'st') {
+ my $sec;
+ if (ref($userinfo{$i}{'sections'}) eq 'ARRAY') {
if (@secs > 0) {
$sec = $secs[0];
}
- &modifystudent($userdomain,$username,$cid,$sec,
- $desiredhost,$context);
- $roleresult =
- &Apache::lonnet::modifystudent
- ($userdomain,$username,$id,$amode,$password,
- $fname,$mname,$lname,$gen,$sec,$enddate,
- $startdate,$env{'form.forceid'},
- $desiredhost,$email,'manual','',$cid,
- '',$context,$inststatus,$credits);
- $userresult = $roleresult;
- } else {
- if ($role ne '') {
- if ($context eq 'course' || $setting eq 'course') {
- if ($customroles{$role}) {
- $role = 'cr_'.$env{'user.domain'}.'_'.
- $env{'user.name'}.'_'.$role;
- }
- if (($role ne 'cc') && ($role ne 'co')) {
- if (@secs > 1) {
- $multiple = 1;
- foreach my $sec (@secs) {
- ($userres{$sec},$authres{$sec},$roleres{$sec},$idres{$sec}) =
- &modifyuserrole($context,$setting,
- $changeauth,$cid,$userdomain,$username,
- $id,$amode,$password,$fname,
- $mname,$lname,$gen,$sec,
- $env{'form.forceid'},$desiredhost,
- $email,$role,$enddate,
- $startdate,$checkid,$inststatus);
- }
- } elsif (@secs > 0) {
- $singlesec = $secs[0];
+ }
+ &modifystudent($userdomain,$username,$cid,$sec,
+ $desiredhost,$context);
+ $roleresult =
+ &Apache::lonnet::modifystudent
+ ($userdomain,$username,$id,$amode,$password,
+ $fname,$mname,$lname,$gen,$sec,$enddate,
+ $startdate,$env{'form.forceid'},
+ $desiredhost,$email,'manual','',$cid,
+ '',$context,$inststatus,$credits);
+ $userresult = $roleresult;
+ } else {
+ if ($role ne '') {
+ if ($context eq 'course' || $setting eq 'course') {
+ if ($customroles{$role}) {
+ $role = 'cr_'.$env{'user.domain'}.'_'.
+ $env{'user.name'}.'_'.$role;
+ }
+ if (($role ne 'cc') && ($role ne 'co')) {
+ if (@secs > 1) {
+ $multiple = 1;
+ foreach my $sec (@secs) {
+ ($userres{$sec},$authres{$sec},$roleres{$sec},$idres{$sec}) =
+ &modifyuserrole($context,$setting,
+ $changeauth,$cid,$userdomain,$username,
+ $id,$amode,$password,$fname,
+ $mname,$lname,$gen,$sec,
+ $env{'form.forceid'},$desiredhost,
+ $email,$role,$enddate,
+ $startdate,$checkid,$inststatus);
}
+ } elsif (@secs > 0) {
+ $singlesec = $secs[0];
}
}
}
@@ -4626,38 +4792,27 @@ sub upfile_drop_add {
$checkid,$inststatus);
}
}
- if ($multiple) {
- foreach my $sec (sort(keys(%userres))) {
- $flushc =
+ }
+ if ($multiple) {
+ foreach my $sec (sort(keys(%userres))) {
+ $flushc =
&user_change_result($r,$userres{$sec},$authres{$sec},
$roleres{$sec},$idres{$sec},\%counts,$flushc,
$username,$userdomain,\%userchg);
- }
- } else {
- $flushc =
- &user_change_result($r,$userresult,$authresult,
- $roleresult,$idresult,\%counts,$flushc,
- $username,$userdomain,\%userchg);
}
} else {
- if ($context eq 'course') {
- $r->print('<br />'.
- &mt('[_1]: Unable to enroll. No password specified.','<b>'.$username.'</b>')
- );
- } elsif ($context eq 'author') {
- $r->print('<br />'.
- &mt('[_1]: Unable to add co-author. No password specified.','<b>'.$username.'</b>')
- );
- } else {
- $r->print('<br />'.
- &mt('[_1]: Unable to add user. No password specified.','<b>'.$username.'</b>')
- );
- }
+ $flushc =
+ &user_change_result($r,$userresult,$authresult,
+ $roleresult,$idresult,\%counts,$flushc,
+ $username,$userdomain,\%userchg);
}
}
- }
- } # end of foreach (@userdata)
+ &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last user');
+ } # end of loop
+ $r->print('</ul>');
+ &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+ }
# Flush the course logs so reverse user roles immediately updated
$r->register_cleanup(\&Apache::lonnet::flushcourselogs);
$r->print("</p>\n<p>\n".&mt('Processed [quant,_1,user].',$counts{'user'}).
@@ -4750,11 +4905,12 @@ sub user_change_result {
my ($r,$userresult,$authresult,$roleresult,$idresult,$counts,$flushc,
$username,$userdomain,$userchg) = @_;
my $okresult = 0;
+ my @status;
if ($userresult ne 'ok') {
if ($userresult =~ /^error:(.+)$/) {
my $error = $1;
- $r->print('<br />'.
- &mt('[_1]: Unable to add/modify: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
+ push(@status,
+ &mt('[_1]: Unable to add/modify: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
}
} else {
$counts->{'user'} ++;
@@ -4763,8 +4919,8 @@ sub user_change_result {
if ($authresult ne 'ok') {
if ($authresult =~ /^error:(.+)$/) {
my $error = $1;
- $r->print('<br />'.
- &mt('[_1]: Unable to modify authentication: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
+ push(@status,
+ &mt('[_1]: Unable to modify authentication: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
}
} else {
$counts->{'auth'} ++;
@@ -4773,8 +4929,8 @@ sub user_change_result {
if ($roleresult ne 'ok') {
if ($roleresult =~ /^error:(.+)$/) {
my $error = $1;
- $r->print('<br />'.
- &mt('[_1]: Unable to add role: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
+ push(@status,
+ &mt('[_1]: Unable to add role: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error));
}
} else {
$counts->{'role'} ++;
@@ -4783,14 +4939,16 @@ sub user_change_result {
if ($okresult) {
$flushc++;
$userchg->{$username.':'.$userdomain}=1;
- $r->print('. ');
if ($flushc>15) {
$r->rflush;
$flushc=0;
}
}
if ($idresult) {
- $r->print($idresult);
+ push(@status,$idresult);
+ }
+ if (@status) {
+ $r->print('<li>'.join('<br />',@status).'</li>');
}
return $flushc;
}
@@ -4861,7 +5019,7 @@ sub update_user_list {
foreach my $item (@changelist) {
my ($role,$uname,$udom,$cid,$sec,$scope,$result,$type,$locktype,
@sections,$scopestem,$singlesec,$showsecs,$warn_singlesec,
- $nothingtodo,$keepnosection,$credits);
+ $nothingtodo,$keepnosection,$credits,$instsec);
if ($choice eq 'drop') {
($uname,$udom,$sec) = split(/:/,$item,-1);
$role = 'st';
@@ -4874,8 +5032,9 @@ sub update_user_list {
$scope = $scopestem.'/'.$sec;
}
} elsif ($context eq 'course') {
- ($uname,$udom,$role,$sec,$type,$locktype,$credits) =
- split(/\:/,$item);
+ ($uname,$udom,$role,$sec,$type,$locktype,$credits,$instsec) =
+ split(/\:/,$item,8);
+ $instsec = &unescape($instsec);
$cid = $env{'request.course.id'};
$scopestem = '/'.$cid;
$scopestem =~s/\_/\//g;
@@ -4894,8 +5053,9 @@ sub update_user_list {
} elsif ($setting eq 'author') {
($uname,$udom,$role,$scope) = split(/\:/,$item);
} elsif ($setting eq 'course') {
- ($uname,$udom,$role,$cid,$sec,$type,$locktype,$credits) =
- split(/\:/,$item);
+ ($uname,$udom,$role,$cid,$sec,$type,$locktype,$credits,$instsec) =
+ split(/\:/,$item,9);
+ $instsec = &unescape($instsec);
$scope = '/'.$cid;
$scope =~s/\_/\//g;
if ($sec ne '') {
@@ -4917,7 +5077,7 @@ sub update_user_list {
$end = $now;
if ($role eq 'st') {
$result =
- &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits);
+ &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits,$instsec);
} else {
$result =
&Apache::lonnet::revokerole($udom,$uname,$scope,$role,
@@ -4925,7 +5085,7 @@ sub update_user_list {
}
} elsif ($choice eq 'delete') {
if ($role eq 'st') {
- &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$now,$start,$type,$locktype,$cid,'',$context,$credits);
+ &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$now,$start,$type,$locktype,$cid,'',$context,$credits,$instsec);
}
$result =
&Apache::lonnet::assignrole($udom,$uname,$scope,$role,$now,
@@ -4938,7 +5098,7 @@ sub update_user_list {
}
if ($choice eq 'reenable') {
if ($role eq 'st') {
- $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits);
+ $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits,$instsec);
} else {
$result =
&Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end,
@@ -4946,14 +5106,14 @@ sub update_user_list {
}
} elsif ($choice eq 'activate') {
if ($role eq 'st') {
- $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits);
+ $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits,$instsec);
} else {
$result = &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end,
$now,'','',$context);
}
} elsif ($choice eq 'chgdates') {
if ($role eq 'st') {
- $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits);
+ $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$sec,$end,$start,$type,$locktype,$cid,'',$context,$credits,$instsec);
} else {
$result = &Apache::lonnet::assignrole($udom,$uname,$scope,$role,$end,
$start,'','',$context);
@@ -5023,7 +5183,7 @@ sub update_user_list {
} else {
if ($role eq 'st') {
$result =
- &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$end,$start,$type,$locktype,$cid,'',$context,$credits);
+ &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,undef,$end,$start,$type,$locktype,$cid,'',$context,$credits,$instsec);
} else {
my $newscope = $scopestem;
$result = &Apache::lonnet::assignrole($udom,$uname,$newscope,$role,$end,$start,'','',$context);
@@ -5037,7 +5197,7 @@ sub update_user_list {
foreach my $newsec (@newsecs) {
if (!grep(/^\Q$newsec\E$/,@retained)) {
if ($role eq 'st') {
- $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$newsec,$end,$start,$type,$locktype,$cid,'',$context,$credits);
+ $result = &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$newsec,$end,$start,$type,$locktype,$cid,'',$context,$credits,$instsec);
if (@newsecs > 1) {
my $showsingle;
if ($newsec eq '') {
@@ -5215,18 +5375,25 @@ sub active_student_roles {
sub section_check_js {
my $groupslist= &get_groupslist();
+ my %js_lt = &Apache::lonlocal::texthash(
+ mayn => 'may not be used as the name for a section, as it is a reserved word.',
+ plch => 'Please choose a different section name.',
+ mnot => 'may not be used as a section name, as it is the name of a course group.',
+ secn => 'Section names and group names must be distinct. Please choose a different section name.',
+ );
+ &js_escape(\%js_lt);
return <<"END";
function validate(caller) {
var groups = new Array($groupslist);
var secname = caller.value;
if ((secname == 'all') || (secname == 'none')) {
- alert("'"+secname+"' may not be used as the name for a section, as it is a reserved word.\\nPlease choose a different section name.");
+ alert("'"+secname+"' $js_lt{'mayn'}\\n$js_lt{'plch'}");
return 'error';
}
if (secname != '') {
for (var k=0; k<groups.length; k++) {
if (secname == groups[k]) {
- alert("'"+secname+"' may not be used as the name for a section, as it is the name of a course group.\\nSection names and group names must be distinct. Please choose a different section name.");
+ alert("'"+secname+"' $js_lt{'mnot'}\\n$js_lt{'secn'}");
return 'error';
}
}
@@ -5265,13 +5432,13 @@ sub set_login {
}
sub course_sections {
- my ($sections_count,$role,$current_sec) = @_;
+ my ($sections_count,$role,$current_sec,$disabled) = @_;
my $output = '';
- my @sections = (sort {$a <=> $b} keys %{$sections_count});
+ my @sections = (sort {$a <=> $b} keys(%{$sections_count}));
my $numsec = scalar(@sections);
my $is_selected = ' selected="selected"';
if ($numsec <= 1) {
- $output = '<select name="currsec_'.$role.'" >'."\n".
+ $output = '<select name="currsec_'.$role.'"'.$disabled.'>'."\n".
' <option value="">'.&mt('Select').'</option>'."\n";
if ($current_sec eq 'none') {
$output .=
@@ -5294,7 +5461,7 @@ sub course_sections {
my $multiple = 4;
if (scalar(@sections) < 4) { $multiple = scalar(@sections); }
if ($role eq 'st') {
- $output .= '>'."\n".
+ $output .= $disabled.'>'."\n".
' <option value="">'.&mt('Select').'</option>'."\n";
if ($current_sec eq 'none') {
$output .=
@@ -5304,7 +5471,7 @@ sub course_sections {
' <option value="">'.&mt('No section')."</option>\n";
}
} else {
- $output .= 'multiple="multiple" size="'.$multiple.'">'."\n";
+ $output .= 'multiple="multiple" size="'.$multiple.'"'.$disabled.'>'."\n";
}
foreach my $sec (@sections) {
if ($current_sec eq $sec) {
@@ -5385,7 +5552,8 @@ sub setsections_javascript {
mnot => 'may not be used as a section name, as it is the name of a course group.',
secn => 'Section names and group names must be distinct. Please choose a different section name.',
nonw => 'Section names may only contain letters or numbers.',
- );
+ );
+ &js_escape(\%alerts);
$setsection_js .= <<"ENDSECCODE";
function setSections(formname,crstype) {
@@ -5396,6 +5564,9 @@ function setSections(formname,crstype) {
var groups = new Array($groupslist);
for (var i=0;i<formname.elements.length;i++) {
var str = formname.elements[i].name;
+ if (typeof(str) === "undefined") {
+ continue;
+ }
var checkcurr = str.match(re1);
if (checkcurr != null) {
var num = i;
@@ -5517,6 +5688,9 @@ sub can_create_user {
my $cancreate = 1;
if (&Apache::lonnet::allowed('mau',$dom)) {
return $cancreate;
+ } elsif ($context eq 'domain') {
+ $cancreate = 0;
+ return $cancreate;
}
if (ref($domconf{'usercreation'}) eq 'HASH') {
if (ref($domconf{'usercreation'}{'cancreate'}) eq 'HASH') {
@@ -5659,7 +5833,7 @@ sub roles_by_context {
} elsif ($context eq 'author') {
@allroles = ('ca','aa');
} elsif ($context eq 'domain') {
- @allroles = ('li','ad','dg','sc','au','dc');
+ @allroles = ('li','ad','dg','dh','sc','au','dc');
}
return @allroles;
}
@@ -5717,6 +5891,17 @@ sub get_permission {
}
}
}
+ if ($env{'request.course.id'}) {
+ my $user = $env{'user.name'}.':'.$env{'user.domain'};
+ if (($user ne '') && ($env{'course.'.$env{'request.course.id'}.'.internal.courseowner'} eq
+ $user)) {
+ $permission{'owner'} = 1;
+ } elsif (($user ne '') && ($env{'course.'.$env{'request.course.id'}.'.internal.co-owners'} ne '')) {
+ if (grep(/^\Q$user\E$/,split(/,/,$env{'course.'.$env{'request.course.id'}.'.internal.co-owners'}))) {
+ $permission{'co-owner'} = 1;
+ }
+ }
+ }
} elsif ($context eq 'author') {
$permission{'cusr'} = &authorpriv($env{'user.name'},$env{'request.role.domain'});
$permission{'view'} = $permission{'cusr'};
@@ -5736,7 +5921,15 @@ sub get_permission {
if (&Apache::lonnet::allowed('ccr',$env{'request.role.domain'})) {
$permission{'custom'} = 1;
}
- $permission{'view'} = $permission{'cusr'};
+ if (&Apache::lonnet::allowed('vac',$env{'request.role.domain'})) {
+ $permission{'activity'} = 1;
+ }
+ if (&Apache::lonnet::allowed('vur',$env{'request.role.domain'})) {
+ $permission{'view'} = 1;
+ }
+ if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
+ $permission{'owner'} = 1;
+ }
}
my $allowed = 0;
foreach my $perm (values(%permission)) {
@@ -6019,6 +6212,7 @@ sub sectioncheck_alerts {
thwa => 'There was a problem with your course selection',
thwc => 'There was a problem with your community selection',
);
+ &js_escape(\%alerts);
return %alerts;
}
@@ -6029,6 +6223,7 @@ sub authcheck_alerts {
krb => 'You need to specify the Kerberos domain.',
ipass => 'You need to specify the initial password.',
);
+ &js_escape(\%alerts);
return %alerts;
}
@@ -6095,7 +6290,7 @@ sub selfenroll_validation_types {
button => 'Text for validation button',
markup => 'Validation description (HTML)',
);
- my @fields = ('username','domain','uniquecode','course','token','coursetype','description');
+ my @fields = ('username','domain','uniquecode','course','coursetype','description');
return (\@items,\%names,\@fields);
}
@@ -6110,6 +6305,8 @@ sub get_extended_type {
}
if ($crstype eq 'Community') {
$type = 'community';
+ } elsif ($crstype eq 'Placement') {
+ $type = 'placement';
} elsif ($settings{'internal.coursecode'}) {
$type = 'official';
} elsif ($settings{'internal.textbook'}) {
@@ -6168,5 +6365,447 @@ sub selfenrollment_administration {
return (\@in_course,\@in_domain);
}
+sub custom_role_header {
+ my ($context,$crstype,$templaterolerefs,$prefix) = @_;
+ my %lt = &Apache::lonlocal::texthash(
+ sele => 'Select a Template',
+ );
+ my ($context_code,$button_code);
+ if ($context eq 'domain') {
+ $context_code = &custom_coursetype_switch($crstype,$prefix);
+ }
+ if (ref($templaterolerefs) eq 'ARRAY') {
+ foreach my $role (@{$templaterolerefs}) {
+ my $display = 'inline';
+ if (($context eq 'domain') && ($role eq 'co')) {
+ $display = 'none';
+ }
+ $button_code .= &make_button_code($role,$crstype,$display,$prefix).' ';
+ }
+ }
+ return <<"END";
+<div class="LC_left_float">
+<fieldset>
+<legend>$lt{'sele'}</legend>
+$button_code
+</fieldset></div>
+$context_code
+<br clear="all" />
+END
+}
+
+sub custom_coursetype_switch {
+ my ($crstype,$prefix) = @_;
+ my ($checkedcourse,$checkedcommunity);
+ if ($crstype eq 'Community') {
+ $checkedcommunity = ' checked="checked"';
+ } else {
+ $checkedcourse = ' checked="checked"';
+ }
+ my %lt = &Apache::lonlocal::texthash(
+ cont => 'Context',
+ cour => 'Course',
+ comm => 'Community',
+ );
+ return <<"END";
+<div class="LC_left_float">
+<fieldset>
+<legend>$lt{'cont'}</legend>
+<label>
+<input type="radio" name="${prefix}_custrolecrstype" value="Course"$checkedcourse onclick="javascript:customSwitchType('$prefix');" />
+$lt{'cour'}
+</label>
+<label>
+<input type="radio" name="${prefix}_custrolecrstype" value="Community"$checkedcommunity onclick="javascript:customSwitchType('$prefix');" />
+$lt{'comm'}
+</label>
+</fieldset>
+</div>
+END
+}
+
+sub custom_role_table {
+ my ($crstype,$full,$levels,$levelscurrent,$prefix,$add_class,$id) = @_;
+ return unless ((ref($full) eq 'HASH') && (ref($levels) eq 'HASH') &&
+ (ref($levelscurrent) eq 'HASH'));
+ my %lt=&Apache::lonlocal::texthash (
+ 'prv' => "Privilege",
+ 'crl' => "Course Level",
+ 'dml' => "Domain Level",
+ 'ssl' => "System Level");
+ my %cr = (
+ course => '_c',
+ domain => '_d',
+ system => '_s',
+ );
+
+ my $output=&Apache::loncommon::start_data_table($add_class,$id).
+ &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,$crstype);
+ $output .= &Apache::loncommon::start_data_table_row().
+ '<td><span id="'.$prefix.$priv.'">'.$privtext.'</span></td>';
+ foreach my $type ('course','domain','system') {
+ if (($type eq 'system') && ($priv eq 'bre') && ($crstype eq 'Community')) {
+ $output .= '<td> </td>';
+ } else {
+ $output .= '<td>'.
+ ($levels->{$type}{$priv}?'<input type="checkbox" id="'.$prefix.$priv.$cr{$type}.'"'.
+ ' name="'.$prefix.$priv.$cr{$type}.'"'.
+ ($levelscurrent->{$type}{$priv}?' checked="checked"':'').' />':' ').
+ '</td>';
+ }
+ }
+ $output .= &Apache::loncommon::end_data_table_row();
+ }
+ $output .= &Apache::loncommon::end_data_table();
+ return $output;
+}
+
+sub custom_role_privs {
+ my ($privs,$full,$levels,$levelscurrent)= @_;
+ return unless ((ref($privs) eq 'HASH') && (ref($full) eq 'HASH') &&
+ (ref($levels) eq 'HASH') && (ref($levelscurrent) eq 'HASH'));
+ my %cr = (
+ course => 'cr:c',
+ domain => 'cr:d',
+ system => 'cr:s',
+ );
+ foreach my $type ('course','domain','system') {
+ foreach my $item (split(/\:/,$Apache::lonnet::pr{$cr{$type}})) {
+ my ($priv,$restrict)=split(/\&/,$item);
+ if (!$restrict) { $restrict='F'; }
+ $levels->{$type}->{$priv}=$restrict;
+ if ($privs->{$type}=~/\:$priv/) {
+ $levelscurrent->{$type}->{$priv}=1;
+ }
+ $full->{$priv}=1;
+ }
+ }
+ return;
+}
+
+sub custom_template_roles {
+ my ($context,$crstype) = @_;
+ my @template_roles = ("in","ta","ep");
+ if (($context eq 'domain') || ($context eq 'domprefs')) {
+ push(@template_roles,"ad");
+ }
+ push(@template_roles,"st");
+ if ($context eq 'domain') {
+ unshift(@template_roles,('co','cc'));
+ } else {
+ if ($crstype eq 'Community') {
+ unshift(@template_roles,'co');
+ } else {
+ unshift(@template_roles,'cc');
+ }
+ }
+ return @template_roles;
+}
+
+sub custom_roledefs_js {
+ my ($context,$crstype,$formname,$full,$templaterolesref,$jsback) = @_;
+ my $button_code = "\n";
+ my $head_script = "\n";
+ my (%roletitlestr,$rolenamestr);
+ my %role_titles = (
+ Course => [],
+ Community => [],
+ );
+ $head_script .= '<script type="text/javascript">'."\n"
+ .'// <![CDATA['."\n";
+ if (ref($templaterolesref) eq 'ARRAY') {
+ if ($context eq 'domain') {
+ $rolenamestr = join("','",@{$templaterolesref});
+ }
+ foreach my $role (@{$templaterolesref}) {
+ $head_script .= &make_script_template($role,$crstype,$formname);
+ if ($context eq 'domain') {
+ foreach my $type ('Course','Community') {
+ push(@{$role_titles{$type}},&Apache::lonnet::plaintext($role,$type));
+ }
+ }
+ }
+ }
+ if ($context eq 'domain') {
+ foreach my $type ('Course','Community') {
+ $roletitlestr{$type} = join("','",@{$role_titles{$type}});
+ }
+ my %pt = (
+ Community => {
+ cst => &mt('Grant/revoke role of Member'),
+ mdc => &mt('Edit community contents'),
+ pch => &mt('Post discussion on community resources'),
+ pfo => &mt('Print for other users and entire community'),
+ },
+ Course => {
+ cst => &mt('Grant/revoke role of Student'),
+ mdc => &mt('Edit course contents'),
+ pch => &mt('Post discussion on course resources'),
+ pfo => &mt('Print for other users and entire course'),
+ },
+ );
+ $head_script .= <<"ENDJS";
+function customSwitchType(prefix) {
+ var privnames = new Array('cst','mdc','pch','pfo');
+ var privtxtcrs = new Array('$pt{Course}{cst}','$pt{Course}{mdc}','$pt{Course}{pch}','$pt{Course}{pfo}');
+ var privtxtcom = new Array('$pt{Community}{cst}','$pt{Community}{mdc}','$pt{Community}{pch}','$pt{Community}{pfo}');
+ var rolenames = new Array('$rolenamestr');
+ var rolescrs = new Array('$roletitlestr{Course}');
+ var rolescom = new Array('$roletitlestr{Community}');
+ var radio = prefix+'_custrolecrstype';
+ if (document.$formname.elements[radio].length > 1) {
+ for (var i=0; i<document.$formname.elements[radio].length; i++) {
+ if (document.$formname.elements[radio][i].checked) {
+ if ((document.getElementById(prefix+'bre_s')) && (document.getElementById(prefix+'bro_s'))) {
+ if (document.$formname.elements[radio][i].value == 'Community') {
+ if (document.getElementById(prefix+'bre_s').checked) {
+ document.getElementById(prefix+'bro_s').checked = true;
+ document.getElementById(prefix+'bre_s').checked = false;
+
+ }
+ document.getElementById(prefix+'bre_s').style.visibility = 'hidden';
+ } else {
+ document.getElementById(prefix+'bre_s').style.visibility = 'visible';
+ if (document.getElementById(prefix+'bro_s').checked) {
+ document.getElementById(prefix+'bre_s').checked = true;
+ document.getElementById(prefix+'bro_s').checked = false;
+ }
+ }
+ }
+ for (var j=0; j<privnames.length; j++) {
+ if (document.getElementById(prefix+privnames[j])) {
+ if (document.getElementById(prefix+privnames[j])) {
+ if (document.$formname.elements[radio][i].value == 'Course') {
+ document.getElementById(prefix+privnames[j]).innerHTML = privtxtcrs[j];
+ } else {
+ document.getElementById(prefix+privnames[j]).innerHTML = privtxtcom[j];
+ }
+ }
+ }
+ }
+ for (var j=0; j<rolenames.length; j++) {
+ if (document.getElementById(prefix+rolenames[j])) {
+ if (document.getElementById(prefix+rolenames[j])) {
+ if (document.$formname.elements[radio][i].value == 'Course') {
+ document.getElementById(prefix+rolenames[j]).value = rolescrs[j];
+ if (rolenames[j] == 'cc') {
+ document.getElementById(prefix+rolenames[j]).style.display = 'inline';
+ }
+ if (rolenames[j] == 'co') {
+ document.getElementById(prefix+rolenames[j]).style.display = 'none';
+ }
+ } else {
+ document.getElementById(prefix+rolenames[j]).value = rolescom[j];
+ if (rolenames[j] == 'cc') {
+ document.getElementById(prefix+rolenames[j]).style.display = 'none';
+ }
+ if (rolenames[j] == 'co') {
+ document.getElementById(prefix+rolenames[j]).style.display = 'inline';
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return;
+}
+ENDJS
+ }
+ $head_script .= "\n".$jsback."\n"
+ .'// ]]>'."\n"
+ .'</script>'."\n";
+ return $head_script;
+}
+
+# --------------------------------------------------------
+sub make_script_template {
+ my ($role,$crstype,$formname) = @_;
+ my $return_script = 'function set_'.$role.'(prefix) {'."\n";
+ my (%full_by_level,%role_priv);
+ foreach my $level ('c','d','s') {
+ foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:'.$level})) {
+ next if (($level eq 's') && ($crstype eq 'Community') && ($item eq 'bre&S'));
+ my ($priv,$restrict)=split(/\&/,$item);
+ $full_by_level{$level}{$priv}=1;
+ }
+ $role_priv{$level} = {};
+ my @temp = split(/:/,$Apache::lonnet::pr{$role.':'.$level});
+ foreach my $priv (@temp) {
+ my ($priv_item, $dummy) = split(/\&/,$priv);
+ $role_priv{$level}{$priv_item} = 1;
+ }
+ }
+ my %to_check = (
+ c => ['c','d','s'],
+ d => ['d','s'],
+ s => ['s'],
+ );
+ foreach my $level ('c','d','s') {
+ if (ref($full_by_level{$level}) eq 'HASH') {
+ foreach my $priv (keys(%{$full_by_level{$level}})) {
+ my $value = 'false';
+ if (ref($to_check{$level}) eq 'ARRAY') {
+ foreach my $lett (@{$to_check{$level}}) {
+ if (exists($role_priv{$lett}{$priv})) {
+ $value = 'true';
+ last;
+ }
+ }
+ $return_script .= "document.$formname.elements[prefix+'".$priv."_".$level."'].checked = $value;\n";
+ }
+ }
+ }
+ }
+ $return_script .= '}'."\n";
+ return ($return_script);
+}
+# ----------------------------------------------------------
+sub make_button_code {
+ my ($role,$crstype,$display,$prefix) = @_;
+ my $label = &Apache::lonnet::plaintext($role,$crstype);
+ my $button_code = '<input type="button" onclick="set_'.$role."('$prefix'".')" '.
+ 'id="'.$prefix.$role.'" value="'.$label.'" '.
+ 'style="display:'.$display.'" />';
+ return ($button_code);
+}
+
+sub custom_role_update {
+ my ($rolename,$prefix) = @_;
+# ------------------------------------------------------- What can be assigned?
+ my %privs = (
+ c => '',
+ d => '',
+ s => '',
+ );
+ foreach my $level (keys(%privs)) {
+ foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:'.$level})) {
+ my ($priv,$restrict)=split(/\&/,$item);
+ if (!$restrict) { $restrict=''; }
+ if ($env{'form.'.$prefix.$priv.'_'.$level}) {
+ $privs{$level} .=':'.$item;
+ }
+ }
+ }
+ return %privs;
+}
+
+sub adhoc_status_types {
+ my ($cdom,$context,$role,$selectedref,$othertitle,$usertypes,$types,$disabled) = @_;
+ my $output = &Apache::loncommon::start_data_table();
+ my $numinrow = 3;
+ my $rem;
+ if (ref($types) eq 'ARRAY') {
+ for (my $i=0; $i<@{$types}; $i++) {
+ if (defined($usertypes->{$types->[$i]})) {
+ my $rem = $i%($numinrow);
+ if ($rem == 0) {
+ if ($i > 0) {
+ $output .= &Apache::loncommon::end_data_table_row();
+ }
+ $output .= &Apache::loncommon::start_data_table_row();
+ }
+ my $check;
+ if (ref($selectedref) eq 'ARRAY') {
+ if (grep(/^\Q$types->[$i]\E$/,@{$selectedref})) {
+ $check = ' checked="checked"';
+ }
+ }
+ $output .= '<td>'.
+ '<span class="LC_nobreak"><label>'.
+ '<input type="checkbox" name="'.$context.$role.'_status" '.
+ 'value="'.$types->[$i].'"'.$check.$disabled.' />'.
+ $usertypes->{$types->[$i]}.'</label></span></td>';
+ }
+ }
+ $rem = @{$types}%($numinrow);
+ }
+ my $colsleft = $numinrow - $rem;
+ if (($rem == 0) && (@{$types} > 0)) {
+ $output .= &Apache::loncommon::start_data_table_row();
+ }
+ if ($colsleft > 1) {
+ $output .= '<td colspan="'.$colsleft.'">';
+ } else {
+ $output .= '<td>';
+ }
+ my $defcheck;
+ if (ref($selectedref) eq 'ARRAY') {
+ if (grep(/^default$/,@{$selectedref})) {
+ $defcheck = ' checked="checked"';
+ }
+ }
+ $output .= '<span class="LC_nobreak"><label>'.
+ '<input type="checkbox" name="'.$context.$role.'_status"'.
+ 'value="default"'.$defcheck.$disabled.' />'.
+ $othertitle.'</label></span></td>'.
+ &Apache::loncommon::end_data_table_row().
+ &Apache::loncommon::end_data_table();
+ return $output;
+}
+
+sub adhoc_staff {
+ my ($access,$context,$role,$selectedref,$adhocref,$disabled) = @_;
+ my $output;
+ if (ref($adhocref) eq 'HASH') {
+ my %by_fullname;
+ my $numinrow = 4;
+ my $rem;
+ my @personnel = keys(%{$adhocref});
+ if (@personnel) {
+ foreach my $person (@personnel) {
+ my ($uname,$udom) = split(/:/,$person);
+ my $fullname = &Apache::loncommon::plainname($uname,$udom,'lastname');
+ $by_fullname{$fullname} = $person;
+ }
+ my @sorted = sort(keys(%by_fullname));
+ my $count = scalar(@sorted);
+ $output = &Apache::loncommon::start_data_table();
+ for (my $i=0; $i<$count; $i++) {
+ my $rem = $i%($numinrow);
+ if ($rem == 0) {
+ if ($i > 0) {
+ $output .= &Apache::loncommon::end_data_table_row();
+ }
+ $output .= &Apache::loncommon::start_data_table_row();
+ }
+ my $check;
+ my $user = $by_fullname{$sorted[$i]};
+ if (ref($selectedref) eq 'ARRAY') {
+ if (grep(/^\Q$user\E$/,@{$selectedref})) {
+ $check = ' checked="checked"';
+ }
+ }
+ if ($i == $count-1) {
+ my $colsleft = $numinrow - $rem;
+ if ($colsleft > 1) {
+ $output .= '<td colspan="'.$colsleft.'">';
+ } else {
+ $output .= '<td>';
+ }
+ } else {
+ $output .= '<td>';
+ }
+ $output .= '<span class="LC_nobreak"><label>'.
+ '<input type="checkbox" name="'.$context.$role.'_staff_'.$access.'" '.
+ 'value="'.$user.'"'.$check.$disabled.' />'.$sorted[$i].
+ '</label></span></td>';
+ if ($i == $count-1) {
+ $output .= &Apache::loncommon::end_data_table_row();
+ }
+ }
+ $output .= &Apache::loncommon::end_data_table();
+ }
+ }
+ return $output;
+}
+
+
1;