[LON-CAPA-cvs] cvs: loncom /interface lonprintout.pm

sakharuk lon-capa-cvs@mail.lon-capa.org
Wed, 12 May 2004 19:04:00 -0000


sakharuk		Wed May 12 15:04:00 2004 EDT

  Modified files:              
    /loncom/interface	lonprintout.pm 
  Log:
  Used lonDocRoot instead /home/httpd/html everywhere where possible.
  
  
Index: loncom/interface/lonprintout.pm
diff -u loncom/interface/lonprintout.pm:1.301 loncom/interface/lonprintout.pm:1.302
--- loncom/interface/lonprintout.pm:1.301	Mon May 10 10:25:02 2004
+++ loncom/interface/lonprintout.pm	Wed May 12 15:04:00 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Printout
 #
-# $Id: lonprintout.pm,v 1.301 2004/05/10 14:25:02 sakharuk Exp $
+# $Id: lonprintout.pm,v 1.302 2004/05/12 19:04:00 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1103,7 +1103,7 @@
 		if ($urlp =~ m|/home/([^/]+)/public_html|) {
 		    $urlp =~ s|/home/([^/]*)/public_html|/~$1|;
 		} else {
-		    $urlp =~ s|^/home/httpd/html||;
+		    $urlp =~ s|^$Apache::lonnet::perlvar{'lonDocRoot'}||;
 		}
 		my $texversion=&Apache::lonnet::ssi($urlp,%form);
 		if(($helper->{'VARS'}->{'ANSWER_TYPE'} eq 'no') ||
@@ -1494,7 +1494,7 @@
     # "Delete everything after the last slash."
     $subdir =~ s|/[^/]+$||;
     if (not $helper->{VARS}->{'construction'}) {
-	$subdir='/home/httpd/html/res/'.$subdir;
+	$subdir=$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$subdir;
     }
     # "Remove all duplicate slashes."
     $subdir =~ s|/+|/|g;
@@ -1693,7 +1693,7 @@
     }
 
     # FIXME: That RE should come from a library somewhere.
-    if ((((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) and $ENV{'request.role.adv'} and $subdir ne '/home/httpd/html/res/') {    
+    if ((((&Apache::lonnet::allowed('bre',$subdir) eq 'F') and ($helper->{VARS}->{'postdata'}=~/\.(problem|exam|quiz|assess|survey|form|library|page|xml|html|htm|xhtml|xhtm)/)) or defined $helper->{'VARS'}->{'construction'}) and $ENV{'request.role.adv'} and $subdir ne $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/') {    
         push @{$printChoices}, ["<b>".&mt('Problems')."</b> ".&mt('from current subdirectory')." <b><i>$subdir</i></b>", 'problems_from_directory', 'CHOOSE_FROM_SUBDIR'];
 
         my $f = '$filename';