--- loncom/interface/loncommon.pm	2011/10/24 19:36:06	1.1022
+++ loncom/interface/loncommon.pm	2011/10/25 22:04:16	1.1024
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1022 2011/10/24 19:36:06 www Exp $
+# $Id: loncommon.pm,v 1.1024 2011/10/25 22:04:16 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4546,13 +4546,15 @@ Returns: Path to the Construction Space
 
 sub authorspace {
     my $caname = '';
+    my $cadom = '';
     if ($env{'request.role'} =~ /^ca|^aa/) {
-        (undef,$caname) =
+        ($cadom,$caname) =
             ($env{'request.role'}=~/($match_domain)\/($match_username)$/);
     } else {
         $caname = $env{'user.name'};
+        $cadom = $env{'user.domain'};
     }
-    return '/priv/'.$caname.'/';
+    return '/priv/'.$cadom.'/'.$caname.'/';
 }
 
 ##############################################
@@ -4610,7 +4612,7 @@ sub CSTR_pageheader {
         .'<b>'.&mt('Construction Space:').'</b> '
         .'<form name="dirs" method="post" action="'.$formaction
         .'" target="_top">' #FIXME lonpubdir: target="_parent"
-        .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv',undef,undef);
+        .&Apache::lonhtmlcommon::crumbs($uname.'/'.$parentpath,'_top','/priv/'.$udom,undef,undef);
 
     if ($lastitem) {
         $output .=
@@ -8938,7 +8940,6 @@ sub modify_html_refs {
         $container = $env{'form.primaryurl'};
     } else {
         $container = $env{'form.filename'};
-        $container =~ s{^/priv/(\Q$uname\E)/(.*)}{/home/$1/public_html/$2};
     }
     my (%allfiles,%codebase,$output,$content);
     my @changes = &get_env_multiple('form.namechange');