[LON-CAPA-cvs] cvs: loncom /lonnet/perl lonnet.pm

[albertel]

albertel		Wed Jan 11 15:27:44 2006 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - BUG#4563 forward port of 1.683.2.10
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.697 loncom/lonnet/perl/lonnet.pm:1.698
--- loncom/lonnet/perl/lonnet.pm:1.697	Wed Jan 11 03:24:21 2006
+++ loncom/lonnet/perl/lonnet.pm	Wed Jan 11 15:27:43 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.697 2006/01/11 08:24:21 albertel Exp $
+# $Id: lonnet.pm,v 1.698 2006/01/11 20:27:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5042,8 +5042,7 @@
     # if it is a non metadata possible uri return quickly
     if (($uri eq '') || 
 	(($uri =~ m|^/*adm/|) && 
-	     ($uri !~ m|^adm/includes|) && ($uri !~ m|/bulletinboard$|)
-	  && ($uri !~ m|^adm/coursedocs/|) && ($uri !~ m|^adm/wrapper/|)) ||
+	     ($uri !~ m|^adm/includes|) && ($uri !~ m|/bulletinboard$|)) ||
         ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ /^~/) ||
 	($uri =~ m|home/[^/]+/public_html/|)) {
 	return undef;
@@ -6169,14 +6168,21 @@
 	} else {
 	    my ($ext) = ($thisfn =~ /\.(\w+)$/);
 	    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 'wrp')) {
 		$thisfn='/adm/wrapper'.$thisfn;
-	    } elsif ($embstyle eq 'ssi') {
-		#do nothing with these
-	    } elsif ($thisfn!~/\.(sequence|page)$/) {
+	    } elsif ($embstyle eq 'unk'
+		     && $thisfn!~/\.(sequence|page)$/) {
 		$thisfn='/adm/coursedocs/showdoc'.$thisfn;
+	    } else {
+		&logthis("Got a blank emb style");
 	    }
 	}
     }