--- loncom/publisher/lonpubdir.pm 2003/02/03 18:03:53 1.30 +++ 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.30 2003/02/03 18:03:53 harris41 Exp $ +# $Id: lonpubdir.pm,v 1.45 2003/11/18 04:08:15 taceyjo1 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -48,6 +48,7 @@ use File::Copy; use Apache::Constants qw(:common :http :methods); use Apache::loncacc; use Apache::loncommon(); +use Apache::lonlocal; sub handler { @@ -69,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/\/$//; @@ -103,14 +104,16 @@ sub handler { # 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, @@ -147,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 (?) @@ -163,6 +168,7 @@ sub getEffectiveUrl { $fn=~s|^/~(\w+)|/home/$1/public_html|; } } + $fn=~s/\/+/\//g; return $fn; } # @@ -179,7 +185,7 @@ sub getEffectiveUrl { 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'); @@ -187,6 +193,12 @@ sub startpage { $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(); @@ -201,19 +213,25 @@ sub startpage { ENDPUBDIRSCRIPT - $r->print('

Construction Space Directory '. - $thisdisfn.'/

'.$pubdirscript. + $r->print('

'.&mt('Construction Space Directory').' '. + $thisdisfn.'/

'. + ''. + $pubdirscript. '
'. - ''. - ''. + ''. ''. - ''. + '
ActionsNameTitleStatusLast Modified
'.&mt('Actions').''.&mt('Name').''. + &mt('Title').''.&mt('Status').''.&mt('Last Modified'). + '
'. ''); + $uname.$thisdisfn."/default.meta'".'" value="'. +&mt('Edit Directory Catalog Information').'" />
'.&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. '

'); } } @@ -232,7 +250,7 @@ sub getTitleString { my $title = &Apache::lonnet::metadata($fullname, 'title'); unless ($title) { - $title = "[untitled]"; + $title = "[".&mt('untitled')."]"; } return $title; } @@ -254,7 +272,7 @@ sub putdirectory { my $disfilename = $dirname; if ($dirname eq '..') { - $disfilename = 'Parent Directory'; + $disfilename = ''.&mt('Parent Directory').''; } unless (( ($dirname eq '..') && ($reqfile eq '')) || ($dirname eq '.')) { @@ -264,7 +282,7 @@ sub putdirectory { $disfilename.''. ' '. ' '. - ''.localtime($modtime).''. + ''.&Apache::lonlocal::locallocaltime($modtime).''. "\n"); } return OK; @@ -286,36 +304,53 @@ 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=''. 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)$/) { + &Apache::lonnet::appenv('cgi.file' => $filename); + $editlink=' ('.&mt('Decompress').')'; } $r->print(''. ''.'Publish'. + $uname.$thisdisfn.'/'.$filename.'">'.&mt('Publish').''. ''. ''. ''. - $filename.''. + $filename.''.$editlink2.$editlink. ''. ''.$title.''. ''.$status.''. - ''.localtime($cmtime).''. + ''.&Apache::lonlocal::locallocaltime($cmtime).''. "\n"); return OK; } @@ -350,7 +385,7 @@ __END__ =head1 NAME -Apache::lonpubdir - Publication Handler for Directories +Apache::lonpubdir - Construction space directory lister =head1 SYNOPSIS