[BACK]Return to lonnet.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / lonnet / perl

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

version 1.683.2.7, 2006/01/11 07:33:45 version 1.683.2.10, 2006/01/11 20:26:45
Line 4930  sub EXT { Line 4930  sub EXT {
  if ($space eq 'time') {   if ($space eq 'time') {
     return time;      return time;
         }          }
       } elsif ($realm eq 'server') {
   # ----------------------------------------------------------------- system.time
    if ($space eq 'name') {
       return $ENV{'SERVER_NAME'};
           }
     }      }
     return '';      return '';
 }  }
Line 4976  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 6083  sub declutter { Line 6087  sub declutter {
     if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); }      if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); }
     $thisfn=~s/^\Q$perlvar{'lonDocRoot'}\E//;      $thisfn=~s/^\Q$perlvar{'lonDocRoot'}\E//;
     $thisfn=~s/^\///;      $thisfn=~s/^\///;
     $thisfn=~s/^res\///;  
     $thisfn=~s/\?.+$//;  
     $thisfn=~s|^adm/wrapper/||;      $thisfn=~s|^adm/wrapper/||;
     $thisfn=~s|^adm/coursedocs/showdoc/||;      $thisfn=~s|^adm/coursedocs/showdoc/||;
       $thisfn=~s/^res\///;
       $thisfn=~s/\?.+$//;
     return $thisfn;      return $thisfn;
 }  }
   
Line 6103  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.7  
changed lines
  Added in v.1.683.2.10

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