--- loncom/publisher/lonpublisher.pm 2004/01/27 22:54:59 1.163
+++ loncom/publisher/lonpublisher.pm 2004/03/31 05:24:00 1.165
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Publication Handler
#
-# $Id: lonpublisher.pm,v 1.163 2004/01/27 22:54:59 albertel Exp $
+# $Id: lonpublisher.pm,v 1.165 2004/03/31 05:24:00 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -920,11 +920,11 @@ sub publish {
$allowstr.="\n".'';
}
$scrout.='
';
- unless ($thisdep=~/\*/) {
+ if ($thisdep!~/\*/ && $thisdep!~m|^/adm/|) {
$scrout.='';
}
$scrout.=''.$thisdep.'';
- unless ($thisdep=~/\*/) {
+ if ($thisdep!~/\*/ && $thisdep!~m|^/adm/|) {
$scrout.='';
if (
&Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
@@ -945,11 +945,6 @@ sub publish {
}
$outstring=~s/\n*(\<\/[^\>]+\>)\s*$/$allowstr\n$1\n/s;
-### FIXME: is this really what we want?
-# I dont' think so, to will corrupt any UTF-8 resources at least,
-# and any encoding other than ISO-8859-1 will probably break
- #Encode any High ASCII characters
- #$outstring=&HTML::Entities::encode($outstring,"\200-\377");
# ------------------------------------------------------------- Write modified.
{
@@ -1419,7 +1414,7 @@ sub phasetwo {
print $mfh ' '.$_.'="'.$value.'"';
}
print $mfh '>'.
- &HTML::Entities::encode($metadatafields{$unikey})
+ &HTML::Entities::encode($metadatafields{$unikey},'<>&"')
.''.$tag.'>';
}
}