--- loncom/interface/lonpopulate.pm 2005/04/07 07:34:52 1.24
+++ loncom/interface/lonpopulate.pm 2005/11/07 15:43:31 1.33
@@ -1,5 +1,5 @@
# automated enrollment configuration handler
-# $Id: lonpopulate.pm,v 1.24 2005/04/07 07:34:52 albertel Exp $
+# $Id: lonpopulate.pm,v 1.33 2005/11/07 15:43:31 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -151,27 +151,8 @@ function process(calling,numauto,nummanu
}
|;
if ($action eq 'viewclass') {
+ $scripttag .= &Apache::loncommon::check_uncheck_jscript();
$scripttag .= qq|
-function checkAll(field) {
- if (field.length > 0) {
- for (i = 0; i < field.length; i++) {
- field[i].checked = true ;
- }
- } else {
- field.checked = true
- }
-}
-
-function uncheckAll(field) {
- if (field.length > 0) {
- for (i = 0; i < field.length; i++) {
- field[i].checked = false ;
- }
- } else {
- field.checked = false ;
- }
-}
-
function countChecked(field) {
var count = 0;
if (field.length > 0) {
@@ -504,15 +485,10 @@ ENDTWO
ENDTWO
} elsif ($action eq "notify") {
- my @notified = ();
- if ($enrollvar{notifylist} =~ m/,/) {
- @notified = split/,/,$enrollvar{notifylist};
- } else {
- @notified = $enrollvar{notifylist};
- }
my $notifycount = 0;
+ my @notified = split(/,/,$enrollvar{notifylist});
foreach (@notified) {
- unless ($_ eq '') { $notifycount ++; }
+ unless ($_ eq '') { $notifycount ++; }
}
my $noteset = '';
if ($notifycount) {
@@ -559,8 +535,8 @@ ENDTWO
my @roleinfo = split/:/,$_;
if ($roleinfo[0] eq 'cc') {
unless (grep/^$roleinfo[1]\@$roleinfo[2]/,@ccs) {
- my $active_cc = &LONCAPA::Enrollment::check_user_status($roleinfo[2],$roleinfo[1],$dom,$crs,'cc');
- if ($active_cc eq 'ok') {
+ my $active_cc = &Apache::loncommon::check_user_status($roleinfo[2],$roleinfo[1],$dom,$crs,'cc');
+ if ($active_cc eq 'active') {
push @ccs, "$roleinfo[1]\@$roleinfo[2]";
$pname{"$roleinfo[1]\@$roleinfo[2]"} = &Apache::loncommon::plainname($roleinfo[1],$roleinfo[2]);
if (grep/^$roleinfo[1]\@$roleinfo[2]$/,@notified) {
@@ -657,11 +633,9 @@ ENDTWO
");
} elsif ($action eq "crosslist") {
- my @xlists = ();
- if ($enrollvar{crosslistings} =~ m/,/) {
- @xlists = split/,/,$enrollvar{crosslistings};
- } elsif ($enrollvar{crosslistings} ne '') {
- $xlists[0] = $enrollvar{crosslistings};
+ my @xlists;
+ if ($enrollvar{crosslistings} ne '') {
+ @xlists = split(/,/,$enrollvar{crosslistings});
}
my $cross_str = @xlists;
$r->print("
@@ -690,7 +664,7 @@ ENDTWO
for (my $i=0; $i<@xlists; $i++) {
my $xl = ' ';
my $gp = ' ';
- if ($xlists[$i] =~ /(\w+):?(.*)$/) {
+ if ($xlists[$i] =~ /^([^:]+):?(.*)$/) {
$xl = $1;
$gp = $2;
}
@@ -742,14 +716,9 @@ ENDTWO
} elsif ($action eq "sections") {
my @sections = ();
@sections = &Apache::lonnet::auto_get_sections($crs,$dom,$enrollvar{coursecode});
- my @storedsections = ();
+ my @storedsections = split(/,/,$enrollvar{sectionnums});
my @currsections = ();
my %sec_id = ();
- if ($enrollvar{sectionnums} =~ m/,/) {
- @storedsections = split/,/,$enrollvar{sectionnums};
- } else {
- $storedsections[0] = $enrollvar{sectionnums};
- }
foreach (@storedsections) {
if ($_ =~ m/^(\w+):(\w*)$/) {
push @currsections, $1;
@@ -1507,18 +1476,13 @@ sub print_notify_response {
my %settings = &Apache::lonnet::get('environment',['internal.notifylist','internal.coursecode'],$dom,$crs);
my $notifylist = $settings{'internal.notifylist'};
my $coursecode = $settings{'internal.coursecode'};
- my @currpeople = ();
+ my @currpeople = split(/,/,$notifylist);
my $notify = 0;
my @people = ();
my $peoplestr = "";
my $response = "";
my $noprocess = 0;
- if ($notifylist =~ m/,/) {
- @currpeople = split/,/,$notifylist;
- } else {
- $currpeople[0] = $notifylist;
- }
my $currcount = 0;
foreach (@currpeople) {
unless ($_ eq '') { $currcount ++; }
@@ -1593,10 +1557,8 @@ sub print_crosslistings_menu () {
my $xliststr = '';
my $response = '';
my $coursecode = $settings{'internal.coursecode'};
- if ($settings{'internal.crosslistings'} =~ m/,/) {
- @currxlists = split/,/,$settings{'internal.crosslistings'};
- } elsif ($settings{'internal.crosslistings'} ne '') {
- $currxlists[0] = $settings{'internal.crosslistings'};
+ if ($settings{'internal.crosslistings'} ne '') {
+ @currxlists = split(/,/,$settings{'internal.crosslistings'});
}
if (@currxlists > 0) {
@@ -1619,11 +1581,8 @@ sub print_crosslistings_menu () {
}
}
- if ($crosscount > 1) {
- $xliststr = join(",",@xlists);
- } else {
- $xliststr = $xlists[0];
- }
+ $xliststr = join(",",@xlists);
+
my %cenv = ('internal.crosslistings' => $xliststr);
my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs);
if ($reply !~ /^ok$/) {
@@ -1701,10 +1660,8 @@ sub print_crosslistings_response () {
my $warning = '';
my $warn_prefix = '';
- if ($xliststr =~ m/,/) {
- @allxlists = split/,/,$xliststr;
- } else {
- unless ($xliststr eq '') { $allxlists[0] = $xliststr; }
+ if ($xliststr ne '') {
+ @allxlists = split(/,/,$xliststr);
}
if ( exists($env{'form.numcross'}) ) {
@@ -1736,11 +1693,8 @@ sub print_crosslistings_response () {
if (@xlists > 0 ) {
unless ($xliststr eq '') { $xliststr .= ","; }
- if (@xlists > 1) {
- $xliststr .= join(",",@xlists);
- } else {
- $xliststr .= $xlists[0];
- }
+ $xliststr .= join(",",@xlists);
+
my %cenv = ('internal.crosslistings' => $xliststr);
my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs);
if ($reply !~ /^ok$/) {
@@ -1755,12 +1709,7 @@ sub print_crosslistings_response () {
}
} else {
if ($xliststr =~ m/:/) {
- my @oldxlists = ();
- if ($xliststr =~ m/,/) {
- @oldxlists = split/,/,$xliststr;
- } else {
- $oldxlists[0] = $xliststr;
- }
+ my @oldxlists = (split/,/,$xliststr);
$response .= "Although no new crosslistings were added, the courses listed below continue to be crosslisted with your LON-CAPA course.
\n";
foreach (@oldxlists) {
my ($xlist,$gp) = split/:/,$_;
@@ -1815,10 +1764,8 @@ sub print_sections_menu () {
my $warn_prefix = "";
my $coursecode = $settings{'internal.coursecode'};
my $owner = $settings{'internal.courseowner'};
- if ($settings{'internal.sectionnums'} =~ m/,/) {
- @currsections = split/,/,$settings{'internal.sectionnums'};
- } elsif ($settings{'internal.sectionnums'} ne '') {
- $currsections[0] = $settings{'internal.sectionnums'};
+ if ($settings{'internal.sectionnums'} ne '') {
+ @currsections = split(/,/,$settings{'internal.sectionnums'});
}
if ( exists($env{'form.secshow'}) ) {
@@ -1885,11 +1832,8 @@ sub print_sections_menu () {
}
}
- if ($seccount > 1) {
- $secstr = join(",",@sections);
- } else {
- $secstr = $sections[0];
- }
+ $secstr = join(",",@sections);
+
my %cenv = ('internal.sectionnums' => $secstr);
my $reply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs);
if ($reply !~ /^ok$/) {
@@ -1999,10 +1943,8 @@ sub print_sections_response () {
my $putreply = '';
my $warning = '';
my $warn_prefix = '';
- if ($secstr =~ m/,/) {
- @allsections = split/,/,$secstr;
- } else {
- unless ($secstr eq '') { $allsections[0] = $secstr; }
+ if ($secstr ne '') {
+ @allsections = split(/,/,$secstr);
}
if ( exists($env{'form.numsec'}) ) {
@@ -2035,11 +1977,7 @@ sub print_sections_response () {
if (@sections > 0 ) {
unless ($secstr eq '') { $secstr .= ","; }
- if (@sections > 1) {
- $secstr .= join(",",@sections);
- } else {
- $secstr .= $sections[0];
- }
+ $secstr .= join(",",@sections);
my %cenv = ('internal.sectionnums' => $secstr);
$putreply = &Apache::lonnet::put('environment',\%cenv,$dom,$crs);
if ($putreply !~ /^ok$/) {
@@ -2156,21 +2094,17 @@ sub print_update_result () {
my @currsections = ();
my @currxlists = ();
- if ($settings{'internal.sectionnums'} =~ m/,/) {
- @currsections = split/,/,$settings{'internal.sectionnums'};
- } elsif ($settings{'internal.sectionnums'} ne '') {
- $currsections[0] = $settings{'internal.sectionnums'};
+ if ($settings{'internal.sectionnums'} ne '') {
+ @currsections = split(/,/,$settings{'internal.sectionnums'});
}
- if ($settings{'internal.crosslistings'} =~ m/,/) {
- @currxlists = split/,/,$settings{'internal.crosslistings'};
- } elsif ($settings{'internal.crosslistings'} ne '') {
- $currxlists[0] = $settings{'internal.crosslistings'};
+ if ($settings{'internal.crosslistings'} ne '') {
+ @currxlists = split(/,/,$settings{'internal.crosslistings'});
}
if (@currxlists > 0) {
foreach (@currxlists) {
- if (m/^(\w+):(\w*)$/) {
+ if (m/^([^:]+):(\w*)$/) {
unless (grep/^$1$/,@allcourses) {
push @allcourses,$1;
$LC_code{$1} = $2;
@@ -2241,7 +2175,7 @@ sub print_viewclass_response {
my %otherdom = ();
my %lockchg = ();
my %nolockchg = ();
- my $classlist = &Apache::loncoursedata::get_classlist($cid,$dom,$crs);
+ my $classlist = &Apache::loncoursedata::get_classlist($dom,$crs);
my $endidx = &Apache::loncoursedata::CL_END;
my $startidx = &Apache::loncoursedata::CL_START;
my $ididx=&Apache::loncoursedata::CL_ID;
@@ -2323,7 +2257,7 @@ sub print_viewclass_response {
}
if ($chgtotal > 0) {
$response = "You requested a change in enrollment type for $chgtotal students.
\n";
- $classlist = &Apache::loncoursedata::get_classlist($cid,$dom,$crs);
+ $classlist = &Apache::loncoursedata::get_classlist($dom,$crs);
if ($chgok > 0) {
$response .= "The following $chgok changes were successful:
";
$response .= &enrolltype_result(\%chg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx);
@@ -2340,7 +2274,7 @@ sub print_viewclass_response {
}
if ($locktotal > 0) {
$response .= "You requested locking/unlocking for $locktotal manually enrolled students.
\n";
- $classlist = &Apache::loncoursedata::get_classlist($cid,$dom,$crs);
+ $classlist = &Apache::loncoursedata::get_classlist($dom,$crs);
if ($lockok > 0) {
$response .= "The following $lockok changes were successful:
";
$response .= &enrolltype_result(\%lockchg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx);