--- loncom/interface/lonmodifycourse.pm	2004/11/27 17:23:09	1.14
+++ loncom/interface/lonmodifycourse.pm	2006/03/16 21:39:26	1.23
@@ -1,3 +1,8 @@
+# The LearningOnline Network with CAPA
+# automated enrollment course setup handler
+#
+# $Id: lonmodifycourse.pm,v 1.23 2006/03/16 21:39:26 albertel Exp $
+#
 # Copyright Michigan State University Board of Trustees
 #
 # This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -33,7 +38,7 @@ use lib '/home/httpd/lib/perl';
 
 sub print_course_selection_page {
     my ($r,$tasklongref) = @_;
-    my $dom = $ENV{'request.role.domain'};
+    my $dom = $env{'request.role.domain'};
     my %lt=&Apache::lonlocal::texthash(
                     'csae' => "Course settings for automated enrollment",
                     'unst' => "Unlike standard LON-CAPA course parameters, such as course description, feedback addresses, and top level map, which are displayed and/or modified using the 'Course Environment Parameters' screen, settings that control automated enrollment based on classlist data available from your institution's student information system are handled differently.  Automated enrollment settings fall into two groups: (a) settings that can be modified by a Course Coordinator using the Automated Enrollment Manager and (b)  settings that may only be modified by a Domain Coordinator via the 'View/Modify Course settings' menu accessed from this page.", 
@@ -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">
@@ -132,9 +137,9 @@ sub print_course_modification_page {
     my %enrollvar = ();
     my $javascript_validations;
     my $course = '';
-    my $dom = $ENV{'request.role.domain'};
-    if ( defined($ENV{'form.course'}) ) {
-        $course = $ENV{'form.course'};
+    my $dom = $env{'request.role.domain'};
+    if ( defined($env{'form.course'}) ) {
+        $course = $env{'form.course'};
     }
     my $ok_course = 'ok';
     if ( ($course == -1) || ($course == '-2') || ($course eq '') ) {
@@ -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,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});
@@ -227,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'};
@@ -239,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'};
@@ -437,8 +449,8 @@ ENDDOCUMENT
 
 sub modify_course {
     my ($r,$tasklongref,$typeref) = @_;
-    my $dom = $ENV{'user.domain'};
-    my $crs = $ENV{'form.course'};
+    my $dom = $env{'user.domain'};
+    my $crs = $env{'form.course'};
     unless ( &check_course($dom,$crs) eq 'ok' ) {
         &print_header($r,$tasklongref);
         my $reply = "<br/>".&mt("The LON-CAPA course selected was not a valid course for this domain");
@@ -486,19 +498,19 @@ sub modify_course {
     my $description = $settings{'description'};
     my %cenv = ();
 
-    if ($ENV{'form.login'} eq 'krb') {
-        $newattr{'authtype'} = $ENV{'form.login'};
-        $newattr{'authtype'} .= $ENV{'form.krbver'};
-        $newattr{'autharg'} = $ENV{'form.krbarg'};
-    } elsif ($ENV{'form.login'} eq 'int') {
+    if ($env{'form.login'} eq 'krb') {
+        $newattr{'authtype'} = $env{'form.login'};
+        $newattr{'authtype'} .= $env{'form.krbver'};
+        $newattr{'autharg'} = $env{'form.krbarg'};
+    } elsif ($env{'form.login'} eq 'int') {
         $newattr{'authtype'} ='internal';
-        if ((defined($ENV{'form.intarg'})) && ($ENV{'form.intarg'})) {
-            $newattr{'autharg'} = $ENV{'form.intarg'};
+        if ((defined($env{'form.intarg'})) && ($env{'form.intarg'})) {
+            $newattr{'autharg'} = $env{'form.intarg'};
         }
-    } elsif ($ENV{'form.login'} eq 'loc') {
+    } elsif ($env{'form.login'} eq 'loc') {
         $newattr{'authtype'} = 'localauth';
-        if ((defined($ENV{'form.locarg'})) && ($ENV{'form.locarg'})) {
-            $newattr{'autharg'} = $ENV{'form.locarg'};
+        if ((defined($env{'form.locarg'})) && ($env{'form.locarg'})) {
+            $newattr{'autharg'} = $env{'form.locarg'};
         }
     }
     if ( $newattr{'authtype'}=~ /^krb/) {
@@ -508,21 +520,21 @@ sub modify_course {
         }
     }
 
-    if ( exists($ENV{'form.courseowner'}) ) {
-        $newattr{'courseowner'}=$ENV{'form.courseowner'};
+    if ( exists($env{'form.courseowner'}) ) {
+        $newattr{'courseowner'}=$env{'form.courseowner'};
         unless ( $newattr{'courseowner'} eq $currattr{'courseowner'} ) {
             $changeowner = 1;
         } 
     }
 													      
-    if ( exists($ENV{'form.coursecode'}) ) {
-        $newattr{'coursecode'}=$ENV{'form.coursecode'};
+    if ( exists($env{'form.coursecode'}) ) {
+        $newattr{'coursecode'}=$env{'form.coursecode'};
         unless ( $newattr{'coursecode'} eq $currattr{'coursecode'} ) {
             $changecode = 1;
         }
     }
     if ($changeowner == 1 || $changecode == 1) {
-        my $courseid_entry = &Apache::lonnet::escape($dom.'_'.$crs).'='.&Apache::lonnet::escape($description).':'.&Apache::lonnet::escape($ENV{'form.coursecode'}).':'.&Apache::lonnet::escape($ENV{'form.courseowner'});
+        my $courseid_entry = &Apache::lonnet::escape($dom.'_'.$crs).'='.&Apache::lonnet::escape($description).':'.&Apache::lonnet::escape($env{'form.coursecode'}).':'.&Apache::lonnet::escape($env{'form.courseowner'});
         &Apache::lonnet::courseidput($dom,$courseid_entry,&Apache::lonnet::homeserver($crs,$dom));
     }
 
@@ -642,8 +654,8 @@ sub print_header {
              'comg' => 'Course Manager',
              );
     my $action = "start";
-    if ( exists($ENV{'form.action'}) ) {
-        $action = $ENV{'form.action'};
+    if ( exists($env{'form.action'}) ) {
+        $action = $env{'form.action'};
     }
     if ( ($description eq '') || (!defined($description)) ) {
         $description = $lt{'comg'};
@@ -655,25 +667,22 @@ sub print_header {
     } else {
         $page =  '<a href="/adm/modifycourse">'.$lt{'chco'}.'</a>';
         if ( $action eq 'process' ) {
-            my $course = $ENV{'form.course'};
+            my $course = $env{'form.course'};
             $page .= "-&gt; <a href=\"/adm/modifycourse?action=display&course=$course\">".$$tasklongref{'display'}."</a> -&gt; <b>$$tasklongref{$action}</b> ";
         } else {
             $page .=  " -&gt; <b>".$$tasklongref{$action}."</b>";
         }
     }
-    $r->print("
-<html>
-<head>");
+    my $html=&Apache::lonxml::xmlbegin();
+    my $js;
     if ($action eq 'display') {
-        $r->print("
-<script language=\"JavaScript\" type=\"text/javascript\">
-$$javascriptref
-</script>");
+	$js = '<script  type="text/javascript">
+                  '.$$javascriptref.'
+               </script>';
     }
+    $r->print(&Apache::loncommon::start_page('View/Modify Course Settings',
+					     $js));
     $r->print(<<ENDTHIS);
-<title>The LearningOnline Network with CAPA</title>
-</head>
-$bodytag
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
  <tr>
   <td bgcolor="#CCCC99">
@@ -689,18 +698,14 @@ ENDTHIS
 }
 
 sub print_footer {
-    my $r = shift;
-    $r->print(<<ENDBASE);
-<br/>
-</body>
-</html>
-ENDBASE
+    my ($r) = @_;
+    $r->print('<br />'.&Apache::loncommon::end_page());
     return;
 }
 
 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) {
@@ -720,12 +725,12 @@ sub handler {
         return OK;
     }
                                                                                   
-    if (&Apache::lonnet::allowed('ccc',$ENV{'request.role.domain'})) {
+    if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
         &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
 
         &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['action','course']);
-        my $dom = $ENV{'user.domain'};
+        my $dom = $env{'user.domain'};
         my %longtype=&Apache::lonlocal::texthash(
                        'authtype' => 'Default authentication method',
                        'autharg'  => 'Default authentication parameter',
@@ -747,15 +752,15 @@ sub handler {
                         'process'  => 'Results of changes',
                        );
                                                                                   
-        if ($ENV{'form.action'} eq 'process') {
+        if ($env{'form.action'} eq 'process') {
             &modify_course($r,\%tasklong,\%longtype);
-        } elsif ($ENV{'form.action'} eq 'display')  {
+        } elsif ($env{'form.action'} eq 'display')  {
             &print_course_modification_page($r,\%tasklong,\%longtype);
         } else {
             &print_course_selection_page($r,\%tasklong);
         }
     } else {
-        $ENV{'user.error.msg'}=
+        $env{'user.error.msg'}=
         "/adm/modifycourse:ccc:0:0:Cannot modify course settings";
         return HTTP_NOT_ACCEPTABLE;
     }