--- loncom/publisher/lonpubdir.pm 2002/04/09 06:01:56 1.24
+++ loncom/publisher/lonpubdir.pm 2003/11/18 04:08:15 1.45
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
-# (Publication Handler
+# Construction Space Directory Lister
#
-# $Id: lonpubdir.pm,v 1.24 2002/04/09 06:01:56 albertel Exp $
+# $Id: lonpubdir.pm,v 1.45 2003/11/18 04:08:15 taceyjo1 Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -36,7 +36,6 @@
# 03/23 Guy Albertelli
# 03/24,03/29 Gerd Kortemeyer)
# 03/31,04/03,05/09,06/23,08/18,08/20 Gerd Kortemeyer
-# 12/15 Scott Harrison
# 12/28 Gerd Kortemeyer
#
###
@@ -49,6 +48,7 @@ use File::Copy;
use Apache::Constants qw(:common :http :methods);
use Apache::loncacc;
use Apache::loncommon();
+use Apache::lonlocal;
sub handler {
@@ -70,13 +70,13 @@ sub handler {
$fn,$r->dir_config('lonDefDomain'));
unless (($uname) && ($udom)) {
$r->log_reason($uname.' at '.$udom.
- ' trying to publish file '.$ENV{'form.filename'}.
+ ' trying to list directory '.$ENV{'form.filename'}.
' ('.$fn.') - not authorized',
$r->filename);
return HTTP_NOT_ACCEPTABLE;
}
- # Remove trailing / from direcgtory name.
+ # Remove trailing / from directory name.
$fn=~s/\/$//;
@@ -95,23 +95,25 @@ sub handler {
my $resdir=$docroot.'/res/'.$udom.'/'.$uname.$thisdisfn; # Resource directory
my $targetdir=$udom.'/'.$uname.$thisdisfn; # Publiction target directory.
- my $linkdir='/~'.$uname.$thisdisfn; # Full URL name of constr space.
+ my $linkdir='/priv/'.$uname.$thisdisfn; # Full URL name of constr space.
- startpage($r, $uname, $udom, $thisdisfn); # Put out the start of page.
+ &startpage($r, $uname, $udom, $thisdisfn); # Put out the start of page.
# Start off the diretory table.
$r->print('<table border=2>'.
- '<tr><th>Actions</th><th>Name</th><th>Title</th>'.
- '<th>Status</th><th>Last Modified</th></tr>');
+ '<tr><th>'.&mt('Actions').'</th><th>'.&mt('Name').'</th><th>'.
+ &mt('Title').'</th>'.
+ '<th>'.&mt('Status').'</th><th>'.&mt('Last Modified').
+ '</th></tr>');
my $filename;
my $dirptr=16384; # Mask indicating a directory in stat.cmode.
opendir(DIR,$fn);
- my @files=sort(readdir(DIR));
+ my @files=sort {uc($a) cmp uc($b)} (readdir(DIR));
foreach my $filename (@files) {
my ($cdev,$cino,$cmode,$cnlink,
$cuid,$cgid,$crdev,$csize,
@@ -148,7 +150,9 @@ sub getEffectiveUrl {
# Replace the ~username of the URL with /home/username/public_html
# so that we don't have to worry about ~ expansion internally.
#
- $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
+ $fn=~s/^http\:\/\/[^\/]+\///;
+ $fn=~s/^\///;
+ $fn=~s/\~(\w+)/\/home\/$1\/public_html/;
# Remove trailing / strings (?)
@@ -164,6 +168,7 @@ sub getEffectiveUrl {
$fn=~s|^/~(\w+)|/home/$1/public_html|;
}
}
+ $fn=~s/\/+/\//g;
return $fn;
}
#
@@ -176,22 +181,57 @@ sub getEffectiveUrl {
# $uname - User name.
# $udom - Domain name the user is logged in under.
# $thisdisfn - Displayable version of the filename.
+
sub startpage {
my ($r, $uname, $udom, $thisdisfn) = @_;
- $r->content_type('text/html');
+ &Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
$r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
- $r->print('<body bgcolor="#FFFFFF"><img align=right '.
- 'src=/adm/lonIcons/lonlogos.gif>');
-
- $r->print('<h1>Construction Space Directory <tt>'.
- $thisdisfn.'/</tt></h1>');
+ $r->print(&Apache::loncommon::bodytag(undef,undef,undef,1));
+ my $pubdirscript=(<<ENDPUBDIRSCRIPT);
+<script>
+// Store directory location for menu bar to find
+
+parent.lastknownpriv='/~$uname/$thisdisfn/';
+
+// Confirmation dialogues
+
+ function pubdir(theform) {
+ if (confirm('Publish complete directory?')) {
+ theform.submit();
+ }
+ }
+ function pubrecdir(theform) {
+ if (confirm('Publish directory and all subdirectories?')) {
+ theform.pubrec.value='1';
+ theform.submit();
+ }
+ }
+</script>
+ENDPUBDIRSCRIPT
+
+ $r->print('<h1>'.&mt('Construction Space Directory').' <tt>'.
+ $thisdisfn.'/</tt></h1>'.
+ '<script type="text/javascript">top.document.title = \''.
+ $thisdisfn.'/ - LON-CAPA Construction Space\';</script>'.
+ $pubdirscript.
+ '<form method="post" action="/adm/publish" target="_parent">'.
+ '<table><tr><td><input type="hidden" name="filename" value="/~'.
+ $uname.$thisdisfn.'/" />'.
+ '<input type="button" onClick="pubdir(this.form);" value="'.
+&mt('Publish Directory').'" />'.
+ '<input type="hidden" name="pubrec" value="" />'.
+ '<input type="button" onClick="pubrecdir(this.form);" value="'.
+&mt('Publish Directory and Sub Directories').'" /></td><td>'.
+'<input type="button" onClick="window.location='."'/~".
+ $uname.$thisdisfn."/default.meta'".'" value="'.
+&mt('Edit Directory Catalog Information').'" /></td></tr><tr><td><input type="checkbox" name="forcerepub" /> '.&mt('Force publication of unmodified files').'.</td><td> </td></tr></table></form>');
if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
- $r->print('<h3>Co-Author: '.$uname.' at '.$udom.
+ $r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.
'</h3>');
}
}
@@ -210,7 +250,7 @@ sub getTitleString {
my $title = &Apache::lonnet::metadata($fullname, 'title');
unless ($title) {
- $title = "[untitled]";
+ $title = "[".&mt('untitled')."]";
}
return $title;
}
@@ -232,18 +272,18 @@ sub putdirectory {
my $disfilename = $dirname;
if ($dirname eq '..') {
- $disfilename = '<i>Parent Directory</i>';
+ $disfilename = '<i>'.&mt('Parent Directory').'</i>';
}
unless (( ($dirname eq '..') && ($reqfile eq '')) ||
($dirname eq '.')) {
- $r->print('<tr>'.
- '<td>Click to cwd</td>'.
- '<td><a href="'.$here.'/'.$dirname.'/">'.
+ $r->print('<tr bgcolor="#CCCCFF">'.
+ '<td>Go to ...</td>'.
+ '<td><a href="'.$here.'/'.$dirname.'/" target="_top">'.
$disfilename.'</a></td>'.
'<td> </td>'.
'<td> </td>'.
- '<td>'.localtime($modtime).'</td>'.
- '</tr>');
+ '<td>'.&Apache::lonlocal::locallocaltime($modtime).'</td>'.
+ "</tr>\n");
}
return OK;
}
@@ -256,6 +296,7 @@ sub putresource {
$cmtime) = @_;
my $status='Unpublished';
+ my $bgcolor='#FFCCCC';
my $title=' ';
if (-e $resdir.'/'.$filename) {
my ($rdev,$rino,$rmode,$rnlink,
@@ -263,34 +304,54 @@ sub putresource {
$ratime,$rmtime,$rctime,
$rblksize,$rblocks)=stat($resdir.'/'.$filename);
if ($rmtime>=$cmtime) {
- $status='Published';
+ $status=&mt('Published');
+ $bgcolor='#CCFFCC';
+ if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
+ $status=&mt('Obsolete');
+ $bgcolor='#AAAAAA';
+ }
$title='<a href="/res/'.$targetdir.'/'.$filename.
'.meta" target=cat>'.
getTitleString($targetdir.'/'.$filename, 'title').'</a>';
} else {
- $status='Modified';
+ $status=&mt('Modified');
+ $bgcolor='#FFFFCC';
$title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target=cat>'.
- &Apache::lonnet::metadata($targetdir.'/'.$filename,'title').'</a>';
+ getTitleString($targetdir.'/'.$filename,'title').'</a>';
if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
$status.='<br><a href="/adm/diff?filename=/~'.$uname.
$thisdisfn.'/'.$filename.
- '&versionone=priv" target=cat>Diffs</a>';
+ '&versiontwo=priv" target=cat>'.&mt('Diffs').'</a>';
}
}
$status.='<br><a href="/adm/retrieve?filename=/~'.$uname.
- $thisdisfn.'/'.$filename.'" target=cat>Retrieve</a>';
+ $thisdisfn.'/'.$filename.'" target=cat>'.&mt('Retrieve').'</a>';
+ }
+ my $editlink='';
+ my $editlink2='';
+ if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) {
+ $editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('Edit').'</a>)';
+ }
+ if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+ $editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_top">'.&mt('EditXML').'</a>)';
+ $editlink2=' (<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_top">'.&mt('Edit').'</a>)';
+ }
+ if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {
+ &Apache::lonnet::appenv('cgi.file' => $filename);
+ $editlink=' (<a href="'.$linkdir.'/'.$filename.'?decompress=1" target="_top">'.&mt('Decompress').'</a>)';
}
- $r->print('<tr>'.
+ $r->print('<tr bgcolor="'.$bgcolor.'">'.
'<td><a target="_parent" href="/adm/publish?filename=/~'.
- $uname.$thisdisfn.'/'.$filename.'">'.'Publish</a>'.
+ $uname.$thisdisfn.'/'.$filename.'">'.&mt('Publish').'</a>'.
'</td>'.
'<td>'.
- '<a href="'.$linkdir.'/'.$filename.'">'.$filename.'</a>'.
+ '<a href="'.$linkdir.'/'.$filename.'" target="_top">'.
+ $filename.'</a>'.$editlink2.$editlink.
'</td>'.
'<td>'.$title.'</td>'.
'<td>'.$status.'</td>'.
- '<td>'.localtime($cmtime).'</td>'.
- '</tr>');
+ '<td>'.&Apache::lonlocal::locallocaltime($cmtime).'</td>'.
+ "</tr>\n");
return OK;
}
#
@@ -324,7 +385,7 @@ __END__
=head1 NAME
-Apache::lonpubdir - Publication Handler for Directories
+Apache::lonpubdir - Construction space directory lister
=head1 SYNOPSIS