--- loncom/interface/lonpopulate.pm 2005/04/07 07:34:52 1.24 +++ loncom/interface/lonpopulate.pm 2005/11/04 15:03:29 1.28 @@ -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.28 2005/11/04 15:03:29 albertel 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,9 @@ 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 +534,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) { @@ -591,7 +566,7 @@ ENDTWO $notifystate{$viewer} = 0; } - my $notifyshow = @ccs; + my $notifyshow = join(' ',@ccs); if (@ccs > 0) { @ccs = sort @ccs; @@ -657,13 +632,11 @@ 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; + my $cross_str = join(' ',@xlists); $r->print("