--- loncom/interface/Attic/londropadd.pm 2004/11/12 16:34:15 1.121
+++ loncom/interface/Attic/londropadd.pm 2005/06/03 16:27:26 1.130
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.121 2004/11/12 16:34:15 matthew Exp $
+# $Id: londropadd.pm,v 1.130 2005/06/03 16:27:26 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -32,7 +32,7 @@
package Apache::londropadd;
use strict;
-use Apache::lonnet();
+use Apache::lonnet;
use Apache::loncommon();
use Apache::lonhtmlcommon();
use Apache::Constants qw(:common :http REDIRECT);
@@ -43,10 +43,11 @@ use Apache::lonlocal;
###############################################################
###############################################################
sub header {
+ my $html=&Apache::lonxml::xmlbegin();
my $bodytag=&Apache::loncommon::bodytag('Enrollment Manager');
my $title = &mt('LON-CAPA Enrollment Manager');
return(<
+$html
$title
@@ -138,10 +139,10 @@ sub domain_form {
sub print_main_menu {
my ($r,$enrl_permission,$view_permission)=@_;
#
- my ($cdom,$cnum) = split/_/,$ENV{'request.course.id'};
+ my ($cdom,$cnum) = split/_/,$env{'request.course.id'};
my @menu =
(
- { text => 'Uploade a class list',
+ { text => 'Upload a class list',
help => 'Course_Create_Class_List',
action => 'upload',
permission => $enrl_permission,
@@ -204,17 +205,17 @@ sub print_upload_manager_header {
my ($r,$datatoken,$distotal,$krbdefdom)=@_;
my $javascript;
#
- if (! exists($ENV{'form.upfile_associate'})) {
- $ENV{'form.upfile_associate'} = 'forward';
+ if (! exists($env{'form.upfile_associate'})) {
+ $env{'form.upfile_associate'} = 'forward';
}
- if ($ENV{'form.associate'} eq 'Reverse Association') {
- if ( $ENV{'form.upfile_associate'} ne 'reverse' ) {
- $ENV{'form.upfile_associate'} = 'reverse';
+ if ($env{'form.associate'} eq 'Reverse Association') {
+ if ( $env{'form.upfile_associate'} ne 'reverse' ) {
+ $env{'form.upfile_associate'} = 'reverse';
} else {
- $ENV{'form.upfile_associate'} = 'forward';
+ $env{'form.upfile_associate'} = 'forward';
}
}
- if ($ENV{'form.upfile_associate'} eq 'reverse') {
+ if ($env{'form.upfile_associate'} eq 'reverse') {
$javascript=&upload_manager_javascript_reverse_associate();
} else {
$javascript=&upload_manager_javascript_forward_associate();
@@ -222,8 +223,8 @@ sub print_upload_manager_header {
#
# Deal with restored settings
my $password_choice = '';
- if (exists($ENV{'form.ipwd_choice'}) &&
- $ENV{'form.ipwd_choice'} ne '') {
+ if (exists($env{'form.ipwd_choice'}) &&
+ $env{'form.ipwd_choice'} ne '') {
# If a column was specified for password, assume it is for an
# internal password. This is a bug waiting to be filed (could be
# local or krb auth instead of internal) but I do not have the
@@ -233,7 +234,7 @@ sub print_upload_manager_header {
#
my $javascript_validations=&javascript_validations('auth',$krbdefdom,
$password_choice);
- my $checked=(($ENV{'form.noFirstLine'})?' checked="1"':'');
+ my $checked=(($env{'form.noFirstLine'})?' checked="1"':'');
$r->print('
'.&mt('Uploading Class List')."
\n".
"\n".
'
'.&mt('Identify fields')."
\n");
@@ -246,9 +247,9 @@ sub print_upload_manager_header {
&hidden_input('state','got_file').
&hidden_input('associate','').
&hidden_input('datatoken',$datatoken).
- &hidden_input('fileupload',$ENV{'form.fileupload'}).
- &hidden_input('upfiletype',$ENV{'form.upfiletype'}).
- &hidden_input('upfile_associate',$ENV{'form.upfile_associate'}));
+ &hidden_input('fileupload',$env{'form.fileupload'}).
+ &hidden_input('upfiletype',$env{'form.upfiletype'}).
+ &hidden_input('upfile_associate',$env{'form.upfile_associate'}));
$r->print('');
@@ -590,9 +591,9 @@ sub print_upload_manager_footer {
kerb_def_dom => $krbdefdom,
kerb_def_auth => $krbdef
);
- if (exists($ENV{'form.ipwd_choice'}) &&
- defined($ENV{'form.ipwd_choice'}) &&
- $ENV{'form.ipwd_choice'} ne '') {
+ if (exists($env{'form.ipwd_choice'}) &&
+ defined($env{'form.ipwd_choice'}) &&
+ $env{'form.ipwd_choice'} ne '') {
$param{'curr_authtype'} = 'int';
}
my $krbform = &Apache::loncommon::authform_kerberos(%param);
@@ -606,6 +607,7 @@ sub print_upload_manager_footer {
$Str .= '
'.&mt('Login Type')."
\n";
$Str .= "
\n".
&mt('Note: this will not take effect if the user already exists').
+ &Apache::loncommon::help_open_topic('Auth_Options').
"
\n";
$Str .= $krbform."\n
\n".
$intform."\n
\n".
@@ -638,14 +640,14 @@ sub print_upload_manager_form {
my $firstLine;
my $datatoken;
- if (!$ENV{'form.datatoken'}) {
+ if (!$env{'form.datatoken'}) {
$datatoken=&Apache::loncommon::upfile_store($r);
} else {
- $datatoken=$ENV{'form.datatoken'};
+ $datatoken=$env{'form.datatoken'};
&Apache::loncommon::load_tmp_file($r);
}
my @records=&Apache::loncommon::upfile_record_sep();
- if($ENV{'form.noFirstLine'}){
+ if($env{'form.noFirstLine'}){
$firstLine=shift(@records);
}
my $total=$#records;
@@ -668,7 +670,7 @@ sub print_upload_manager_form {
});
#
# Determine kerberos parameters as appropriate
- my $defdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ my $defdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my ($krbdef,$krbdefdom) =
&Apache::loncommon::get_kerberos_defaults($defdom);
#
@@ -677,17 +679,17 @@ sub print_upload_manager_form {
my $keyfields;
if ($total>=0) {
my @field=
- (['username',&mt('Username'), $ENV{'form.username_choice'}],
- ['names',&mt('Last Name, First Names'),$ENV{'form.names_choice'}],
- ['fname',&mt('First Name'), $ENV{'form.fname_choice'}],
- ['mname',&mt('Middle Names/Initials'),$ENV{'form.mname_choice'}],
- ['lname',&mt('Last Name'), $ENV{'form.lname_choice'}],
- ['gen', &mt('Generation'), $ENV{'form.gen_choice'}],
- ['id', &mt('ID/Student Number'),$ENV{'form.id_choice'}],
- ['sec', &mt('Group/Section'), $ENV{'form.sec_choice'}],
- ['ipwd', &mt('Initial Password'),$ENV{'form.ipwd_choice'}],
- ['email',&mt('EMail Address'), $ENV{'form.email_choice'}]);
- if ($ENV{'form.upfile_associate'} eq 'reverse') {
+ (['username',&mt('Username'), $env{'form.username_choice'}],
+ ['names',&mt('Last Name, First Names'),$env{'form.names_choice'}],
+ ['fname',&mt('First Name'), $env{'form.fname_choice'}],
+ ['mname',&mt('Middle Names/Initials'),$env{'form.mname_choice'}],
+ ['lname',&mt('Last Name'), $env{'form.lname_choice'}],
+ ['gen', &mt('Generation'), $env{'form.gen_choice'}],
+ ['id', &mt('ID/Student Number'),$env{'form.id_choice'}],
+ ['sec', &mt('Group/Section'), $env{'form.sec_choice'}],
+ ['ipwd', &mt('Initial Password'),$env{'form.ipwd_choice'}],
+ ['email',&mt('EMail Address'), $env{'form.email_choice'}]);
+ if ($env{'form.upfile_associate'} eq 'reverse') {
&Apache::loncommon::csv_print_samples($r,\@records);
$i=&Apache::loncommon::csv_print_select_table($r,\@records,
\@field);
@@ -711,25 +713,25 @@ sub print_upload_manager_form {
sub enroll_single_student {
my $r=shift;
# Remove non alphanumeric values from section
- $ENV{'form.csec'}=~s/\W//g;
+ $env{'form.csec'}=~s/\W//g;
#
# We do the dates first because the action of making them the defaul
# in the course is entirely separate from the action of enrolling the
# student. Also, a failure in setting the dates as default is not fatal
# to the process of enrolling / modifying a student.
my ($startdate,$enddate) = &get_dates_from_form();
- if ($ENV{'form.makedatesdefault'}) {
+ if ($env{'form.makedatesdefault'}) {
$r->print(&make_dates_default($startdate,$enddate));
}
$r->print('
');
+ if (($env{'form.cuname'})&&($env{'form.cuname'}!~/\W/)&&
+ ($env{'form.lcdomain'})&&($env{'form.lcdomain'}!~/\W/)) {
# Deal with home server selection
- my $domain=$ENV{'form.lcdomain'};
- my $desiredhost = $ENV{'form.lcserver'};
+ my $domain=$env{'form.lcdomain'};
+ my $desiredhost = $env{'form.lcserver'};
if (lc($desiredhost) eq 'default') {
$desiredhost = undef;
} else {
@@ -744,33 +746,33 @@ sub enroll_single_student {
# End of home server selection logic
my $amode='';
my $genpwd='';
- if ($ENV{'form.login'} eq 'krb') {
+ if ($env{'form.login'} eq 'krb') {
$amode='krb';
- $amode.=$ENV{'form.krbver'};
- $genpwd=$ENV{'form.krbarg'};
- } elsif ($ENV{'form.login'} eq 'int') {
+ $amode.=$env{'form.krbver'};
+ $genpwd=$env{'form.krbarg'};
+ } elsif ($env{'form.login'} eq 'int') {
$amode='internal';
- $genpwd=$ENV{'form.intarg'};
- } elsif ($ENV{'form.login'} eq 'loc') {
+ $genpwd=$env{'form.intarg'};
+ } elsif ($env{'form.login'} eq 'loc') {
$amode='localauth';
- $genpwd=$ENV{'form.locarg'};
+ $genpwd=$env{'form.locarg'};
if (!$genpwd) { $genpwd=" "; }
}
- my $home = &Apache::lonnet::homeserver($ENV{'form.cuname'},
- $ENV{'form.lcdomain'});
+ my $home = &Apache::lonnet::homeserver($env{'form.cuname'},
+ $env{'form.lcdomain'});
if ((($amode) && ($genpwd)) || ($home ne 'no_host')) {
# Clean out any old roles the student has in this class.
- &modifystudent($ENV{'form.lcdomain'},$ENV{'form.cuname'},
- $ENV{'request.course.id'},$ENV{'form.csec'},
+ &modifystudent($env{'form.lcdomain'},$env{'form.cuname'},
+ $env{'request.course.id'},$env{'form.csec'},
$desiredhost);
my $login_result = &Apache::lonnet::modifystudent
- ($ENV{'form.lcdomain'},$ENV{'form.cuname'},
- $ENV{'form.cstid'},$amode,$genpwd,
- $ENV{'form.cfirst'},$ENV{'form.cmiddle'},
- $ENV{'form.clast'},$ENV{'form.cgen'},
- $ENV{'form.csec'},$enddate,
- $startdate,$ENV{'form.forceid'},
- $desiredhost);
+ ($env{'form.lcdomain'},$env{'form.cuname'},
+ $env{'form.cstid'},$amode,$genpwd,
+ $env{'form.cfirst'},$env{'form.cmiddle'},
+ $env{'form.clast'},$env{'form.cgen'},
+ $env{'form.csec'},$enddate,
+ $startdate,$env{'form.forceid'},
+ $desiredhost,$env{'form.emailaddress'});
if ($login_result =~ /^ok/) {
$r->print($login_result);
$r->print("
".&mt('If active, the new role will be available when the student next logs in to LON-CAPA.')."
");
@@ -784,7 +786,7 @@ sub enroll_single_student {
} else {
$r->print(&mt('Invalid login mode or password.').' ');
}
- $r->print(''.&mt('Unable to enroll').' '.$ENV{'form.cuname'}.'.
');
+ $r->print(''.&mt('Unable to enroll').' '.$env{'form.cuname'}.'.');
}
} else {
$r->print(&mt('Invalid username or domain'));
@@ -796,9 +798,9 @@ sub setup_date_selectors {
if (! defined($starttime)) {
$starttime = time;
unless ($mode eq 'create_enrolldates' || $mode eq 'create_defaultdates') {
- if (exists($ENV{'course.'.$ENV{'request.course.id'}.
+ if (exists($env{'course.'.$env{'request.course.id'}.
'.default_enrollment_start_date'})) {
- $starttime = $ENV{'course.'.$ENV{'request.course.id'}.
+ $starttime = $env{'course.'.$env{'request.course.id'}.
'.default_enrollment_start_date'};
}
}
@@ -806,9 +808,9 @@ sub setup_date_selectors {
if (! defined($endtime)) {
$endtime = time+(6*30*24*60*60); # 6 months from now, approx
unless ($mode eq 'createcourse') {
- if (exists($ENV{'course.'.$ENV{'request.course.id'}.
+ if (exists($env{'course.'.$env{'request.course.id'}.
'.default_enrollment_end_date'})) {
- $endtime = $ENV{'course.'.$ENV{'request.course.id'}.
+ $endtime = $env{'course.'.$env{'request.course.id'}.
'.default_enrollment_end_date'};
}
}
@@ -841,7 +843,7 @@ sub setup_date_selectors {
sub get_dates_from_form {
my $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate');
my $enddate = &Apache::lonhtmlcommon::get_date_from_form('enddate');
- if ($ENV{'form.no_end_date'}) {
+ if ($env{'form.no_end_date'}) {
$enddate = 0;
}
return ($startdate,$enddate);
@@ -879,8 +881,8 @@ sub date_setting_table {
sub make_dates_default {
my ($startdate,$enddate) = @_;
my $result = '';
- my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
- my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+ my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $crs = $env{'course.'.$env{'request.course.id'}.'.num'};
my $put_result = &Apache::lonnet::put('environment',
{'default_enrollment_start_date'=>$startdate,
'default_enrollment_end_date' =>$enddate},$dom,$crs);
@@ -888,7 +890,7 @@ sub make_dates_default {
$result .= "Set default start and end dates for course ";
#
# Refresh the course environment
- &Apache::lonnet::coursedescription($ENV{'request.course.id'});
+ &Apache::lonnet::coursedescription($env{'request.course.id'});
} else {
$result .= &mt('Unable to set default dates for course').":".$put_result.
' ';
@@ -902,7 +904,7 @@ sub make_dates_default {
sub get_student_username_domain_form {
my $r = shift;
my $domform = &Apache::loncommon::select_dom_form
- ($ENV{'course.'.$ENV{'request.course.id'}.'.domain'},'cudomain',0);
+ ($env{'course.'.$env{'request.course.id'}.'.domain'},'cudomain',0);
my %lt=&Apache::lonlocal::texthash(
'eos' => "Enroll One Student",
'usr' => "Username",
@@ -935,10 +937,10 @@ sub print_enroll_single_student_form {
my $r=shift;
$r->print("
".&mt('Enroll One Student')."
");
#
- my $username = $ENV{'form.cuname'};
- my $domain = $ENV{'form.cudomain'};
- $username=~s/[\W|_]//gs;
- $domain=~s/[\W|_]//gs;
+ my $username = $env{'form.cuname'};
+ my $domain = $env{'form.cudomain'};
+ $username=~s/\W//gs;
+ $domain=~s/\W//gs;
my $home = &Apache::lonnet::homeserver($username,$domain);
# $new_user flags whether we are creating a new user or using an old one
my $new_user = 1;
@@ -949,7 +951,7 @@ sub print_enroll_single_student_form {
my $user_data_html = '';
my $javascript_validations = '';
if ($new_user) {
- my $defdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+ my $defdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
# Set up authentication forms
my ($krbdef,$krbdefdom) =
&Apache::loncommon::get_kerberos_defaults($domain);
@@ -983,7 +985,9 @@ sub print_enroll_single_student_form {
'hs' => "Home Server",
'pswd' => "Password",
'psam' => "Please select an authentication mechanism",
+ 'mail' => "Email Address"
);
+ my $authhelp=&Apache::loncommon::help_open_topic('Auth_Options');
$user_data_html = <$lt{'udf'} $username\@$domain
@@ -997,9 +1001,11 @@ sub print_enroll_single_student_form {
\n");
- if ($ENV{'form.action'} ne 'modifystudent') {
+ if ($env{'form.action'} ne 'modifystudent') {
my %lt=&Apache::lonlocal::texthash('csv' => "CSV",
'excel' => "Excel",
'html' => 'HTML');
my $output_selector = '