--- loncom/interface/Attic/londropadd.pm 2002/04/16 19:08:49 1.25
+++ 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.25 2002/04/16 19:08:49 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(<<ENDHEAD);
+ return(<<ENDHEAD);
<html>
<head>
<title>LON-CAPA Student Drop/Add</title>
@@ -75,35 +74,30 @@ ENDHEAD
}
# =========== Drop student from all sections of a course, except optional $csec
-
-sub dropstudent {
+sub modifystudent {
my ($udom,$unam,$courseid,$csec)=@_;
+ # if $csec is undefined, drop the student from all the courses matching
+ # this one. If $csec is defined, drop them from all other sections of
+ # this course and add them to section $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 %roles = &Apache::lonnet::dump('roles',$udom,$unam);
+ my ($tmp) = keys(%roles);
+ # Bail out if we were unable to get the students roles
+ return if ($tmp =~ /^(con_lost|error|no_such_host)/i);
+ # Go through the roles looking for enrollment in this course
+ foreach my $course (keys(%roles)) {
+ my $value = $roles{$course};
+ if ($course=~/^$courseid(?:\/)*(\w+)*\_st$/) {
+ # We are in this course
my $section=$1;
- if ($key eq $courseid.'_st') { $section=''; }
+ $section='' if ($course eq $courseid.'_st');
if (((!$section) && (!$csec)) || ($section ne $csec)) {
- my ($dummy,$end,$start)=split(/\_/,
- &Apache::lonnet::unescape
- ($value));
+ my (undef,$end,$start)=split(/\_/,$roles{$course});
my $now=time;
- my $notactive=0;
- if ($start) {
- if ($now<$start) { $notactive=1; }
- }
- if ($end) {
- if ($now>$end) { $notactive=1; }
- }
- unless ($notactive) {
+ if (!($start && ($now<$start)) || !($end && ($now>$end))) {
my $reply=&Apache::lonnet::modifystudent
- ($udom,$unam,'','','',
- '','','','',$section,time);
+ ($udom,$unam,'','','','','','','',$section,time);
}
}
}
@@ -111,7 +105,6 @@ sub dropstudent {
}
# ============================================================== Menu Phase One
-
sub menu_phase_one {
my $r=shift;
my $upfile_select=&Apache::loncommon::upfile_select_html();
@@ -130,7 +123,6 @@ $upfile_select
ENDUPFORM
}
-
sub phase_two_header {
my ($r,$datatoken,$distotal,$krbdefdom)=@_;
my $javascript;
@@ -146,16 +138,16 @@ sub phase_two_header {
Total number of records found in file: $distotal <hr />
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.<hr />
-<input type="submit" name="associate" value="Reverse Association" />
-<input type="hidden" name="phase" value="three" />
-<input type="hidden" name="datatoken" value="$datatoken" />
+<input type="submit" name="associate" value="Reverse Association" />
+<input type="hidden" name="phase" value="three" />
+<input type="hidden" name="datatoken" value="$datatoken" />
<input type="hidden" name="fileupload" value="$ENV{'form.fileupload'}" />
<input type="hidden" name="upfiletype" value="$ENV{'form.upfiletype'}" />
-<input type="hidden" name="upfile_associate" value="$ENV{'form.upfile_associate'}" />
+<input type="hidden" name="upfile_associate"
+ value="$ENV{'form.upfile_associate'}" />
<hr />
-<script>
+<script type="text/javascript" language="Javascript">
$javascript
-
$javascript_validations
</script>
ENDPICK
@@ -163,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 (<<ENDPICK);
function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec) {
var foundatype=0;
var message='';
if (founduname==0) {
- alert('You need to specify at least the username field');
+ alert('You need to specify the username field');
return;
}
- if (vf.login[0].checked) {
- foundatype=1;
- if (vf.krbdom.value=='') {
- alert('You need to specify the Kerberos domain');
- return;
- }
+ if (current.radiovalue == null || current.radiovalue == 'nochange') {
+ // They did not check any of the login radiobuttons.
+ alert('You must choose an authentication type');
+ return;
}
- if (vf.login[1].checked) {
- foundatype=1;
- if ((vf.intpwd.value=='') && (foundpwd==0)) {
- alert('You need to specify the initial password');
+ foundatype=1;
+ if (current.argfield == null || current.argfield == '') {
+ var alertmsg = '';
+ switch (current.value) {
+ case 'krb':
+ alertmsg = 'You need to specify the Kerberos domain';
+ break;
+ case 'loc':
+ case 'fsys':
+ alertmsg = 'You need to specify the initial password';
+ break;
+ case 'fsys':
+ alertmsg = '';
+ break;
+ default:
+ alertmsg = '';
+ }
+ if (alertmsg != '') {
+ alert(alertmsg);
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 name fields specified. '; }
if (foundid==0) { message+='No ID or student number field specified. '; }
if (foundsec==0) { message+='No section or group field specified. '; }
@@ -220,49 +221,6 @@ function verify_message (vf,founduname,f
}
}
-function setkrb(vf) {
- if (vf.krbdom.value!='') {
- clearpwd(vf);
- vf.login[0].checked=true;
- vf.krbdom.value=vf.krbdom.value.toUpperCase();
- vf.intpwd.value='';
- vf.locarg.value='';
- }
-}
-
-function setint(vf) {
- if (vf.intpwd.value!='') {
- 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='';
- }
-}
-
-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() {
parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
@@ -291,7 +249,9 @@ function clickloc(vf) {
pclose();
}
+$authheader
ENDPICK
+
}
sub phase_two_javascript_forward_associate {
@@ -314,7 +274,6 @@ function verify(vf) {
verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec);
}
-
function flip(vf,tf) {
var nw=eval('vf.f'+tf+'.selectedIndex');
var i;
@@ -344,9 +303,10 @@ function flip(vf,tf) {
}
}
if (nw==9) {
- vf.login[1].checked=true;
- vf.intpwd.value='';
- vf.krbdom.value='';
+ changed_radio('int',document.studentform);
+ set_auth_radio_buttons('int',document.studentform);
+ vf.intarg.value='';
+ vf.krbarg.value='';
vf.locarg.value='';
}
}
@@ -399,9 +359,10 @@ function flip(vf,tf) {
}
// intial password specified, pick internal authentication
if (tf==8 && nw!=0) {
- vf.login[1].checked=true;
- vf.intpwd.value='';
- vf.krbdom.value='';
+ changed_radio('int',document.studentform);
+ set_auth_radio_buttons('int',document.studentform);
+ vf.krbarg.value='';
+ vf.intarg.value='';
vf.locarg.value='';
}
}
@@ -417,6 +378,12 @@ ENDPICK
sub phase_two_end {
my ($r,$i,$keyfields,$defdom,$today,$halfyear)=@_;
+ 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,'lcdomain');
$r->print(<<ENDPICK);
</table>
<input type=hidden name=nfields value=$i>
@@ -424,28 +391,22 @@ sub phase_two_end {
<h3>Login Type</h3>
<p>Note: this will not take effect if the user already exists</p>
<p>
-<input type=radio name=login value=krb onClick="clickkrb(this.form);" />
-Kerberos authenticated with domain
-<input type=text size=10 name=krbdom onChange="setkrb(this.form);" />
+$krbform
</p>
<p>
-<input type=radio name=login value=int onClick="clickint(this.form);" />
-Internally authenticated (with initial password
-<input type=text size=10 name=intpwd onChange="setint(this.form);" />)
+$intform
</p>
<p>
-<input type=radio name=login value=loc onClick="clickloc(this.form);" />
-Local Authentication with argument
-<input type=text size=10 name=locarg onChange="setloc(this.form);" />
+$locform
</p>
<h3>LON-CAPA Domain for Students</h3>
-LON-CAPA domain: <input type=text size=10 value=$defdom name=lcdomain><p>
+LON-CAPA domain: $domform <p>
<h3>Starting and Ending Dates</h3>
-<input type="hidden" value='' name="pres_value">
-<input type="hidden" value='' name="pres_type">
-<input type="hidden" value='' name="pres_marker">
-<input type="hidden" value='$today' name=startdate>
-<input type="hidden" value='$halfyear' name=enddate>
+<input type="hidden" value='' name="pres_value" >
+<input type="hidden" value='' name="pres_type" >
+<input type="hidden" value='' name="pres_marker" >
+<input type="hidden" value='$today' name="startdate" >
+<input type="hidden" value='$halfyear' name="enddate" >
<a
href="javascript:pjump('date_start','Enrollment Starting Date',document.studentform.startdate.value,'start','studentform.pres','dateset');"
>Set Starting Date</a><p>
@@ -460,21 +421,21 @@ LON-CAPA domain: <input type=text size=1
<input type=checkbox name=forceid value=yes>
Disable ID/Student Number Safeguard and Force Change of Conflicting IDs
(only do if you know what you are doing)<p>
-<input type=button onClick="verify(this.form)" value="Update Courselist"><br>
+<input type="button" onClick="verify(this.form)" value="Update Courselist"><br>
Note: for large courses, this operation might be time consuming.
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);
+ $datatoken=&Apache::loncommon::upfile_store($r);
} else {
- $datatoken=$ENV{'form.datatoken'};
- &Apache::loncommon::load_tmp_file($r);
+ $datatoken=$ENV{'form.datatoken'};
+ &Apache::loncommon::load_tmp_file($r);
}
my @records=&Apache::loncommon::upfile_record_sep();
my $total=$#records;
@@ -510,56 +471,62 @@ sub menu_phase_two_upload {
}
# ======================================================= Enroll single student
-
sub enroll_single_student {
my $r=shift;
$r->print('<h3>Enrolling Student</h3>');
+ $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'};
+ $amode='krb4';
+ $genpwd=$ENV{'form.krbarg'};
} elsif ($ENV{'form.login'} eq 'int') {
- $amode='internal';
- $genpwd=$ENV{'form.intpwd'};
+ $amode='internal';
+ $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'});
- $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'}));
+ &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,
+ $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;
+ 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);
+ # Set up domain selection form
+ my $domform = &Apache::loncommon::select_dom_form($defdom,'cdomain');
+ # Print it all out
$r->print(<<ENDSENROLL);
-<script>
+<script type="text/javascript" language="Javascript">
function verify(vf) {
var founduname=0;
var foundpwd=0;
@@ -567,12 +534,12 @@ function verify(vf) {
var foundid=0;
var foundsec=0;
var tw;
- if ((typeof(vf.cuname.value)!="undefined") && (vf.cuname.value!='') &&
+ if ((typeof(vf.cuname.value) !="undefined") && (vf.cuname.value!='') &&
(typeof(vf.cdomain.value)!="undefined") && (vf.cdomain.value!='')) {
founduname=1;
}
if ((typeof(vf.cfirst.value)!="undefined") && (vf.cfirst.value!='') &&
- (typeof(vf.clast.value)!="undefined") && (vf.clast.value!='')) {
+ (typeof(vf.clast.value) !="undefined") && (vf.clast.value!='')) {
foundname=1;
}
if ((typeof(vf.csec.value)!="undefined") && (vf.csec.value!='')) {
@@ -596,123 +563,143 @@ function clearpwd(vf) {
</script>
<h3>Personal Data</h3>
-First Name: <input type=text name=cfirst size=15><br>
-Middle Name: <input type=text name=cmiddle size=15><br>
-Last Name: <input type=text name=clast size=15><br>
-Generation: <input type=text name=cgen size=5><p>
+First Name: <input type="text" name="cfirst" size="15"><br>
+Middle Name: <input type="text" name="cmiddle" size="15"><br>
+Last Name: <input type="text" name="clast" size="15"><br>
+Generation: <input type="text" name="cgen" size="5">
-ID/Student Number: <input type=text name=cstid size=10><p>
+<p>ID/Student Number: <input type="text" name="cstid" size="10"></p>
-Group/Section: <input type=text name=csec size=5><p>
+<p>Group/Section: <input type=text name=csec size=5></p>
<h3>Login Data</h3>
-Username: <input type=text name=cuname size=15><p>
-Domain: <input type=text size=10 value=$defdom name=cdomain><p>
-Note: login settings below will not take effect if the user already exists<p>
-
-<input type=radio name=login value=krb onClick="clickkrb(this.form);">
-Kerberos authenticated with domain
-<input type=text size=10 name=krbdom onChange="setkrb(this.form);"><p>
-<input type=radio name=login value=int onClick="clickint(this.form);">
-Internally authenticated (with initial password
-<input type=text size=10 name=intpwd onChange="setint(this.form);">)
-<p>
-<input type=radio name=login value=loc onClick="clickloc(this.form);" />
-Local Authentication with argument
-<input type=text size=10 name=locarg onChange="setloc(this.form);" />
-</p>
+<p>Username: <input type="text" name="cuname" size="15"></p>
+<p>Domain: $domform</p>
+<p>Note: login settings below will not take effect if the user already exists
+</p><p>
+$krbform
+</p><p>
+$intform
+</p><p>
+$locform
+</p><p>
<h3>Starting and Ending Dates</h3>
<input type="hidden" value='' name="pres_value">
<input type="hidden" value='' name="pres_type">
<input type="hidden" value='' name="pres_marker">
<input type="hidden" value='$today' name=startdate>
<input type="hidden" value='$halfyear' name=enddate>
+</p><p>
<a
href="javascript:pjump('date_start','Enrollment Starting Date',document.studentform.startdate.value,'start','studentform.pres','dateset');"
->Set Starting Date</a><p>
-
+>Set Starting Date</a>
+</p><p>
<a
href="javascript:pjump('date_end','Enrollment Ending Date',document.studentform.enddate.value,'end','studentform.pres','dateset');"
->Set Ending Date</a><p>
+>Set Ending Date</a>
+</p><p>
<h3>ID/Student Number</h3>
-<input type=checkbox name=forceid value=yes>
+<input type="checkbox" name="forceid" value="yes">
Disable ID/Student Number Safeguard and Force Change of Conflicting IDs
(only do if you know what you are doing)<p>
-<input type=button onClick="verify(this.form)" value="Enroll as student"><br>
-<input type=hidden name=phase value=five>
+<input type="button" onClick="verify(this.form)" value="Enroll as student"><br>
+<input type="hidden" name="phase" value="five">
+</p>
ENDSENROLL
}
-# ========================================================= Menu Phase Two Drop
-
-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'});
+# =================================================== get the current classlist
+sub get_current_classlist {
+ my ($domain,$identifier) = @_;
+ # domain is the domain the class is being run in
+ # identifier is the internal, unique identifier for the class.
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 %results=&Apache::lonnet::dump('classlist',$domain,$identifier);
+ my ($tmp) = keys(%results);
+ if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
+ foreach my $student (keys(%results)) {
+ # Extract the start and end dates
+ my ($end,$start)=split(/\:/,$results{$student});
+ # If the class isn't over, put it in the list
+ unless (($end) && ($now>$end)) {
+ $currentlist{$student}=1;
}
}
-# ----------------------------------------------------------- Print out choices
- &show_drop_list($r,%currentlist);
+ return (undef,%currentlist);
} else {
- $r->print('<font color=red><h3>Could not access classlist: '.$classlst.
- '</h3></font>');
+ return ($tmp,undef);
}
}
-# =================================================== Show student list to drop
+# ========================================================= Menu Phase Two Drop
+sub menu_phase_two_drop {
+ my $r=shift;
+ my $cid=$ENV{'request.course.id'};
+ my ($error,%currentlist)=&get_current_classlist($ENV{'course.'.$cid.'.domain'},
+ $ENV{'course.'.$cid.'.num'});
+ if (defined($error)) {
+ $r->print('<pre>ERROR:$error</pre>');
+ }
+ 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('<input type=hidden name=phase value=four>');
- $r->print('<table border=2>');
+ $r->print(<<'END');
+<input type="hidden" name="phase" value="four">
+<table border=2>
+<tr><th> </th><th>username</th><th>domain</th>
+<th>ID</th><th>student name</th><th>generation</th>
+<th>section</th></tr>
+END
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('<tr><td><input type=checkbox name="drop:'.$_.'"></td><td>'.
- $sname.'</td><td>'.$sdom.'</td><td>'.
- $reply{$sname}.'</td><td>'.
- &Apache::lonnet::unescape($reply[2]).' '.
- &Apache::lonnet::unescape($reply[3]).', '.
- &Apache::lonnet::unescape($reply[0]).' '.
- &Apache::lonnet::unescape($reply[1]).
- '</td><td>'.
- $ssec."</td></tr>\n");
+ my %info=&Apache::lonnet::get('environment',
+ ['firstname','middlename',
+ 'lastname','generation'],
+ $sdom, $sname);
+ my ($tmp) = keys(%info);
+ if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
+ $r->print('<tr><td colspan="7"><font color="red">'.
+ 'Internal error: unable to get environment '.
+ 'for '.$sname.' in domain '.$sdom.'</font></td></tr>');
+ } else {
+ $r->print(<<"END");
+<tr>
+ <td><input type="checkbox" name="droplist" value="$_"></td>
+ <td>$sname</td>
+ <td>$sdom</td>
+ <td>$reply{$sname}</td>
+ <td>$info{'lastname'}, $info{'firstname'} $info{'middlename'}</td>
+ <td>$info{'generation'}</td>
+ <td>$ssec</td>
+</tr>
+END
+ }
}
$r->print('</table><br>');
$r->print('<input type=submit value="Drop Students">');
}
# ================================================= Drop/Add from uploaded file
-
sub upfile_drop_add {
my $r=shift;
&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 @keyfields = split(/\,/,$ENV{'form.keyfields'});
+ my $cid = $ENV{'request.course.id'};
my %fields=();
- for (my $i=0;$i<=$ENV{'form.nfields'};$i++) {
+ 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};
@@ -721,20 +708,23 @@ sub upfile_drop_add {
$fields{$ENV{'form.f'.$i}}=$keyfields[$i];
}
}
- my $startdate=$ENV{'form.startdate'};
- my $enddate=$ENV{'form.enddate'};
+ #
+ my $startdate = $ENV{'form.startdate'};
+ my $enddate = $ENV{'form.enddate'};
if ($startdate=~/\D/) { $startdate=''; }
- if ($enddate=~/\D/) { $enddate=''; }
+ if ($enddate=~/\D/) { $enddate=''; }
+ #
my $domain=$ENV{'form.lcdomain'};
- my $amode='';
- my $genpwd='';
+ # Determine authentication mechanism
+ 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';
- if ((defined($ENV{'form.intpwd'})) && ($ENV{'form.intpwd'})) {
- $genpwd=$ENV{'form.intpwd'};
+ if ((defined($ENV{'form.intarg'})) && ($ENV{'form.intarg'})) {
+ $genpwd=$ENV{'form.intarg'};
}
} elsif ($ENV{'form.login'} eq 'loc') {
$amode='localauth';
@@ -743,20 +733,23 @@ sub upfile_drop_add {
}
}
unless (($domain=~/\W/) || ($amode eq '')) {
+ #######################################
+ ## Enroll Students ##
+ #######################################
$r->print('<h3>Enrolling Students</h3>');
my $count=0;
my $flushc=0;
my %student=();
-# ----------------------------------------------------------- Get new classlist
-# --------------------------------------------------------- Enroll new students
+ # 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=''; my $mname=''; my $lname=''; my $gen='';
+ my ($fname, $mname, $lname,$gen) = ('','','','');
if (defined($fields{'names'})) {
- ($lname,$fname,$mname)=
- ($entries{$fields{'names'}}=~/([^\,]+)\,\s*(\w+)\s*(.*)$/);
+ ($lname,$fname,$mname)=($entries{$fields{'names'}}=~
+ /([^\,]+)\,\s*(\w+)\s*(.*)$/);
} else {
if (defined($fields{'fname'})) {
$fname=$entries{$fields{'fname'}};
@@ -776,6 +769,7 @@ sub upfile_drop_add {
$entries{$fields{'username'}}.' for user '.
$fname.' '.$mname.' '.$lname.' '.$gen.'</b><p>');
} else {
+ # determine section number
my $sec='';
my $username=$entries{$fields{'username'}};
if (defined($fields{'sec'})) {
@@ -783,6 +777,7 @@ sub upfile_drop_add {
$sec=$entries{$fields{'sec'}};
}
}
+ # determine student id number
my $id='';
if (defined($fields{'id'})) {
if (defined($entries{$fields{'id'}})) {
@@ -790,6 +785,7 @@ sub upfile_drop_add {
}
$id=~tr/A-Z/a-z/;
}
+ # determine student password
my $password='';
if ($genpwd) {
$password=$genpwd;
@@ -801,14 +797,15 @@ sub upfile_drop_add {
}
}
if ($password) {
- &dropstudent($domain,$username,$cid,$sec);
+ &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'});
- unless ($reply eq 'ok') {
- $r->print(
- "<p><b>Error enrolling $username: $reply</b><p>");
+ if ($reply ne 'ok') {
+ $r->print('<p><b>'.
+ 'Error enrolling '.$username.': '.
+ $reply.'</b></p>');
} else {
$count++; $flushc++;
$student{$username}=1;
@@ -822,130 +819,115 @@ sub upfile_drop_add {
$r->print("<p><b>No password for $username</b><p>");
}
}
- }
- }
+ }
+ } # end of foreach (@studentdata)
$r->print('<p>Processed Students: '.$count);
-# --------------------------------------------------------------- Drop students
+ #####################################
+ # Drop students #
+ #####################################
if ($ENV{'form.fullup'} eq 'yes') {
$r->print('<h3>Dropping Students</h3>');
-# ------------------------------------------------------- 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;
- }
- }
-# ------------------------------------------------ Now got up-to-date classlist
+ # Get current classlist
+ my ($error,%currentlist)=&get_current_classlist
+ ($ENV{'course.'.$cid.'.domain'},
+ $ENV{'course.'.$cid.'.num'});
+ if (defined($error)) {
+ $r->print('<pre>ERROR:$error</pre>');
+ }
+ 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});
+ delete($currentlist{$entries{$fields{'username'}}.
+ ':'.$domain});
}
}
-# ----------------------------------------------------------- Print out choices
+ # Print out list of dropped students
&show_drop_list($r,%currentlist);
} else {
- $r->print('<font color=red><h3>Could not access classlist: '.
- $classlst.'</h3></font>');
+ $r->print("There are no students currently enrolled.\n");
}
}
-# ------------------------------------------------------------------------ Done
- }
+ } # 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.'<br>');
- $count++;
- }
+ foreach (@{$ENV{'form.droplist'}}) {
+ my ($uname,$udom)=split(/\:/,$_);
+ &modifystudent($udom,$uname,$ENV{'request.course.id'});
+ $r->print('Dropped '.$uname.' at '.$udom.'<br>');
+ $count++;
}
$r->print('<p><b>Dropped '.$count.' student(s).</b>');
$r->print('<p>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('</form></body></html>');
- } 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;
- }
- return OK;
+ 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;
+ $r->print(&header());
+ # 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('</form></body></html>');
+ } 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;
+ }
+ return OK;
}
1;