--- loncom/interface/Attic/londropadd.pm 2002/04/17 13:55:35 1.27
+++ loncom/interface/Attic/londropadd.pm 2002/04/25 19:21:34 1.30
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.27 2002/04/17 13:55:35 matthew Exp $
+# $Id: londropadd.pm,v 1.30 2002/04/25 19:21:34 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -146,7 +146,7 @@ to this page if the data selected is ins
-
@@ -155,36 +155,45 @@ ENDPICK
sub javascript_validations {
my ($krbdefdom)=@_;
+ my %param = ( formname => 'studentform',
+ kerb_def_dom => $krbdefdom );
+ my $authheader = &Apache::loncommon::authform_header(%param);
return (< 'document.studentform');
+ 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 $domform = &Apache::loncommon::select_dom_form($defdom,'lcdomain');
$r->print(<
@@ -415,22 +391,16 @@ sub phase_two_end {
Login Type
Note: this will not take effect if the user already exists
@@ -504,16 +474,17 @@ sub menu_phase_two_upload {
sub enroll_single_student {
my $r=shift;
$r->print('
Enrolling Student
');
+ $r->print($ENV{'form.cuname'}." in domain ".$ENV{'form.cdomain'}.": ");
if (($ENV{'form.cuname'})&&($ENV{'form.cuname'}!~/\W/)&&
($ENV{'form.cdomain'})&&($ENV{'form.cdomain'}!~/\W/)) {
my $amode='';
my $genpwd='';
if ($ENV{'form.login'} eq 'krb') {
$amode='krb4';
- $genpwd=$ENV{'form.krbdom'};
+ $genpwd=$ENV{'form.krbarg'};
} elsif ($ENV{'form.login'} eq 'int') {
$amode='internal';
- $genpwd=$ENV{'form.intpwd'};
+ $genpwd=$ENV{'form.intarg'};
} elsif ($ENV{'form.login'} eq 'loc') {
$amode='localauth';
$genpwd=$ENV{'form.locarg'};
@@ -546,8 +517,16 @@ sub menu_phase_two_enroll {
my $halfyear = $today+15552000;
my $defdom=$r->dir_config('lonDefDomain');
my $javascript_validations=&javascript_validations($krbdefdom);
+ # Set up authentication forms
+ my %param = ( formname => 'document.studentform');
+ 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 $domform = &Apache::loncommon::select_dom_form($defdom,'cdomain');
+ # Print it all out
$r->print(<
+