version 1.73, 2003/07/05 10:07:11
|
version 1.83, 2003/08/25 14:31:20
|
Line 32
|
Line 32
|
# (TeX Content Handler |
# (TeX Content Handler |
# |
# |
############################################################### |
############################################################### |
############################################################### |
############################################################## |
|
|
package Apache::londropadd; |
package Apache::londropadd; |
|
|
Line 154 sub print_main_menu {
|
Line 154 sub print_main_menu {
|
</font> |
</font> |
</p><p> |
</p><p> |
<font size="+1"> |
<font size="+1"> |
<a href="/adm/dropadd?action=classlist">View Classlist</a> |
<a href="/adm/dropadd?action=classlist">View Class List</a> |
</font> |
</font> |
</p><p> |
</p><p> |
<font size="+1"> |
<font size="+1"> |
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 275 ENDPICK
|
Line 277 ENDPICK
|
|
|
} |
} |
|
|
|
sub javascript_validations_without_auth { |
|
my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition(); |
|
return (<<ENDPICK); |
|
function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) { |
|
var foundatype=0; |
|
var message=''; |
|
if (founduname==0) { |
|
alert('You need to specify the username field'); |
|
return; |
|
} |
|
if (foundname==0) { message='name fields'; } |
|
if (foundid==0) { if (message!='') { message+=', '; } message+='student number field'; } |
|
if (foundsec==0) { if (message!='') { message+=', '; } message+='section or group field'; } |
|
if (foundemail==0) { if (message!='') { message+=', '; } message+='email address field'; } |
|
if (message!='') { |
|
message='Not specified (optional): '+message+'. Continue enrollment?'; |
|
if (confirm(message)) { |
|
vf.state.value='enrolling'; |
|
vf.submit(); |
|
} |
|
} else { |
|
vf.state.value='enrolling'; |
|
vf.submit(); |
|
} |
|
} |
|
|
|
ENDPICK |
|
|
|
} |
|
|
############################################################### |
############################################################### |
############################################################### |
############################################################### |
sub upload_manager_javascript_forward_associate { |
sub upload_manager_javascript_forward_associate { |
Line 475 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 484 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{'request.role.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 523 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 590 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 678 sub make_dates_default {
|
Line 717 sub make_dates_default {
|
return $result; |
return $result; |
} |
} |
|
|
# ======================================================= Menu Phase Two Enroll |
## |
|
## Single student enrollment routines (some of them) |
|
## |
|
sub get_student_username_domain_form { |
|
my $r = shift; |
|
my $domform = &Apache::loncommon::select_dom_form |
|
($ENV{'request.role.domain'},'cudomain',0); |
|
$r->print(<<END); |
|
<input type="hidden" name="action" value="enrollstudent" /> |
|
<input type="hidden" name="state" value="gotusername" /> |
|
<h3>Enroll One Student</h3> |
|
<table> |
|
<tr><th>Username:</th> |
|
<td><input type="text" name="cuname" size="15" /></td></tr> |
|
<tr><th>Domain:</th> |
|
<td>$domform</td></tr> |
|
<tr><th> </th> |
|
<td> |
|
<input type="submit" name="Begin Enrollment" value="Begin Enrollment" /> |
|
</td></tr> |
|
</table> |
|
END |
|
return; |
|
} |
|
|
sub print_enroll_single_student_form { |
sub print_enroll_single_student_form { |
my $r=shift; |
my $r=shift; |
$r->print("<h3>Enroll One Student</h3>"); |
$r->print("<h3>Enroll One Student</h3>"); |
my $today = time; |
# |
my $halfyear = $today+15552000; |
my $username = $ENV{'form.cuname'}; |
my $defdom=$r->dir_config('lonDefDomain'); |
my $domain = $ENV{'form.cudomain'}; |
# Set up authentication forms |
my $home = &Apache::lonnet::homeserver($username,$domain); |
my ($krbdef,$krbdefdom) = |
# $new_user flags whether we are creating a new user or using an old one |
&Apache::loncommon::get_kerberos_defaults($defdom); |
my $new_user = 1; |
my $javascript_validations=&javascript_validations($krbdefdom); |
if ($home ne 'no_host') { |
my %param = ( formname => 'document.studentform', |
$new_user = 0; |
kerb_def_dom => $krbdefdom, |
} |
kerb_def_auth => $krbdef |
&Apache::lonnet::logthis('home = '.$home); |
); |
# |
my $krbform = &Apache::loncommon::authform_kerberos(%param); |
my $user_data_html = ''; |
my $intform = &Apache::loncommon::authform_internal(%param); |
my $javascript_validations = ''; |
my $locform = &Apache::loncommon::authform_local(%param); |
if ($new_user) { |
# Set up domain selection form |
my $defdom=$ENV{'request.role.domain'}; |
my $domform = &domain_form($defdom); |
# Set up authentication forms |
|
my ($krbdef,$krbdefdom) = |
|
&Apache::loncommon::get_kerberos_defaults($domain); |
|
$javascript_validations=&javascript_validations($krbdefdom); |
|
my %param = ( formname => 'document.studentform', |
|
kerb_def_dom => $krbdefdom, |
|
kerb_def_auth => $krbdef |
|
); |
|
my $krbform = &Apache::loncommon::authform_kerberos(%param); |
|
my $intform = &Apache::loncommon::authform_internal(%param); |
|
my $locform = &Apache::loncommon::authform_local(%param); |
|
# |
|
# Set up domain selection form |
|
my $homeserver_form = ''; |
|
my %servers = &Apache::loncommon::get_library_servers($domain); |
|
$homeserver_form = '<select name="lcserver" size="1">'."\n". |
|
'<option value="default" selected>default</option>'."\n"; |
|
while (my ($servername,$serverdescription) = each (%servers)) { |
|
$homeserver_form .= '<option value="'.$servername.'">'. |
|
$serverdescription."</option>\n"; |
|
} |
|
$homeserver_form .= "</select>\n"; |
|
# |
|
# |
|
$user_data_html = <<END; |
|
<h3>User Data for $username\@$domain</h3> |
|
<table> |
|
<tr><th>First Name:</th> |
|
<td><input type="text" name="cfirst" size="15"></td></tr> |
|
<tr><th>Middle Name:</th> |
|
<td><input type="text" name="cmiddle" size="15"></td></tr> |
|
<tr><th>Last Name:</th> |
|
<td><input type="text" name="clast" size="15"></td></tr> |
|
<tr><th>Generation:</th> |
|
<td><input type="text" name="cgen" size="5"> </td></tr> |
|
<tr><th>Home Server:</th> |
|
<td>$homeserver_form</td></tr> |
|
</table> |
|
<h3>Password</h3> |
|
Please select an authentication mechanism |
|
<table> |
|
<p> |
|
$krbform |
|
<br /> |
|
$intform |
|
<br /> |
|
$locform |
|
</p> |
|
END |
|
} else { |
|
# User already exists. Do not worry about authentication |
|
my %uenv = &Apache::lonnet::dump('environment',$domain,$username); |
|
$javascript_validations = &javascript_validations_without_auth(); |
|
$user_data_html = <<END; |
|
<h3>User Data for $username\@$domain</h3> |
|
<input type="hidden" name="lcserver" value="default" /> |
|
<table> |
|
<tr><th>First Name:</th> |
|
<td> |
|
<input type="text" name="cfirst" value="$uenv{'firstname'}" size="15" /> |
|
</td></tr> |
|
<tr><th>Middle Name:</th> |
|
<td> |
|
<input type="text" name="cmiddle" value="$uenv{'middlename'}" size="15" /> |
|
</td></tr> |
|
<tr><th>Last Name:</th> |
|
<td> |
|
<input type="text" name="clast"value="$uenv{'lastname'}" size="15" /> |
|
</td></tr> |
|
<tr><th>Generation:</th> |
|
<td> |
|
<input type="text" name="cgen" value="$uenv{'generation'}" size="5" /> |
|
</td></tr> |
|
</table> |
|
END |
|
} |
my $date_table = &date_setting_table(); |
my $date_table = &date_setting_table(); |
# Print it all out |
# Print it all out |
$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="done"> |
<input type="hidden" name="state" value="done" /> |
|
<input type="hidden" name="cuname" value="$username" /> |
|
<input type="hidden" name="lcdomain" value="$domain" /> |
<script type="text/javascript" language="Javascript"> |
<script type="text/javascript" language="Javascript"> |
function verify(vf) { |
function verify(vf) { |
var founduname=0; |
var founduname=0; |
Line 740 function clearpwd(vf) {
|
Line 879 function clearpwd(vf) {
|
} |
} |
|
|
</script> |
</script> |
<h3>Personal Data</h3> |
|
<table> |
|
<tr><td>First Name:</td><td> <input type="text" name="cfirst" size="15"></td></tr> |
|
<tr><td>Middle Name:</td><td> <input type="text" name="cmiddle" size="15"></td></tr> |
|
<tr><td>Last Name: </td><td><input type="text" name="clast" size="15"></td></tr> |
|
<tr><td>Generation: </td><td><input type="text" name="cgen" size="5"> </td></tr> |
|
</table> |
|
|
|
<h3>Login Data</h3> |
$user_data_html |
<p>Username: <input type="text" name="cuname" size="15"></p> |
|
<p>Domain: $domform</p> |
|
<p>Note: login settings below will not take effect if the user already exists |
|
</p><p> |
|
$krbform |
|
</p><p> |
|
$intform |
|
</p><p> |
|
$locform |
|
</p><p> |
|
|
|
<h3>Course Data</h3> |
<h3>Course Data</h3> |
|
|
Line 810 sub print_html_classlist {
|
Line 932 sub print_html_classlist {
|
<input type="hidden" name="action" value="$ENV{'form.action'}" /> |
<input type="hidden" name="action" value="$ENV{'form.action'}" /> |
<input type="hidden" name="state" value="" /> |
<input type="hidden" name="state" value="" /> |
<p> |
<p> |
<font size="+1">Current Classlist</font> |
<font size="+1">Current Class List</font> |
|
|
END |
END |
if ($ENV{'form.action'} ne 'modifystudent') { |
if ($ENV{'form.action'} ne 'modifystudent') { |
Line 915 END
|
Line 1037 END
|
$excel_workbook->set_tempdir('/home/httpd/perl/tmp'); |
$excel_workbook->set_tempdir('/home/httpd/perl/tmp'); |
$excel_sheet = $excel_workbook->addworksheet('classlist'); |
$excel_sheet = $excel_workbook->addworksheet('classlist'); |
# |
# |
my $description = 'Classlist for '. |
my $description = 'Class List for '. |
$ENV{'course.'.$ENV{'request.course.id'}.'.description'}; |
$ENV{'course.'.$ENV{'request.course.id'}.'.description'}; |
$excel_sheet->write($row++,0,$description); |
$excel_sheet->write($row++,0,$description); |
# |
# |
Line 1082 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 1406 $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 1419 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 1467 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 1512 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 1648 The response to the request is governed
|
Line 1785 The response to the request is governed
|
upload enrolling enroll students based on upload |
upload enrolling enroll students based on upload |
drop undefined print the classlist ready to drop |
drop undefined print the classlist ready to drop |
drop done drop the selected students |
drop done drop the selected students |
enrollstudent undefined print single student enroll menu |
enrollstudent undefined print student username domain form |
|
enrollstudent gotusername print single student enroll menu |
enrollstudent enrolling enroll student |
enrollstudent enrolling enroll student |
classlist undefined print html classlist |
classlist undefined print html classlist |
classlist csv print csv classlist |
classlist csv print csv classlist |
Line 1716 sub handler {
|
Line 1854 sub handler {
|
} |
} |
} elsif ($ENV{'form.action'} eq 'enrollstudent') { |
} elsif ($ENV{'form.action'} eq 'enrollstudent') { |
if (! exists($ENV{'form.state'})) { |
if (! exists($ENV{'form.state'})) { |
|
&get_student_username_domain_form($r); |
|
} elsif ($ENV{'form.state'} eq 'gotusername') { |
&print_enroll_single_student_form($r); |
&print_enroll_single_student_form($r); |
} elsif ($ENV{'form.state'} eq 'enrolling') { |
} elsif ($ENV{'form.state'} eq 'enrolling') { |
&enroll_single_student($r); |
&enroll_single_student($r); |
} else { |
} else { |
&print_enroll_single_student_form($r); |
&get_student_username_domain_form($r); |
} |
} |
} elsif ($ENV{'form.action'} eq 'classlist') { |
} elsif ($ENV{'form.action'} eq 'classlist') { |
if (! exists($ENV{'form.state'})) { |
if (! exists($ENV{'form.state'})) { |