--- loncom/publisher/loncfile.pm 2005/11/09 09:06:59 1.74
+++ loncom/publisher/loncfile.pm 2006/05/30 12:47:41 1.77
@@ -9,7 +9,7 @@
# and displays a page showing the results of the action.
#
#
-# $Id: loncfile.pm,v 1.74 2005/11/09 09:06:59 www Exp $
+# $Id: loncfile.pm,v 1.77 2006/05/30 12:47:41 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -72,6 +72,9 @@ use Apache::loncacc;
use Apache::lonnet;
use Apache::loncommon();
use Apache::lonlocal;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
my $DEBUG=0;
my $r; # Needs to be global for some stuff RF.
@@ -1229,12 +1232,12 @@ sub handler {
if ($env{'form.filename'}) {
&Debug($r, "test: $env{'form.filename'}");
- $fn=&Apache::lonnet::unescape($env{'form.filename'});
+ $fn=&unescape($env{'form.filename'});
$fn=&URLToPath($fn);
} elsif($ENV{'QUERY_STRING'} && $env{'form.phase'} ne 'two') {
#Just hijack the script only the first time around to inject the
#correct information for further processing
- $fn=&Apache::lonnet::unescape($env{'form.decompress'});
+ $fn=&unescape($env{'form.decompress'});
$fn=&URLToPath($fn);
$env{'form.action'}="decompress";
} elsif ($env{'form.qualifiedfilename'}) {
@@ -1273,10 +1276,12 @@ sub handler {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
+ my (%loaditem,$js);
+
if ( ($env{'form.action'} eq 'newdir') && ($env{'form.phase'} eq 'two') && ( ($env{'form.callingmode'} eq 'testbank') || ($env{'form.callingmode'} eq 'imsimport') ) ) {
my $newdirname = $env{'form.newfilename'};
- $r->print('LON-CAPA Construction Space
- |);
- my $loaditem = 'onLoad="writeDone()"';
- $r->print(&Apache::loncommon::bodytag('Construction Space File Operation','',$loaditem));
- } else {
- $r->print('LON-CAPA Construction Space');
- $r->print(&Apache::loncommon::bodytag('Construction Space File Operation'));
+|;
+ $loaditem{'onload'} = "writeDone()";
}
-
+
+ $r->print(&Apache::loncommon::start_page('Construction Space File Operation',
+ $js,
+ {'add_entries' => \%loaditem,}));
$r->print(''.&mt('Location').': '.&display($fn).'
');
@@ -1325,7 +1329,8 @@ function writeDone() {
$env{'form.action'} eq 'Select Action' ) {
$r->print(''.&mt('New Resource').'
');
} else {
- $r->print(''.&mt('Unknown Action').' '.$env{'form.action'}.'
');
+ $r->print(''.&mt('Unknown Action').' '.$env{'form.action'}.'
'.
+ &Apache::loncommon::end_page());
return OK;
}
if ($env{'form.phase'} eq 'two') {
@@ -1336,7 +1341,7 @@ function writeDone() {
&phaseone($r,$fn,$uname,$udom);
}
- $r->print('