--- loncom/interface/lonmodifycourse.pm 2005/02/17 08:29:43 1.15 +++ loncom/interface/lonmodifycourse.pm 2005/04/07 06:56:23 1.16 @@ -33,7 +33,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.", @@ -132,9 +132,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 '') ) { @@ -437,8 +437,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 = "
".&mt("The LON-CAPA course selected was not a valid course for this domain"); @@ -486,19 +486,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 +508,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 +642,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,7 +655,7 @@ sub print_header { } else { $page = ''.$lt{'chco'}.''; if ( $action eq 'process' ) { - my $course = $ENV{'form.course'}; + my $course = $env{'form.course'}; $page .= "-> ".$$tasklongref{'display'}." -> $$tasklongref{$action} "; } else { $page .= " -> ".$$tasklongref{$action}.""; @@ -722,12 +722,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', @@ -749,15 +749,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; }