--- loncom/publisher/lonpublisher.pm 2002/10/21 16:58:21 1.106
+++ loncom/publisher/lonpublisher.pm 2003/02/18 16:29:37 1.110
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Publication Handler
#
-# $Id: lonpublisher.pm,v 1.106 2002/10/21 16:58:21 albertel Exp $
+# $Id: lonpublisher.pm,v 1.110 2003/02/18 16:29:37 www 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
#
###
@@ -554,7 +550,7 @@ sub get_all_text_unbalanced {
} elsif ($token->[0] eq 'E') {
$result.=$token->[2];
}
- if ($result =~ /(.*)$tag(.*)/) {
+ if ($result =~ /(.*)\Q$tag\E(.*)/s) {
#&Apache::lonnet::logthis('Got a winner with leftovers ::'.$2);
#&Apache::lonnet::logthis('Result is :'.$1);
$result=$1;
@@ -1203,11 +1199,18 @@ sub phasetwo {
my ($r,$source,$target,$style,$distarget,$batch)=@_;
$source=~s/\/+/\//g;
$target=~s/\/+/\//g;
+
+ if ($target=~/\_\_\_/) {
+ $r->print(
+ 'Unsupported character combination "___" in filename, FAIL');
+ return 0;
+ }
$distarget=~s/\/+/\//g;
my $logfile;
unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
- return
- 'No write permission to user directory, FAIL';
+ $r->print(
+ 'No write permission to user directory, FAIL');
+ return 0;
}
print $logfile
"\n================= Publish ".localtime()." Phase Two ================\n";