--- loncom/publisher/lonpublisher.pm 2001/03/24 21:51:58 1.20 +++ loncom/publisher/lonpublisher.pm 2001/03/29 21:45:06 1.21 @@ -7,7 +7,7 @@ # # 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer # 03/23 Guy Albertelli -# 03/24 Gerd Kortemeyer +# 03/24,03/29 Gerd Kortemeyer package Apache::lonpublisher; @@ -646,7 +646,6 @@ sub handler { return OK; } -unless ($ENV{'form.pubdir'}) { # -------------------------------------------------------------- Check filename my $fn=$ENV{'form.filename'}; @@ -775,55 +774,7 @@ unless ($ENV{'form.phase'} eq 'two') { } $r->print(''); -} else { - - my $fn=$ENV{'form.filename'}; - - $fn=~s/\/[^\/]+$//; - my $thisprefix=$fn; - $thisprefix=~s/\/\~/\/priv\//; - - $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/; - - unless ($fn) { - $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}. - ' trying to publish empty directory', $r->filename); - return HTTP_NOT_FOUND; - } -# ----------------------------------------------------------- Start page output - - $r->content_type('text/html'); - $r->send_http_header; - - $r->print('LON-CAPA Publishing Directory'); - $r->print( - ''); - - my $thisdisfn=$fn; - $thisdisfn=~s/^\/home\/$ENV{'user.name'}\/public_html\///; - - $r->print('

Publishing directory '.$thisdisfn.'

'); - my $i=0; - $r->print(''); - - $r->print(''); - -} return OK; }