--- loncom/interface/Attic/londropadd.pm 2002/04/04 17:32:45 1.22 +++ loncom/interface/Attic/londropadd.pm 2002/04/16 19:08:49 1.25 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to drop and add students in courses # -# $Id: londropadd.pm,v 1.22 2002/04/04 17:32:45 albertel Exp $ +# $Id: londropadd.pm,v 1.25 2002/04/16 19:08:49 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -52,7 +52,8 @@ package Apache::londropadd; use strict; -use Apache::lonnet; +use Apache::lonnet(); +use Apache::loncommon(); use Apache::Constants qw(:common :http REDIRECT); # ================================================================ Print header @@ -73,131 +74,38 @@ action="/adm/dropadd" name="studentform" ENDHEAD } -# ========================================================= Store uploaded file -# needs $ENV{'form.upfile'} -# return $datatoken to be put into hidden field - -sub upfile_store { - my $r=shift; - $ENV{'form.upfile'}=~s/\r/\n/gs; - $ENV{'form.upfile'}=~s/\f/\n/gs; - $ENV{'form.upfile'}=~s/\n+/\n/gs; - $ENV{'form.upfile'}=~s/\n+$//gs; - - my $datatoken=$ENV{'user.name'}.'_'.$ENV{'user.domain'}. - '_enroll_'.$ENV{'request.course.id'}.'_'.time.'_'.$$; - { - my $fh=Apache::File->new('>'.$r->dir_config('lonDaemons'). - '/tmp/'.$datatoken.'.tmp'); - print $fh $ENV{'form.upfile'}; - } - return $datatoken; -} - -# ================================================= Load uploaded file from tmp -# needs $ENV{'form.datatoken'} -# sets $ENV{'form.upfile'} - -sub load_tmp_file { - my $r=shift; - my @studentdata=(); - { - my $fh; - if ($fh=Apache::File->new($r->dir_config('lonDaemons'). - '/tmp/'.$ENV{'form.datatoken'}.'.tmp')) { - @studentdata=<$fh>; - } - } - $ENV{'form.upfile'}=join('',@studentdata); -} - -# ========================================= Separate uploaded file into records -# returns array of records - -sub upfile_record_sep { - if ($ENV{'form.upfiletype'} eq 'xml') { - } else { - return split(/\n/,$ENV{'form.upfile'}); - } -} - -# =============================================== Separate a record into fields - -sub record_sep { - my $record=shift; - my %components=(); - if ($ENV{'form.upfiletype'} eq 'xml') { - } elsif ($ENV{'form.upfiletype'} eq 'space') { - my $i=0; - foreach (split(/\s+/,$record)) { - my $field=$_; - $field=~s/^(\"|\')//; - $field=~s/(\"|\')$//; - $components{$i}=$field; - $i++; - } - } elsif ($ENV{'form.upfiletype'} eq 'tab') { - my $i=0; - foreach (split(/\t+/,$record)) { - my $field=$_; - $field=~s/^(\"|\')//; - $field=~s/(\"|\')$//; - $components{$i}=$field; - $i++; - } - } else { - my @allfields=split(/\,/,$record); - my $i=0; - my $j; - for ($j=0;$j<=$#allfields;$j++) { - my $field=$allfields[$j]; - if ($field=~/^\s*(\"|\')/) { - my $delimiter=$1; - while (($field!~/$delimiter$/) && ($j<$#allfields)) { - $j++; - $field.=','.$allfields[$j]; - } - $field=~s/^\s*$delimiter//; - $field=~s/$delimiter\s*$//; - } - $components{$i}=$field; - $i++; - } - } - return %components; -} - # =========== Drop student from all sections of a course, except optional $csec sub dropstudent { - my ($udom,$unam,$courseid,$csec)=@_; - $courseid=~s/\_/\//g; - $courseid=~s/^(\w)/\/$1/; - foreach (split(/\&/, - &Apache::lonnet::reply('dump:'.$udom.':'.$unam.':roles', + my ($udom,$unam,$courseid,$csec)=@_; + $courseid=~s/\_/\//g; + $courseid=~s/^(\w)/\/$1/; + foreach (split(/\&/, + &Apache::lonnet::reply('dump:'.$udom.':'.$unam.':roles', &Apache::lonnet::homeserver($unam,$udom)))) { my ($key,$value)=split(/\=/,$_); $key=&Apache::lonnet::unescape($key); if ($key=~/^$courseid(?:\/)*(\w+)*\_st$/) { - my $section=$1; - if ($key eq $courseid.'_st') { $section=''; } - if (((!$section) && (!$csec)) || ($section ne $csec)) { - my ($dummy,$end,$start)=split(/\_/, - &Apache::lonnet::unescape($value)); - my $now=time; - my $notactive=0; - if ($start) { - if ($now<$start) { $notactive=1; } - } - if ($end) { - if ($now>$end) { $notactive=1; } - } - unless ($notactive) { - my $reply=&Apache::lonnet::modifystudent( - $udom,$unam,'','','', - '','','','',$section,time); + my $section=$1; + if ($key eq $courseid.'_st') { $section=''; } + if (((!$section) && (!$csec)) || ($section ne $csec)) { + my ($dummy,$end,$start)=split(/\_/, + &Apache::lonnet::unescape + ($value)); + my $now=time; + my $notactive=0; + if ($start) { + if ($now<$start) { $notactive=1; } + } + if ($end) { + if ($now>$end) { $notactive=1; } + } + unless ($notactive) { + my $reply=&Apache::lonnet::modifystudent + ($udom,$unam,'','','', + '','','','',$section,time); + } } - } } } } @@ -206,17 +114,12 @@ sub dropstudent { sub menu_phase_one { my $r=shift; + my $upfile_select=&Apache::loncommon::upfile_select_html(); $r->print(<

