--- loncom/interface/lonmodifycourse.pm 2005/09/16 16:01:18 1.19 +++ loncom/interface/lonmodifycourse.pm 2006/03/23 22:32:10 1.24 @@ -1,3 +1,8 @@ +# The LearningOnline Network with CAPA +# automated enrollment course setup handler +# +# $Id: lonmodifycourse.pm,v 1.24 2006/03/23 22:32:10 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}); @@ -246,7 +259,7 @@ all settings except course code, course } } my $numlocalcc = @local_ccs; - my $bodytag=&Apache::loncommon::bodytag(&mt("Modify Course Settings")); + my $helplink=&Apache::loncommon::help_open_topic('Modify_Course',&mt("Help on Modifying Courses")); my ($krbdef,$krbdefdom)=&Apache::loncommon::get_kerberos_defaults($dom); my $curr_authtype = ''; @@ -635,7 +648,6 @@ sub modify_course { sub print_header { my ($r,$tasklongref,$description,$javascriptref) = @_; my %lt =&Apache::lonlocal::texthash( - 'vmcs' => 'View/Modify Course Settings', 'chco' => 'Choose a course', 'main' => 'Main Menu', 'comg' => 'Course Manager', @@ -648,7 +660,7 @@ sub print_header { $description = $lt{'comg'}; } my $page = ''; - my $bodytag=&Apache::loncommon::bodytag($lt{'vmcs'}); + if ($action eq 'start') { $page = "$lt{'chco'}"; } else { @@ -660,21 +672,16 @@ sub print_header { $page .= " -> ".$$tasklongref{$action}.""; } } - my $html=&Apache::lonxml::xmlbegin(); - $r->print(" -$html -
-"); + + my $js; if ($action eq 'display') { - $r->print(" -"); + $js = ''; } + $r->print(&Apache::loncommon::start_page('View/Modify Course Settings', + $js)); $r->print(<
@@ -690,12 +697,8 @@ ENDTHIS
}
sub print_footer {
- my $r = shift;
- $r->print(< |