Diff for /loncom/lonnet/perl/lonnet.pm between versions 1.683.2.9 and 1.683.2.10

version 1.683.2.9, 2006/01/11 08:25:06 version 1.683.2.10, 2006/01/11 20:26:45
Line 4981  sub metadata { Line 4981  sub metadata {
     # if it is a non metadata possible uri return quickly      # if it is a non metadata possible uri return quickly
     if (($uri eq '') ||       if (($uri eq '') || 
  (($uri =~ m|^/*adm/|) &&    (($uri =~ m|^/*adm/|) && 
      ($uri !~ m|^adm/includes|) && ($uri !~ m|/bulletinboard$|)       ($uri !~ m|^adm/includes|) && ($uri !~ m|/bulletinboard$|)) ||
   && ($uri !~ m|^adm/coursedocs/|) && ($uri !~ m|^adm/wrapper/|)) ||  
         ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ /^~/) ||          ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ /^~/) ||
  ($uri =~ m|home/[^/]+/public_html/|)) {   ($uri =~ m|home/[^/]+/public_html/|)) {
  return undef;   return undef;
Line 6108  sub clutter { Line 6107  sub clutter {
  } else {   } else {
     my ($ext) = ($thisfn =~ /\.(\w+)$/);      my ($ext) = ($thisfn =~ /\.(\w+)$/);
     my $embstyle=&Apache::loncommon::fileembstyle($ext);      my $embstyle=&Apache::loncommon::fileembstyle($ext);
     if (($embstyle eq 'img')       if ($embstyle eq 'ssi'
    || ($embstyle eq 'hdn')
    || ($embstyle eq 'rat')
    || ($embstyle eq 'prv')
    || ($embstyle eq 'ign')) {
    #do nothing with these
       } elsif (($embstyle eq 'img') 
  || ($embstyle eq 'emb')   || ($embstyle eq 'emb')
  || ($embstyle eq 'wrp')) {   || ($embstyle eq 'wrp')) {
  $thisfn='/adm/wrapper'.$thisfn;   $thisfn='/adm/wrapper'.$thisfn;
     } elsif ($embstyle eq 'ssi') {      } elsif ($embstyle eq 'unk'
  #do nothing with these       && $thisfn!~/\.(sequence|page)$/) {
     } elsif ($thisfn!~/\.(sequence|page)$/) {  
  $thisfn='/adm/coursedocs/showdoc'.$thisfn;   $thisfn='/adm/coursedocs/showdoc'.$thisfn;
       } else {
    &logthis("Got a blank emb style");
     }      }
  }   }
     }      }

Removed from v.1.683.2.9  
changed lines
  Added in v.1.683.2.10


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>