--- loncom/interface/lonsource.pm 2011/10/31 01:16:59 1.27 +++ loncom/interface/lonsource.pm 2015/05/25 15:36:11 1.35 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Source Code handler # -# $Id: lonsource.pm,v 1.27 2011/10/31 01:16:59 raeburn Exp $ +# $Id: lonsource.pm,v 1.35 2015/05/25 15:36:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -40,7 +40,7 @@ use Apache::lonmeta; use Apache::File; use Apache::lonlocal; use HTML::Entities; -use LONCAPA; +use LONCAPA qw(:DEFAULT :match); sub make_link { my ($filename, $listname) = @_; @@ -52,10 +52,11 @@ sub make_link { sub stage_2 { my ($r, $filename, $listname) = @_; my ($author)=($filename=~/\/res\/[^\/]+\/([^\/]+)\//); - $r->print(&Apache::loncommon::start_page('Copy Problem Source Code to Construction Space') + $r->print(&Apache::loncommon::start_page('Copy Problem Source Code to Authoring Space',undef, + {'only_body' => 1,}) .&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,' + .&mt('Note: the path is in reference to the root of your Authoring Space,' .' and new directories will be automatically created.') .'
'); $r->print(''); + '. + &Apache::loncommon::end_page()); return OK; } @@ -86,83 +88,71 @@ sub copy_author { sub copy_stage { my ($r, $filename, $listname, $newpath) = @_; -#Figure out if we are author or co-author - my ($role,$author_name,$domain)=©_author(); - -# Construct path to copy and filter out any possibly nasty stuff - my $path_to_new_file = $r->dir_config('lonDocRoot'). - "/priv/$domain/$author_name/$newpath/$listname"; - $path_to_new_file=~s/\.\.//g; - $path_to_new_file=~s/\~//g; - $path_to_new_file=~s/\/+/\//g; - -#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); - - 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; - } + my ($path_to_new_file,$uname,$udom) = &get_path_to_newfile($r,$newpath,$listname); #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, $newpath, $filename, $path_to_new_file, '1'); - } elsif(($result) && ($result =~ m|exists!|)) { - &confirm($r, $newpath, $filename, $path_to_new_file); - } else { - ©_file($r, $newpath, $filename, $path_to_new_file); + if ($path_to_new_file) { + $r->print(&Apache::loncommon::start_page('Copying Source',undef,{'only_body' => 1})); + my $result = &Apache::loncfile::exists($uname, $udom, $path_to_new_file); + $r->print($result); + if (($result) && ($result =~ /published/)) { + &delete_copy_file($r, $newpath, $filename, $path_to_new_file, '1'); + } elsif (($result) && ($result =~ /exists\!/)) { + &confirm($r, $newpath, $filename, $listname); + } else { + ©_file($r, $newpath, $filename, $path_to_new_file); + } + $r->print(&Apache::loncommon::end_page()); } - - $r->print(&Apache::loncommon::end_page()); + return; } sub confirm { - my ($r, $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'
.&mt('Cannot delete non-obsolete published file.')
.'
'
.&mt('Please use the code view in previous window to use shared code.')
.'
');
- $r->print('print('
'.&mt('Error:').' '.$!.'
'); return 0; } } else { - $r->print(''.&mt('No such file').'
'); + $r->print(''.&mt('No such file').'
'); return 0; } ©_file($r, $newpath, $filename, $path_to_new_file); + $r->print(&Apache::loncommon::end_page()); + return; } } sub copy_file { my ($r, $newpath, $filename, $path_to_new_file) = @_; - $r->print("Creating directories"); + $r->print(''.&mt('Creating directories').''); #Figure out if we are author or co-author my ($role,$author_name,$domain)=©_author(); @@ -188,7 +178,7 @@ sub copy_file { } else { } #Just move along } - $r->print("'. + &mt('Source code is displayed, but you can not copy to Authoring Space, as you do not have an author or co-author role on this server.'). + '
'.&mt('Close Window'). + ''. + &mt('Source code is displayed, but you can not copy to Authoring Space on this server.'). + '
'.&mt('Close Window'). + ''. + &mt('Unable to retrieve file contents.'). + '
'.&mt('Close Window').'' + ); } - my $rows = $count; - my $cols = $maxlength; - $r->print(''); - return OK; - + $r->print(&Apache::loncommon::end_page()); + return; } sub includemeta { @@ -234,7 +286,46 @@ sub includemeta { } else { $file_output=~s/(\<(?:html|problem)[^\>]*\>)/$1\n\/i; } - return $file_output; + if ($file_output eq '-1') { + return; + } else { + return $file_output; + } +} + +sub get_path_to_newfile { + my ($r,$newpath,$listname) = @_; + + #Figure out if we are author or co-author + my ($role,$author_name,$domain) = ©_author(); + + # Construct path to copy and filter out any possibly nasty stuff + my $path = $r->dir_config('lonDocRoot')."/priv/$domain/$author_name/"; + my $path_to_new_file = $path."$newpath/$listname"; + $path_to_new_file=~s/\.\.//g; + $path_to_new_file=~s/\~//g; + $path_to_new_file=~s/\/+/\//g; + + #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::lonnet::constructaccess($path_to_new_file); + + if (!$uname || !$udom) { + $r->print(&Apache::loncommon::start_page('Not Allowed',undef,{'only_body' => 1})); + $r->print(&mt('Not allowed to create file [_1]', $path_to_new_file)); + $r->print(&Apache::loncommon::end_page()); + if (wantarray) { + return(); + } else { + return; + } + } + if (wantarray) { + return ($path_to_new_file,$uname,$udom); + } else { + return $path_to_new_file; + } } sub handler { @@ -243,36 +334,36 @@ sub handler { ['filename','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"; return HTTP_NOT_ACCEPTABLE; - } - unless ((&Apache::lonnet::allowed('bre',$filename)) && - (&Apache::lonnet::allowed('cre','/'))) { + } + unless (&Apache::lonnet::allowed('bre',$filename)) { $env{'user.error.msg'}="$filename:bre:1:1:Access to resource denied"; return HTTP_NOT_ACCEPTABLE; - } + } + unless (&Apache::lonnet::allowed('cre','/')) { + $env{'user.error.msg'}="$filename:cre:1:1:Access to source code denied"; + return HTTP_NOT_ACCEPTABLE; + } + my $newpath = $env{'form.newpath'}; &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; if ($env{'form.action'} eq 'stage2') { - &stage_2($r, $filename,$listname); + &stage_2($r,$filename,$listname); } elsif($env{'form.action'} eq 'copy_stage') { - ©_stage($r, $filename,$env{'form.listname'},$env{'form.newpath'}); + ©_stage($r,$filename,$listname,$newpath); } elsif($env{'form.action'} eq 'delete_confirm') { - &delete_copy_file($r, $env{'form.newpath'}, $env{'form.filename'}, $env{'form.path'}, '0'); + my $path_to_new_file = &get_path_to_newfile($r,$newpath,$listname); + if ($path_to_new_file) { + &delete_copy_file($r, $newpath, $filename, $path_to_new_file, '0'); + } } else { - $r->print(''); - $r->print('