--- loncom/publisher/lonpubdir.pm 2002/02/09 01:38:54 1.23 +++ loncom/publisher/lonpubdir.pm 2003/12/22 19:30:25 1.48 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA -# (Publication Handler +# Construction Space Directory Lister # -# $Id: lonpubdir.pm,v 1.23 2002/02/09 01:38:54 foxr Exp $ +# $Id: lonpubdir.pm,v 1.48 2003/12/22 19:30:25 www 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,8 @@ use File::Copy; use Apache::Constants qw(:common :http :methods); use Apache::loncacc; use Apache::loncommon(); +use Apache::lonhtmlcommon(); +use Apache::lonlocal; sub handler { @@ -70,13 +58,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 +83,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(''. - ''. - ''); + ''. + ''); 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,14 +138,25 @@ 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 (?) $fn=~s/\/[^\/]+$//; - } else { # If no form is defined, use request filename. - $fn=$r->filename(); + } 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|^/~(\w+)|/home/$1/public_html|; + } } + $fn=~s/\/+/\//g; return $fn; } # @@ -168,24 +169,60 @@ 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('LON-CAPA Construction Space'); - $r->print(''); - - $r->print('

Construction Space Directory '. - $thisdisfn.'/

'); + $r->print(&Apache::loncommon::bodytag(undef,undef,undef,1)); + my $pubdirscript=(< +// 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(); + } + } + +ENDPUBDIRSCRIPT + + $r->print('

'.&mt('Construction Space Directory').'

'. + ''. + $pubdirscript. + '
'. + '
ActionsNameTitleStatusLast Modified
'.&mt('Actions').''.&mt('Name').''. + &mt('Title').''.&mt('Status').''.&mt('Last Modified'). + '
'. + ''. + ''. + ''. +'
'.&mt('Force publication of unmodified files').'. 
'); if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) { - $r->print('

Co-Author: '.$uname.' at '.$udom. + $r->print('

'.&mt('Co-Author').': '.$uname.' at '.$udom. '

'); } + $r->print( + &Apache::lonhtmlcommon::crumbs($thisdisfn,'_top','/priv/'.$uname)); } # @@ -202,7 +239,7 @@ sub getTitleString { my $title = &Apache::lonnet::metadata($fullname, 'title'); unless ($title) { - $title = "[untitled]"; + $title = "[".&mt('untitled')."]"; } return $title; } @@ -224,18 +261,18 @@ sub putdirectory { my $disfilename = $dirname; if ($dirname eq '..') { - $disfilename = 'Parent Directory'; + $disfilename = ''.&mt('Parent Directory').''; } unless (( ($dirname eq '..') && ($reqfile eq '')) || ($dirname eq '.')) { - $r->print(''. - 'Click to cwd'. - ''. + $r->print(''. + ''.&mt('Go to ...').''. + ''. $disfilename.''. ' '. ' '. - ''.localtime($modtime).''. - ''); + ''.&Apache::lonlocal::locallocaltime($modtime).''. + "\n"); } return OK; } @@ -247,7 +284,8 @@ sub putresource { $resdir, $targetdir, $linkdir, $cmtime) = @_; - my $status='Unpublished'; + my $status=&mt('Unpublished'); + my $bgcolor='#FFCCCC'; my $title=' '; if (-e $resdir.'/'.$filename) { my ($rdev,$rino,$rmode,$rnlink, @@ -255,34 +293,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=''. getTitleString($targetdir.'/'.$filename, 'title').''; } else { - $status='Modified'; + $status=&mt('Modified'); + $bgcolor='#FFFFCC'; $title=''. - &Apache::lonnet::metadata($targetdir.'/'.$filename,'title').''; + getTitleString($targetdir.'/'.$filename,'title').''; if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') { $status.='
Diffs'; + '&versiontwo=priv" target=cat>'.&mt('Diffs').''; } } $status.='
Retrieve'; + $thisdisfn.'/'.$filename.'" target=cat>'.&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=~/\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) { + $editlink=' ('.&mt('Decompress').')'; } - $r->print(''. + $r->print(''. ''.'Publish'. + $uname.$thisdisfn.'/'.$filename.'">'.&mt('Publish').''. ''. ''. - ''.$filename.''. + ''. + $filename.''.$editlink2.$editlink. ''. ''.$title.''. ''.$status.''. - ''.localtime($cmtime).''. - ''); + ''.&Apache::lonlocal::locallocaltime($cmtime).''. + "\n"); return OK; } # @@ -316,7 +374,7 @@ __END__ =head1 NAME -Apache::lonpubdir - Publication Handler for Directories +Apache::lonpubdir - Construction space directory lister =head1 SYNOPSIS