--- loncom/interface/lonsource.pm 2005/04/07 06:56:23 1.11 +++ loncom/interface/lonsource.pm 2006/03/15 19:41:26 1.16 @@ -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.16 2006/03/15 19:41:26 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -43,8 +43,7 @@ use HTML::Entities; sub make_link { my ($filename, $listname) = @_; - my $sourcelink = "http://".$ENV{'SERVER_NAME'}. - "/adm/source/?filename=".$filename."&listname=".$listname; + my $sourcelink = "/adm/source?filename=".$filename."&listname=".$listname; return $sourcelink; } @@ -55,16 +54,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('
+ $r->print(' -   +  
'); return OK; @@ -95,9 +92,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 +110,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('
+ $r->print(' @@ -215,8 +210,8 @@ sub handler { $env{'user.error.msg'}="$filename:cre:1:1:Source code not available"; return HTTP_NOT_ACCEPTABLE; } - if ((!&Apache::lonnet::allowed('cre',$filename)) || - (!&Apache::lonnet::allowed('bre',$filename))) { + unless ((&Apache::lonnet::allowed('bre',$filename)) && + (&Apache::lonnet::allowed('cre','/'))) { $env{'user.error.msg'}="$filename:bre:1:1:Access to resource denied"; return HTTP_NOT_ACCEPTABLE; } @@ -233,7 +228,7 @@ sub handler { } else { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print(' + $r->print('