--- loncom/interface/lonmodifycourse.pm	2005/04/27 19:09:30	1.18
+++ loncom/interface/lonmodifycourse.pm	2006/02/10 23:38:15	1.22
@@ -1,3 +1,8 @@
+# The LearningOnline Network with CAPA
+# automated enrollment course setup handler
+#
+# $Id: lonmodifycourse.pm,v 1.22 2006/02/10 23:38:15 albertel Exp $
+#
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -190,26 +195,34 @@ 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 "sectionums") {
+		$enrollvar{$type} = $settings{$item};
+		$enrollvar{$type} =~ s/,/, /g;
+            } elsif ($type eq "courseowner"   || $type eq "authtype" 
+		     || $type eq "autharg"    || $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});
@@ -226,8 +239,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'};
@@ -238,8 +251,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'};