--- loncom/interface/Attic/londropadd.pm 2002/04/15 23:37:37 1.24
+++ loncom/interface/Attic/londropadd.pm 2002/04/22 15:26:46 1.28
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.24 2002/04/15 23:37:37 albertel Exp $
+# $Id: londropadd.pm,v 1.28 2002/04/22 15:26:46 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(< 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
@@ -459,13 +419,12 @@ LON-CAPA domain:
Disable ID/Student Number Safeguard and Force Change of Conflicting IDs
(only do if you know what you are doing)
-
+First Name:
+ ID/Student Number:
+ Group/Section:
-Domain:
-Note: login settings below will not take effect if the user already exists
-
-
-Kerberos authenticated with domain
-
-
-Internally authenticated (with initial password
-)
-
-
-Local Authentication with argument
-
- Username: Domain: Note: login settings below will not take effect if the user already exists
+
+$krbform
+
+$intform
+
+$locform
+
Enter as many fields as you can. The system will inform you and bring you back
to this page if the data selected is insufficient to run your class.
-
-
-
+
+
+
-
+
-
ENDPICK
@@ -162,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 (<Login Type
LON-CAPA Domain for Students
LON-CAPA domain: Starting and Ending Dates
-
-
-
-
-
+
+
+
+
+
Set Starting Date
+
Note: for large courses, this operation might be time consuming.
ENDPICK
}
# ======================================================= Menu Phase Two Upload
-
sub menu_phase_two_upload {
my $r=shift;
@@ -479,18 +438,13 @@ sub menu_phase_two_upload {
my @records=&Apache::loncommon::upfile_record_sep();
my $total=$#records;
my $distotal=$total+1;
-
$ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
my $krbdefdom=$1;
$krbdefdom=~tr/a-z/A-Z/;
-
my $today=time;
my $halfyear=$today+15552000;
-
my $defdom=$r->dir_config('lonDefDomain');
-
&phase_two_header($r,$datatoken,$distotal,$krbdefdom);
-
my $i;
my $keyfields;
if ($total>=0) {
@@ -511,13 +465,10 @@ sub menu_phase_two_upload {
$keyfields=join(',',sort(keys(%sone)));
}
}
-
-
&phase_two_end($r,$i,$keyfields,$defdom,$today,$halfyear);
}
# ======================================================= Enroll single student
-
sub enroll_single_student {
my $r=shift;
$r->print('Enrolling Student
');
@@ -527,18 +478,18 @@ sub enroll_single_student {
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'};
if (!$genpwd) { $genpwd=" "; }
}
if (($amode) && ($genpwd)) {
- &dropstudent($ENV{'form.cdomain'},$ENV{'form.cuname'},
- $ENV{'request.course.id'},$ENV{'form.csec'});
+ &modifystudent($ENV{'form.cdomain'},$ENV{'form.cuname'},
+ $ENV{'request.course.id'},$ENV{'form.csec'});
$r->print(&Apache::lonnet::modifystudent(
$ENV{'form.cdomain'},$ENV{'form.cuname'},
$ENV{'form.cstid'},$amode,$genpwd,
@@ -555,21 +506,22 @@ sub enroll_single_student {
}
# ======================================================= Menu Phase Two Enroll
-
sub menu_phase_two_enroll {
my $r=shift;
-
- $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
- my $krbdefdom=$1;
+ my ($krbdefdom) = $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
$krbdefdom=~tr/a-z/A-Z/;
-
- my $today=time;
- my $halfyear=$today+15552000;
-
+ my $today = time;
+ 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);
+ # Print it all out
$r->print(<Personal Data
-First Name:
-Middle Name:
-Last Name:
-Generation:
+Middle Name:
+Last Name:
+Generation:
-ID/Student Number: Login Data
-Username: Starting and Ending Dates
+
- +>Set Starting Date +
+>Set Ending Date +
-
-
+
+
+
ERROR:$error'); + } + if (!defined(%currentlist)) { + $r->print("There are no students currently enrolled.\n"); + } else { + # Print out the available choices + &show_drop_list($r,%currentlist); + } } # =================================================== Show student list to drop - sub show_drop_list { my ($r,%currentlist)=@_; my $cid=$ENV{'request.course.id'}; - - $r->print(''); - $r->print('
'. - $sname.' | '.$sdom.' | '. - $reply{$sname}.' | '. - &Apache::lonnet::unescape($reply[2]).' '. - &Apache::lonnet::unescape($reply[3]).', '. - &Apache::lonnet::unescape($reply[0]).' '. - &Apache::lonnet::unescape($reply[1]). - ' | '. - $ssec." |
username | domain | +ID | student name | generation | +section | |
---|---|---|---|---|---|---|
'. + 'Internal error: unable to get environment '. + 'for '.$sname.' in domain '.$sdom.' | ||||||
+ | $sname | +$sdom | +$reply{$sname} | +$info{'lastname'}, $info{'firstname'} $info{'middlename'} | +$info{'generation'} | +$ssec | +
Unacceptable username: '.
+ my @keyfields = split(/\,/,$ENV{'form.keyfields'});
+ my $cid = $ENV{'request.course.id'};
+ my %fields=();
+ for (my $i=0; $i<=$ENV{'form.nfields'}; $i++) {
+ if ($ENV{'form.upfile_associate'} eq 'reverse') {
+ if ($ENV{'form.f'.$i} ne 'none') {
+ $fields{$keyfields[$i]}=$ENV{'form.f'.$i};
+ }
+ } else {
+ $fields{$ENV{'form.f'.$i}}=$keyfields[$i];
+ }
+ }
+ #
+ my $startdate = $ENV{'form.startdate'};
+ my $enddate = $ENV{'form.enddate'};
+ if ($startdate=~/\D/) { $startdate=''; }
+ if ($enddate=~/\D/) { $enddate=''; }
+ #
+ my $domain=$ENV{'form.lcdomain'};
+ # Determine authentication mechanism
+ my $amode = '';
+ my $genpwd = '';
+ if ($ENV{'form.login'} eq 'krb') {
+ $amode='krb4';
+ $genpwd=$ENV{'form.krbarg'};
+ } elsif ($ENV{'form.login'} eq 'int') {
+ $amode='internal';
+ if ((defined($ENV{'form.intarg'})) && ($ENV{'form.intarg'})) {
+ $genpwd=$ENV{'form.intarg'};
+ }
+ } elsif ($ENV{'form.login'} eq 'loc') {
+ $amode='localauth';
+ if ((defined($ENV{'form.locarg'})) && ($ENV{'form.locarg'})) {
+ $genpwd=$ENV{'form.locarg'};
+ }
+ }
+ unless (($domain=~/\W/) || ($amode eq '')) {
+ #######################################
+ ## Enroll Students ##
+ #######################################
+ $r->print('Enrolling Students
');
+ my $count=0;
+ my $flushc=0;
+ my %student=();
+ # Get new classlist
+ foreach (@studentdata) {
+ my %entries=&Apache::loncommon::record_sep($_);
+ # Determine student name
+ unless (($entries{$fields{'username'}} eq '') ||
+ (!defined($entries{$fields{'username'}}))) {
+ my ($fname, $mname, $lname,$gen) = ('','','','');
+ if (defined($fields{'names'})) {
+ ($lname,$fname,$mname)=($entries{$fields{'names'}}=~
+ /([^\,]+)\,\s*(\w+)\s*(.*)$/);
+ } else {
+ if (defined($fields{'fname'})) {
+ $fname=$entries{$fields{'fname'}};
+ }
+ if (defined($fields{'mname'})) {
+ $mname=$entries{$fields{'mname'}};
+ }
+ if (defined($fields{'lname'})) {
+ $lname=$entries{$fields{'lname'}};
+ }
+ if (defined($fields{'gen'})) {
+ $gen=$entries{$fields{'gen'}};
+ }
+ }
+ if ($entries{$fields{'username'}}=~/\W/) {
+ $r->print('
Unacceptable username: '. $entries{$fields{'username'}}.' for user '. $fname.' '.$mname.' '.$lname.' '.$gen.'
'); - } else { - my $sec=''; - my $username=$entries{$fields{'username'}}; - if (defined($fields{'sec'})) { - if (defined($entries{$fields{'sec'}})) { - $sec=$entries{$fields{'sec'}}; - } - } - my $id=''; - if (defined($fields{'id'})) { - if (defined($entries{$fields{'id'}})) { - $id=$entries{$fields{'id'}}; - } - $id=~tr/A-Z/a-z/; - } - my $password=''; - if ($genpwd) { - $password=$genpwd; - } else { - if (defined($fields{'ipwd'})) { - if ($entries{$fields{'ipwd'}}) { - $password=$entries{$fields{'ipwd'}}; - } - } - } - if ($password) { - &dropstudent($domain,$username,$cid,$sec); - my $reply=&Apache::lonnet::modifystudent( - $domain,$username,$id,$amode,$password, - $fname,$mname,$lname,$gen,$sec,$enddate,$startdate, - $ENV{'form.forceid'}); - unless ($reply eq 'ok') { - $r->print( - "
Error enrolling $username: $reply
"); + } else { + # determine section number + my $sec=''; + my $username=$entries{$fields{'username'}}; + if (defined($fields{'sec'})) { + if (defined($entries{$fields{'sec'}})) { + $sec=$entries{$fields{'sec'}}; + } + } + # determine student id number + my $id=''; + if (defined($fields{'id'})) { + if (defined($entries{$fields{'id'}})) { + $id=$entries{$fields{'id'}}; + } + $id=~tr/A-Z/a-z/; + } + # determine student password + my $password=''; + if ($genpwd) { + $password=$genpwd; + } else { + if (defined($fields{'ipwd'})) { + if ($entries{$fields{'ipwd'}}) { + $password=$entries{$fields{'ipwd'}}; + } + } + } + if ($password) { + &modifystudent($domain,$username,$cid,$sec); + my $reply=&Apache::lonnet::modifystudent + ($domain,$username,$id,$amode,$password, + $fname,$mname,$lname,$gen,$sec,$enddate, + $startdate,$ENV{'form.forceid'}); + if ($reply ne 'ok') { + $r->print('
'. + 'Error enrolling '.$username.': '. + $reply.'
'); } else { $count++; $flushc++; $student{$username}=1; @@ -833,146 +810,119 @@ sub upfile_drop_add { $flushc=0; } } - } else { - $r->print( - "No password for $username
"); - } - } - } - } - $r->print('
Processed Students: '.$count); -# --------------------------------------------------------------- Drop students - if ($ENV{'form.fullup'} eq 'yes') { - $r->print('
No password for $username
"); + } + } + } + } # end of foreach (@studentdata) + $r->print('
Processed Students: '.$count); + ##################################### + # Drop students # + ##################################### + if ($ENV{'form.fullup'} eq 'yes') { + $r->print('
ERROR:$error'); + } + if (defined(%currentlist)) { + # Drop the students + foreach (@studentdata) { + my %entries=&Apache::loncommon::record_sep($_); + unless (($entries{$fields{'username'}} eq '') || + (!defined($entries{$fields{'username'}}))) { + delete($currentlist{$entries{$fields{'username'}}. + ':'.$domain}); + } + } + # Print out list of dropped students + &show_drop_list($r,%currentlist); + } else { + $r->print("There are no students currently enrolled.\n"); + } + } + } # end of unless } # ================================================================== Phase four - sub drop_student_list { my $r=shift; my $count=0; - foreach (keys %ENV) { - if ($_=~/^form\.drop\:/) { - my ($dummy,$uname,$udom)=split(/\:/,$_); - &dropstudent($udom,$uname,$ENV{'request.course.id'}); - $r->print('Dropped '.$uname.' at '.$udom.'
Dropped '.$count.' student(s).'); $r->print('
Re-enrollment will re-activate data.'); } # ================================================================ Main Handler - sub handler { - my $r=shift; - $Apache::lonxml::debug=1; - if ($r->header_only) { - $r->content_type('text/html'); - $r->send_http_header; - return OK; - } - -# ----------------------------------------------------- Needs to be in a course - - if (($ENV{'request.course.fn'}) && - (&Apache::lonnet::allowed('cst',$ENV{'request.course.id'}))) { - -# ------------------------------------------------------------------ Start page - $r->content_type('text/html'); - $r->send_http_header; - &header($r); - -# --------------------------------------------------- Phase one, initial screen - unless ($ENV{'form.phase'}) { - &menu_phase_one($r); - } -# ------------------------------------------------------------------- Phase two - - if ($ENV{'form.associate'} eq 'Reverse Association') { - $ENV{'form.phase'} = 'two'; - if ( $ENV{'form.upfile_associate'} ne 'reverse' ) { - $ENV{'form.upfile_associate'} = 'reverse'; - } else { - $ENV{'form.upfile_associate'} = 'forward'; - } - } - if ($ENV{'form.phase'} eq 'two') { - if ($ENV{'form.fileupload'}) { - &menu_phase_two_upload($r); - } elsif ($ENV{'form.enroll'}) { - &menu_phase_two_enroll($r); - } elsif ($ENV{'form.drop'}) { - &menu_phase_two_drop($r); - } - } - - - - -# ----------------------------------------------------------------- Phase three - if ($ENV{'form.phase'} eq 'three') { - if ($ENV{'form.datatoken'}) { - &upfile_drop_add($r); - } - } -# ------------------------------------------------------------------ Phase four - if ($ENV{'form.phase'} eq 'four') { - &drop_student_list($r); - } -# ------------------------------------------------------------------ Phase five - if ($ENV{'form.phase'} eq 'five') { - &enroll_single_student($r); - } -# ------------------------------------------------------------------------- End - $r->print('