--- loncom/interface/lonuserutils.pm 2017/08/08 15:34:32 1.186
+++ loncom/interface/lonuserutils.pm 2018/03/23 01:01:21 1.194
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.186 2017/08/08 15:34:32 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.194 2018/03/23 01:01:21 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -546,6 +546,7 @@ END
case 'fsys':
alertmsg = '';
break;
+ case 'lti':
default:
alertmsg = '';
}
@@ -898,6 +899,7 @@ sub print_upload_manager_footer {
my $krbform = &Apache::loncommon::authform_kerberos(%param);
my $intform = &Apache::loncommon::authform_internal(%param);
my $locform = &Apache::loncommon::authform_local(%param);
+ my $ltiform = &Apache::loncommon::authform_lti(%param);
my $date_table = &date_setting_table(undef,undef,$context,undef,
$formname,$permission,$crstype);
@@ -926,7 +928,7 @@ sub print_upload_manager_footer {
&Apache::loncommon::help_open_topic('Auth_Options').
"</p>\n";
}
- $Str .= &set_login($defdom,$krbform,$intform,$locform);
+ $Str .= &set_login($defdom,$krbform,$intform,$locform,$ltiform);
my ($home_server_pick,$numlib) =
&Apache::loncommon::home_server_form_item($defdom,'lcserver',
@@ -943,14 +945,14 @@ sub print_upload_manager_footer {
&Apache::lonhtmlcommon::row_closure();
}
- my ($trustedref,$untrustedref);
+ my ($trusted,$untrusted);
if ($context eq 'course') {
- ($trustedref,$untrustedref) = &Apache::lonnet::trusted_domains('enroll',$defdom);
+ ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$defdom);
} elsif ($context eq 'author') {
- ($trustedref,$untrustedref) = &Apache::lonnet::trusted_domains('othcoau',$defdom);
+ ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('othcoau',$defdom);
}
$Str .= &Apache::lonhtmlcommon::row_title(&mt('Default domain'))
- .&Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1,undef,$trustedref,$untrustedref)
+ .&Apache::loncommon::select_dom_form($defdom,'defaultdomain',undef,1,undef,$trusted,$untrusted)
.&Apache::lonhtmlcommon::row_closure();
$Str .= &Apache::lonhtmlcommon::row_title(&mt('Starting and Ending Dates'))
@@ -1127,8 +1129,15 @@ sub print_upload_manager_form {
if (!$env{'form.datatoken'}) {
$datatoken=&Apache::loncommon::upfile_store($r);
} else {
- $datatoken=$env{'form.datatoken'};
- &Apache::loncommon::load_tmp_file($r);
+ $datatoken=&Apache::loncommon::valid_datatoken($env{'form.datatoken'});
+ if ($datatoken ne '') {
+ &Apache::loncommon::load_tmp_file($r,$datatoken);
+ }
+ }
+ if ($datatoken eq '') {
+ $r->print('<p class="LC_error">'.&mt('Error').': '.
+ &mt('Invalid datatoken').'</p>');
+ return 'missingdata';
}
my @records=&Apache::loncommon::upfile_record_sep();
if($env{'form.noFirstLine'}){
@@ -1212,6 +1221,7 @@ sub print_upload_manager_form {
}
&print_upload_manager_footer($r,$i,$keyfields,$defdom,$today,$halfyear,
$context,$permission,$crstype,$showcredits);
+ return 'ok';
}
sub setup_date_selectors {
@@ -2342,7 +2352,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) {
@@ -4113,7 +4124,10 @@ sub print_first_users_upload_form {
# ================================================= Drop/Add from uploaded file
sub upfile_drop_add {
my ($r,$context,$permission,$showcredits) = @_;
- &Apache::loncommon::load_tmp_file($r);
+ my $datatoken = &Apache::loncommon::valid_datatoken($env{'form.datatoken'});
+ if ($datatoken ne '') {
+ &Apache::loncommon::load_tmp_file($r,$datatoken);
+ }
my @userdata=&Apache::loncommon::upfile_record_sep();
if($env{'form.noFirstLine'}){shift(@userdata);}
my @keyfields = split(/\,/,$env{'form.keyfields'});
@@ -4127,10 +4141,6 @@ sub upfile_drop_add {
$fields{$env{'form.f'.$i}}=$keyfields[$i];
}
}
- if ($env{'form.fullup'} ne 'yes') {
- $r->print('<form name="studentform" method="post" action="/adm/createuser">'."\n".
- '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />');
- }
#
# Store the field choices away
my @storefields = qw/username names fname mname lname gen id
@@ -4168,39 +4178,43 @@ sub upfile_drop_add {
my $domain;
if ($env{'form.defaultdomain'} ne '') {
if (($context eq 'course') || ($setting eq 'course')) {
- unless ($env{'form.defaultdomain'} eq $crsdom) {
+ if ($env{'form.defaultdomain'} eq $crsdom) {
+ $domain = $env{'form.defaultdomain'};
+ } else {
if (&Apache::lonnet::will_trust('enroll',$crsdom,$env{'form.defaultdomain'})) {
$domain = $env{'form.defaultdomain'};
} else {
- $r->print('<span class="LC_error">'.&mt('Error').
+ $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 'untrusted';
}
- return;
}
} elsif ($context eq 'author') {
- unless ($env{'form.defaultdomain'} eq $defdom) {
+ if ($env{'form.defaultdomain'} eq $defdom) {
+ $domain = $env{'form.defaultdomain'};
+ } else {
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').
+ $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 'untrusted';
}
- return;
}
} elsif (($context eq 'domain') && ($setting eq 'domain')) {
- unless ($env{'form.defaultdomain'} eq $defdom) {
+ if ($env{'form.defaultdomain'} eq $defdom) {
+ $domain = $env{'form.defaultdomain'};
+ } else {
if (&Apache::lonnet::will_trust('domroles',$defdom,$env{'form.defaultdomain'})) {
$domain = $env{'form.defaultdomain'};
} else {
- $r->print('<span class="LC_error">'.&mt('Error').
+ $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 'untrusted';
}
}
}
@@ -4213,10 +4227,9 @@ sub upfile_drop_add {
} else {
my %home_servers = &Apache::lonnet::get_servers($defdom,'library');
if (! exists($home_servers{$desiredhost})) {
- $r->print('<span class="LC_error">'.&mt('Error').
- &mt('Invalid home server specified').'</span>');
- $r->print(&Apache::loncommon::end_page());
- return;
+ $r->print('<p class="LC_error">'.&mt('Error').': '.
+ &mt('Invalid home server specified').'</p>');
+ return 'invalidhome';
}
}
# Determine authentication mechanism
@@ -4240,6 +4253,8 @@ sub upfile_drop_add {
if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) {
$genpwd=$env{'form.locarg'};
}
+ } elsif ($env{'form.login'} eq 'lti') {
+ $amode='lti';
}
if ($amode =~ /^krb/) {
if (! defined($genpwd) || $genpwd eq '') {
@@ -4316,6 +4331,11 @@ sub upfile_drop_add {
}
}
}
+ if ($datatoken eq '') {
+ $r->print('<p class="LC_error">'.&mt('Error').': '.
+ &mt('Invalid datatoken').'</p>');
+ return 'missingdata';
+ }
if ( $domain eq &LONCAPA::clean_domain($domain)
&& ($amode ne '')) {
#######################################
@@ -4609,7 +4629,7 @@ sub upfile_drop_add {
&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') {
+ unless (($password ne '') || ($env{'form.login'} eq 'loc') || ($env{'form.login'} eq 'lti')) {
$disallow{$counter} =
&mt('[_1]: This is a new user but no default password was provided, and the authentication type requires one.',
'<b>'.$username.'</b>');
@@ -4891,7 +4911,9 @@ sub upfile_drop_add {
"</p>\n");
if ($counts{'role'} > 0) {
$r->print("<p>\n".
- &mt('Roles added for [quant,_1,user].',$counts{'role'}).' '.&mt('If a user is currently logged-in to LON-CAPA, any new roles which are active will be available when the user next logs in.')."</p>\n");
+ &mt('Roles added for [quant,_1,user].',$counts{'role'}).' '.
+ &mt('If a user is currently logged-in to LON-CAPA, any new roles which are active will be available when the user next logs in.').
+ "</p>\n");
} else {
$r->print('<p>'.&mt('No roles added').'</p>');
}
@@ -4909,10 +4931,9 @@ sub upfile_drop_add {
# Get current classlist
my $classlist = &Apache::loncoursedata::get_classlist();
if (! defined($classlist)) {
- $r->print('<form name="studentform" method="post" action="/adm/createuser">'.
- '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'.
- '<p class="LC_info">'.&mt('There are no students with current/future access to the course.').'</p>'.
- '</form>'."\n");
+ $r->print('<p class="LC_info">'.
+ &mt('There are no students with current/future access to the course.').
+ '</p>'."\n");
} elsif (ref($classlist) eq 'HASH') {
# Remove the students we just added from the list of students.
foreach my $line (@userdata) {
@@ -4928,9 +4949,7 @@ sub upfile_drop_add {
}
}
} # end of unless
- if ($env{'form.fullup'} ne 'yes') {
- $r->print('</form>');
- }
+ return 'ok';
}
sub print_namespacing_alerts {
@@ -5476,7 +5495,7 @@ END
}
sub set_login {
- my ($dom,$authformkrb,$authformint,$authformloc) = @_;
+ my ($dom,$authformkrb,$authformint,$authformloc,$authformlti) = @_;
my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
my $response;
my ($authnum,%can_assign) =
@@ -5498,6 +5517,11 @@ sub set_login {
'<td>'.$authformloc.'</td>'.
&Apache::loncommon::end_data_table_row()."\n";
}
+ if ($can_assign{'lti'}) {
+ $response .= &Apache::loncommon::start_data_table_row().
+ '<td>'.$authformlti.'</td>'.
+ &Apache::loncommon::end_data_table_row()."\n";
+ }
$response .= &Apache::loncommon::end_data_table();
}
return $response;