--- loncom/publisher/lonpubdir.pm 2002/10/19 06:34:15 1.27 +++ loncom/publisher/lonpubdir.pm 2003/08/03 01:20:02 1.37 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA -# (Publication Handler +# Construction Space Directory Lister # -# $Id: lonpubdir.pm,v 1.27 2002/10/19 06:34:15 albertel Exp $ +# $Id: lonpubdir.pm,v 1.37 2003/08/03 01:20:02 www 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 # ### @@ -70,13 +69,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/\/$//; @@ -148,7 +147,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 +165,7 @@ sub getEffectiveUrl { $fn=~s|^/~(\w+)|/home/$1/public_html|; } } + $fn=~s/\/+/\//g; return $fn; } # @@ -186,14 +188,41 @@ sub startpage { $r->print('LON-CAPA Construction Space'); $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('

Construction Space Directory '. $thisdisfn.'/

'. + ''. + $pubdirscript. '
'. - ''. - ''. - '
'); + ''. + ''. + ''. +' Force publication of unmodified files. '); if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) { $r->print('

Co-Author: '.$uname.' at '.$udom. @@ -288,13 +317,20 @@ sub putresource { $status.='
Retrieve'; } + my $editlink=''; + if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) { + $editlink=' (Edit)'; + } + if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library)$/) { + $editlink=' (EditXML)'; + } $r->print(''. ''.'Publish'. ''. ''. ''. - $filename.''. + $filename.''.$editlink. ''. ''.$title.''. ''.$status.''. @@ -333,7 +369,7 @@ __END__ =head1 NAME -Apache::lonpubdir - Publication Handler for Directories +Apache::lonpubdir - Construction space directory lister =head1 SYNOPSIS