--- loncom/publisher/lonpublisher.pm	2002/11/06 22:36:08	1.107
+++ loncom/publisher/lonpublisher.pm	2003/03/07 17:52:37	1.113
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.107 2002/11/06 22:36:08 albertel Exp $
+# $Id: lonpublisher.pm,v 1.113 2003/03/07 17:52:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,18 +33,14 @@
 # 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
 # 03/23 Guy Albertelli
 # 03/24,03/29,04/03 Gerd Kortemeyer
-# 04/16/2001 Scott Harrison
 # 05/03,05/05,05/07 Gerd Kortemeyer
-# 05/28/2001 Scott Harrison
 # 06/23,08/07,08/11,8/13,8/17,8/18,8/24,9/26,10/16 Gerd Kortemeyer
 # 12/04,12/05 Guy Albertelli
 # 12/05 Gerd Kortemeyer
 # 12/05 Guy Albertelli
 # 12/06,12/07 Gerd Kortemeyer
-# 12/15,12/16 Scott Harrison
 # 12/25 Gerd Kortemeyer
 # YEAR=2002
-# 1/16,1/17 Scott Harrison
 # 1/17 Gerd Kortemeyer
 #
 ###
@@ -121,7 +117,6 @@ use File::Copy;
 use Apache::Constants qw(:common :http :methods);
 use HTML::LCParser;
 use Apache::lonxml;
-use Apache::lonhomework;
 use Apache::loncacc;
 use DBI;
 use Apache::lonnet();
@@ -794,6 +789,10 @@ This is the workhorse function of this m
 backup copies, performs any automatic processing (prior to publication,
 especially for rat and ssi files),
 
+Returns a 2 element array, the first is the string to be shown to the
+user, the second is an error code, either 1 (an error occured) or 0
+(no error occurred)
+
 I<Additional documentation needed.>
 
 =cut
@@ -810,8 +809,7 @@ sub publish {
     my %allow=();
 
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
-	return 
-         '<font color=red>No write permission to user directory, FAIL</font>';
+	return ('<font color=red>No write permission to user directory, FAIL</font>',1);
     }
     print $logfile 
 "\n\n================= Publish ".localtime()." Phase One  ================\n";
@@ -825,14 +823,14 @@ sub publish {
 	    print $logfile "Copied original file to ".$copyfile."\n";
         } else {
 	    print $logfile "Unable to write backup ".$copyfile.':'.$!."\n";
-          return "<font color=red>Failed to write backup copy, $!,FAIL</font>";
+	    return ("<font color=red>Failed to write backup copy, $!,FAIL</font>",1);
         }
 # ------------------------------------------------------------- IDs and indices
 	
 	my ($outstring,$error);
 	($outstring,$error,%allow)=&fix_ids_and_indices($logfile,$source,
 							$target);
-	if ($error) { return $outstring; }
+	if ($error) { return ($outstring,$error); }
 # ------------------------------------------------------------ Construct Allows
     
 	$scrout.='<h3>Dependencies</h3>';
@@ -877,9 +875,8 @@ sub publish {
           my $org;
           unless ($org=Apache::File->new('>'.$source)) {
              print $logfile "No write permit to $source\n";
-             return 
-		 '<font color="red">No write permission to '.$source.
-		 ', FAIL</font>';
+             return ('<font color="red">No write permission to '.$source.
+		     ', FAIL</font>',1);
 	  }
           print($org $outstring);
         }
@@ -1127,8 +1124,7 @@ END
     my $copyright_help =
         Apache::loncommon::help_open_topic('Publishing_Copyright');
     $scrout =~ s/DISTRIBUTION:/'DISTRIBUTION: ' . $copyright_help/ge;
-    return $scrout.
-        '<p><input type="submit" value="Finalize Publication" /></p></form>';
+    return ($scrout.'<p><input type="submit" value="Finalize Publication" /></p></form>',0);
 # =============================================================================
 # BATCH MODE
 #
@@ -1156,7 +1152,7 @@ END
 	$ENV{'form.copyright'}='default';
     } 
     $ENV{'form.allmeta'}=&Apache::lonnet::escape($allmeta);
-    return $scrout;
+    return ($scrout,0);
   }
 }
 
@@ -1203,11 +1199,18 @@ sub phasetwo {
     my ($r,$source,$target,$style,$distarget,$batch)=@_;
     $source=~s/\/+/\//g;
     $target=~s/\/+/\//g;
+
+    if ($target=~/\_\_\_/) {
+	$r->print(
+ '<font color=red>Unsupported character combination "<tt>___</tt>" in filename, FAIL</font>');
+        return 0;
+    }
     $distarget=~s/\/+/\//g;
     my $logfile;
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
-	return 
-            '<font color=red>No write permission to user directory, FAIL</font>';
+	$r->print(
+        '<font color=red>No write permission to user directory, FAIL</font>');
+        return 0;
     }
     print $logfile 
         "\n================= Publish ".localtime()." Phase Two  ================\n";
@@ -1470,13 +1473,16 @@ sub batchpublish {
 
 # phase one takes
 #  my ($source,$target,$style,$batch)=@_;
-    $r->print('<p>'.&publish($srcfile,$targetfile,$thisembstyle,1).'</p>');
+    my ($outstring,$error)=&publish($srcfile,$targetfile,$thisembstyle,1);
+    $r->print('<p>'.$outstring.'</p>');
 # phase two takes
 # my ($source,$target,$style,$distarget,batch)=@_;
 # $ENV{'form.allmeta'},$ENV{'form.title'},$ENV{'form.author'},...
-    $r->print('<p>');
-    &phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1);
-    $r->print('</p>');
+    if (!$error) {
+	$r->print('<p>');
+	&phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1);
+	$r->print('</p>');
+    }
     return '';
 }
 
@@ -1591,7 +1597,7 @@ sub handler {
 
 # -------------------------------------------------------------- Check filename
 
-  my $fn=$ENV{'form.filename'};
+  my $fn=&Apache::lonnet::unescape($ENV{'form.filename'});
 
   
   unless ($fn) { 
@@ -1721,13 +1727,12 @@ unless ($ENV{'form.phase'} eq 'two') {
 # ------------------ Publishing from $thisfn to $thistarget with $thisembstyle.
 
        unless ($ENV{'form.phase'} eq 'two') {
-         $r->print(
-          '<hr />'.&publish($thisfn,$thistarget,$thisembstyle));
+	   my ($outstring,$error)=&publish($thisfn,$thistarget,$thisembstyle);
+	   $r->print('<hr />'.$outstring);
        } else {
            $r->print('<hr />');
            &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget); 
-       }  
-
+       }
   }
   $r->print('</body></html>');