--- loncom/publisher/lonpubdir.pm 2002/02/09 01:38:54 1.23 +++ loncom/publisher/lonpubdir.pm 2002/09/16 13:05:49 1.26 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # (Publication Handler # -# $Id: lonpubdir.pm,v 1.23 2002/02/09 01:38:54 foxr Exp $ +# $Id: lonpubdir.pm,v 1.26 2002/09/16 13:05:49 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -95,11 +95,11 @@ 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. @@ -153,8 +153,16 @@ sub getEffectiveUrl { # 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|; + } } return $fn; } @@ -168,6 +176,7 @@ 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) = @_; @@ -176,11 +185,15 @@ sub startpage { $r->print('LON-CAPA Construction Space'); - $r->print(''); + $r->print(&Apache::loncommon::bodytag(undef,undef,undef,1)); $r->print('

Construction Space Directory '. - $thisdisfn.'/

'); + $thisdisfn.'/'. + '
'. + ''. + ''. + '
'); if (($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) { $r->print('

Co-Author: '.$uname.' at '.$udom. @@ -228,14 +241,14 @@ sub putdirectory { } unless (( ($dirname eq '..') && ($reqfile eq '')) || ($dirname eq '.')) { - $r->print(''. - 'Click to cwd'. - ''. + $r->print(''. + 'Go to ...'. + ''. $disfilename.''. ' '. ' '. ''.localtime($modtime).''. - ''); + "\n"); } return OK; } @@ -248,6 +261,7 @@ sub putresource { $cmtime) = @_; my $status='Unpublished'; + my $bgcolor='#FFCCCC'; my $title=' '; if (-e $resdir.'/'.$filename) { my ($rdev,$rino,$rmode,$rnlink, @@ -256,13 +270,15 @@ sub putresource { $rblksize,$rblocks)=stat($resdir.'/'.$filename); if ($rmtime>=$cmtime) { $status='Published'; + $bgcolor='#CCFFCC'; $title=''. getTitleString($targetdir.'/'.$filename, 'title').''; } else { $status='Modified'; + $bgcolor='#FFFFCC'; $title=''. - &Apache::lonnet::metadata($targetdir.'/'.$filename,'title').''; + getTitleString($targetdir.'/'.$filename,'title').''; if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') { $status.='
Retrieve'; } - $r->print(''. + $r->print(''. ''.'Publish'. ''. ''. - ''.$filename.''. + ''. + $filename.''. ''. ''.$title.''. ''.$status.''. ''.localtime($cmtime).''. - ''); + "\n"); return OK; } #