--- loncom/interface/lonsource.pm 2007/08/28 22:46:32 1.20 +++ loncom/interface/lonsource.pm 2015/05/23 21:02:39 1.34 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA -# Souce Code handler +# Source Code handler # -# $Id: lonsource.pm,v 1.20 2007/08/28 22:46:32 albertel Exp $ +# $Id: lonsource.pm,v 1.34 2015/05/23 21:02:39 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) = @_; @@ -50,26 +50,27 @@ sub make_link { } sub stage_2 { - my ($r, $filename, $author, $listname) = @_; - my ($uname, $udom) = &Apache::loncacc::constructaccess('/~'.$author.'/',$r->dir_config('lonDefDomain')); - $r->print(&Apache::loncommon::start_page('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.

"); + my ($r, $filename, $listname) = @_; + my ($author)=($filename=~/\/res\/[^\/]+\/([^\/]+)\//); + $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 Authoring Space,' + .' and new directories will be automatically created.') + .'

'); $r->print('
-   - -
'); +   + + '. + &Apache::loncommon::end_page()); return OK; } - -sub copy_stage { - my ($r, $filename, $listname, $newpath) = @_; - -#Figure out if we are author or co-author +sub copy_author { my $role; my $domain; my $author_name; @@ -80,74 +81,103 @@ sub copy_stage { $domain = $env{'user.domain'}; $author_name = $env{'user.name'}; } + return ($role,$author_name,$domain); +} + + +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; - my $path_to_new_file = '/home/'.$author_name.'/public_html/'.$newpath.'/'.$listname; #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); + my ($uname,$udom)= &Apache::lonnet::constructaccess($path_to_new_file); if (!$uname || !$udom) { - $r->print(&Apache::loncommon::start_page('Not Allowed')); + $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()); return; } - #allowed - $r->print(&Apache::loncommon::start_page('Copying Source')); + $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 =~ m|published|) ) { - &delete_copy_file($r, $author_name, $newpath, $filename, $path_to_new_file, '1'); + &delete_copy_file($r, $newpath, $filename, $path_to_new_file, '1'); } elsif(($result) && ($result =~ m|exists!|)) { - &confirm($r, $author_name, $newpath, $filename, $path_to_new_file); + &confirm($r, $newpath, $filename, $path_to_new_file); } else { - ©_file($r, $author_name, $newpath, $filename, $path_to_new_file); + ©_file($r, $newpath, $filename, $path_to_new_file); } $r->print(&Apache::loncommon::end_page()); + return; } 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

"); + my ($r, $newpath, $filename, $path_to_new_file) = @_; + $r->print(''.&mt('Press delete to remove file and replace it with a copy of the source you are viewing.').'

'); $r->print('
-
'); + return; } sub delete_copy_file { - my ($r, $author_name, $newpath, $filename, $path_to_new_file, $type) = @_; + my ($r, $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 { + $r->print(&Apache::loncommon::start_page('Copying Source',undef,{'only_body' => 1})); 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); + ©_file($r, $newpath, $filename, $path_to_new_file); + $r->print(&Apache::loncommon::end_page()); } + return; } sub copy_file { - my ($r, $author_name, $newpath, $filename, $path_to_new_file) = @_; - $r->print("Creating directories"); - my $path = '/home/'.$author_name.'/public_html/'; + my ($r, $newpath, $filename, $path_to_new_file) = @_; + $r->print(''.&mt('Creating directories').''); + +#Figure out if we are author or co-author + my ($role,$author_name,$domain)=©_author(); + + my $path = $r->dir_config('lonDocRoot')."/priv/$domain/$author_name/"; my @directories = split(/\//,$newpath); + foreach my $now_checking (@directories) { if($now_checking ne '') { $path = $path.'/'.$now_checking; @@ -155,18 +185,18 @@ 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; } } } else { } #Just move along } - $r->print("
Copying File"); + $r->print('
'.&mt('Copying File').''); my $problem_filename = $Apache::lonnet::perlvar{'lonDocRoot'}.$filename; my $file_output = &includemeta(&Apache::lonnet::getfile($problem_filename),$filename); my $fs=Apache::File->new(">$path_to_new_file"); @@ -174,28 +204,90 @@ sub copy_file { print $fs $file_output; } $r->print("

"); - $r->print(''); + $r->print('
' + .'' + .'
'); #Some 1.3'ish feature is to include the derivative feature, will go here..' + return; } sub print_item { - my ($r, $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)) { - $count+=int(length($_)/79); - $count++; - if (length($_) > $maxlength) { - $maxlength = length($_); + my ($r,$filename,$listname) = @_; + my $file_output = + &includemeta(&Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.$filename), + $filename); + $r->print(&Apache::loncommon::start_page('View Source Code',undef, + {'only_body' => 1})); + if ($file_output ne '') { + my $access_to_cstr; + my $lonhost = $r->dir_config('lonHostID'); + if (&Apache::lonnet::is_library($lonhost)) { + my @possdoms = &Apache::lonnet::current_machine_domains(); + foreach my $dom (@possdoms) { + if ($env{"user.role.au./$dom/"}) { + $access_to_cstr = 1; + last; + } + } + unless ($access_to_cstr) { + foreach my $key (keys(%env)) { + if ($key =~ m{^\Quser.role.ca./\E($match_domain)/}) { + my $adom = $1; + if (grep(/^\Q$adom\E$/,@possdoms)) { + $access_to_cstr = 1; + last; + } + } + } + } + if ($access_to_cstr) { + $r->print(' +
+ + + + + +

+ '); + } else { + $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'). + '

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

'. + &mt('Source code is displayed, but you can not copy to Authoring Space on this server.'). + '

'.&mt('Close Window'). + '

' + ); + + } + my $count=0; + my $maxlength=-1; + foreach (split ("\n", $file_output)) { + $count+=int(length($_)/79); + $count++; + if (length($_) > $maxlength) { + $maxlength = length($_); + } } + my $rows = $count; + my $cols = $maxlength; + $r->print('
'."\n". + '
'); + } else { + $r->print('

'. + &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 { @@ -212,7 +304,11 @@ 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 handler { @@ -225,39 +321,27 @@ sub handler { 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; + } &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; if ($env{'form.action'} eq 'stage2') { - my $author = &Apache::lonnet::metadata($filename,'authorspace'); - #strip the domain of the author name - if ($author =~ /:/) { - ($author) = split(/:/,$author); - } else { - ($author) = split(/@/,$author); - } - &stage_2($r, $env{'form.filename'}, $author, $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,$env{'form.newpath'}); } elsif($env{'form.action'} eq 'delete_confirm') { - &delete_copy_file($r, $env{'form.author'}, $env{'form.newpath'}, $env{'form.filename'}, $env{'form.path'}, '0'); + &delete_copy_file($r,$env{'form.newpath'},$filename, $env{'form.path'}, '0'); } else { - $r->print('
- - - - - -
'); - $r->print('
'); - &print_item($r, $env{'form.filename'}); + &print_item($r,$filename,$listname); } return OK; }