version 1.76, 2003/07/21 17:54:43
|
version 1.85, 2003/09/08 14:30:47
|
Line 32
|
Line 32
|
# (TeX Content Handler |
# (TeX Content Handler |
# |
# |
############################################################### |
############################################################### |
############################################################### |
############################################################## |
|
|
package Apache::londropadd; |
package Apache::londropadd; |
|
|
Line 185 sub print_upload_manager_header {
|
Line 185 sub print_upload_manager_header {
|
$javascript=&upload_manager_javascript_forward_associate(); |
$javascript=&upload_manager_javascript_forward_associate(); |
} |
} |
my $javascript_validations=&javascript_validations($krbdefdom); |
my $javascript_validations=&javascript_validations($krbdefdom); |
|
my $checked=(($ENV{'form.noFirstLine'})?' checked="1"':''); |
$r->print(<<ENDPICK); |
$r->print(<<ENDPICK); |
<h3>Uploading Class List</h3> |
<h3>Uploading Class List</h3> |
<hr> |
<hr> |
Line 198 to this page if the data selected is ins
|
Line 199 to this page if the data selected is ins
|
<input type="hidden" name="associate" value="" /> |
<input type="hidden" name="associate" value="" /> |
<input type="hidden" name="datatoken" value="$datatoken" /> |
<input type="hidden" name="datatoken" value="$datatoken" /> |
<input type="hidden" name="fileupload" value="$ENV{'form.fileupload'}" /> |
<input type="hidden" name="fileupload" value="$ENV{'form.fileupload'}" /> |
|
<input type="checkbox" name="noFirstLine" $checked />Ignore First Line |
<input type="hidden" name="upfiletype" value="$ENV{'form.upfiletype'}" /> |
<input type="hidden" name="upfiletype" value="$ENV{'form.upfiletype'}" /> |
<input type="hidden" name="upfile_associate" |
<input type="hidden" name="upfile_associate" |
value="$ENV{'form.upfile_associate'}" /> |
value="$ENV{'form.upfile_associate'}" /> |
Line 505 ENDPICK
|
Line 507 ENDPICK
|
# ======================================================= Menu Phase Two Upload |
# ======================================================= Menu Phase Two Upload |
sub print_upload_manager_form { |
sub print_upload_manager_form { |
my $r=shift; |
my $r=shift; |
|
my $firstLine; |
my $datatoken; |
my $datatoken; |
if (!$ENV{'form.datatoken'}) { |
if (!$ENV{'form.datatoken'}) { |
$datatoken=&Apache::loncommon::upfile_store($r); |
$datatoken=&Apache::loncommon::upfile_store($r); |
Line 514 sub print_upload_manager_form {
|
Line 516 sub print_upload_manager_form {
|
&Apache::loncommon::load_tmp_file($r); |
&Apache::loncommon::load_tmp_file($r); |
} |
} |
my @records=&Apache::loncommon::upfile_record_sep(); |
my @records=&Apache::loncommon::upfile_record_sep(); |
|
if($ENV{'form.noFirstLine'}){$firstLine=shift(@records);} |
my $total=$#records; |
my $total=$#records; |
my $distotal=$total+1; |
my $distotal=$total+1; |
my $today=time; |
my $today=time; |
my $halfyear=$today+15552000; |
my $halfyear=$today+15552000; |
my $defdom=$r->dir_config('lonDefDomain'); |
my $defdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; |
my ($krbdef,$krbdefdom) = |
my ($krbdef,$krbdefdom) = |
&Apache::loncommon::get_kerberos_defaults($defdom); |
&Apache::loncommon::get_kerberos_defaults($defdom); |
&print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom); |
&print_upload_manager_header($r,$datatoken,$distotal,$krbdefdom); |
Line 553 sub print_upload_manager_form {
|
Line 556 sub print_upload_manager_form {
|
# ======================================================= Enroll single student |
# ======================================================= Enroll single student |
sub enroll_single_student { |
sub enroll_single_student { |
my $r=shift; |
my $r=shift; |
|
# Remove non alphanumeric values from section |
|
$ENV{'form.csec'}=~s/\W//g; |
# |
# |
# We do the dates first because the action of making them the defaul |
# We do the dates first because the action of making them the defaul |
# in the course is entirely seperate from the action of enrolling the |
# in the course is entirely seperate from the action of enrolling the |
Line 620 sub enroll_single_student {
|
Line 625 sub enroll_single_student {
|
$r->print("unable to enroll: ".$login_result); |
$r->print("unable to enroll: ".$login_result); |
} |
} |
} else { |
} else { |
$r->print('<p><font color="#ff0000">ERROR</font> '. |
$r->print('<p><font color="#ff0000">ERROR</font> '); |
'Invalid login mode or password. '. |
if ($amode =~ /^krb/) { |
'Unable to enroll '.$ENV{'form.cuname'}.'.</p>'); |
$r->print('Missing Kerberos domain information. '); |
} |
} else { |
|
$r->print('Invalid login mode or password. '); |
|
} |
|
$r->print('<b>Unable to enroll '.$ENV{'form.cuname'}.'.</b></p>'); |
|
} |
} else { |
} else { |
$r->print('Invalid username or domain'); |
$r->print('Invalid username or domain'); |
} |
} |
Line 714 sub make_dates_default {
|
Line 723 sub make_dates_default {
|
sub get_student_username_domain_form { |
sub get_student_username_domain_form { |
my $r = shift; |
my $r = shift; |
my $domform = &Apache::loncommon::select_dom_form |
my $domform = &Apache::loncommon::select_dom_form |
($r->dir_config('lonDefDomain'),'cudomain',0); |
($ENV{'course.'.$ENV{'request.course.id'}.'.domain'},'cudomain',0); |
$r->print(<<END); |
$r->print(<<END); |
<input type="hidden" name="action" value="enrollstudent" /> |
<input type="hidden" name="action" value="enrollstudent" /> |
<input type="hidden" name="state" value="gotusername" /> |
<input type="hidden" name="state" value="gotusername" /> |
Line 750 sub print_enroll_single_student_form {
|
Line 759 sub print_enroll_single_student_form {
|
my $user_data_html = ''; |
my $user_data_html = ''; |
my $javascript_validations = ''; |
my $javascript_validations = ''; |
if ($new_user) { |
if ($new_user) { |
my $defdom=$r->dir_config('lonDefDomain'); |
my $defdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; |
# Set up authentication forms |
# Set up authentication forms |
my ($krbdef,$krbdefdom) = |
my ($krbdef,$krbdefdom) = |
&Apache::loncommon::get_kerberos_defaults($domain); |
&Apache::loncommon::get_kerberos_defaults($domain); |
Line 1195 END
|
Line 1204 END
|
sub modify_single_student { |
sub modify_single_student { |
my $r = shift; |
my $r = shift; |
# |
# |
|
# Remove non alphanumeric values from the section |
|
$ENV{'form.section'} =~ s/\W//g; |
|
# |
# Do the date defaults first |
# Do the date defaults first |
my ($starttime,$endtime) = &get_dates_from_form(); |
my ($starttime,$endtime) = &get_dates_from_form(); |
if ($ENV{'form.makedatesdefault'}) { |
if ($ENV{'form.makedatesdefault'}) { |
Line 1519 $upfile_select
|
Line 1531 $upfile_select
|
<input type=submit name="fileupload" value="Upload Courselist"> |
<input type=submit name="fileupload" value="Upload Courselist"> |
<input type="hidden" name="action" value="upload" /> |
<input type="hidden" name="action" value="upload" /> |
<input type="hidden" name="state" value="got_file" /> |
<input type="hidden" name="state" value="got_file" /> |
|
<input type="checkbox" name="noFirstLine" /> Ignore First Line<br /> |
</p> |
</p> |
$create_classlist_help <br /> |
$create_classlist_help <br /> |
$create_csv_help |
$create_csv_help |
Line 1532 sub upfile_drop_add {
|
Line 1545 sub upfile_drop_add {
|
my $r=shift; |
my $r=shift; |
&Apache::loncommon::load_tmp_file($r); |
&Apache::loncommon::load_tmp_file($r); |
my @studentdata=&Apache::loncommon::upfile_record_sep(); |
my @studentdata=&Apache::loncommon::upfile_record_sep(); |
|
if($ENV{'form.noFirstLine'}){shift(@studentdata);} |
my @keyfields = split(/\,/,$ENV{'form.keyfields'}); |
my @keyfields = split(/\,/,$ENV{'form.keyfields'}); |
my $cid = $ENV{'request.course.id'}; |
my $cid = $ENV{'request.course.id'}; |
my %fields=(); |
my %fields=(); |
Line 1580 sub upfile_drop_add {
|
Line 1594 sub upfile_drop_add {
|
$genpwd=$ENV{'form.locarg'}; |
$genpwd=$ENV{'form.locarg'}; |
} |
} |
} |
} |
|
if ($amode =~ /^krb/) { |
|
if (! defined($genpwd) || $genpwd eq '') { |
|
$r->print('<font color="red" size="+1">'. |
|
'Unable to enroll students:'.'</font> '. |
|
'No Kerberos domain was specified.</p>'); |
|
$amode = ''; # This causes the loop below to be skipped |
|
} |
|
} |
unless (($domain=~/\W/) || ($amode eq '')) { |
unless (($domain=~/\W/) || ($amode eq '')) { |
####################################### |
####################################### |
## Enroll Students ## |
## Enroll Students ## |
Line 1625 sub upfile_drop_add {
|
Line 1647 sub upfile_drop_add {
|
$sec=$entries{$fields{'sec'}}; |
$sec=$entries{$fields{'sec'}}; |
} |
} |
} |
} |
|
# remove non alphanumeric values from section |
|
$sec =~ s/\W//g; |
# determine student id number |
# determine student id number |
my $id=''; |
my $id=''; |
if (defined($fields{'id'})) { |
if (defined($fields{'id'})) { |
Line 1657 sub upfile_drop_add {
|
Line 1681 sub upfile_drop_add {
|
\$lname,\$gen,\$sec) { |
\$lname,\$gen,\$sec) { |
$$_ =~ s/(\s+$|^\s+)//g; |
$$_ =~ s/(\s+$|^\s+)//g; |
} |
} |
if ($password) { |
if ($password || $ENV{'form.login'} eq 'loc') { |
&modifystudent($domain,$username,$cid,$sec, |
&modifystudent($domain,$username,$cid,$sec, |
$desiredhost); |
$desiredhost); |
my $reply=&Apache::lonnet::modifystudent |
my $reply=&Apache::lonnet::modifystudent |