--- loncom/interface/lonsource.pm 2006/03/15 19:41:26 1.16
+++ loncom/interface/lonsource.pm 2008/08/01 16:01:44 1.21
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Souce Code handler
#
-# $Id: lonsource.pm,v 1.16 2006/03/15 19:41:26 albertel Exp $
+# $Id: lonsource.pm,v 1.21 2008/08/01 16:01:44 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,29 +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;
- $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.
");
+ $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; } @@ -70,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."; @@ -87,24 +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; + + + #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 { @@ -166,7 +171,7 @@ sub copy_file { } $r->print("