--- loncom/interface/lonsource.pm 2005/06/23 23:24:53 1.13 +++ loncom/interface/lonsource.pm 2009/08/13 11:00:38 1.24 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA -# Souce Code handler +# Source Code handler # -# $Id: lonsource.pm,v 1.13 2005/06/23 23:24:53 www Exp $ +# $Id: lonsource.pm,v 1.24 2009/08/13 11:00:38 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,31 +40,30 @@ use Apache::lonmeta; use Apache::File; use Apache::lonlocal; use HTML::Entities; +use LONCAPA; sub make_link { my ($filename, $listname) = @_; - my $sourcelink = "/adm/source?filename=".$filename."&listname=".$listname; + my $sourcelink = "/adm/source?inhibitmenu=yes&filename=".$filename."&listname=".$listname; return $sourcelink; } sub stage_2 { my ($r, $filename, $author, $listname) = @_; - $filename = $filename; - &Apache::loncommon::content_type($r,'text/html'); my ($uname, $udom) = &Apache::loncacc::constructaccess('/~'.$author.'/',$r->dir_config('lonDefDomain')); - $r->send_http_header; - 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(&Apache::loncommon::start_page('Copy Problem Source Code to Construction Space') + .&mt('Please enter the directory that you would like the source code to go into.') + .'

' + .&mt('Note: the path is in reference to the root of your construction space,' + .' and new directories will be automatically created.') + .'

'); $r->print('
-   - +   +
'); return OK; } @@ -72,12 +71,12 @@ sub stage_2 { sub copy_stage { my ($r, $filename, $listname, $newpath) = @_; + +#Figure out if we are author or co-author my $role; my $domain; my $author_name; -#Figure out if we are author or co-author - - if($env{'request.role'} =~ m|ca.|) { + if ($env{'request.role'} =~ m{^ca\.}) { ($role, $domain, $author_name) = split(/\//,$env{'request.role'}); } else { $role = "au."; @@ -89,26 +88,28 @@ sub copy_stage { #Just checking again for access as we want to make sure that it is really ok now that we have the real path my ($uname,$udom)= &Apache::loncacc::constructaccess($path_to_new_file,$domain); - unless (($uname) && ($udom)) { - return HTTP_NOT_ACCEPTABLE; + + if (!$uname || !$udom) { + $r->print(&Apache::loncommon::start_page('Not Allowed')); + $r->print(&mt('Not allowed to create file [_1]', $path_to_new_file)); + $r->print(&Apache::loncommon::end_page()); + return; } - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - my $html=&Apache::lonxml::xmlbegin(); - $r->print($html.'LON-CAPA Move source to construction space'); - $r->print(&Apache::loncommon::bodytag('Copying Source')); + + + #allowed + $r->print(&Apache::loncommon::start_page('Copying Source')); my $result = &Apache::loncfile::exists($uname, $udom, $path_to_new_file); $r->print($result); if(($result) && ($result =~ m|published|) ) { - &delete_copy_file($r, $author_name, $newpath, $filename, $path_to_new_file, '1'); + &delete_copy_file($r, $author_name, $newpath, $filename, $path_to_new_file, '1'); } elsif(($result) && ($result =~ m|exists!|)) { - &confirm($r, $author_name, $newpath, $filename, $path_to_new_file); + &confirm($r, $author_name, $newpath, $filename, $path_to_new_file); } else { - ©_file($r, $author_name, $newpath, $filename, $path_to_new_file); + ©_file($r, $author_name, $newpath, $filename, $path_to_new_file); } - - return OK; - + + $r->print(&Apache::loncommon::end_page()); } sub confirm { @@ -128,17 +129,22 @@ sub confirm { sub delete_copy_file { my ($r, $author_name, $newpath, $filename, $path_to_new_file, $type) = @_; if($type eq '1') { - $r->print("Cannot delete non-obsolete published file
Please - use the code view in previous window to use shared code

"); - $r->print(''); + $r->print('

' + .&mt('Cannot delete non-obsolete published file.') + .'
' + .&mt('Please use the code view in previous window to use shared code.') + .'

'); + $r->print('' + .'

'); } else { if(-e $path_to_new_file) { unless(unlink($path_to_new_file)) { - $r->print(''.&mt('Error').': '.$!.''); + $r->print('

'.&mt('Error:').' '.$!.'

'); return 0; } } else { - $r->print('

'.&mt('No such file').'.

'); + $r->print('

'.&mt('No such file').'

'); return 0; } ©_file($r, $author_name, $newpath, $filename, $path_to_new_file); @@ -157,11 +163,11 @@ sub copy_file { else { unless(mkdir($path, 02770)) { - $r->print(''.&mt('Error').': '.$!.''); + $r->print('

'.&mt('Error:').' '.$!.'

'); return 0; } unless(chmod(02770, ($path))) { - $r->print(' '.&mt('Error').': '.$!.''); + $r->print('

'.&mt('Error:').' '.$!.'

'); return 0; } } @@ -170,21 +176,19 @@ sub copy_file { } $r->print("
Copying File"); my $problem_filename = $Apache::lonnet::perlvar{'lonDocRoot'}.$filename; - my $file_output = &Apache::lonnet::getfile($problem_filename); + my $file_output = &includemeta(&Apache::lonnet::getfile($problem_filename),$filename); my $fs=Apache::File->new(">$path_to_new_file"); if (defined($fs)) { print $fs $file_output; } $r->print("

"); - $r->print(''); + $r->print(''); #Some 1.3'ish feature is to include the derivative feature, will go here..' } sub print_item { my ($r, $filename) = @_; - $filename = $Apache::lonnet::perlvar{'lonDocRoot'}.$filename; - &Apache::lonnet::logthis("print_item filename = $filename"); - my $file_output = &Apache::lonnet::getfile($filename); + my $file_output = &includemeta(&Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.$filename),$filename); my $count=0; my $maxlength=-1; foreach (split ("\n", $file_output)) { @@ -202,6 +206,22 @@ sub print_item { } +sub includemeta { + my ($file_output,$orgfilename)=@_; + my $escfilename=&escape($orgfilename); + my $copytime=time; + if ($file_output=~/\]*\>)/$1\n\/i; + } + if ($file_output=~/\]*\>)/$1\n\/i; + } + return $file_output; +} sub handler { my $r=shift; @@ -214,30 +234,35 @@ sub handler { $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))) { + 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; } + + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + if ($env{'form.action'} eq 'stage2') { my $author = &Apache::lonnet::metadata($filename,'authorspace'); - ($author) = split('@',$author); #strip the domain of the author name + #strip the domain of the author name + if ($author =~ /:/) { + ($author) = split(/:/,$author); + } else { + ($author) = split(/@/,$author); + } &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'); } else { - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; - $r->print('
- + $r->print(' + - +
'); $r->print('
'); &print_item($r, $env{'form.filename'});