--- loncom/publisher/lonpubdir.pm 2002/11/18 15:26:10 1.29 +++ loncom/publisher/lonpubdir.pm 2003/06/15 18:02:57 1.32 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA -# (Publication Handler +# Construction Space Directory Lister # -# $Id: lonpubdir.pm,v 1.29 2002/11/18 15:26:10 www Exp $ +# $Id: lonpubdir.pm,v 1.32 2003/06/15 18:02:57 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 (?) @@ -203,7 +204,10 @@ sub startpage { ENDPUBDIRSCRIPT $r->print('

Construction Space Directory '. - $thisdisfn.'/

'.$pubdirscript. + $thisdisfn.'/'. + ''. + $pubdirscript. '
'. ''. @@ -351,7 +355,7 @@ __END__ =head1 NAME -Apache::lonpubdir - Publication Handler for Directories +Apache::lonpubdir - Construction space directory lister =head1 SYNOPSIS