--- loncom/interface/lonhelper.pm	2006/05/15 22:01:12	1.149
+++ loncom/interface/lonhelper.pm	2006/05/30 21:54:22	1.154
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # .helper XML handler to implement the LON-CAPA helper
 #
-# $Id: lonhelper.pm,v 1.149 2006/05/15 22:01:12 foxr Exp $
+# $Id: lonhelper.pm,v 1.154 2006/05/30 21:54:22 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -183,7 +183,9 @@ use Apache::File;
 use Apache::lonxml;
 use Apache::lonlocal;
 use Apache::lonnet;
+use Apache::longroup;
 use Apache::lonselstudent;
+use LONCAPA;
 
 # Register all the tags with the helper, so the helper can 
 # push and pop them
@@ -362,6 +364,7 @@ use Apache::loncommon;
 use Apache::File;
 use Apache::lonlocal;
 use Apache::lonnet;
+use LONCAPA;
 
 sub new {
     my $proto = shift;
@@ -467,9 +470,8 @@ sub _saveVars {
 sub _varsInFile {
     my $self = shift;
     my @vars = ();
-    for my $key (keys %{$self->{VARS}}) {
-        push @vars, &Apache::lonnet::escape($key) . '=' .
-            &Apache::lonnet::escape($self->{VARS}->{$key});
+    for my $key (keys(%{$self->{VARS}})) {
+        push(@vars, &escape($key) . '=' . &escape($self->{VARS}->{$key}));
     }
     return join ('&', @vars);
 }
@@ -2341,7 +2343,8 @@ sub render {
     my ($course_personnel, 
 	$current_members, 
 	$expired_members, 
-	$future_members) = &Apache::lonselstudent::get_people_in_class();
+	$future_members) = 
+	    &Apache::lonselstudent::get_people_in_class($env{'request.course.sec'});
 
 
 
@@ -2848,7 +2851,7 @@ sub start_section {
     return if ($token->[2]{'onlysections'});
 
     # add in groups to the end of the list
-    my %curr_groups = &Apache::loncommon::coursegroups();
+    my %curr_groups = &Apache::longroup::coursegroups();
     foreach my $group_name (sort(keys(%curr_groups))) {
 	push(@{$paramHash->{CHOICES}}, [$group_name, $group_name]);
     }
@@ -2912,7 +2915,7 @@ sub start_group {
     # Populate the CHOICES element
     my %choices;
 
-    my %curr_groups = &Apache::loncommon::coursegroups();
+    my %curr_groups = &Apache::longroup::coursegroups();
     foreach my $group_name (sort {lc($a) cmp lc($b)} (keys(%curr_groups))) {
 	push(@{$paramHash->{CHOICES}}, [$group_name, $group_name]);
     }
@@ -3400,8 +3403,10 @@ sub render {
     if ($vars->{GRANULARITY} eq 'whole_course') {
         $resourceString .= '<li>'.&mt('for <b>all resources in the course</b>').'</li>';
 	if ($vars->{TARGETS} eq 'course') {
-	    $level = 11; # general course, see lonparmset.pm perldoc
+	    $level = 14; # general course, see lonparmset.pm perldoc
 	} elsif ($vars->{TARGETS} eq 'section') {
+	    $level = 9;
+	} elsif ($vars->{TARGETS} eq 'group') {
 	    $level = 6;
 	} else {
 	    $level = 3;
@@ -3416,8 +3421,10 @@ sub render {
         $symb = $res->symb();
         $resourceString .= '<li>'.&mt('for the map named [_1]',"<b>$title</b>").'</li>';
 	if ($vars->{TARGETS} eq 'course') {
-	    $level = 10; # general course, see lonparmset.pm perldoc
+	    $level = 13; # general course, see lonparmset.pm perldoc
 	} elsif ($vars->{TARGETS} eq 'section') {
+	    $level = 8;
+	} elsif ($vars->{TARGETS} eq 'group') {
 	    $level = 5;
 	} else {
 	    $level = 2;
@@ -3433,8 +3440,10 @@ sub render {
         my $title = $res->compTitle();
         $resourceString .= '<li>'.&mt('for the resource named [_1] part [_2]',"<b>$title</b>","<b>$part</b>").'</li>';
 	if ($vars->{TARGETS} eq 'course') {
-	    $level = 7; # general course, see lonparmset.pm perldoc
+	    $level = 10; # general course, see lonparmset.pm perldoc
 	} elsif ($vars->{TARGETS} eq 'section') {
+	    $level = 7;
+	} elsif ($vars->{TARGETS} eq 'group') {
 	    $level = 4;
 	} else {
 	    $level = 1;