--- loncom/interface/lonmodifycourse.pm	2005/04/07 06:56:23	1.16
+++ loncom/interface/lonmodifycourse.pm	2006/02/10 23:36:47	1.21
@@ -1,3 +1,8 @@
+# The LearningOnline Network with CAPA
+# automated enrollment course setup handler
+#
+# $Id: lonmodifycourse.pm,v 1.21 2006/02/10 23:36:47 albertel Exp $
+#
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -45,7 +50,7 @@ sub print_course_selection_page {
     );
                                                                                       
 # Determine the courses
-    my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1,'.','.');
+    my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1,'.','.','.');
     &print_header($r,$tasklongref);
     $r->print(<<ENDBLOCK);
 <form action="/adm/modifycourse" method="post" name="cmod">
@@ -142,7 +147,6 @@ sub print_course_modification_page {
     } else {
         $ok_course = &check_course($dom,$course);
     }
-    print STDERR "Response was $ok_course for $dom,$course\n";
 
     unless ($ok_course eq 'ok') {
         &print_header($r,$tasklongref,'',\$javascript_validations);
@@ -191,26 +195,31 @@ all settings except course code, course
     $enrollvar{'autharg'} = '';
     $enrollvar{'authtype'} = '';
     foreach my $item (keys %settings) {
-        if ($item =~ m/^internal\.(.+)$/) {
-            if ( ($1 eq "autoadds") || ($1 eq "autodrops") ) {
+	if ($item =~ m/^internal\.(.+)$/) {
+	    my $type = $1;
+
+            if ( ($type eq "autoadds") || ($type eq "autodrops") ) {
 	        if ($settings{$item} == 1) {
-	            $enrollvar{$1} = "ON";
+	            $enrollvar{$type} = "ON";
 	        } else {
-	            $enrollvar{$1} = "OFF";
+	            $enrollvar{$type} = "OFF";
 	        }
-            } elsif ( ($1 eq "autostart") || ($1 eq "autoend") ) {
-	        if ( ($1 eq "autoend") && ($settings{$item} == 0) ) {
-	            $enrollvar{$1} = $lt{'noen'};
+            } elsif ( ($type eq "autostart") || ($type eq "autoend") ) {
+	        if ( ($type eq "autoend") && ($settings{$item} == 0) ) {
+	            $enrollvar{$type} = $lt{'noen'};
 	        } else {
-	            $enrollvar{$1} = localtime($settings{$item});
+	            $enrollvar{$type} = localtime($settings{$item});
 	        }
-            } elsif ($1 eq "courseowner" || $1 eq "authtype" || $1 eq "autharg" || $1 eq "sectionnums" || $1 eq "coursecode" || $1 eq "crosslistings") {
-	        $enrollvar{$1} = $settings{$item};
+            } elsif ($type eq "courseowner"   || $type eq "authtype" 
+		     || $type eq "autharg"    || $type eq "sectionums"
+		     || $type eq "coursecode" || $type eq "crosslistings") {
+	        $enrollvar{$type} = $settings{$item};
             }
         } elsif ($item =~ m/^default_enrollment_(start|end)_date$/) {
-            if ( ($1 eq 'end') && ($settings{$item} == 0) ) {
+	    my $type = $1;
+            if ( ($type eq 'end') && ($settings{$item} == 0) ) {
                 $enrollvar{$item} = $lt{'noen'};
-            } elsif ( ($1 eq 'start') && ($settings{$item} eq '') ) {
+            } elsif ( ($type eq 'start') && ($settings{$item} eq '') ) {
                 $enrollvar{$item} = 'When enrolled';
             } else {
                 $enrollvar{$item} = localtime($settings{$item});
@@ -227,8 +236,8 @@ all settings except course code, course
         my @roleinfo = split/:/,$_;
         if ( ($roleinfo[0] eq 'cc')  && ($roleinfo[2] eq $dom) )  {
             unless (grep/^$roleinfo[1]$/,@local_ccs) {
-                $active_cc = &LONCAPA::Enrollment::check_user_status($roleinfo[2],$roleinfo[1],$dom,$course,'cc');
-                if ($active_cc eq 'ok') {
+                $active_cc = &Apache::loncommon::check_user_status($roleinfo[2],$roleinfo[1],$dom,$course,'cc');
+                if ($active_cc eq 'active') {
                     push @local_ccs, $roleinfo[1];
                     $pname{$roleinfo[1]} = &Apache::loncommon::plainname($roleinfo[1],$roleinfo[2]);
                     $cc_status{$roleinfo[1]} = $lt{'actv'};
@@ -239,8 +248,8 @@ all settings except course code, course
     unless ( (grep/^$enrollvar{'courseowner'}$/,@local_ccs) || ($enrollvar{'courseowner'} eq '') )  {
         push @local_ccs, $enrollvar{'courseowner'};
         $pname{$enrollvar{'courseowner'}} =  &Apache::loncommon::plainname($enrollvar{'courseowner'},$dom);
-        $active_cc = &LONCAPA::Enrollment::check_user_status($dom,$enrollvar{'coursecode'},$dom,$course,'cc');
-        if ($active_cc eq 'ok') {
+        $active_cc = &Apache::loncommon::check_user_status($dom,$enrollvar{'coursecode'},$dom,$course,'cc');
+        if ($active_cc eq 'active') {
             $cc_status{$enrollvar{'courseowner'}} = $lt{'actv'};
         } else {
             $cc_status{$enrollvar{'courseowner'}} = $lt{'inac'};
@@ -702,7 +711,7 @@ ENDBASE
 
 sub check_course {
     my ($dom,$course) = @_;
-    my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1,'.','.');
+    my %courseIDs = &Apache::lonnet::courseiddump($dom,'.',1,'.','.','.');
     foreach my $key (sort keys %courseIDs) {
         if ($key =~ m/^($dom)_(\w+)$/) {
             if ($2 eq $course) {