--- loncom/interface/Attic/londropadd.pm 2002/04/16 21:02:17 1.26 +++ loncom/interface/Attic/londropadd.pm 2002/04/23 21:03:59 1.29 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to drop and add students in courses # -# $Id: londropadd.pm,v 1.26 2002/04/16 21:02:17 matthew Exp $ +# $Id: londropadd.pm,v 1.29 2002/04/23 21:03:59 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -59,8 +59,7 @@ use Apache::Constants qw(:common :http R # ================================================================ Print header sub header { - my $r=shift; - $r->print(< LON-CAPA Student Drop/Add @@ -94,9 +93,9 @@ sub modifystudent { my $section=$1; $section='' if ($course eq $courseid.'_st'); if (((!$section) && (!$csec)) || ($section ne $csec)) { - my (undef,$end,$start)=split(/\_/,$course); + my (undef,$end,$start)=split(/\_/,$roles{$course}); my $now=time; - if (($start) && ($end) && ($now>$start) && ($now<$end)) { + if (!($start && ($now<$start)) || !($end && ($now>$end))) { my $reply=&Apache::lonnet::modifystudent ($udom,$unam,'','','','','','','',$section,time); } @@ -147,7 +146,7 @@ to this page if the data selected is ins
- @@ -156,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(< @@ -416,22 +391,16 @@ sub phase_two_end {

Login Type

Note: this will not take effect if the user already exists

- -Kerberos authenticated with domain - +$krbform

- -Internally authenticated (with initial password -) +$intform

- -Local Authentication with argument - +$locform

LON-CAPA Domain for Students

-LON-CAPA domain:

+LON-CAPA domain: $domform

Starting and Ending Dates

@@ -505,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'}; @@ -547,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(< +