[LON-CAPA-cvs] cvs: loncom /publisher lonupload.pm

[raeburn]

raeburn		Mon Oct 31 01:28:47 2011 EDT

  Modified files:              
    /loncom/publisher	lonupload.pm 
  Log:
  - Use lonDocRoot perlvar in place of static string: '/home/httpd/html'.
  
  
Index: loncom/publisher/lonupload.pm
diff -u loncom/publisher/lonupload.pm:1.55 loncom/publisher/lonupload.pm:1.56
--- loncom/publisher/lonupload.pm:1.55	Wed Oct 26 22:38:49 2011
+++ loncom/publisher/lonupload.pm	Mon Oct 31 01:28:47 2011
@@ -2,7 +2,7 @@
 # The LearningOnline Network with CAPA
 # Handler to upload files into construction space
 #
-# $Id: lonupload.pm,v 1.55 2011/10/26 22:38:49 www Exp $
+# $Id: lonupload.pm,v 1.56 2011/10/31 01:28:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -404,7 +404,8 @@
     } elsif ($mode eq 'imsimport') {
         $action = '/adm/imsimport';
     }
-    my $dir_root = '/home/httpd/html/priv/'.$udom.'/'.$uname;
+    my $url_root = "/priv/$udom/$uname";
+    my $dir_root = $r->dir_config('lonDocRoot').$url_root;
     my $url_root = '/priv/'.$udom.'/'.$uname;
     my $path = &File::Basename::dirname($fn);
     my $filename = &HTML::Entities::encode($env{'form.filename'},'<>&"');
@@ -442,8 +443,8 @@
         $action = '/adm/imsimport';
     }
     my $result;
-    my $dir_root = '/home/httpd/html/priv/'.$udom.'/'.$uname;
-    my $url_root = '/priv/'.$udom.'/'.$uname;
+    my $url_root = "/priv/$udom/$uname";
+    my $dir_root = $r->dir_config('lonDocRoot').$url_root;
     my $path = &File::Basename::dirname($fn);
     $result .= &Apache::loncommon::modify_html_refs($mode,$path,
                               $uname,$udom,$dir_root);