--- loncom/publisher/loncleanup.pm	2009/09/09 17:58:37	1.11
+++ loncom/publisher/loncleanup.pm	2011/10/24 22:39:21	1.13
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to cleanup XML files
 #
-# $Id: loncleanup.pm,v 1.11 2009/09/09 17:58:37 bisitz Exp $
+# $Id: loncleanup.pm,v 1.13 2011/10/24 22:39:21 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -278,7 +278,7 @@ sub phaseone {
 sub phasetwo {
     # Check original file
     my ($r,$fn,$uname,$udom)=@_;
-    open(IN,'/home/'.$uname.'/public_html/'.$fn);
+    open(IN,'/home/httpd/html/priv/'.$udom.'/'.$uname.'/'.$fn);
     my $text='';
     while (my $line=<IN>) {
 	$text.=$line;
@@ -310,7 +310,7 @@ sub phasetwo {
                ($env{'form.symbol'} ne 'on'));
     my ($main,$ext)=($fn=~/^(.*)\.(\w+)/);
     my $newfn=$main.'_Auto_Cleaned_Up.'.$ext;
-    open(OUT,'>/home/'.$uname.'/public_html'.$newfn);
+    open(OUT,'>/home/httpd/html/priv/'.$udom.'/'.$uname.'/'.$newfn);
     print OUT $text;
     close(OUT);
     my $newuri='/~'.$uname.$newfn;
@@ -356,10 +356,10 @@ sub phasetwo {
 
 sub phasethree {
     my ($r,$fn,$uname,$udom)=@_;
-    my $old='/home/'.$uname.'/public_html/'.$fn;
+    my $old='/home/httpd/html/priv/'.$udom.'/'.$uname.'/'.$fn;
     my ($main,$ext)=($fn=~/^(.*)\.(\w+)/);
     my $newfn=$main.'_Auto_Cleaned_Up.'.$ext;
-    my $new='/home/'.$uname.'/public_html'.$newfn;
+    my $new='/home/httpd/html/priv/'.$udom.'/'.$uname.'/'.$newfn;
     if ($env{'form.accept'}) {
 	$r->print(
         '<p class="LC_info">'
@@ -407,8 +407,7 @@ sub handler {
     my $uname;
     my $udom;
 
-    ($uname,$udom)=
-	&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
+    ($uname,$udom)=&Apache::loncacc::constructaccess($fn);
     unless (($uname) && ($udom)) {
 	$r->log_reason($uname.' at '.$udom.
 		       ' trying to cleanup file '.$env{'form.filename'}.
@@ -451,9 +450,9 @@ sub handler {
         '</form>'
        .&Apache::lonhtmlcommon::start_funclist()
        .&Apache::lonhtmlcommon::add_item_funclist(
-            '<a href="/priv/'.$uname.'/'.$fn.'">'.&mt('Back to Source File').'</a>')
+            '<a href="/priv/'.$udom.'/'.$uname.'/'.$fn.'">'.&mt('Back to Source File').'</a>')
        .&Apache::lonhtmlcommon::add_item_funclist(
-            '<a href="/priv/'.$uname.'/'.$dir.'">'.&mt('Back to Source Directory').'</a>')
+            '<a href="/priv/'.$udom.'/'.$uname.'/'.$dir.'">'.&mt('Back to Source Directory').'</a>')
        .&Apache::lonhtmlcommon::end_funclist()
        .&Apache::loncommon::end_page()
     );