--- loncom/publisher/lonpublisher.pm	2008/12/07 23:49:40	1.249
+++ loncom/publisher/lonpublisher.pm	2009/11/24 00:59:48	1.249.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.249 2008/12/07 23:49:40 www Exp $
+# $Id: lonpublisher.pm,v 1.249.2.2 2009/11/24 00:59:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1640,7 +1640,8 @@ sub phasetwo {
         my $srcf=$2;
         my $srct=$3;
         my $srcd=$1;
-        unless ($srcd=~/^\/home\/httpd\/html\/res/) {
+        my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+        unless ($srcd=~/^\Q$docroot\E\/res/) {
             print $logfile "\nPANIC: Target dir is ".$srcd;
             $r->print(
 	 "<span class=\"LC_error\">".&mt('Invalid target directory, FAIL')."</span>");
@@ -1652,7 +1653,7 @@ sub phasetwo {
                 unlink($srcd.'/'.$filename);
                 unlink($srcd.'/'.$filename.'.meta');
             } else {
-                if ($filename=~/\Q$srcf\E\.(\d+)\.\Q$srct\E$/) {
+                if ($filename=~/^\Q$srcf\E\.(\d+)\.\Q$srct\E$/) {
                     $maxversion=($1>$maxversion)?$1:$maxversion;
                 }
             }