--- loncom/interface/lonpickcourse.pm	2006/03/16 21:54:40	1.41
+++ loncom/interface/lonpickcourse.pm	2006/05/30 12:46:09	1.47
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.41 2006/03/16 21:54:40 albertel Exp $
+# $Id: lonpickcourse.pm,v 1.47 2006/05/30 12:46:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -34,6 +34,9 @@ use Apache::loncommon;
 use Apache::loncoursedata;
 use Apache::lonnet;
 use Apache::lonlocal;
+use Apache::longroup;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 sub handler {
     my $r = shift;
@@ -96,18 +99,18 @@ sub handler {
                       ['-1','86400','604800','2592000','7776000',
 		      '15552000','31104000']));
 # if called from loncreateuser, report sections, then close
-    my ($loaditem,$seclist);
+    my (%loaditem,$seclist,$groupslist);
     my $num_sections = 0;
     if ($env{'form.form'} eq 'cu' && $env{'form.pickedcourse'}) {
-        $loaditem = 'onLoad="setSections()"';
+        $loaditem{'onload'} ="setSections()";
         my ($cdom,$cnum) = split/_/,$env{'form.pickedcourse'};
-        my %sections_count = ();
-        $num_sections = &Apache::loncommon::get_sections($cdom,$cnum,\%sections_count);
-        my @sections = ();
-        if ($num_sections > 0) {
-            @sections = (sort {$a <=> $b} keys(%sections_count));
-            $seclist = join('","',@sections);
-        }
+
+        my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
+        my @sections =  (sort {$a <=> $b} keys(%sections_count));
+	$seclist = join('","',@sections);
+
+        my %curr_groups = &Apache::longroup::coursegroups($cdom,$cnum);
+	$groupslist = join(',',sort(keys(%curr_groups)));
     }
     my $jscript;
     my $title = 'Selecting a course';
@@ -120,7 +123,7 @@ sub handler {
         $multelement = '<input type="hidden" name="multiple" value="'.$multiple.'" />';
     }
     $r->print(&Apache::loncommon::start_page($title,undef,
-					     {'add_entries' => $loaditem,
+					     {'add_entries' => \%loaditem,
 					      'no_nav_bar'  => 1, }));
     my %lt=&Apache::lonlocal::texthash(
 				       'cac' => 'Course Activity',
@@ -236,6 +239,7 @@ function setSections() {
             opener.document.$env{"form.form"}.currsec.options[0].selected = false
         }
     }
+    opener.document.$env{"form.form"}.groups.value='$groupslist';
     self.close()
 }
 
@@ -284,9 +288,9 @@ ENDSCRIPT
 	foreach my $course (keys(%courses)) {
             my $descr;
             if ($courses{$course} =~ m/^([^:]*):/i) {
-                $descr = &Apache::lonnet::unescape($1);
+                $descr = &unescape($1);
             } else {
-                $descr = &Apache::lonnet::unescape($courses{$course});
+                $descr = &unescape($courses{$course});
             }
             my $description = $descr;
             push (@{$by_descrip{$description}}, $course);
@@ -309,10 +313,10 @@ ENDSCRIPT
 		      ($Apache::lonnet::domaindescription{$cdom}?
                        $Apache::lonnet::domaindescription{$cdom}:$cdom).")");
                 unless ($instcode eq '') {
-                    $r->print(" - ".&Apache::lonnet::unescape($instcode));
+                    $r->print(" - ".&unescape($instcode));
                 }
                 unless ($owner eq '') {
-                    $r->print(", owner - ".&Apache::lonnet::unescape($owner));
+                    $r->print(", owner - ".&unescape($owner));
                 }
 		if ($multiple) { $r->print("</label>\n"); }
                 $r->print("<br />\n");