--- loncom/publisher/lonpublisher.pm 2001/08/11 18:51:40 1.35 +++ loncom/publisher/lonpublisher.pm 2001/08/11 19:06:54 1.36 @@ -133,9 +133,6 @@ sub selectbox { # -------------------------------------------------------- Publication Step One -sub makeallowed { -} - sub urlfixup { my ($url,$target)=@_; my ($host)=($url=~/(?:http\:\/\/)*([^\/]+)/); @@ -160,6 +157,8 @@ sub publish { my $scrout=''; my $allmeta=''; my $content=''; + my %allow=(); + undef %allow; unless ($logfile=Apache::File->new('>>'.$source.'.log')) { return @@ -255,7 +254,7 @@ sub publish { print $logfile 'URL: '.$tag.':'.$oldurl.' - '. $newurl."\n"; } - &makeallowed($newurl); + $allow{$newurl}=1; } } ('src','href','codebase'); @@ -271,7 +270,9 @@ sub publish { } keys %parms; $outstring.='<'.$tag.$newparmstring.$endtag.'>'; - } + } else { + $allow{$token->[2]->{'src'}}=1; + } } elsif ($token->[0] eq 'E') { unless ($token->[1] eq 'allow') { $outstring.=$token->[2]; @@ -280,6 +281,13 @@ sub publish { $outstring.=$token->[1]; } } +# ------------------------------------------------------------ Construct Allows + my $allowstr="\n"; + map { + $allowstr.=''."\n"; + } keys %allow; + $outstring=~s/(\<\/[^\>]+\>\s*)$/$allowstr$1/s; + { my $org; unless ($org=Apache::File->new('>'.$source)) {