--- loncom/interface/Attic/londropadd.pm 2001/02/14 22:51:48 1.12 +++ loncom/interface/Attic/londropadd.pm 2002/01/04 18:13:58 1.19 @@ -1,12 +1,37 @@ # The LearningOnline Network with CAPA # Handler to drop and add students in courses # +# $Id: londropadd.pm,v 1.19 2002/01/04 18:13:58 www 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,02/14 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; @@ -147,7 +179,7 @@ sub dropstudent { 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; @@ -257,6 +289,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; @@ -315,6 +351,7 @@ function flip(vf,tf) { vf.login[1].checked=true; vf.intpwd.value=''; vf.krbdom.value=''; + vf.locarg.value=''; } } @@ -411,14 +448,14 @@ ENDPICK 'id:ID/Student Number','sec:Group/Section', 'ipwd:Initial Password'); $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
@@ -476,7 +526,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'});
@@ -486,7 +540,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');
}
@@ -520,18 +574,18 @@ function verify(vf) {
var foundatype=0;
var tw;
var message='';
- if ((vf.cuname.value!=undefined) && (vf.cuname.value!='') &&
- (vf.cdomain.value!=undefined) && (vf.cdomain.value!='')) {
+ if ((typeof(vf.cuname.value)!="undefined") && (vf.cuname.value!='') &&
+ (typeof(vf.cdomain.value)!="undefined") && (vf.cdomain.value!='')) {
founduname=1;
}
- if ((vf.cfirst.value!=undefined) && (vf.cfirst.value!='') &&
- (vf.clast.value!=undefined) && (vf.clast.value!='')) {
+ if ((typeof(vf.cfirst.value)!="undefined") && (vf.cfirst.value!='') &&
+ (typeof(vf.clast.value)!="undefined") && (vf.clast.value!='')) {
foundname=1;
}
- if ((vf.csec.value!=undefined) && (vf.csec.value!='')) {
+ if ((typeof(vf.csec.value)!="undefined") && (vf.csec.value!='')) {
foundsec=1;
}
- if ((vf.cstid.value!=undefined) && (vf.cstid.value!='')) {
+ if ((typeof(vf.cstid.value)!="undefined") && (vf.cstid.value!='')) {
foundid=1;
}
if (founduname==0) {
@@ -552,6 +606,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;
@@ -588,6 +646,7 @@ function setkrb(vf) {
vf.login[0].checked=true;
vf.krbdom.value=vf.krbdom.value.toUpperCase();
vf.intpwd.value='';
+ vf.locarg.value='';
}
}
@@ -595,16 +654,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() {
@@ -656,7 +731,11 @@ Kerberos authenticated with domain
Internally authenticated (with initial password
)
-
+
+ +Local Authentication with argument + +
+
ENDSENROLL
@@ -767,7 +850,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('
Error enrolling $username: $reply
");