--- loncom/interface/Attic/londropadd.pm 2001/02/13 21:24:18 1.10 +++ loncom/interface/Attic/londropadd.pm 2002/04/04 20:41:17 1.23 @@ -1,12 +1,37 @@ # The LearningOnline Network with CAPA # Handler to drop and add students in courses # +# $Id: londropadd.pm,v 1.23 2002/04/04 20:41:17 albertel Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# # (Handler to set parameters for assessments # # (Handler to resolve ambiguous file locations # # (TeX Content Handler # +# YEAR=2000 # 05/29/00,05/30,10/11 Gerd Kortemeyer) # # 10/11,10/12,10/16 Gerd Kortemeyer) @@ -15,7 +40,14 @@ # 12/08,12/12 Gerd Kortemeyer) # # 12/26,12/27,12/28, -# 01/01/01,01/15,02/10,02/13 Gerd Kortemeyer +# YEAR=2001 +# 01/01/01,01/15,02/10,02/13,02/14,02/22 Gerd Kortemeyer +# 8/6 Scott Harrison +# Guy Albertelli +# 9/25 Gerd Kortemeyer +# 12/19 Guy Albertelli +# YEAR=2002 +# 1/4 Gerd Kortemeyer package Apache::londropadd; @@ -97,22 +129,22 @@ sub record_sep { if ($ENV{'form.upfiletype'} eq 'xml') { } elsif ($ENV{'form.upfiletype'} eq 'space') { my $i=0; - map { + foreach (split(/\s+/,$record)) { my $field=$_; $field=~s/^(\"|\')//; $field=~s/(\"|\')$//; $components{$i}=$field; $i++; - } split(/\s+/,$record); + } } elsif ($ENV{'form.upfiletype'} eq 'tab') { my $i=0; - map { + foreach (split(/\t+/,$record)) { my $field=$_; $field=~s/^(\"|\')//; $field=~s/(\"|\')$//; $components{$i}=$field; $i++; - } split(/\t+/,$record); + } } else { my @allfields=split(/\,/,$record); my $i=0; @@ -141,13 +173,15 @@ sub dropstudent { my ($udom,$unam,$courseid,$csec)=@_; $courseid=~s/\_/\//g; $courseid=~s/^(\w)/\/$1/; - map { + 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 ne $csec) { + if (((!$section) && (!$csec)) || ($section ne $csec)) { my ($dummy,$end,$start)=split(/\_/, &Apache::lonnet::unescape($value)); my $now=time; @@ -165,8 +199,7 @@ sub dropstudent { } } } - } split(/\&/,&Apache::lonnet::reply('dump:'.$udom.':'.$unam.':roles', - &Apache::lonnet::homeserver($unam,$udom))); + } } # ============================================================== Menu Phase One @@ -189,38 +222,23 @@ 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)=@_;
$r->print(< Note: this will not take effect if the user already exists
+
Kerberos authenticated with domain
-
-
+
+
+
Internally authenticated (with initial password
-)
+)
+
+
+Local Authentication with argument
+
+
+(also print list of users not enrolled anymore)
+
+
+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
+
+
+
+ Error enrolling $username: $reply ");
@@ -586,7 +953,7 @@ sub upfile_drop_add {
}
}
}
- } @studentdata;
+ }
$r->print(' Processed Students: '.$count);
# --------------------------------------------------------------- Drop students
if ($ENV{'form.fullup'} eq 'yes') {
@@ -599,7 +966,7 @@ sub upfile_drop_add {
my %currentlist=();
my $now=time;
unless ($classlst=~/^error\:/) {
- map {
+ foreach (split(/\&/,$classlst)) {
my ($name,$value)=split(/\=/,$_);
my ($end,$start)=split(/\:/,
&Apache::lonnet::unescape($value));
@@ -608,9 +975,9 @@ sub upfile_drop_add {
if ($active) {
$currentlist{&Apache::lonnet::unescape($name)}=1;
}
- } split(/\&/,$classlst);
+ }
# ------------------------------------------------ Now got up-to-date classlist
- map {
+ foreach (@studentdata) {
my %entries=&record_sep($_);
unless (($entries{$fields{'username'}} eq '') ||
(!defined($entries{$fields{'username'}}))) {
@@ -618,28 +985,9 @@ sub upfile_drop_add {
$entries{$fields{'username'}}.':'.
$domain});
}
- } @studentdata;
+ }
# ----------------------------------------------------------- Print out choices
- $r->print(' Dropped '.$count.' student(s).');
+ $r->print(' Re-enrollment will re-activate data.');
+}
+
# ================================================================ Main Handler
sub handler {
@@ -696,6 +1061,14 @@ sub handler {
&upfile_drop_add($r);
}
}
+# ------------------------------------------------------------------ Phase four
+ if ($ENV{'form.phase'} eq 'four') {
+ &drop_student_list($r);
+ }
+# ------------------------------------------------------------------ Phase four
+ if ($ENV{'form.phase'} eq 'five') {
+ &enroll_single_student($r);
+ }
# ------------------------------------------------------------------------- End
$r->print('
Identify fields
-Total number of records found in file: $distotal
+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
- my %sone; my %stwo; my %sthree;
- my $i=0;
+}
- if ($total>=0) {
- %sone=&record_sep($records[0]);
- if ($total>=1) {
- %stwo=&record_sep($records[1]);
-
- }
- if ($total>=2) {
- %sthree=&record_sep($records[2]);
- }
- map {
- $r->print('Field Samples ');
- $i++;
- } sort keys %sone;
- $i--;
- }
- my $keyfields=join(',',sort keys %sone);
- $r->print(<');
- if (defined($sone{$i})) {
- $r->print($sone{$i}."\n");
- }
- if (defined($stwo{$i})) {
- $r->print($stwo{$i}."\n");
- }
- if (defined($sthree{$i})) {
- $r->print($sthree{$i}."\n");
- }
- $r->print(' Login Type
-
+LON-CAPA Domain for Students
LON-CAPA domain: Starting and Ending Dates
@@ -454,29 +450,394 @@ LON-CAPA domain: Set Ending DateFull Update
Full update
-(also dropping students)ID/Student Number
+
+Disable ID/Student Number Safeguard and Force Change of Conflicting IDs
+(only do if you know what you are doing)
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=&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');
+
+ &phase_two_header($r,$datatoken,$distotal,$krbdefdom);
+
+ my %sone; my %stwo; my %sthree;
+ my $i=0;
+
+ 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);
+
+ &phase_two_end($r,$i,$keyfields,$defdom,$today,$halfyear);
+}
+
+# ======================================================= Enroll single student
+
+sub enroll_single_student {
+ my $r=shift;
+ $r->print('');
+ if (defined($sone{$_})) {
+ $r->print($sone{$_}."\n");
+ }
+ if (defined($stwo{$_})) {
+ $r->print($stwo{$_}."\n");
+ }
+ if (defined($sthree{$_})) {
+ $r->print($sthree{$_}."\n");
+ }
+ $r->print(' Enrolling Student
');
+ 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'};
+ } elsif ($ENV{'form.login'} eq 'int') {
+ $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'}));
+ } else {
+ $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');
+
+ $r->print(<Personal Data
+First Name:
+Middle Name:
+Last Name:
+Generation: Login Data
+Username: Starting and Ending Dates
+
+
+
+
+
+Set Starting DateID/Student Number
+
+Disable ID/Student Number Safeguard and Force Change of Conflicting IDs
+(only do if you know what you are doing)
+
+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'});
+ 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 student list to drop
+
+sub show_drop_list {
+ my ($r,%currentlist)=@_;
+ my $cid=$ENV{'request.course.id'};
+
+ $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;
- $r->print('');
&load_tmp_file($r);
my @studentdata=&upfile_record_sep();
@@ -503,7 +864,12 @@ sub upfile_drop_add {
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;
@@ -511,7 +877,7 @@ sub upfile_drop_add {
my %student=();
# ----------------------------------------------------------- Get new classlist
# --------------------------------------------------------- Enroll new students
- map {
+ foreach (@studentdata) {
my %entries=&record_sep($_);
unless (($entries{$fields{'username'}} eq '') ||
@@ -567,7 +933,8 @@ sub upfile_drop_add {
&dropstudent($domain,$username,$cid,$sec);
my $reply=&Apache::lonnet::modifystudent(
$domain,$username,$id,$amode,$password,
- $fname,$mname,$lname,$gen,$sec,$enddate,$startdate);
+ $fname,$mname,$lname,$gen,$sec,$enddate,$startdate,
+ $ENV{'form.forceid'});
unless ($reply eq 'ok') {
$r->print(
"');
- map {
- 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");
- } sort keys %currentlist;
- $r->print(''.
- $sname.' '.$sdom.' '.
- $reply{$sname}.' '.
- $reply[2].' '.$reply[3],', '.$reply[0].' '.
- $reply[1].' '.
- $ssec."
');
- $r->print('');
-
+ &show_drop_list($r,%currentlist);
} else {
$r->print(
'Could not access classlist: '.$classlst.
@@ -651,6 +999,23 @@ sub upfile_drop_add {
}
}
+# ================================================================== 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.'
');
+ $count++;
+ }
+ }
+ $r->print('