Upload a courselist

- -
Type: +$upfile_select

Enroll a single student

@@ -227,53 +130,43 @@ sub menu_phase_one { ENDUPFORM } -# ======================================================= Menu Phase Two Upload - -sub menu_phase_two_upload { - my $r=shift; - - my $datatoken=&upfile_store($r); - - my @records=&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'); +sub phase_two_header { + my ($r,$datatoken,$distotal,$krbdefdom)=@_; + my $javascript; + if ($ENV{'form.upfile_associate'} eq 'reverse') { + $javascript=&phase_two_javascript_reverse_associate(); + } else { + $javascript=&phase_two_javascript_forward_associate(); + } + my $javascript_validations=&javascript_validations($krbdefdom); $r->print(< - -

Identify fields

Total number of records found in file: $distotal
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 +} + +sub javascript_validations { + my ($krbdefdom)=@_; + return (<=2) && (tw<=6)) { foundname=1; } - if (tw==7) { foundid=1; } - if (tw==8) { foundsec=1; } - if (tw==9) { foundpwd=1; } - } if (founduname==0) { alert('You need to specify at least the username field'); return; @@ -324,48 +217,7 @@ function verify(vf) { } else { pclose(); vf.submit(); - } -} - -function flip(vf,tf) { - var nw=eval('vf.f'+tf+'.selectedIndex'); - var i; - for (i=0;i<=vf.nfields.value;i++) { - if ((i!=tf) && (eval('vf.f'+i+'.selectedIndex')==nw)) { - eval('vf.f'+i+'.selectedIndex=0;') - } - } - if (nw==2) { - for (i=0;i<=vf.nfields.value;i++) { - if ((eval('vf.f'+i+'.selectedIndex')>=3) && - (eval('vf.f'+i+'.selectedIndex')<=6)) { - eval('vf.f'+i+'.selectedIndex=0;') - } - } - } - if ((nw>=3) && (nw<=6)) { - for (i=0;i<=vf.nfields.value;i++) { - if (eval('vf.f'+i+'.selectedIndex')==2) { - eval('vf.f'+i+'.selectedIndex=0;') - } - } - } - if (nw==9) { - vf.login[1].checked=true; - vf.intpwd.value=''; - vf.krbdom.value=''; - vf.locarg.value=''; - } - -} - -function clearpwd(vf) { - var i; - for (i=0;i<=vf.nfields.value;i++) { - if (eval('vf.f'+i+'.selectedIndex')==9) { - eval('vf.f'+i+'.selectedIndex=0;') - } - } + } } function setkrb(vf) { @@ -374,6 +226,7 @@ function setkrb(vf) { vf.login[0].checked=true; vf.krbdom.value=vf.krbdom.value.toUpperCase(); vf.intpwd.value=''; + vf.locarg.value=''; } } @@ -382,6 +235,15 @@ function setint(vf) { clearpwd(vf); vf.login[1].checked=true; vf.krbdom.value=''; + vf.locarg.value=''; + } +} + +function setloc(vf) { + if (vf.locarg.value!='') { + vf.login[2].checked=true; + vf.krbdom.value=''; + vf.intpwd.value=''; } } @@ -389,10 +251,17 @@ function clickkrb(vf) { vf.krbdom.value='$krbdefdom'; clearpwd(vf); vf.intpwd.value=''; + vf.locarg.value=''; } function clickint(vf) { vf.krbdom.value=''; + vf.locarg.value=''; +} + +function clickloc(vf) { + vf.krbdom.value=''; + vf.intpwd.value=''; } function pclose() { @@ -422,51 +291,133 @@ function clickint(vf) { pclose(); } - - ENDPICK - my %sone; my %stwo; my %sthree; - my $i=0; +} + +sub phase_two_javascript_forward_associate { + return(<=2) && (tw<=6)) { foundname=1; } + if (tw==7) { foundid=1; } + if (tw==8) { foundsec=1; } + if (tw==9) { foundpwd=1; } + } + verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec); +} + + +function flip(vf,tf) { + var nw=eval('vf.f'+tf+'.selectedIndex'); + var i; + for (i=0;i<=vf.nfields.value;i++) { + if ((i!=tf) && (eval('vf.f'+i+'.selectedIndex')==nw)) { + eval('vf.f'+i+'.selectedIndex=0;') + } + } + if (tf==1 && nw!=0) { + for (i=2;i<=5;i++) { + eval('vf.f'+i+'.selectedIndex=0;') + } + } + if (nw==2) { + for (i=0;i<=vf.nfields.value;i++) { + if ((eval('vf.f'+i+'.selectedIndex')>=3) && + (eval('vf.f'+i+'.selectedIndex')<=6)) { + eval('vf.f'+i+'.selectedIndex=0;') + } + } + } + if ((nw>=3) && (nw<=6)) { + for (i=0;i<=vf.nfields.value;i++) { + if (eval('vf.f'+i+'.selectedIndex')==2) { + eval('vf.f'+i+'.selectedIndex=0;') + } + } + } + if (nw==9) { + vf.login[1].checked=true; + vf.intpwd.value=''; + vf.krbdom.value=''; + vf.locarg.value=''; + } +} + +function clearpwd(vf) { + var i; + for (i=0;i<=vf.nfields.value;i++) { + if (eval('vf.f'+i+'.selectedIndex')==9) { + eval('vf.f'+i+'.selectedIndex=0;') + } + } +} + +ENDPICK +} + +sub phase_two_javascript_reverse_associate { + return(<=1) && (i<=5)) && tw!=0 ) { foundname=1; } + if (i==6 && tw!=0) { foundid=1; } + if (i==7 && tw!=0) { foundsec=1; } + if (i==8 && tw!=0) { foundpwd=1; } + } + verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec); +} + +function flip(vf,tf) { + var nw=eval('vf.f'+tf+'.selectedIndex'); + var i; + // picked the all one one name field, reset the other name ones to blank + if (tf==1 && nw!=0) { + for (i=2;i<=5;i++) { + eval('vf.f'+i+'.selectedIndex=0;') + } + } + //picked one of the piecewise name fields, reset the all in + //one field to blank + if ((tf>=2) && (tf<=5) && (nw!=0)) { + eval('vf.f1.selectedIndex=0;') + } + // intial password specified, pick internal authentication + if (tf==8 && nw!=0) { + vf.login[1].checked=true; + vf.intpwd.value=''; + vf.krbdom.value=''; + vf.locarg.value=''; + } +} + +function clearpwd(vf) { + var i; + if (eval('vf.f8.selectedIndex')!=0) { + eval('vf.f8.selectedIndex=0;') + } +} +ENDPICK +} - if ($total>=0) { - %sone=&record_sep($records[0]); - if ($total>=1) { - %stwo=&record_sep($records[1]); - - } - if ($total>=2) { - %sthree=&record_sep($records[2]); - } - foreach (sort keys %sone) { - $r->print(''); - $i++; - } - $i--; - } - my $keyfields=join(',',sort keys %sone); - $r->print(<print(< @@ -514,6 +465,50 @@ Note: for large courses, this operation ENDPICK } +# ======================================================= Menu Phase Two Upload + +sub menu_phase_two_upload { + my $r=shift; + my $datatoken; + if (!$ENV{'form.datatoken'}) { + $datatoken=&Apache::loncommon::upfile_store($r); + } else { + $datatoken=$ENV{'form.datatoken'}; + &Apache::loncommon::load_tmp_file($r); + } + 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) { + my @d=(['username','Username'],['names','Last Name, First Names'], + ['fname','First Name'],['mname','Middle Names/Initials'], + ['lname','Last Name'],['gen','Generation'], + ['id','ID/Student Number'],['sec','Group/Section'], + ['ipwd','Initial Password']); + if ($ENV{'form.upfile_associate'} eq 'reverse') { + &Apache::loncommon::csv_print_samples($r,\@records); + $i=&Apache::loncommon::csv_print_select_table($r,\@records,\@d); + foreach (@d) { $keyfields.=$_->[0].','; } + chop($keyfields); + } else { + unshift(@d,['none','']); + $i=&Apache::loncommon::csv_samples_select_table($r,\@records,\@d); + my %sone=&Apache::loncommon::record_sep($records[0]); + $keyfields=join(',',sort(keys(%sone))); + } + } + &phase_two_end($r,$i,$keyfields,$defdom,$today,$halfyear); +} + # ======================================================= Enroll single student sub enroll_single_student { @@ -524,48 +519,45 @@ sub enroll_single_student { my $amode=''; my $genpwd=''; if ($ENV{'form.login'} eq 'krb') { - $amode='krb4'; - $genpwd=$ENV{'form.krbdom'}; + $amode='krb4'; + $genpwd=$ENV{'form.krbdom'}; } elsif ($ENV{'form.login'} eq 'int') { - $amode='internal'; - $genpwd=$ENV{'form.intpwd'}; + $amode='internal'; + $genpwd=$ENV{'form.intpwd'}; } 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'}); - $r->print(&Apache::lonnet::modifystudent( - $ENV{'form.cdomain'},$ENV{'form.cuname'}, - $ENV{'form.cstid'},$amode,$genpwd, - $ENV{'form.cfirst'},$ENV{'form.cmiddle'}, - $ENV{'form.clast'},$ENV{'form.cgen'}, - $ENV{'form.csec'},$ENV{'form.enddate'}, - $ENV{'form.startdate'},$ENV{'form.forceid'})); + &dropstudent($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, + $ENV{'form.cfirst'},$ENV{'form.cmiddle'}, + $ENV{'form.clast'},$ENV{'form.cgen'}, + $ENV{'form.csec'},$ENV{'form.enddate'}, + $ENV{'form.startdate'},$ENV{'form.forceid'})); } else { - $r->print('Invalid login mode or password'); + $r->print('Invalid login mode or password'); } } else { $r->print('Invalid username or domain'); - } + } } # ======================================================= Menu Phase Two Enroll sub menu_phase_two_enroll { my $r=shift; - $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'); - + my $javascript_validations=&javascript_validations($krbdefdom); $r->print(< function verify(vf) { @@ -574,9 +566,7 @@ function verify(vf) { var foundname=0; var foundid=0; var foundsec=0; - var foundatype=0; var tw; - var message=''; if ((typeof(vf.cuname.value)!="undefined") && (vf.cuname.value!='') && (typeof(vf.cdomain.value)!="undefined") && (vf.cdomain.value!='')) { founduname=1; @@ -595,123 +585,15 @@ function verify(vf) { alert('You need to specify at least the username and domain fields'); return; } - if (vf.login[0].checked) { - foundatype=1; - if (vf.krbdom.value=='') { - alert('You need to specify the Kerberos domain'); - return; - } - } - if (vf.login[1].checked) { - foundatype=1; - if ((vf.intpwd.value=='') && (foundpwd==0)) { - alert('You need to specify the initial password'); - return; - } - } - if (vf.login[2].checked) { - foundatype=1; - //An argument is not required - } - if (foundatype==0) { - alert('You need to set the login type'); - return; - } - if (foundname==0) { message='No first and last name specified. '; } - if (foundid==0) { message+='No ID or student number field specified. '; } - if (foundsec==0) { message+='No section or group field specified. '; } - if (vf.startdate.value=='') { - message+='No starting date set. '; - } - if (vf.enddate.value=='') { - message+='No ending date set. '; - } - if ((vf.enddate.value!='') && (vf.startdate.value!='')) { - if (Math.round(vf.enddate.value)

Personal Data

First Name:
@@ -766,30 +648,29 @@ ENDSENROLL sub menu_phase_two_drop { my $r=shift; my $cid=$ENV{'request.course.id'}; - my $classlst=&Apache::lonnet::reply - ('dump:'.$ENV{'course.'.$cid.'.domain'}.':'. - $ENV{'course.'.$cid.'.num'}.':classlist', - $ENV{'course.'.$cid.'.home'}); - my %currentlist=(); - my $now=time; - unless ($classlst=~/^error\:/) { - foreach (split(/\&/,$classlst)) { - my ($name,$value)=split(/\=/,$_); - my ($end,$start)=split(/\:/, - &Apache::lonnet::unescape($value)); - my $active=1; - if (($end) && ($now>$end)) { $active=0; } - if ($active) { - $currentlist{&Apache::lonnet::unescape($name)}=1; - } - } + my $classlst=&Apache::lonnet::reply + ('dump:'.$ENV{'course.'.$cid.'.domain'}.':'. + $ENV{'course.'.$cid.'.num'}.':classlist', + $ENV{'course.'.$cid.'.home'}); + my %currentlist=(); + my $now=time; + unless ($classlst=~/^error\:/) { + foreach (split(/\&/,$classlst)) { + my ($name,$value)=split(/\=/,$_); + my ($end,$start)=split(/\:/, + &Apache::lonnet::unescape($value)); + my $active=1; + if (($end) && ($now>$end)) { $active=0; } + if ($active) { + $currentlist{&Apache::lonnet::unescape($name)}=1; + } + } # ----------------------------------------------------------- Print out choices - &show_drop_list($r,%currentlist); - } else { - $r->print( - '

Could not access classlist: '.$classlst. + &show_drop_list($r,%currentlist); + } else { + $r->print('

Could not access classlist: '.$classlst. '

'); - } + } } # =================================================== Show student list to drop @@ -799,132 +680,133 @@ sub show_drop_list { my $cid=$ENV{'request.course.id'}; $r->print(''); - $r->print('

FieldSamples
'); - if (defined($sone{$_})) { - $r->print($sone{$_}."
\n"); - } - if (defined($stwo{$_})) { - $r->print($stwo{$_}."
\n"); - } - if (defined($sthree{$_})) { - $r->print($sthree{$_}."
\n"); - } - $r->print('
'); - foreach (sort keys %currentlist) { - my ($sname,$sdom)=split(/\:/,$_); - my %reply=&Apache::lonnet::idrget($sdom,$sname); - my $ssec=&Apache::lonnet::usection($sdom,$sname,$cid); - my @reply=split(/[\&\=]/,&Apache::lonnet::reply( - 'get:'.$sdom.':'.$sname. - ':environment:firstname&middlename&lastname&generation', - &Apache::lonnet::homeserver($sname,$sdom))); - $r->print( - '\n"); - } - $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."

'); - $r->print(''); + $r->print(''); + foreach (sort keys %currentlist) { + my ($sname,$sdom)=split(/\:/,$_); + my %reply=&Apache::lonnet::idrget($sdom,$sname); + my $ssec=&Apache::lonnet::usection($sdom,$sname,$cid); + my @reply=split(/[\&\=]/,&Apache::lonnet::reply + ('get:'.$sdom.':'.$sname. + ':environment:firstname&middlename&lastname&generation', + &Apache::lonnet::homeserver($sname,$sdom))); + $r->print('\n"); + } + $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."

'); + $r->print(''); } # ================================================= Drop/Add from uploaded file sub upfile_drop_add { my $r=shift; - - &load_tmp_file($r); - my @studentdata=&upfile_record_sep(); - + &Apache::loncommon::load_tmp_file($r); + my @studentdata=&Apache::loncommon::upfile_record_sep(); my @keyfields=split(/\,/,$ENV{'form.keyfields'}); my $cid=$ENV{'request.course.id'}; - - my %fields=(); - for (my $i=0;$i<=$ENV{'form.nfields'};$i++) { - $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'}; - my $amode=''; - my $genpwd=''; - if ($ENV{'form.login'} eq 'krb') { - $amode='krb4'; - $genpwd=$ENV{'form.krbdom'}; - } elsif ($ENV{'form.login'} eq 'int') { - $amode='internal'; - if ((defined($ENV{'form.intpwd'})) && ($ENV{'form.intpwd'})) { - $genpwd=$ENV{'form.intpwd'}; - } - } 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 '')) { - $r->print('

Enrolling Students

'); - my $count=0; - my $flushc=0; - my %student=(); + 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'}; + my $amode=''; + my $genpwd=''; + if ($ENV{'form.login'} eq 'krb') { + $amode='krb4'; + $genpwd=$ENV{'form.krbdom'}; + } elsif ($ENV{'form.login'} eq 'int') { + $amode='internal'; + if ((defined($ENV{'form.intpwd'})) && ($ENV{'form.intpwd'})) { + $genpwd=$ENV{'form.intpwd'}; + } + } 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 '')) { + $r->print('

Enrolling Students

'); + my $count=0; + my $flushc=0; + my %student=(); # ----------------------------------------------------------- Get new classlist # --------------------------------------------------------- Enroll new students - foreach (@studentdata) { - my %entries=&record_sep($_); - - unless (($entries{$fields{'username'}} eq '') || - (!defined($entries{$fields{'username'}}))) { - my $fname=''; my $mname=''; my $lname=''; my $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: '. + foreach (@studentdata) { + my %entries=&Apache::loncommon::record_sep($_); + unless (($entries{$fields{'username'}} eq '') || + (!defined($entries{$fields{'username'}}))) { + my $fname=''; my $mname=''; my $lname=''; my $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') { + } 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 { @@ -936,56 +818,53 @@ sub upfile_drop_add { $flushc=0; } } - } else { - $r->print( - "

No password for $username

"); - } - } - } - } - $r->print('

Processed Students: '.$count); + } else { + $r->print("

No password for $username

"); + } + } + } + } + $r->print('

Processed Students: '.$count); # --------------------------------------------------------------- Drop students - if ($ENV{'form.fullup'} eq 'yes') { - $r->print('

Dropping Students

'); + if ($ENV{'form.fullup'} eq 'yes') { + $r->print('

Dropping Students

'); # ------------------------------------------------------- Get current classlist - my $classlst=&Apache::lonnet::reply - ('dump:'.$ENV{'course.'.$cid.'.domain'}.':'. - $ENV{'course.'.$cid.'.num'}.':classlist', - $ENV{'course.'.$cid.'.home'}); - my %currentlist=(); - my $now=time; - unless ($classlst=~/^error\:/) { - foreach (split(/\&/,$classlst)) { - my ($name,$value)=split(/\=/,$_); - my ($end,$start)=split(/\:/, - &Apache::lonnet::unescape($value)); - my $active=1; - if (($end) && ($now>$end)) { $active=0; } - if ($active) { - $currentlist{&Apache::lonnet::unescape($name)}=1; - } - } + my $classlst=&Apache::lonnet::reply + ('dump:'.$ENV{'course.'.$cid.'.domain'}.':'. + $ENV{'course.'.$cid.'.num'}.':classlist', + $ENV{'course.'.$cid.'.home'}); + my %currentlist=(); + my $now=time; + unless ($classlst=~/^error\:/) { + foreach (split(/\&/,$classlst)) { + my ($name,$value)=split(/\=/,$_); + my ($end,$start)=split(/\:/, + &Apache::lonnet::unescape($value)); + my $active=1; + if (($end) && ($now>$end)) { $active=0; } + if ($active) { + $currentlist{&Apache::lonnet::unescape($name)}=1; + } + } # ------------------------------------------------ Now got up-to-date classlist - foreach (@studentdata) { - my %entries=&record_sep($_); - unless (($entries{$fields{'username'}} eq '') || - (!defined($entries{$fields{'username'}}))) { - delete($currentlist{ + foreach (@studentdata) { + my %entries=&Apache::loncommon::record_sep($_); + unless (($entries{$fields{'username'}} eq '') || + (!defined($entries{$fields{'username'}}))) { + delete($currentlist{ $entries{$fields{'username'}}.':'. - $domain}); - } - } + $domain}); + } + } # ----------------------------------------------------------- Print out choices - &show_drop_list($r,%currentlist); - } else { - $r->print( - '

Could not access classlist: '.$classlst. - '

'); - } - } + &show_drop_list($r,%currentlist); + } else { + $r->print('

Could not access classlist: '. + $classlst.'

'); + } + } # ------------------------------------------------------------------------ Done - - } + } } # ================================================================== Phase four @@ -1009,62 +888,62 @@ sub drop_student_list { 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); - + $r->content_type('text/html'); + $r->send_http_header; + &header($r); # --------------------------------------------------- Phase one, initial screen - unless ($ENV{'form.phase'}) { - &menu_phase_one($r); - } + unless ($ENV{'form.phase'}) { + &menu_phase_one($r); + } # ------------------------------------------------------------------- Phase two - 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); - } - } - - - - + 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); - } + if ($ENV{'form.phase'} eq 'three') { + if ($ENV{'form.datatoken'}) { + &upfile_drop_add($r); + } + } # ------------------------------------------------------------------ Phase four - if ($ENV{'form.phase'} eq 'five') { - &enroll_single_student($r); - } + 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(''); + $r->print(''); } else { # ----------------------------- Not in a course, or not allowed to modify parms - $ENV{'user.error.msg'}= - "/adm/dropadd:cst:0:0:Cannot drop or add students"; - return HTTP_NOT_ACCEPTABLE; + $ENV{'user.error.msg'}= + "/adm/dropadd:cst:0:0:Cannot drop or add students"; + return HTTP_NOT_ACCEPTABLE; } return OK; } @@ -1072,6 +951,3 @@ sub handler { 1; __END__ - - -