$title:
".
- '';
+ '';
+}
+
+sub hiddenfield {
+ my ($name,$value)=@_;
+ return "\n".'';
+}
+
+sub selectbox {
+ my ($title,$name,$value,%options)=@_;
+ my $selout="\n
$title:
".'';
+}
+
+# -------------------------------------------------------- Publication Step One
+
+sub urlfixup {
+ my ($url,$target)=@_;
+ unless ($url) { return ''; }
+ my ($host)=($url=~/(?:http\:\/\/)*([^\/]+)/);
+ map {
+ if ($_ eq $host) {
+ $url=~s/^http\:\/\///;
+ $url=~s/^$host//;
+ }
+ } values %Apache::lonnet::hostname;
+ if ($url=~/^http\:\/\//) { return $url; }
+ $url=~s/\~$cuname/res\/$cudom\/$cuname/;
+ if ($target) {
+ $target=~s/\/[^\/]+$//;
+ $url=&Apache::lonnet::hreflocation($target,$url);
+ }
+ return $url;
}
sub publish {
@@ -84,35 +185,34 @@ sub publish {
my ($source,$target,$style)=@_;
my $logfile;
my $scrout='';
+ my $allmeta='';
+ my $content='';
+ my %allow=();
+ undef %allow;
unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
return
'No write permission to user directory, FAIL';
}
print $logfile
-"\n\n================== Publish ".localtime()." =================\n";
+"\n\n================= Publish ".localtime()." Phase One ================\n";
if (($style eq 'ssi') || ($style eq 'rat')) {
# ------------------------------------------------------- This needs processing
# ----------------------------------------------------------------- Backup Copy
my $copyfile=$source.'.save';
- {
- my $org=Apache::File->new($source);
- my $cop=Apache::File->new('>'.$copyfile);
- while (my $line=<$org>) { print $cop $line; }
- }
- if (-e $copyfile) {
+ if (copy($source,$copyfile)) {
print $logfile "Copied original file to ".$copyfile."\n";
} else {
- print $logfile "Unable to write backup ".$copyfile."\n";
- return "Failed to write backup copy, FAIL";
+ print $logfile "Unable to write backup ".$copyfile.':'.$!."\n";
+ return "Failed to write backup copy, $!,FAIL";
}
# ------------------------------------------------------------- IDs and indices
my $maxindex=10;
my $maxid=10;
- my $content='';
+
my $needsfixup=0;
{
@@ -149,46 +249,139 @@ sub publish {
print $logfile "Needs ID and/or index fixup\n".
"Max ID : $maxid (min 10)\n".
"Max Index: $maxindex (min 10)\n";
-
+ }
my $outstring='';
my $parser=HTML::TokeParser->new(\$content);
+ $parser->xml_mode(1);
my $token;
while ($token=$parser->get_token) {
if ($token->[0] eq 'S') {
- my $counter;
- if ($counter=$addid{$token->[1]}) {
+ my $counter;
+ my $tag=$token->[1];
+ my $lctag=lc($tag);
+ unless ($lctag eq 'allow') {
+ my %parms=%{$token->[2]};
+ $counter=$addid{$tag};
+ if (!$counter) { $counter=$addid{$lctag}; }
+ if ($counter) {
if ($counter eq 'id') {
- if (defined($token->[2]->{'id'})) {
- $outstring.=$token->[4];
- } else {
+ unless (defined($parms{'id'})) {
$maxid++;
- my $thisid=' id="'.$maxid.'"';
- my $fixup=$token->[4];
- $fixup=~s/(\<\w+)/$1$thisid/;
- $outstring.=$fixup;
- print $logfile 'ID: '.$fixup."\n";
+ $parms{'id'}=$maxid;
+ print $logfile 'ID: '.$tag.':'.$maxid."\n";
}
- } else {
- if (defined($token->[2]->{'index'})) {
- $outstring.=$token->[4];
- } else {
+ } elsif ($counter eq 'index') {
+ unless (defined($parms{'index'})) {
$maxindex++;
- my $thisindex=' index="'.$maxindex.'"';
- my $fixup=$token->[4];
- $fixup=~s/(\<\w+)/$1$thisindex/;
- $outstring.=$fixup;
- print $logfile 'Index: '.$fixup."\n";
+ $parms{'index'}=$maxindex;
+ print $logfile 'Index: '.$tag.':'.$maxindex."\n";
}
}
- } else {
- $outstring.=$token->[4];
+ }
+
+ map {
+ if (defined($parms{$_})) {
+ my $oldurl=$parms{$_};
+ my $newurl=&urlfixup($oldurl,$target);
+ if ($newurl ne $oldurl) {
+ $parms{$_}=$newurl;
+ print $logfile 'URL: '.$tag.':'.$oldurl.' - '.
+ $newurl."\n";
+ }
+ $allow{$newurl}=1;
+ }
+ } ('src','href','background');
+
+ if ($lctag eq 'applet') {
+ my $codebase='';
+ if (defined($parms{'codebase'})) {
+ my $oldcodebase=$parms{'codebase'};
+ unless ($oldcodebase=~/\/$/) {
+ $oldcodebase.='/';
+ }
+ $codebase=&urlfixup($oldcodebase,$target);
+ $codebase=~s/\/$//;
+ if ($codebase ne $oldcodebase) {
+ $parms{'codebase'}=$codebase;
+ print $logfile 'URL codebase: '.$tag.':'.
+ $oldcodebase.' - '.
+ $codebase."\n";
+ }
+ $allow{$codebase.'/*'}=1;
+ } else {
+ map {
+ if (defined($parms{$_})) {
+ my $oldurl=$parms{$_};
+ my $newurl=&urlfixup($oldurl,$target);
+ $newurl=~s/\/[^\/]+$/\/\*/;
+ print $logfile 'Allow: applet '.$_.':'.
+ $oldurl.' allows '.
+ $newurl."\n";
+ $allow{$newurl}=1;
+ }
+ } ('archive','code','object');
+ }
}
+
+ my $newparmstring='';
+ my $endtag='';
+ map {
+ if ($_ eq '/') {
+ $endtag=' /';
+ } else {
+ my $quote=($parms{$_}=~/\"/?"'":'"');
+ $newparmstring.=' '.$_.'='.$quote.$parms{$_}.$quote;
+ }
+ } keys %parms;
+ if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
+ $outstring.='<'.$tag.$newparmstring.$endtag.'>';
+ } else {
+ $allow{$token->[2]->{'src'}}=1;
+ }
} elsif ($token->[0] eq 'E') {
- $outstring.=$token->[2];
+ if ($token->[2]) {
+ unless ($token->[1] eq 'allow') {
+ $outstring.='[1].'>';
+ }
+ }
} else {
$outstring.=$token->[1];
}
}
+# ------------------------------------------------------------ Construct Allows
+ unless ($style eq 'rat') {
+ $scrout.='