version 1.163, 2014/02/16 15:38:53
|
version 1.172, 2015/08/09 21:43:18
|
Line 450 sub javascript_validations {
|
Line 450 sub javascript_validations {
|
if (($mode eq 'upload') && ($context eq 'domain')) { |
if (($mode eq 'upload') && ($context eq 'domain')) { |
$alert{'inststatus'} = &mt('The optional affiliation field was not specified'); |
$alert{'inststatus'} = &mt('The optional affiliation field was not specified'); |
} |
} |
|
&js_escape(\%alert); |
my $function_name = <<"END"; |
my $function_name = <<"END"; |
$setsections_js |
$setsections_js |
|
|
Line 642 sub upload_manager_javascript_forward_as
|
Line 643 sub upload_manager_javascript_forward_as
|
$numbuttons ++; |
$numbuttons ++; |
} |
} |
if (!$can_assign->{'int'}) { |
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.'); |
&mt('Your current role does not have rights to create users with that authentication type.'); |
|
&js_escape(\$warning); |
$auth_update = <<"END"; |
$auth_update = <<"END"; |
// Currently the initial password field is only supported for internal auth |
// Currently the initial password field is only supported for internal auth |
// (see bug 6368). |
// (see bug 6368). |
Line 781 sub upload_manager_javascript_reverse_as
|
Line 783 sub upload_manager_javascript_reverse_as
|
if (!$can_assign->{'int'}) { |
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'). |
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.'); |
&mt('Your current role does not have rights to create users with that authentication type.'); |
|
&js_escape(\$warning); |
$auth_update = <<"END"; |
$auth_update = <<"END"; |
// Currently the initial password field is only supported for internal auth |
// Currently the initial password field is only supported for internal auth |
// (see bug 6368). |
// (see bug 6368). |
Line 1081 sub forceid_change {
|
Line 1084 sub forceid_change {
|
my ($context) = @_; |
my ($context) = @_; |
my $output = |
my $output = |
'<label><input type="checkbox" name="forceid" value="yes" />' |
'<label><input type="checkbox" name="forceid" value="yes" />' |
.&mt('Force change of exising ID') |
.&mt('Force change of existing ID') |
.'</label>'.&Apache::loncommon::help_open_topic('ForceIDChange')."\n"; |
.'</label>'.&Apache::loncommon::help_open_topic('ForceIDChange')."\n"; |
if ($context eq 'domain') { |
if ($context eq 'domain') { |
$output .= |
$output .= |
Line 3173 sub bulkaction_javascript {
|
Line 3176 sub bulkaction_javascript {
|
my $noaction = &mt("You need to select an action to take for the user(s) you have selected"); |
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 $singconfirm = &mt(' for a single user?'); |
my $multconfirm = &mt(' for multiple users?'); |
my $multconfirm = &mt(' for multiple users?'); |
|
&js_escape(\$alert); |
|
&js_escape(\$noaction); |
|
&js_escape(\$singconfirm); |
|
&js_escape(\$multconfirm); |
my $output = <<"ENDJS"; |
my $output = <<"ENDJS"; |
function verify_action (field) { |
function verify_action (field) { |
var numchecked = 0; |
var numchecked = 0; |
Line 4290 sub upfile_drop_add {
|
Line 4297 sub upfile_drop_add {
|
my $newuserdom = $env{'request.role.domain'}; |
my $newuserdom = $env{'request.role.domain'}; |
map { $cancreate{$_} = &can_create_user($newuserdom,$context,$_); } keys(%longtypes); |
map { $cancreate{$_} = &can_create_user($newuserdom,$context,$_); } keys(%longtypes); |
# Get new users list |
# Get new users list |
|
my (%existinguser,%userinfo,%disallow,%rulematch,%inst_results,%alerts,%checkuname); |
|
my $counter = -1; |
foreach my $line (@userdata) { |
foreach my $line (@userdata) { |
|
$counter ++; |
my @secs; |
my @secs; |
my %entries=&Apache::loncommon::record_sep($line); |
my %entries=&Apache::loncommon::record_sep($line); |
# Determine user name |
# Determine user name |
Line 4322 sub upfile_drop_add {
|
Line 4332 sub upfile_drop_add {
|
if ($entries{$fields{'username'}} =~ /\s/) { |
if ($entries{$fields{'username'}} =~ /\s/) { |
$nowhitespace = ' - '.&mt('usernames may not contain spaces.'); |
$nowhitespace = ' - '.&mt('usernames may not contain spaces.'); |
} |
} |
$r->print( |
$disallow{$counter} = |
'<br />'. |
|
&mt('Unacceptable username [_1] for user [_2] [_3] [_4] [_5]', |
&mt('Unacceptable username [_1] for user [_2] [_3] [_4] [_5]', |
'"<b>'.$entries{$fields{'username'}}.'</b>"', |
'"<b>'.$entries{$fields{'username'}}.'</b>"', |
$fname,$mname,$lname,$gen). |
$fname,$mname,$lname,$gen).$nowhitespace; |
$nowhitespace); |
|
next; |
next; |
} else { |
} else { |
$entries{$fields{'domain'}} =~ s/^\s+|\s+$//g; |
$entries{$fields{'domain'}} =~ s/^\s+|\s+$//g; |
if ($entries{$fields{'domain'}} |
if ($entries{$fields{'domain'}} |
ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) { |
ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) { |
$r->print( |
$disallow{$counter} = |
'<br />'. |
|
&mt('Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]', |
&mt('Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]', |
'"<b>'.$entries{$fields{'domain'}}.'</b>"', |
'"<b>'.$entries{$fields{'domain'}}.'</b>"', |
$fname,$mname,$lname,$gen)); |
$fname,$mname,$lname,$gen); |
next; |
next; |
} |
} |
my $username = $entries{$fields{'username'}}; |
my $username = $entries{$fields{'username'}}; |
my $userdomain = $entries{$fields{'domain'}}; |
my $userdomain = $entries{$fields{'domain'}}; |
Line 4350 sub upfile_drop_add {
|
Line 4357 sub upfile_drop_add {
|
$entries{$fields{'sec'}} =~ s/\W//g; |
$entries{$fields{'sec'}} =~ s/\W//g; |
my $item = $entries{$fields{'sec'}}; |
my $item = $entries{$fields{'sec'}}; |
if ($item eq "none" || $item eq 'all') { |
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; |
next; |
} elsif (exists($curr_groups{$item})) { |
} 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; |
next; |
} else { |
} else { |
push(@secs,$item); |
push(@secs,$item); |
Line 4365 sub upfile_drop_add {
|
Line 4377 sub upfile_drop_add {
|
if (ref($userlist{$username.':'.$userdomain}) eq 'ARRAY') { |
if (ref($userlist{$username.':'.$userdomain}) eq 'ARRAY') { |
my $currsec = $userlist{$username.':'.$userdomain}[$secidx]; |
my $currsec = $userlist{$username.':'.$userdomain}[$secidx]; |
if ($currsec ne $env{'request.course.sec'}) { |
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 '') { |
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 { |
} 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; |
next; |
} |
} |
} |
} |
Line 4424 sub upfile_drop_add {
|
Line 4443 sub upfile_drop_add {
|
} |
} |
if ($role eq '') { |
if ($role eq '') { |
my $rolestr = join(', ',@permitted_roles); |
my $rolestr = join(', ',@permitted_roles); |
$r->print('<br />' |
$disallow{$counter} = |
.&mt('[_1]: You do not have permission to add the requested role [_2] for the user.' |
&mt('[_1]: You do not have permission to add the requested role [_2] for the user.' |
,'<b>'.$entries{$fields{'username'}}.'</b>' |
,'<b>'.$entries{$fields{'username'}}.'</b>' |
,$entries{$fields{'role'}}) |
,$entries{$fields{'role'}}) |
.'<br />' |
.'<br />' |
.&mt('Allowable role(s) is/are: [_1].',$rolestr)."\n" |
.&mt('Allowable role(s) is/are: [_1].',$rolestr); |
); |
|
next; |
next; |
} |
} |
} |
} |
Line 4460 sub upfile_drop_add {
|
Line 4478 sub upfile_drop_add {
|
# check against rules |
# check against rules |
my $checkid = 0; |
my $checkid = 0; |
my $newuser = 0; |
my $newuser = 0; |
my (%rulematch,%inst_results,%idinst_results); |
|
my $uhome=&Apache::lonnet::homeserver($username,$userdomain); |
my $uhome=&Apache::lonnet::homeserver($username,$userdomain); |
if ($uhome eq 'no_host') { |
if ($uhome eq 'no_host') { |
if ($userdomain ne $newuserdom) { |
if ($userdomain ne $newuserdom) { |
if ($context eq 'course') { |
if ($context eq 'course') { |
$r->print('<br />'. |
$disallow{$counter} = |
&mt('[_1]: The domain specified ([_2]) is different to that of the course.', |
&mt('[_1]: The domain specified ([_2]) is different to that of the course.', |
'<b>'.$username.'</b>',$userdomain).'<br />'); |
'<b>'.$username.'</b>',$userdomain); |
} elsif ($context eq 'author') { |
} elsif ($context eq 'author') { |
$r->print(&mt('[_1]: The domain specified ([_2]) is different to that of the author.', |
$disallow{$counter} = |
'<b>'.$username.'</b>',$userdomain).'<br />'); |
&mt('[_1]: The domain specified ([_2]) is different to that of the author.', |
|
'<b>'.$username.'</b>',$userdomain); |
} else { |
} else { |
$r->print(&mt('[_1]: The domain specified ([_2]) is different to that of your current role.', |
$disallow{$counter} = |
'<b>'.$username.'</b>',$userdomain).'<br />'); |
&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; |
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; |
$checkid = 1; |
$newuser = 1; |
$newuser = 1; |
my $user = $username.':'.$newuserdom; |
$checkuname{$username.':'.$newuserdom} = { 'newuser' => $newuser, 'id' => $id }; |
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; |
|
} |
|
} else { |
} else { |
if ($context eq 'course' || $context eq 'author') { |
if ($context eq 'course' || $context eq 'author') { |
if ($userdomain eq $domain ) { |
if ($userdomain eq $domain ) { |
Line 4541 sub upfile_drop_add {
|
Line 4540 sub upfile_drop_add {
|
} |
} |
} |
} |
} |
} |
|
if ($id) { |
|
$existinguser{$userdomain}{$username} = $id; |
|
} |
} |
} |
if ($id ne '') { |
$userinfo{$counter} = { |
if (!$newuser) { |
username => $username, |
my %idhash = &Apache::lonnet::idrget($userdomain,($username)); |
domain => $userdomain, |
if ($idhash{$username} ne $id) { |
fname => $fname, |
$checkid = 1; |
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 ($checkid) { |
} |
my $checkhash; |
} |
my $checks = { 'id' => 1 }; |
if (keys(%checkuname)) { |
$checkhash->{$username.':'.$userdomain} = { 'newuser' => $newuser, |
&Apache::loncommon::user_rule_check(\%checkuname,{ 'username' => 1, 'id' => 1, }, |
'id' => $id }; |
\%alerts,\%rulematch,\%inst_results, |
&Apache::loncommon::user_rule_check($checkhash,$checks, |
\%curr_rules,\%got_rules); |
\%alerts,\%rulematch,\%idinst_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 (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'}) eq 'HASH') { |
if (ref($alerts{'id'}{$userdomain}) eq 'HASH') { |
if (ref($alerts{'id'}{$userdomain}) eq 'HASH') { |
if ($alerts{'id'}{$userdomain}{$id}) { |
if ($alerts{'id'}{$userdomain}{$username}) { |
$r->print(&mt('[_1]: has a student/employee ID matching the format at your institution, but the ID is found by your directory service.', |
$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 />'. |
'<b>'.$username.'</b>').'<br />'. |
&mt('Consequently, the user was not created.')); |
&mt('Consequently, the user was not created.').'</li>'); |
next; |
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 $multiple = 0; |
my ($userresult,$authresult,$roleresult,$idresult); |
my ($userresult,$authresult,$roleresult,$idresult); |
my (%userres,%authres,%roleres,%idres); |
my (%userres,%authres,%roleres,%idres); |
my $singlesec = ''; |
my $singlesec = ''; |
if ($role eq 'st') { |
if ($role eq 'st') { |
my $sec; |
my $sec; |
if (ref($userinfo{$i}{'sections'}) eq 'ARRAY') { |
if (@secs > 0) { |
if (@secs > 0) { |
$sec = $secs[0]; |
$sec = $secs[0]; |
} |
} |
&modifystudent($userdomain,$username,$cid,$sec, |
} |
$desiredhost,$context); |
&modifystudent($userdomain,$username,$cid,$sec, |
$roleresult = |
$desiredhost,$context); |
&Apache::lonnet::modifystudent |
$roleresult = |
($userdomain,$username,$id,$amode,$password, |
&Apache::lonnet::modifystudent |
$fname,$mname,$lname,$gen,$sec,$enddate, |
($userdomain,$username,$id,$amode,$password, |
$startdate,$env{'form.forceid'}, |
$fname,$mname,$lname,$gen,$sec,$enddate, |
$desiredhost,$email,'manual','',$cid, |
$startdate,$env{'form.forceid'}, |
'',$context,$inststatus,$credits); |
$desiredhost,$email,'manual','',$cid, |
$userresult = $roleresult; |
'',$context,$inststatus,$credits); |
} else { |
$userresult = $roleresult; |
if ($role ne '') { |
} else { |
if ($context eq 'course' || $setting eq 'course') { |
if ($role ne '') { |
if ($customroles{$role}) { |
if ($context eq 'course' || $setting eq 'course') { |
$role = 'cr_'.$env{'user.domain'}.'_'. |
if ($customroles{$role}) { |
$env{'user.name'}.'_'.$role; |
$role = 'cr_'.$env{'user.domain'}.'_'. |
} |
$env{'user.name'}.'_'.$role; |
if (($role ne 'cc') && ($role ne 'co')) { |
} |
if (@secs > 1) { |
if (($role ne 'cc') && ($role ne 'co')) { |
$multiple = 1; |
if (@secs > 1) { |
foreach my $sec (@secs) { |
$multiple = 1; |
($userres{$sec},$authres{$sec},$roleres{$sec},$idres{$sec}) = |
foreach my $sec (@secs) { |
&modifyuserrole($context,$setting, |
($userres{$sec},$authres{$sec},$roleres{$sec},$idres{$sec}) = |
$changeauth,$cid,$userdomain,$username, |
&modifyuserrole($context,$setting, |
$id,$amode,$password,$fname, |
$changeauth,$cid,$userdomain,$username, |
$mname,$lname,$gen,$sec, |
$id,$amode,$password,$fname, |
$env{'form.forceid'},$desiredhost, |
$mname,$lname,$gen,$sec, |
$email,$role,$enddate, |
$env{'form.forceid'},$desiredhost, |
$startdate,$checkid,$inststatus); |
$email,$role,$enddate, |
} |
$startdate,$checkid,$inststatus); |
} elsif (@secs > 0) { |
|
$singlesec = $secs[0]; |
|
} |
} |
|
} elsif (@secs > 0) { |
|
$singlesec = $secs[0]; |
} |
} |
} |
} |
} |
} |
Line 4626 sub upfile_drop_add {
|
Line 4753 sub upfile_drop_add {
|
$checkid,$inststatus); |
$checkid,$inststatus); |
} |
} |
} |
} |
if ($multiple) { |
} |
foreach my $sec (sort(keys(%userres))) { |
if ($multiple) { |
$flushc = |
foreach my $sec (sort(keys(%userres))) { |
|
$flushc = |
&user_change_result($r,$userres{$sec},$authres{$sec}, |
&user_change_result($r,$userres{$sec},$authres{$sec}, |
$roleres{$sec},$idres{$sec},\%counts,$flushc, |
$roleres{$sec},$idres{$sec},\%counts,$flushc, |
$username,$userdomain,\%userchg); |
$username,$userdomain,\%userchg); |
|
|
} |
|
} else { |
|
$flushc = |
|
&user_change_result($r,$userresult,$authresult, |
|
$roleresult,$idresult,\%counts,$flushc, |
|
$username,$userdomain,\%userchg); |
|
} |
} |
} else { |
} else { |
if ($context eq 'course') { |
$flushc = |
$r->print('<br />'. |
&user_change_result($r,$userresult,$authresult, |
&mt('[_1]: Unable to enroll. No password specified.','<b>'.$username.'</b>') |
$roleresult,$idresult,\%counts,$flushc, |
); |
$username,$userdomain,\%userchg); |
} 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>') |
|
); |
|
} |
|
} |
} |
} |
} |
} |
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,'last user'); |
} # end of foreach (@userdata) |
} # end of loop |
|
$r->print('</ul>'); |
|
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
|
} |
# Flush the course logs so reverse user roles immediately updated |
# Flush the course logs so reverse user roles immediately updated |
$r->register_cleanup(\&Apache::lonnet::flushcourselogs); |
$r->register_cleanup(\&Apache::lonnet::flushcourselogs); |
$r->print("</p>\n<p>\n".&mt('Processed [quant,_1,user].',$counts{'user'}). |
$r->print("</p>\n<p>\n".&mt('Processed [quant,_1,user].',$counts{'user'}). |
Line 4750 sub user_change_result {
|
Line 4866 sub user_change_result {
|
my ($r,$userresult,$authresult,$roleresult,$idresult,$counts,$flushc, |
my ($r,$userresult,$authresult,$roleresult,$idresult,$counts,$flushc, |
$username,$userdomain,$userchg) = @_; |
$username,$userdomain,$userchg) = @_; |
my $okresult = 0; |
my $okresult = 0; |
|
my @status; |
if ($userresult ne 'ok') { |
if ($userresult ne 'ok') { |
if ($userresult =~ /^error:(.+)$/) { |
if ($userresult =~ /^error:(.+)$/) { |
my $error = $1; |
my $error = $1; |
$r->print('<br />'. |
push(@status, |
&mt('[_1]: Unable to add/modify: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error)); |
&mt('[_1]: Unable to add/modify: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error)); |
} |
} |
} else { |
} else { |
$counts->{'user'} ++; |
$counts->{'user'} ++; |
Line 4763 sub user_change_result {
|
Line 4880 sub user_change_result {
|
if ($authresult ne 'ok') { |
if ($authresult ne 'ok') { |
if ($authresult =~ /^error:(.+)$/) { |
if ($authresult =~ /^error:(.+)$/) { |
my $error = $1; |
my $error = $1; |
$r->print('<br />'. |
push(@status, |
&mt('[_1]: Unable to modify authentication: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error)); |
&mt('[_1]: Unable to modify authentication: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error)); |
} |
} |
} else { |
} else { |
$counts->{'auth'} ++; |
$counts->{'auth'} ++; |
Line 4773 sub user_change_result {
|
Line 4890 sub user_change_result {
|
if ($roleresult ne 'ok') { |
if ($roleresult ne 'ok') { |
if ($roleresult =~ /^error:(.+)$/) { |
if ($roleresult =~ /^error:(.+)$/) { |
my $error = $1; |
my $error = $1; |
$r->print('<br />'. |
push(@status, |
&mt('[_1]: Unable to add role: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error)); |
&mt('[_1]: Unable to add role: [_2]','<b>'.$username.':'.$userdomain.'</b>',$error)); |
} |
} |
} else { |
} else { |
$counts->{'role'} ++; |
$counts->{'role'} ++; |
Line 4783 sub user_change_result {
|
Line 4900 sub user_change_result {
|
if ($okresult) { |
if ($okresult) { |
$flushc++; |
$flushc++; |
$userchg->{$username.':'.$userdomain}=1; |
$userchg->{$username.':'.$userdomain}=1; |
$r->print('. '); |
|
if ($flushc>15) { |
if ($flushc>15) { |
$r->rflush; |
$r->rflush; |
$flushc=0; |
$flushc=0; |
} |
} |
} |
} |
if ($idresult) { |
if ($idresult) { |
$r->print($idresult); |
push(@status,$idresult); |
|
} |
|
if (@status) { |
|
$r->print('<li>'.join('<br />',@status).'</li>'); |
} |
} |
return $flushc; |
return $flushc; |
} |
} |
Line 5215 sub active_student_roles {
|
Line 5334 sub active_student_roles {
|
|
|
sub section_check_js { |
sub section_check_js { |
my $groupslist= &get_groupslist(); |
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"; |
return <<"END"; |
function validate(caller) { |
function validate(caller) { |
var groups = new Array($groupslist); |
var groups = new Array($groupslist); |
var secname = caller.value; |
var secname = caller.value; |
if ((secname == 'all') || (secname == 'none')) { |
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'; |
return 'error'; |
} |
} |
if (secname != '') { |
if (secname != '') { |
for (var k=0; k<groups.length; k++) { |
for (var k=0; k<groups.length; k++) { |
if (secname == groups[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'; |
return 'error'; |
} |
} |
} |
} |
Line 5267 sub set_login {
|
Line 5393 sub set_login {
|
sub course_sections { |
sub course_sections { |
my ($sections_count,$role,$current_sec) = @_; |
my ($sections_count,$role,$current_sec) = @_; |
my $output = ''; |
my $output = ''; |
my @sections = (sort {$a <=> $b} keys %{$sections_count}); |
my @sections = (sort {$a <=> $b} keys(%{$sections_count})); |
my $numsec = scalar(@sections); |
my $numsec = scalar(@sections); |
my $is_selected = ' selected="selected"'; |
my $is_selected = ' selected="selected"'; |
if ($numsec <= 1) { |
if ($numsec <= 1) { |
Line 5351 sub setsections_javascript {
|
Line 5477 sub setsections_javascript {
|
} |
} |
$rolecode = "var match = str.split('_'); |
$rolecode = "var match = str.split('_'); |
var role = match[3];\n"; |
var role = match[3];\n"; |
} elsif ($formname eq 'enrollstudent') { |
} elsif (($formname eq 'enrollstudent') || ($formname eq 'selfenroll')) { |
$checkincluded = 'formname.name == "'.$formname.'"'; |
$checkincluded = 'formname.name == "'.$formname.'"'; |
if ($checkauth) { |
if ($checkauth) { |
$finish = "var authcheck = auth_check();\n". |
$finish = "var authcheck = auth_check();\n". |
Line 5385 sub setsections_javascript {
|
Line 5511 sub setsections_javascript {
|
mnot => 'may not be used as a section name, as it is the name of a course group.', |
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.', |
secn => 'Section names and group names must be distinct. Please choose a different section name.', |
nonw => 'Section names may only contain letters or numbers.', |
nonw => 'Section names may only contain letters or numbers.', |
); |
); |
|
&js_escape(\%alerts); |
$setsection_js .= <<"ENDSECCODE"; |
$setsection_js .= <<"ENDSECCODE"; |
|
|
function setSections(formname,crstype) { |
function setSections(formname,crstype) { |
Line 5396 function setSections(formname,crstype) {
|
Line 5523 function setSections(formname,crstype) {
|
var groups = new Array($groupslist); |
var groups = new Array($groupslist); |
for (var i=0;i<formname.elements.length;i++) { |
for (var i=0;i<formname.elements.length;i++) { |
var str = formname.elements[i].name; |
var str = formname.elements[i].name; |
|
if (typeof(str) === "undefined") { |
|
continue; |
|
} |
var checkcurr = str.match(re1); |
var checkcurr = str.match(re1); |
if (checkcurr != null) { |
if (checkcurr != null) { |
var num = i; |
var num = i; |
Line 5701 sub get_permission {
|
Line 5831 sub get_permission {
|
if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) { |
if (&Apache::lonnet::allowed('mdg',$env{'request.course.id'})) { |
$permission{'grp_manage'} = 1; |
$permission{'grp_manage'} = 1; |
} |
} |
|
if ($permission{'cusr'}) { |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my %coursehash = ( |
|
'internal.selfenrollmgrdc' => $env{'course.'.$env{'request.course.id'}.'.internal.selfenrollmgrdc'}, |
|
'internal.selfenrollmgrcc' => $env{'course.'.$env{'request.course.id'}.'.internal.selfenrollmgrcc'}, |
|
'internal.coursecode' => $env{'course.'.$env{'request.course.id'}.'.internal.coursecode'}, |
|
'internal.textbook' =>$env{'course.'.$env{'request.course.id'}.'.internal.textbook'}, |
|
); |
|
my ($managed_by_cc,$managed_by_dc) = &selfenrollment_administration($cdom,$cnum,$crstype,\%coursehash); |
|
if (ref($managed_by_cc) eq 'ARRAY') { |
|
if (@{$managed_by_cc}) { |
|
$permission{'selfenrolladmin'} = 1; |
|
} |
|
} |
|
} |
} elsif ($context eq 'author') { |
} elsif ($context eq 'author') { |
$permission{'cusr'} = &authorpriv($env{'user.name'},$env{'request.role.domain'}); |
$permission{'cusr'} = &authorpriv($env{'user.name'},$env{'request.role.domain'}); |
$permission{'view'} = $permission{'cusr'}; |
$permission{'view'} = $permission{'cusr'}; |
Line 6003 sub sectioncheck_alerts {
|
Line 6149 sub sectioncheck_alerts {
|
thwa => 'There was a problem with your course selection', |
thwa => 'There was a problem with your course selection', |
thwc => 'There was a problem with your community selection', |
thwc => 'There was a problem with your community selection', |
); |
); |
|
&js_escape(\%alerts); |
return %alerts; |
return %alerts; |
} |
} |
|
|
Line 6013 sub authcheck_alerts {
|
Line 6160 sub authcheck_alerts {
|
krb => 'You need to specify the Kerberos domain.', |
krb => 'You need to specify the Kerberos domain.', |
ipass => 'You need to specify the initial password.', |
ipass => 'You need to specify the initial password.', |
); |
); |
|
&js_escape(\%alerts); |
return %alerts; |
return %alerts; |
} |
} |
|
|
Line 6031 sub is_courseowner {
|
Line 6179 sub is_courseowner {
|
return; |
return; |
} |
} |
|
|
|
sub get_selfenroll_titles { |
|
my @row = ('types','registered','enroll_dates','access_dates','section', |
|
'approval','limit'); |
|
my %lt = &Apache::lonlocal::texthash ( |
|
types => 'Users allowed to self-enroll', |
|
registered => 'Registration status (official courses)' , |
|
enroll_dates => 'Dates self-enrollment available', |
|
access_dates => 'Access dates for self-enrolling users', |
|
section => "Self-enrolling users' section", |
|
approval => 'Processing of requests', |
|
limit => 'Enrollment limit', |
|
); |
|
return (\@row,\%lt); |
|
} |
|
|
|
sub selfenroll_default_descs { |
|
my %desc = ( |
|
types => { |
|
dom => &mt('Course domain'), |
|
all => &mt('Any domain'), |
|
'' => &mt('None'), |
|
}, |
|
limit => { |
|
none => &mt('No limit'), |
|
allstudents => &mt('Limit by total students'), |
|
selfenrolled => &mt('Limit by total self-enrolled'), |
|
}, |
|
approval => { |
|
'0' => &mt('Processed automatically'), |
|
'1' => &mt('Queued for approval'), |
|
'2' => &mt('Queued, pending validation'), |
|
}, |
|
registered => { |
|
0 => 'No registration required', |
|
1 => 'Registered students only', |
|
}, |
|
); |
|
return %desc; |
|
} |
|
|
|
sub selfenroll_validation_types { |
|
my @items = ('url','fields','button','markup'); |
|
my %names = &Apache::lonlocal::texthash ( |
|
url => 'Web address of validation server/script', |
|
fields => 'Form fields to send to validator', |
|
button => 'Text for validation button', |
|
markup => 'Validation description (HTML)', |
|
); |
|
my @fields = ('username','domain','uniquecode','course','coursetype','description'); |
|
return (\@items,\%names,\@fields); |
|
} |
|
|
|
sub get_extended_type { |
|
my ($cdom,$cnum,$crstype,$current) = @_; |
|
my $type = 'unofficial'; |
|
my %settings; |
|
if (ref($current) eq 'HASH') { |
|
%settings = %{$current}; |
|
} else { |
|
%settings = &Apache::lonnet::get('environment',['internal.coursecode','internal.textbook'],$cdom,$cnum); |
|
} |
|
if ($crstype eq 'Community') { |
|
$type = 'community'; |
|
} elsif ($settings{'internal.coursecode'}) { |
|
$type = 'official'; |
|
} elsif ($settings{'internal.textbook'}) { |
|
$type = 'textbook'; |
|
} |
|
return $type; |
|
} |
|
|
|
sub selfenrollment_administration { |
|
my ($cdom,$cnum,$crstype,$coursehash) = @_; |
|
my %settings; |
|
if (ref($coursehash) eq 'HASH') { |
|
%settings = %{$coursehash}; |
|
} else { |
|
%settings = &Apache::lonnet::get('environment', |
|
['internal.selfenrollmgrdc','internal.selfenrollmgrcc', |
|
'internal.coursecode','internal.textbook'],$cdom,$cnum); |
|
} |
|
my ($possconfigs) = &get_selfenroll_titles(); |
|
my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom); |
|
my $selfenrolltype = &get_extended_type($cdom,$cnum,$crstype,\%settings); |
|
|
|
my (@in_course,@in_domain); |
|
if ($settings{'internal.selfenrollmgrcc'} ne '') { |
|
@in_course = split(/,/,$settings{'internal.selfenrollmgrcc'}); |
|
my @diffs = &Apache::loncommon::compare_arrays($possconfigs,\@in_course); |
|
unless (@diffs) { |
|
return (\@in_course,\@in_domain); |
|
} |
|
} |
|
if ($settings{'internal.selfenrollmgrdc'} ne '') { |
|
my @in_domain = split(/,/,$settings{'internal.selfenrollmgrdc'}); |
|
my @diffs = &Apache::loncommon::compare_arrays(\@in_domain,$possconfigs); |
|
unless (@diffs) { |
|
return (\@in_course,\@in_domain); |
|
} |
|
} |
|
my @combined = @in_course; |
|
push(@combined,@in_domain); |
|
my @diffs = &Apache::loncommon::compare_arrays(\@combined,$possconfigs); |
|
unless (@diffs) { |
|
return (\@in_course,\@in_domain); |
|
} |
|
if ($domdefaults{$selfenrolltype.'selfenrolladmdc'} eq '') { |
|
push(@in_course,@diffs); |
|
} else { |
|
my @defaultdc = split(/,/,$domdefaults{$selfenrolltype.'selfenrolladmdc'}); |
|
foreach my $item (@diffs) { |
|
if (grep(/^\Q$item\E$/,@defaultdc)) { |
|
push(@in_domain,$item); |
|
} else { |
|
push(@in_course,$item); |
|
} |
|
} |
|
} |
|
return (\@in_course,\@in_domain); |
|
} |
|
|
1; |
1; |
|
|