--- loncom/publisher/lonpubdir.pm 2004/12/07 22:35:34 1.70
+++ loncom/publisher/lonpubdir.pm 2005/07/14 18:27:35 1.87
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Construction Space Directory Lister
#
-# $Id: lonpubdir.pm,v 1.70 2004/12/07 22:35:34 raeburn Exp $
+# $Id: lonpubdir.pm,v 1.87 2005/07/14 18:27:35 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -61,7 +61,7 @@ sub handler {
$fn,$r->dir_config('lonDefDomain'));
unless (($uname) && ($udom)) {
$r->log_reason($uname.' at '.$udom.
- ' trying to list directory '.$ENV{'form.filename'}.
+ ' trying to list directory '.$env{'form.filename'}.
' ('.$fn.') - not authorized',
$r->filename);
return HTTP_NOT_ACCEPTABLE;
@@ -72,7 +72,7 @@ sub handler {
$fn=~s/\/$//;
unless ($fn) {
- $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+ $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
' trying to list empty directory', $r->filename);
return HTTP_NOT_FOUND;
}
@@ -91,9 +91,11 @@ sub handler {
my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
&startpage($r, $uname, $udom, $thisdisfn); # Put out the start of page.
- if ($ENV{'environment.remote'} eq 'off') {
+ if ($env{'environment.remote'} eq 'off') {
&dircontrols($r,$uname,$udom,$thisdisfn); # Put out actions for directory,
# browse/upload + new file page.
+ } else {
+ &pubbuttons($r,$uname,$thisdisfn);
}
&resourceactions($r,$uname,$udom,$thisdisfn); #Put out form used for printing/deletion etc.
@@ -109,7 +111,7 @@ sub handler {
'| '.&mt('Title').' | '.
''.&mt('Status').' | '.
''.&mt('Last Modified').
- ' | ');
+ ''."\n");
my $filename;
my $dirptr=16384; # Mask indicating a directory in stat.cmode.
@@ -146,8 +148,8 @@ sub getEffectiveUrl {
my $r = shift;
my $fn;
- if ($ENV{'form.filename'}) { # If a form filename is defined.
- $fn=$ENV{'form.filename'};
+ if ($env{'form.filename'}) { # If a form filename is defined.
+ $fn=$env{'form.filename'};
#
# Replace the ~username of the URL with /home/username/public_html
# so that we don't have to worry about ~ expansion internally.
@@ -189,8 +191,8 @@ sub startpage {
my $currdir = '/priv/'.$uname.$thisdisfn;
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
-
- $r->print('LON-CAPA Construction Space');
+ my $html=&Apache::lonxml::xmlbegin();
+ $r->print($html.'LON-CAPA Construction Space');
my $pagetitle;
my $formaction='/priv/'.$uname.$thisdisfn.'/';
@@ -204,14 +206,15 @@ sub startpage {
'this.form.action=this.form.recent.value;this.form.submit()').
'';
&Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
- if ($ENV{'environment.remote'} eq 'off') {
- $ENV{'request.noversionuri'}=$currdir.'/';
+ if ($env{'environment.remote'} eq 'off') {
+ $env{'request.noversionuri'}=$currdir.'/';
$r->print(&Apache::loncommon::bodytag('Construction Space',undef,undef,undef,undef,undef,$pagetitle));
} else {
$r->print($pagetitle);
}
my $pubdirscript=(<
+