--- loncom/interface/Attic/londropadd.pm 2001/02/14 12:29:25 1.11 +++ loncom/interface/Attic/londropadd.pm 2001/12/19 17:17:46 1.17 @@ -1,12 +1,37 @@ # The LearningOnline Network with CAPA # Handler to drop and add students in courses # +# $Id: londropadd.pm,v 1.17 2001/12/19 17:17:46 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,11 @@ # 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 package Apache::londropadd; @@ -147,7 +176,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 +286,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 +348,7 @@ function flip(vf,tf) { vf.login[1].checked=true; vf.intpwd.value=''; vf.krbdom.value=''; + vf.locarg.value=''; } } @@ -411,14 +445,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 + +
-Initial password (if applicable):
+
+Domain:
+Note: login settings below will not take effect if the user already exists
-
Internally authenticated (with initial password ) -
+
+ +Local Authentication with argument + +
+
+
ENDSENROLL
}
@@ -605,7 +839,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('