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

[www]

www		Mon Oct 24 19:36:06 2011 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
  Log:
  Bug #1320
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1021 loncom/interface/loncommon.pm:1.1022
--- loncom/interface/loncommon.pm:1.1021	Mon Oct 17 12:41:30 2011
+++ loncom/interface/loncommon.pm	Mon Oct 24 19:36:06 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1021 2011/10/17 12:41:30 raeburn Exp $
+# $Id: loncommon.pm,v 1.1022 2011/10/24 19:36:06 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4590,9 +4590,9 @@
 sub CSTR_pageheader {
     # this is for resources; directories have customtitle, and crumbs
             # and select recent are created in lonpubdir.pm  
-    my ($uname,$thisdisfn)=
-        ($env{'request.filename'} =~ m|^/home/([^/]+)/public_html/(.*)|);
-    my $formaction='/priv/'.$uname.'/'.$thisdisfn;
+    my ($udom,$uname,$thisdisfn)=
+        ($env{'request.filename'} =~ m|^/home/httpd/html/priv/([^/]+)/([^/]+)/(.*)$|);
+    my $formaction='/priv/'.$udom.'/'.$uname.'/'.$thisdisfn;
     $formaction=~s/\/+/\//g;
 
     my $parentpath = '';
@@ -8448,8 +8448,8 @@
         $getpropath = 1;
     } elsif (($actionurl eq '/adm/upload') || ($actionurl eq '/adm/testbank') ||
              ($actionurl eq '/adm/imsimport')) { 
-        ($uname,my $rest) = ($args->{'current_path'} =~ m{/priv/($match_username)/?(.*)$});
-        $url = '/home/'.$uname.'/public_html/';
+        my ($udom,$uname,$rest) = ($args->{'current_path'} =~ m{/priv/($match_domain)/($match_username)/?(.*)$});
+        $url = '/home/httpd/html/priv/'.$udom.'/'.$uname.'/';
         $toplevel = $url;
         if ($rest ne '') {
             $url .= $rest;