--- loncom/interface/lonpopulate.pm	2005/09/14 21:25:52	1.25
+++ loncom/interface/lonpopulate.pm	2005/10/04 18:27:32	1.27
@@ -1,5 +1,5 @@
 # automated enrollment configuration handler
-# $Id: lonpopulate.pm,v 1.25 2005/09/14 21:25:52 raeburn Exp $
+# $Id: lonpopulate.pm,v 1.27 2005/10/04 18:27:32 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -540,8 +540,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) {
@@ -2222,7 +2222,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;
@@ -2304,7 +2304,7 @@ sub print_viewclass_response {
     }
     if ($chgtotal > 0) {
         $response = "You requested a change in enrollment type for $chgtotal students.<br /><br />\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:<br />";
             $response .= &enrolltype_result(\%chg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx);
@@ -2321,7 +2321,7 @@ sub print_viewclass_response {
     }
     if ($locktotal > 0) {
         $response .= "You requested locking/unlocking for $locktotal manually enrolled students.<br /><br />\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:<br />";
             $response .= &enrolltype_result(\%lockchg,$classlist,$endidx,$startidx,$ididx,$secidx,$typeidx,$lockedidx);