--- loncom/interface/lonsource.pm 2004/07/07 20:01:02 1.6
+++ loncom/interface/lonsource.pm 2005/04/07 04:46:36 1.10
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Souce Code handler
#
-# $Id: lonsource.pm,v 1.6 2004/07/07 20:01:02 taceyjo1 Exp $
+# $Id: lonsource.pm,v 1.10 2005/04/07 04:46:36 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -55,7 +55,8 @@ 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.
");
@@ -94,7 +95,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);
@@ -212,14 +214,15 @@ sub handler {
if ($source ne 'open') {
$ENV{'user.error.msg'}="$filename:cre:1:1:Source code not available";
return HTTP_NOT_ACCEPTABLE;
- } if ((!&Apache::lonnet::allowed('cre',$filename)) ||
+ }
+ if ((!&Apache::lonnet::allowed('cre',$filename)) ||
(!&Apache::lonnet::allowed('bre',$filename))) {
$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.
+ ($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'});