--- loncom/interface/lonuserutils.pm 2017/01/18 21:07:31 1.181
+++ loncom/interface/lonuserutils.pm 2018/09/14 20:52:35 1.184.4.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.181 2017/01/18 21:07:31 raeburn Exp $
+# $Id: lonuserutils.pm,v 1.184.4.1 2018/09/14 20:52:35 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1121,8 +1121,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'}){
@@ -1206,6 +1213,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 {
@@ -2757,7 +2765,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') {
@@ -3101,7 +3109,14 @@ END
}
if ($showcheckbox) {
$r->print('<td><input type="checkbox" name="'.
- 'actionlist" value="'.&HTML::Entities::encode($checkval,'&<>"').'" /></td>');
+ 'actionlist" value="'.
+ &HTML::Entities::encode($checkval,'&<>"').'" />');
+ foreach my $item ('start','end') {
+ $r->print('<input type="hidden" name="'.
+ &HTML::Entities::encode($checkval.'_'.$item,'&<>"').'"'.
+ ' value="'.$sdata->[$index{$item}].'" />');
+ }
+ $r->print('</td>');
} else {
$r->print('<td> </td>');
}
@@ -3115,8 +3130,6 @@ END
foreach my $item (@cols) {
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="'.&HTML::Entities::encode($checkval.'_'.$item.'" value="'.$sdata->[$index{$item}],'&<>"').'" /></td>'."\n");
} elsif ($item eq 'status') {
my $showitem = $in{$item};
if (defined($ltstatus{$in{$item}})) {
@@ -4102,7 +4115,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'});
@@ -4116,10 +4132,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
@@ -4164,10 +4176,10 @@ 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('<p class="LC_error">'.&mt('Error').': '.
+ &mt('Invalid home server specified').'</p>');
$r->print(&Apache::loncommon::end_page());
- return;
+ return 'invalidhome';
}
}
# Determine authentication mechanism
@@ -4267,6 +4279,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 '')) {
#######################################
@@ -4819,7 +4836,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>');
}
@@ -4837,10 +4856,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) {
@@ -4856,9 +4874,7 @@ sub upfile_drop_add {
}
}
} # end of unless
- if ($env{'form.fullup'} ne 'yes') {
- $r->print('</form>');
- }
+ return 'ok';
}
sub print_namespacing_alerts {
@@ -5833,7 +5849,7 @@ sub roles_by_context {
} elsif ($context eq 'author') {
@allroles = ('ca','aa');
} elsif ($context eq 'domain') {
- @allroles = ('li','ad','dg','dh','sc','au','dc');
+ @allroles = ('li','ad','dg','dh','da','sc','au','dc');
}
return @allroles;
}