--- loncom/interface/lonsource.pm 2004/07/08 20:17:59 1.8 +++ loncom/interface/lonsource.pm 2005/07/08 10:39:49 1.15 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Souce Code handler # -# $Id: lonsource.pm,v 1.8 2004/07/08 20:17:59 taceyjo1 Exp $ +# $Id: lonsource.pm,v 1.15 2005/07/08 10:39:49 www 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(); @@ -43,8 +43,7 @@ use HTML::Entities; sub make_link { my ($filename, $listname) = @_; - my $sourcelink = "http://".$ENV{'SERVER_NAME'}. - "/adm/source/?filename=".$filename."&listname=".$listname; + my $sourcelink = "/adm/source?filename=".$filename."&listname=".$listname; return $sourcelink; } @@ -55,15 +54,16 @@ sub stage_2 { &Apache::loncommon::content_type($r,'text/html'); my ($uname, $udom) = &Apache::loncacc::constructaccess('/~'.$author.'/',$r->dir_config('lonDefDomain')); $r->send_http_header; - $r->print('LON-CAPA Move source to construction space'); + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.'LON-CAPA Move source to construction space'); $r->print(&Apache::loncommon::bodytag('Problem source code moving operation')); $r->print("Please enter the directory that you would like the source code to go into, a default has also been provided
"); $r->print("Also note, the path is in reference to the root of your construction space, and new directories will be automatically created.

"); - $r->print('
+ $r->print(' -   +  
'); return OK; @@ -77,12 +77,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; @@ -94,7 +94,8 @@ sub copy_stage { } &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print('LON-CAPA Move source to construction space'); + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.'LON-CAPA Move source to construction space'); $r->print(&Apache::loncommon::bodytag('Copying Source')); my $result = &Apache::loncfile::exists($uname, $udom, $path_to_new_file); $r->print($result); @@ -113,7 +114,7 @@ sub copy_stage { sub confirm { my ($r, $author_name, $newpath, $filename, $path_to_new_file) = @_; $r->print("Press delete to remove file and replace it with a copy of the source you are viewing

"); - $r->print('
+ $r->print(' @@ -206,33 +207,32 @@ 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"; + unless ((&Apache::lonnet::allowed('bre',$filename)) && + (&Apache::lonnet::allowed('cre','/'))) { + $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 =~ m|@|; - $author = $`; #This just tells who the author name is for later processing. - &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') { + ($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') { &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; - $r->print(' + $r->print(' @@ -240,7 +240,7 @@ sub handler {
'); $r->print('
'); - &print_item($r, $ENV{'form.filename'}); + &print_item($r, $env{'form.filename'}); } return OK; }