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

[www]

www		Mon Oct 24 12:06:03 2011 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
    /rat	lonratedt.pm 
  Log:
  Bug #1320
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1139 loncom/lonnet/perl/lonnet.pm:1.1140
--- loncom/lonnet/perl/lonnet.pm:1.1139	Fri Oct 21 16:14:02 2011
+++ loncom/lonnet/perl/lonnet.pm	Mon Oct 24 12:05:58 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1139 2011/10/21 16:14:02 www Exp $
+# $Id: lonnet.pm,v 1.1140 2011/10/24 12:05:58 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -8991,7 +8991,7 @@
         ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ m{^/*uploaded/.+\.sequence$})) {
 	return undef;
     }
-    if (($uri =~ /^~/ || $uri =~ m{home/$match_username/public_html/}) 
+    if (($uri =~ /^priv/ || $uri=~/home\/httpd\/html\/priv/) 
 	&& &Apache::lonxml::get_state('target') =~ /^(|meta)$/) {
 	return undef;
     }
@@ -9028,7 +9028,7 @@
         my %metathesekeys=();
         unless ($filename=~/\.meta$/) { $filename.='.meta'; }
 	my $metastring;
-	if ($uri =~ /^~/ || $uri =~ m{home/$match_username/public_html/}) {
+	if ($uri =~ /^priv/ || $uri=~/home\/httpd\/html\/priv/) {
 	    my $which = &hreflocation('','/'.($liburi || $uri));
 	    $metastring = 
 		&Apache::lonnet::ssi_body($which,
Index: rat/lonratedt.pm
diff -u rat/lonratedt.pm:1.101 rat/lonratedt.pm:1.102
--- rat/lonratedt.pm:1.101	Tue Aug 24 09:11:40 2010
+++ rat/lonratedt.pm	Mon Oct 24 12:06:03 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Edit Handler for RAT Maps
 #
-# $Id: lonratedt.pm,v 1.101 2010/08/24 09:11:40 wenzelju Exp $
+# $Id: lonratedt.pm,v 1.102 2011/10/24 12:06:03 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -645,7 +645,7 @@
 # ----------------------------------------------------------------- No such dir
 sub nodir {
    my ($r,$dir)=@_;
-   $dir=~s{^/home/$LONCAPA::username_re/public_html}{};
+   $dir=~s{^/home/httpd/html/priv/[^/]+/[^/]+}{};
    my $brcrum = [{'href' => &Apache::loncommon::authorspace(),
                   'text' => 'Construction Space'}];
 #                 {'href' => '',