[LON-CAPA-cvs] cvs: loncom /interface lonsource.pm /publisher lonpublisher.pm

[www]

www		Tue Oct 25 14:28:17 2011 EDT

  Modified files:              
    /loncom/interface	lonsource.pm 
    /loncom/publisher	lonpublisher.pm 
  Log:
  Bug #1320
  
  
Index: loncom/interface/lonsource.pm
diff -u loncom/interface/lonsource.pm:1.24 loncom/interface/lonsource.pm:1.25
--- loncom/interface/lonsource.pm:1.24	Thu Aug 13 11:00:38 2009
+++ loncom/interface/lonsource.pm	Tue Oct 25 14:28:13 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Source Code handler
 #
-# $Id: lonsource.pm,v 1.24 2009/08/13 11:00:38 raeburn Exp $
+# $Id: lonsource.pm,v 1.25 2011/10/25 14:28:13 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -84,10 +84,10 @@
         $author_name = $env{'user.name'};
     }
 
-    my $path_to_new_file = '/home/'.$author_name.'/public_html/'.$newpath.'/'.$listname;
+    my $path_to_new_file = '/home/httpd/html/priv/'.$domain.'/'.$author_name.'/'.$newpath.'/'.$listname;
 #Just checking again for access as we want to make sure that it is really ok now that we have the real path
 
-    my ($uname,$udom)= &Apache::loncacc::constructaccess($path_to_new_file,$domain);
+    my ($uname,$udom)= &Apache::loncacc::constructaccess($path_to_new_file);
 
     if (!$uname || !$udom) {
 	$r->print(&Apache::loncommon::start_page('Not Allowed'));
Index: loncom/publisher/lonpublisher.pm
diff -u loncom/publisher/lonpublisher.pm:1.271 loncom/publisher/lonpublisher.pm:1.272
--- loncom/publisher/lonpublisher.pm:1.271	Sat Oct 22 23:09:44 2011
+++ loncom/publisher/lonpublisher.pm	Tue Oct 25 14:28:17 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.271 2011/10/22 23:09:44 www Exp $
+# $Id: lonpublisher.pm,v 1.272 2011/10/25 14:28:17 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2237,7 +2237,7 @@
 	    }
 	    unless ($errorcount) {
 		my ($outstring,$error)=
-		    &publish($docroot.$fn,$thistarget,$thisembstyle);
+		    &publish($docroot.$fn,$docroot.$thistarget,$thisembstyle);
 		$r->print($outstring);
 	    } else {
 		$r->print('<h3 class="LC_error">'.
@@ -2245,7 +2245,7 @@
 			  '</h3>');
 	    }
 	} else {
-	    &phasetwo($r,$fn,$thistarget,$thisembstyle,$thisdistarget); 
+	    &phasetwo($r,$docroot.$fn,$docroot.$thistarget,$thisembstyle,$thisdistarget); 
 	}
     }
     $r->print(&Apache::loncommon::end_page());