--- loncom/interface/lonsource.pm 2005/04/07 06:56:23 1.11
+++ loncom/interface/lonsource.pm 2007/08/28 22:23:22 1.19
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Souce Code handler
#
-# $Id: lonsource.pm,v 1.11 2005/04/07 06:56:23 albertel Exp $
+# $Id: lonsource.pm,v 1.19 2007/08/28 22:23:22 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,11 +40,11 @@ use Apache::lonmeta;
use Apache::File;
use Apache::lonlocal;
use HTML::Entities;
+use LONCAPA;
sub make_link {
my ($filename, $listname) = @_;
- my $sourcelink = "http://".$ENV{'SERVER_NAME'}.
- "/adm/source/?filename=".$filename."&listname=".$listname;
+ my $sourcelink = "/adm/source?inhibitmenu=yes&filename=".$filename."&listname=".$listname;
return $sourcelink;
}
@@ -55,16 +55,14 @@ 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;
- 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(&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('');
return OK;
@@ -78,7 +76,7 @@ sub copy_stage {
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.";
@@ -95,9 +93,7 @@ sub copy_stage {
}
&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'));
+ $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|) ) {
@@ -115,7 +111,7 @@ sub copy_stage {
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
");
- $r->print('