--- loncom/interface/lonsource.pm 2005/04/07 04:46:36 1.10 +++ loncom/interface/lonsource.pm 2005/04/07 06:56:23 1.11 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Souce Code handler # -# $Id: lonsource.pm,v 1.10 2005/04/07 04:46:36 albertel Exp $ +# $Id: lonsource.pm,v 1.11 2005/04/07 06:56:23 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -31,7 +31,7 @@ package Apache::lonsource; use strict; -use Apache::lonnet(); +use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon(); use Apache::lonsequence(); @@ -78,12 +78,12 @@ sub copy_stage { my $author_name; #Figure out if we are author or co-author - if($ENV{'request.role'} =~ m|ca.|) { - ($role, $domain, $author_name) = split(/\//,$ENV{'request.role'}); + if($env{'request.role'} =~ m|ca.|) { + ($role, $domain, $author_name) = split(/\//,$env{'request.role'}); } else { $role = "au."; - $domain = $ENV{'user.domain'}; - $author_name = $ENV{'user.name'}; + $domain = $env{'user.domain'}; + $author_name = $env{'user.name'}; } my $path_to_new_file = '/home/'.$author_name.'/public_html/'.$newpath.'/'.$listname; @@ -208,28 +208,28 @@ sub handler { my $r=shift; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['filename','listname']); - my $filename = $ENV{'form.filename'}; - my $listname = $ENV{'form.listname'}; + my $filename = $env{'form.filename'}; + my $listname = $env{'form.listname'}; my $source = &Apache::lonnet::metadata($filename,'sourceavail'); if ($source ne 'open') { - $ENV{'user.error.msg'}="$filename:cre:1:1:Source code not available"; + $env{'user.error.msg'}="$filename:cre:1:1:Source code not available"; return HTTP_NOT_ACCEPTABLE; } if ((!&Apache::lonnet::allowed('cre',$filename)) || (!&Apache::lonnet::allowed('bre',$filename))) { - $ENV{'user.error.msg'}="$filename:bre:1:1:Access to resource denied"; + $env{'user.error.msg'}="$filename:bre:1:1:Access to resource denied"; return HTTP_NOT_ACCEPTABLE; } - if ($ENV{'form.action'} eq 'stage2') { + if ($env{'form.action'} eq 'stage2') { my $author = &Apache::lonnet::metadata($filename,'authorspace'); ($author) = split('@',$author); #strip the domain of the author name - &stage_2($r, $ENV{'form.filename'}, $author, $listname); - } elsif($ENV{'form.action'} eq 'copy_stage') { - ©_stage($r, $filename,$ENV{'form.listname'},$ENV{'form.newpath'}); - } elsif($ENV{'form.action'} eq 'delete_confirm') { + &stage_2($r, $env{'form.filename'}, $author, $listname); + } elsif($env{'form.action'} eq 'copy_stage') { + ©_stage($r, $filename,$env{'form.listname'},$env{'form.newpath'}); + } elsif($env{'form.action'} eq 'delete_confirm') { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - &delete_copy_file($r, $ENV{'form.author'}, $ENV{'form.newpath'}, $ENV{'form.filename'}, $ENV{'form.path'}, '0'); + &delete_copy_file($r, $env{'form.author'}, $env{'form.newpath'}, $env{'form.filename'}, $env{'form.path'}, '0'); } else { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; @@ -241,7 +241,7 @@ sub handler { '); $r->print('
'); - &print_item($r, $ENV{'form.filename'}); + &print_item($r, $env{'form.filename'}); } return OK; }