--- loncom/interface/lonuserutils.pm 2017/04/10 23:18:54 1.183
+++ loncom/interface/lonuserutils.pm 2017/08/09 19:20:50 1.187
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.183 2017/04/10 23:18:54 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.187 2017/08/09 19:20:50 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -943,8 +943,14 @@ sub print_upload_manager_footer {
&Apache::lonhtmlcommon::row_closure();
}
+ my ($trustedref,$untrustedref);
+ if ($context eq 'course') {
+ ($trustedref,$untrustedref) = &Apache::lonnet::trusted_domains('enroll',$defdom);
+ } elsif ($context eq 'author') {
+ ($trustedref,$untrustedref) = &Apache::lonnet::trusted_domains('othcoau',$defdom);
+ }
$Str .= &Apache::lonhtmlcommon::row_title(&mt('Default domain'))
- .&Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1)
+ .&Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1,undef,$trustedref,$untrustedref)
.&Apache::lonhtmlcommon::row_closure();
$Str .= &Apache::lonhtmlcommon::row_title(&mt('Starting and Ending Dates'))
@@ -2336,7 +2342,8 @@ function setCourseCat(formname) {
}
courseSet('$codetitles[1]');
for (var j=0; j<formname.Department.length; j++) {
- if (formname.Department.options[j].value == "$env{'form.Department'}") { formname.Department.options[j].selected = true;
+ if (formname.Department.options[j].value == "$env{'form.Department'}") {
+ formname.Department.options[j].selected = true;
}
}
if (formname.Department.options[formname.Department.selectedIndex].value == -1) {
@@ -2757,7 +2764,7 @@ END
.'<input type="checkbox" name="userwin" value="1"'.$checkwin.' />'.$lt{'owin'}
.'</label></span></td></tr></table></fieldset></div>';
}
- $output .= "\n".'<br clear="all" />'."\n".
+ $output .= "\n".'<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n".
&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row();
if ($mode eq 'autoenroll') {
@@ -4138,17 +4145,19 @@ sub upfile_drop_add {
$fieldstype{$field.'_choice'} = 'scalar';
}
&Apache::loncommon::store_course_settings('enrollment_upload',\%fieldstype);
- my ($cid,$crstype,$setting);
+ my ($cid,$crstype,$setting,$crsdom);
if ($context eq 'domain') {
$setting = $env{'form.roleaction'};
}
if ($env{'request.course.id'} ne '') {
$cid = $env{'request.course.id'};
$crstype = &Apache::loncommon::course_type();
+ $crsdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
} elsif ($setting eq 'course') {
if (&Apache::lonnet::is_course($env{'form.dcdomain'},$env{'form.dccourse'})) {
$cid = $env{'form.dcdomain'}.'_'.$env{'form.dccourse'};
$crstype = &Apache::loncommon::course_type($cid);
+ $crsdom = $env{'form.dcdomain'};
}
}
my ($startdate,$enddate) = &get_dates_from_form();
@@ -4159,7 +4168,43 @@ sub upfile_drop_add {
my $defdom=$env{'request.role.domain'};
my $domain;
if ($env{'form.defaultdomain'} ne '') {
- $domain = $env{'form.defaultdomain'};
+ if (($context eq 'course') || ($setting eq 'course')) {
+ unless ($env{'form.defaultdomain'} eq $crsdom) {
+ if (&Apache::lonnet::will_trust('enroll',$crsdom,$env{'form.defaultdomain'})) {
+ $domain = $env{'form.defaultdomain'};
+ } else {
+ $r->print('<span class="LC_error">'.&mt('Error').
+ &mt('Enrollment of users not permitted for specified default domain: [_1].',
+ &Apache::lonnet::domain($env{'form.defaultdomain'},'description')).'</span>');
+ $r->print(&Apache::loncommon::end_page());
+ }
+ return;
+ }
+ } elsif ($context eq 'author') {
+ unless ($env{'form.defaultdomain'} eq $defdom) {
+ if ((&Apache::lonnet::will_trust('othcoau',$defdom,$env{'form.defaultdomain'})) &&
+ (&Apache::lonnet::will_trust('coaurem',$env{'form.defaultdomain'},$defdom))) {
+ $domain = $env{'form.defaultdomain'};
+ } else {
+ $r->print('<span class="LC_error">'.&mt('Error').
+ &mt('Addition of users not permitted for specified default domain: [_1].',
+ &Apache::lonnet::domain($env{'form.defaultdomain'},'description')).'</span>');
+ $r->print(&Apache::loncommon::end_page());
+ }
+ return;
+ }
+ } elsif (($context eq 'domain') && ($setting eq 'domain')) {
+ unless ($env{'form.defaultdomain'} eq $defdom) {
+ if (&Apache::lonnet::will_trust('domroles',$defdom,$env{'form.defaultdomain'})) {
+ $domain = $env{'form.defaultdomain'};
+ } else {
+ $r->print('<span class="LC_error">'.&mt('Error').
+ &mt('Addition of users not permitted for specified default domain: [_1].',
+ &Apache::lonnet::domain($env{'form.defaultdomain'},'description')).'</span>');
+ $r->print(&Apache::loncommon::end_page());
+ }
+ }
+ }
} else {
$domain = $defdom;
}
@@ -4343,6 +4388,7 @@ sub upfile_drop_add {
# Get new users list
my (%existinguser,%userinfo,%disallow,%rulematch,%inst_results,%alerts,%checkuname);
my $counter = -1;
+ my (%willtrust,%trustchecked);
foreach my $line (@userdata) {
$counter ++;
my @secs;
@@ -4390,6 +4436,28 @@ sub upfile_drop_add {
'"<b>'.$entries{$fields{'domain'}}.'</b>"',
$fname,$mname,$lname,$gen);
next;
+ } elsif ($entries{$fields{'domain'}} ne $domain) {
+ my $possdom = $entries{$fields{'domain'}};
+ if ($context eq 'course' || $setting eq 'course') {
+ unless ($trustchecked{$possdom}) {
+ $willtrust{$possdom} = &Apache::lonnet::will_trust('enroll',$domain,$possdom);
+ $trustchecked{$possdom} = 1;
+ }
+ } elsif ($context eq 'author') {
+ unless ($trustchecked{$possdom}) {
+ $willtrust{$possdom} = &Apache::lonnet::will_trust('othcoau',$domain,$possdom);
+ }
+ if ($willtrust{$possdom}) {
+ $willtrust{$possdom} = &Apache::lonnet::will_trust('coaurem',$possdom,$domain);
+ }
+ }
+ unless ($willtrust{$possdom}) {
+ $disallow{$counter} =
+ &mt('Unacceptable domain [_1] for user [_2] [_3] [_4] [_5]',
+ '"<b>'.$possdom.'</b>"',
+ $fname,$mname,$lname,$gen);
+ next;
+ }
}
my $username = $entries{$fields{'username'}};
my $userdomain = $entries{$fields{'domain'}};