--- loncom/interface/Attic/londropadd.pm 2001/08/07 14:07:36 1.14 +++ loncom/interface/Attic/londropadd.pm 2002/03/06 22:34:06 1.20 @@ -1,6 +1,30 @@ # The LearningOnline Network with CAPA # Handler to drop and add students in courses # +# $Id: londropadd.pm,v 1.20 2002/03/06 22:34:06 harris41 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 @@ -19,6 +43,11 @@ # 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; @@ -100,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; @@ -144,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; @@ -168,8 +199,7 @@ sub dropstudent { } } } - } split(/\&/,&Apache::lonnet::reply('dump:'.$udom.':'.$unam.':roles', - &Apache::lonnet::homeserver($unam,$udom))); + } } # ============================================================== Menu Phase One @@ -260,6 +290,10 @@ function verify(vf) { 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; @@ -318,6 +352,7 @@ function flip(vf,tf) { vf.login[1].checked=true; vf.intpwd.value=''; vf.krbdom.value=''; + vf.locarg.value=''; } } @@ -400,19 +435,19 @@ ENDPICK if ($total>=2) { %sthree=&record_sep($records[2]); } - map { + foreach (sort keys %sone) { $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 + +
+
Note: for large courses, this operation might be time consuming.
ENDPICK
@@ -479,7 +527,11 @@ sub enroll_single_student {
} 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'});
@@ -489,7 +541,7 @@ sub enroll_single_student {
$ENV{'form.cfirst'},$ENV{'form.cmiddle'},
$ENV{'form.clast'},$ENV{'form.cgen'},
$ENV{'form.csec'},$ENV{'form.enddate'},
- $ENV{'form.startdate'}));
+ $ENV{'form.startdate'},$ENV{'form.forceid'}));
} else {
$r->print('Invalid login mode or password');
}
@@ -555,6 +607,10 @@ function verify(vf) {
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;
@@ -591,6 +647,7 @@ function setkrb(vf) {
vf.login[0].checked=true;
vf.krbdom.value=vf.krbdom.value.toUpperCase();
vf.intpwd.value='';
+ vf.locarg.value='';
}
}
@@ -598,16 +655,32 @@ function setint(vf) {
if (vf.intpwd.value!='') {
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';
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() {
@@ -659,7 +732,11 @@ Kerberos authenticated with domain
Internally authenticated (with initial password
)
-
+
+ +Local Authentication with argument + +
+
ENDSENROLL
@@ -690,7 +771,7 @@ sub menu_phase_two_drop {
my %currentlist=();
my $now=time;
unless ($classlst=~/^error\:/) {
- map {
+ foreach (split(/\&/,$classlst)) {
my ($name,$value)=split(/\=/,$_);
my ($end,$start)=split(/\:/,
&Apache::lonnet::unescape($value));
@@ -699,7 +780,7 @@ sub menu_phase_two_drop {
if ($active) {
$currentlist{&Apache::lonnet::unescape($name)}=1;
}
- } split(/\&/,$classlst);
+ }
# ----------------------------------------------------------- Print out choices
&show_drop_list($r,%currentlist);
} else {
@@ -717,7 +798,7 @@ sub show_drop_list {
$r->print('');
$r->print('
'. $ssec." | \n"); - } sort keys %currentlist; + } $r->print('
Error enrolling $username: $reply
"); @@ -853,7 +940,7 @@ sub upfile_drop_add { } } } - } @studentdata; + } $r->print('
Processed Students: '.$count);
# --------------------------------------------------------------- Drop students
if ($ENV{'form.fullup'} eq 'yes') {
@@ -866,7 +953,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));
@@ -875,9 +962,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'}}))) {
@@ -885,7 +972,7 @@ sub upfile_drop_add {
$entries{$fields{'username'}}.':'.
$domain});
}
- } @studentdata;
+ }
# ----------------------------------------------------------- Print out choices
&show_drop_list($r,%currentlist);
} else {
@@ -904,14 +991,14 @@ sub upfile_drop_add {
sub drop_student_list {
my $r=shift;
my $count=0;
- map {
+ 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++;
}
- } keys %ENV;
+ }
$r->print('
Dropped '.$count.' student(s).'); $r->print('
Re-enrollment will re-activate data.'); }