--- loncom/interface/Attic/londropadd.pm 2002/04/22 15:26:46 1.28
+++ loncom/interface/Attic/londropadd.pm 2002/04/26 19:10:54 1.32
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to drop and add students in courses
#
-# $Id: londropadd.pm,v 1.28 2002/04/22 15:26:46 matthew Exp $
+# $Id: londropadd.pm,v 1.32 2002/04/26 19:10:54 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -104,6 +104,35 @@ sub modifystudent {
}
}
+# ============ build a domain and server selection form
+sub domain_form {
+ my ($defdom) = @_;
+ # Set up domain and server selection forms
+ #
+ # Get the domains
+ my @domains = &Apache::loncommon::get_domains();
+ # build up the menu information to be passed to
+ # &Apache::loncommon::linked_select_forms
+ my %select_menus;
+ foreach my $dom (@domains) {
+ # set up the text for this domain
+ $select_menus{$dom}->{'text'}= $dom;
+ # we want a choice of 'default' as the default in the second menu
+ $select_menus{$dom}->{'default'}= 'default';
+ $select_menus{$dom}->{'select2'}->{'default'} = 'default';
+ # Now build up the other items in the second menu
+ my %servers = &Apache::loncommon::get_home_servers($dom);
+ foreach my $server (keys(%servers)) {
+ $select_menus{$dom}->{'select2'}->{$server}
+ = "$server $servers{$server}";
+ }
+ }
+ my $result = &Apache::loncommon::linked_select_forms
+ ('studentform',' with home server ',$defdom,
+ 'lcdomain','lcserver',\%select_menus);
+ return $result;
+}
+
# ============================================================== Menu Phase One
sub menu_phase_one {
my $r=shift;
@@ -166,15 +195,15 @@ function verify_message (vf,founduname,f
alert('You need to specify the username field');
return;
}
- if (vf.login.value == null) {
+ if (current.radiovalue == null || current.radiovalue == 'nochange') {
// They did not check any of the login radiobuttons.
alert('You must choose an authentication type');
return;
}
foundatype=1;
- if (vf.login.argfield.value == '') {
+ if (current.argfield == null || current.argfield == '') {
var alertmsg = '';
- switch (vf.login.value) {
+ switch (current.value) {
case 'krb':
alertmsg = 'You need to specify the Kerberos domain';
break;
@@ -382,6 +411,7 @@ sub phase_two_end {
my $krbform = &Apache::loncommon::authform_kerberos(%param);
my $intform = &Apache::loncommon::authform_internal(%param);
my $locform = &Apache::loncommon::authform_local(%param);
+ my $domform = &domain_form($defdom);
$r->print(<
+LON-CAPA domain: $domform
Domain:
+Domain: $domform
Note: login settings below will not take effect if the user already exists
$krbform @@ -649,6 +698,20 @@ sub show_drop_list { my ($r,%currentlist)=@_; my $cid=$ENV{'request.course.id'}; $r->print(<<'END'); + +
username | domain | @@ -683,7 +746,12 @@ END } } $r->print('
---|
+ + +
+END } # ================================================= Drop/Add from uploaded file @@ -708,8 +776,19 @@ sub upfile_drop_add { my $enddate = $ENV{'form.enddate'}; if ($startdate=~/\D/) { $startdate=''; } if ($enddate=~/\D/) { $enddate=''; } - # + # Determine domain and desired host (home server) my $domain=$ENV{'form.lcdomain'}; + my $desiredhost = $ENV{'form.lcserver'}; + if (lc($desiredhost) eq 'default') { + $desiredhost = undef; + } else { + my %home_servers = &Apache::loncommon::get_home_servers($domain); + if (! exists($home_servers{$desiredhost})) { + $r->print('Error:'. + 'Invalid home server specified'); + return; + } + } # Determine authentication mechanism my $amode = ''; my $genpwd = ''; @@ -792,11 +871,11 @@ sub upfile_drop_add { } } if ($password) { - &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'}); + $startdate,$ENV{'form.forceid'},$desiredhost); + &modifystudent($domain,$username,$cid,$sec); if ($reply ne 'ok') { $r->print(''. 'Error enrolling '.$username.': '. @@ -865,7 +944,6 @@ sub drop_student_list { # ================================================================ Main Handler sub handler { my $r=shift; - $Apache::lonxml::debug=1; if ($r->header_only) { $r->content_type('text/html'); $r->send_http_header;