--- loncom/publisher/lonpubdir.pm 2002/01/18 16:48:41 1.20
+++ loncom/publisher/lonpubdir.pm 2006/12/06 22:22:39 1.98
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
-# (Publication Handler
+# Construction Space Directory Lister
#
-# $Id: lonpubdir.pm,v 1.20 2002/01/18 16:48:41 albertel Exp $
+# $Id: lonpubdir.pm,v 1.98 2006/12/06 22:22:39 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,20 +25,6 @@
#
# http://www.lon-capa.org/
#
-#
-# (TeX Content Handler
-#
-# YEAR=2000
-# 05/29/00,05/30,10/11 Gerd Kortemeyer)
-#
-# 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
-# YEAR=2001
-# 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
-#
###
package Apache::lonpubdir;
@@ -49,6 +35,13 @@ use File::Copy;
use Apache::Constants qw(:common :http :methods);
use Apache::loncacc;
use Apache::loncommon();
+use Apache::lonhtmlcommon();
+use Apache::londiff();
+use Apache::lonlocal;
+use Apache::lonmsg;
+use Apache::lonmenu;
+use Apache::lonnet;
+use LONCAPA;
sub handler {
@@ -56,13 +49,11 @@ sub handler {
my $fn;
- if ($ENV{'form.filename'}) {
- $fn=$ENV{'form.filename'};
- $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
- $fn=~s/\/[^\/]+$//;
- } else {
- $fn=$r->filename();
- }
+
+
+ $fn = getEffectiveUrl($r);
+
+ # Validate access to the construction space and get username@domain.
my $uname;
my $udom;
@@ -72,57 +63,63 @@ 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 directory name.
+
$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;
}
# ----------------------------------------------------------- Start page output
-
- $r->content_type('text/html');
- $r->send_http_header;
-
- $r->print('
LON-CAPA Construction Space ');
-
- $r->print(
- ' ');
-
my $thisdisfn=$fn;
- $thisdisfn=~s/^\/home\/$uname\/public_html//;
-
- $r->print('Construction Space Directory '.$thisdisfn.'/ ');
-
- if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) {
- $r->print('Co-Author: '.$uname.' at '.$udom.
- ' ');
+ $thisdisfn=~s/^\/home\/$uname\/public_html//; # subdirectory part of
+ # construction space.
+ my $docroot=$r->dir_config('lonDocRoot'); # Apache londocument root.
+
+ my $resdir=$docroot.'/res/'.$udom.'/'.$uname.$thisdisfn; # Resource directory
+ my $targetdir=$udom.'/'.$uname.$thisdisfn; # Publiction target directory.
+ my $linkdir='/priv/'.$uname.$thisdisfn; # Full URL name of constr space.
+
+ 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') {
+ &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.
-
- my $docroot=$r->dir_config('lonDocRoot');
-
- my $resdir=$docroot.'/res/'.$udom.'/'.$uname.$thisdisfn;
- my $targetdir=$udom.'/'.$uname.$thisdisfn;
- my $linkdir='/~'.$uname.$thisdisfn;
-
- $r->print(''.
- 'Filename Metadata Modified '.
- 'Status ');
+ my $numdir = 0;
+ my $numres = 0;
+
+ # Start off the directory table.
+ $r->print('Directory Contents: ');
+ $r->print(''.
+ ''.&mt('Type').' '.
+ ''.&mt('Actions').' '.
+ ''.&mt('Name').' '.
+ ''.&mt('Title').' '.
+ ''.&mt('Status').' '.
+ ''.&mt('Last Modified').
+ ' '."\n");
my $filename;
- my $dirptr=16384;
+ 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,
@@ -132,72 +129,648 @@ sub handler {
my $extension='';
if ($filename=~/\.(\w+)$/) { $extension=$1; }
if ($cmode&$dirptr) {
- my $disfilename=$filename;
- if ($filename eq '..') {
- $disfilename='Parent Directory ';
- }
- unless ((($filename eq '..') && ($thisdisfn eq '')) ||
- ($filename eq '.')) {
- $r->print(''.$disfilename.
- ' '.localtime($cmtime).
- ' '
- );
- }
+ putdirectory($r, $thisdisfn, $linkdir, $filename, $cmtime,$targetdir,\%bombs,\$numdir);
} elsif (&Apache::loncommon::fileembstyle($extension) ne 'hdn') {
- my $status='Unpublished';
- my $bgcol='#FFBBBB';
- my $title=' ';
- if (-e $resdir.'/'.$filename) {
- my ($rdev,$rino,$rmode,$rnlink,
- $ruid,$rgid,$rrdev,$rsize,
- $ratime,$rmtime,$rctime,
- $rblksize,$rblocks)=stat($resdir.'/'.$filename);
- if ($rmtime>=$cmtime) {
- $status='Published';
- $bgcol='#BBFFBB';
- $title=
- ''.
- &Apache::lonnet::metadata($targetdir.'/'.$filename,'title').' ';
- } else {
- $status='Modified';
- $bgcol='#FFFFBB';
- $title=
- ''.
- &Apache::lonnet::metadata($targetdir.'/'.$filename,'title').' ';
- if
- (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
- $status.='Diffs ';
- }
- }
- $status.='Retrieve ';
- }
- $r->print(''.$filename.
- ' '.$title.
- ' '.localtime($cmtime).' '.$status.' '.
- ''.
- 'Publish ');
+ putresource($r, $udom, $uname, $filename, $thisdisfn, $resdir,
+ $targetdir, $linkdir, $cmtime,\%bombs,\$numres);
} else {
# "hidden" extension and not a directory, so hide it away.
}
}
closedir(DIR);
- $r->print('
');
+ $r->print('
'.&Apache::loncommon::end_page());
return OK;
}
+#
+# Gets the effective URL of the request and returns it:
+# $effn = getEffectiveUrl($r);
+# $r - The Apache Request object.
+sub getEffectiveUrl {
+ my $r = shift;
+ my $fn;
+
+ 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.
+ #
+ $fn=~s/^http\:\/\/[^\/]+\///;
+ $fn=~s/^\///;
+ $fn=~s{~($LONCAPA::username_re)}{/home/$1/public_html};
+
+ # Remove trailing / strings (?)
+
+ $fn=~s/\/[^\/]+$//;
+ } else {
+ # If no form is defined, use request filename.
+ $fn = $r->filename();
+ my $lonDocRoot=$r->dir_config('lonDocRoot');
+ if ( $fn =~ /$lonDocRoot/ ) {
+ #internal authentication, needs fixup.
+ $fn = $r->uri(); # non users do not get the full path request
+ # through SCRIPT_FILENAME
+ $fn=~s{^/~($LONCAPA::username_re)}{/home/$1/public_html};
+ }
+ }
+ $fn=~s/\/+/\//g;
+ return $fn;
+}
+#
+# Output the header of the page. This includes:
+# - The HTML header
+# - The H1/H3 stuff which includes the directory.
+#
+# startpage($r, $uame, $udom, $thisdisfn);
+# $r - The apache request object.
+# $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) = @_;
+ my $currdir = '/priv/'.$uname.$thisdisfn;
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+
+ my $formaction='/priv/'.$uname.$thisdisfn.'/';
+ $formaction=~s|/+|/|g;
+ my $pagetitle .= &Apache::loncommon::help_open_menu('','',3,'Authoring').
+ 'Construction Space : '.
+ '';
+ &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
+ if ($env{'environment.remote'} eq 'off') {
+ $env{'request.noversionuri'}=$currdir.'/';
+ $r->print(&Apache::loncommon::start_page('Construction Space',undef,
+ {'body_title' =>
+ $pagetitle,}));
+ } else {
+ $r->print(&Apache::loncommon::start_page('Construction Space',undef));
+ $r->print($pagetitle);
+ }
+
+ my $pubdirscript=(<
+top.document.title = '$thisdisfn/ - LON-CAPA Construction Space';
+// Store directory location for menu bar to find
+
+parent.lastknownpriv='/~$uname$thisdisfn/';
+
+// Confirmation dialogues
+
+ function currdiract(theform) {
+ if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'publish') {
+ document.publishdir.filename.value = theform.filename.value;
+ document.publishdir.submit();
+ }
+ if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editcat') {
+ top.location=theform.filename.value+'default.meta'
+ }
+ if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'printdir' ) {
+ document.printdir.postdata.value=theform.filename.value
+ document.printdir.submit();
+ }
+ if (theform.dirtask.options[theform.dirtask.selectedIndex].value == "delete") {
+ var delform = document.delresource
+ delform.filename.value = theform.filename.value
+ delform.submit()
+ }
+ }
+
+ function checkUpload(theform) {
+ if (theform.file == '') {
+ alert("Please use 'Browse..' to choose a file first, before uploading")
+ return
+ }
+ theform.submit()
+ }
+
+ function SetPubDir(theform,printForm) {
+ if (theform.diraction.options[theform.diraction.selectedIndex].value == "open") {
+ top.location = theform.openname.value
+ return
+ }
+ if (theform.diraction.options[theform.diraction.selectedIndex].value == "publish") {
+ theform.submit();
+ }
+ if (theform.diraction.options[theform.diraction.selectedIndex].value == "editcat") {
+ top.location=theform.filename.value+'default.meta'
+ }
+ if (theform.diraction.options[theform.diraction.selectedIndex].value == "printdir") {
+ theform.action = '/adm/printout'
+ theform.postdata.value = theform.filename.value
+ theform.submit()
+ }
+ if (theform.diraction.options[theform.diraction.selectedIndex].value == "delete") {
+ var delform = document.delresource
+ delform.filename.value = theform.filename.value
+ delform.submit()
+ }
+ return
+ }
+ function SetResChoice(theform) {
+ var activity = theform.reschoice.options[theform.reschoice.selectedIndex].value
+ if ((activity == 'rename') || (activity == 'copy') || (activity == 'move')) {
+ changename(theform,activity)
+ }
+ if (activity == 'publish') {
+ var pubform = document.pubresource
+ pubform.filename.value = theform.filename.value
+ pubform.submit()
+ }
+ if (activity == 'delete') {
+ var delform = document.delresource
+ delform.filename.value = theform.filename.value
+ delform.submit()
+ }
+ if (activity == 'obsolete') {
+ var pubform = document.pubresource
+ pubform.filename.value = theform.filename.value
+ pubform.makeobsolete.value=1;
+ pubform.submit()
+ }
+ if (activity == 'print') {
+ document.printresource.postdata.value = theform.filename.value
+ document.printresource.submit()
+ }
+ if (activity == 'retrieve') {
+ document.retrieveres.filename.value = theform.filename.value
+ document.retrieveres.submit()
+ }
+ if (activity == 'cleanup') {
+ document.cleanup.filename.value = theform.filename.value
+ document.cleanup.submit()
+ }
+ return
+ }
+ function changename(theform,activity) {
+ var oldname=theform.dispfilename.value;
+ var newname=prompt('New Name',oldname);
+ if (newname == "" || !newname || newname == oldname) {
+ return
+ }
+ document.moveresource.newfilename.value = newname
+ document.moveresource.filename.value = theform.filename.value
+ document.moveresource.action.value = activity
+ document.moveresource.submit();
+ }
+
+ENDPUBDIRSCRIPT
+ $r->print($pubdirscript);
+
+ if ((($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) &&
+ $env{'environment.remote'} ne 'off') {
+ $r->print(''.&mt('Co-Author').': '.$uname.' at '.$udom.
+ ' ');
+ }
+}
+
+sub dircontrols {
+ my ($r,$uname,$udom,$thisdisfn) = @_;
+ my %lt=&Apache::lonlocal::texthash(
+ cnpd => 'Cannot publish directory',
+ cnrd => 'Cannot retrieve directory',
+ mcdi => 'Must create new subdirectory inside a directory',
+ pubr => 'Publish this Resource',
+ pubd => 'Publish this Directory',
+ dedr => 'Delete Directory',
+ rtrv => 'Retrieve Old Version',
+ list => 'List Directory',
+ uplo => 'Upload file',
+ dele => 'Delete',
+ edit => 'Edit Catalog Information',
+ sela => 'Select Action',
+ nfil => 'New file',
+ nhtm => 'New HTML file',
+ nprb => 'New problem',
+ npag => 'New assembled page',
+ nseq => 'New assembled sequence',
+ ncrf => 'New custom rights file',
+ nsty => 'New style file',
+ nlib => 'New library file',
+ nsub => 'New subdirectory',
+ renm => 'Rename current file to',
+ move => 'Move current file to',
+ copy => 'Copy current file to',
+ type => 'Type Name Here',
+ go => 'Go',
+ prnt => 'Print contents of directory',
+ crea => 'Create a new directory or LON-CAPA document',
+ acti => 'Actions for current directory',
+ updc => 'Upload a new document'
+ );
+ $r->print(<
+
+ $lt{'acti'}
+ $lt{'updc'}
+ $lt{'crea'}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+END
+}
+
+sub pubbuttons {
+ my ($r,$uname,$thisdisfn) = @_;
+ $r->print('');
+}
+
+sub resourceactions {
+ my ($r,$uname,$udom,$thisdisfn) = @_;
+ $r->print(<
+
+
+
+
+
+
+
+
+
+END
+}
+
+#
+# Get the title string or "[untitled]" if the file has no title metadata:
+# Without the latter substitution, it's impossible to examine metadata for
+# untitled resources. Resources may be legitimately untitled, to prevent
+# searches from locating them.
+#
+# $str = getTitleString($fullname);
+# $fullname - Fully qualified filename to check.
+#
+sub getTitleString {
+ my $fullname = shift;
+ my $title = &Apache::lonnet::metadata($fullname, 'title');
+
+ unless ($title) {
+ $title = "[".&mt('untitled')."]";
+ }
+ return $title;
+}
+
+sub getCopyRightString {
+ my $fullname = shift;
+ return &Apache::lonnet::metadata($fullname, 'copyright');
+}
+
+sub getSourceRightString {
+ my $fullname = shift;
+ return &Apache::lonnet::metadata($fullname, 'sourceavail');
+}
+#
+# Put out a directory table row:
+# putdirectory(r, base, here, dirname, modtime)
+# r - Apache request object.
+# reqfile - File in request.
+# here - Where we are in directory tree.
+# dirname - Name of directory special file.
+# modtime - Encoded modification time.
+#
+sub putdirectory {
+ my ($r, $reqfile, $here, $dirname, $modtime, $resdir, $bombs, $numdir) = @_;
+ # construct the display filename: the directory name unless ..:
+
+ my $disfilename = $dirname;
+ if ($dirname eq '..') {
+ $disfilename = ''.&mt('Parent Directory').' ';
+ }
+ unless ( (($dirname eq '..') && ($reqfile eq '')) || ($dirname eq '.')) {
+ my $kaputt=0;
+ foreach (keys %{$bombs}) {
+ if ($_=~m:^\Q$resdir\E/\Q$disfilename\E/:) { $kaputt=1; last; }
+ }
+ %Apache::lonpublisher::metadatafields=();
+ %Apache::lonpublisher::metadatakeys=();
+ my $construct=$here;
+ $construct=~s{^/priv/($LONCAPA::username_re)$}{/home/$1/public_html};
+ my $dirpath = $here;
+ $dirpath=~s{^/priv/}{/~};
+ &Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(
+ $construct.'/'.$dirname.'/default.meta'
+ ));
+ my $actionitem = '';
+ if ($dirname eq '..') {
+ $actionitem = 'Go to ...';
+ } else {
+ $actionitem =
+ '';
+ $$numdir ++;
+ }
+ $r->print(''.
+ ' '.
+ ''.$actionitem.' '.
+ ''.
+ $disfilename.' '.
+ ''.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'});
+ if ($Apache::lonpublisher::metadatafields{'subject'} ne '') {
+ $r->print(' '.
+ $Apache::lonpublisher::metadatafields{'subject'}.
+ ' ');
+ }
+ $r->print($Apache::lonpublisher::metadatafields{'keywords'}.' '.
+ ''.&Apache::lonlocal::locallocaltime($modtime).' '.
+ " \n");
+ }
+ return OK;
+}
+#
+# Put a table row for a file resource.
+#
+sub putresource {
+ my ($r, $udom, $uname, $filename, $thisdisfn,
+ $resdir, $targetdir, $linkdir,
+ $cmtime,$bombs,$numres) = @_;
+ &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
+ my $pubstatus = 'unpublished';
+ my $status=&mt('Unpublished');
+ my $css_class='LC_browser_file';
+ my $title=' ';
+ my $publish_button=&mt('Publish');
+ my $cstr_dir = '/home/'.$uname.'/public_html/'.$thisdisfn.'/';
+# my $action_buttons=
+# ''.
+# &mt('Delete').' ';
+ if (-e $resdir.'/'.$filename) {
+ my $same=0;
+ my ($rdev,$rino,$rmode,$rnlink,
+ $ruid,$rgid,$rrdev,$rsize,
+ $ratime,$rmtime,$rctime,
+ $rblksize,$rblocks)=stat($resdir.'/'.$filename);
+ if ($rmtime>=$cmtime) {
+ $same=1;
+ } else {
+ if (&Apache::londiff::are_different_files($resdir.'/'.$filename,
+ $cstr_dir.'/'.$filename)) {
+ $same=0;
+ } else {
+ $same=1;
+ }
+ }
+ my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9];
+ my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
+ my $meta_same = 1;
+ if ($meta_rmtime < $meta_cmtime
+ && &Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta',
+ $cstr_dir.'/'.$filename.'.meta')) {
+ $meta_same = 0;
+ }
+ $publish_button=&mt('Re-publish');
+ my $rights_status =
+ &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
+ &mt(&getSourceRightString($targetdir.'/'.$filename));
+ $title = ''.
+ &getTitleString($targetdir.'/'.$filename).' ';
+ &Apache::lonnet::logthis("same $same meta $meta_same");
+ if ($same) {
+ if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
+ $pubstatus = 'obsolete';
+ $status=&mt('Obsolete');
+ } else {
+ if (!$meta_same) {
+ $pubstatus = 'metamodified';
+ } else {
+ $pubstatus = 'published';
+ }
+ $status=&mt('Published').
+ ' '. $rights_status;
+ }
+# } else {
+# $action_buttons='';
+# }
+ } else {
+ $pubstatus = 'modified';
+ $status=&mt('Modified').
+ ' '. $rights_status;
+# $action_buttons='';
+ if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
+ $status.=''.&mt('Diffs').' ';
+ }
+ }
+
+ $title.="\n".''.
+ ($$bombs{$targetdir.'/'.$filename}?' ':'Edit Metadata').' ';
+
+ if (!$meta_same) {
+ $title = &mt('Metadata Modified').' '.$title.
+ ''.&mt('Metadata Diffs').' ';
+ $title.="\n".''.&mt('Retrieve Metadata').' ';
+ }
+ $status.="\n".''.&mt('Retrieve').' ';
+ }
+ my $editlink='';
+ my $editlink2='';
+ if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) {
+ $editlink=' ('.&mt('Edit').' )';
+ }
+ if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+ $editlink=' ('.&mt('EditXML').' )';
+ $editlink2=' ('.&mt('Edit').' )';
+ }
+ if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) {
+ $editlink.=' ('.&mt('Clean Up').') ';
+ }
+ if ($filename=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {
+ $editlink=' ('.&mt('Decompress').' )';
+ }
+ my $pub_select = '';
+ &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
+ $r->print(''.
+ ''.($filename=~/[\#\~]$/?' ':
+ ' ').' '.
+ ''.$pub_select.' '.
+ ' '.
+ ''.
+ $filename.' '.$editlink2.$editlink.
+ ' '.
+ ''.$title.' '.
+ ''.$status.' '.
+ ''.&Apache::lonlocal::locallocaltime($cmtime).' '.
+ " \n");
+ return OK;
+}
+
+sub create_pubselect {
+ my ($r,$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres) = @_;
+ $$pub_select = '
+