--- loncom/publisher/lonpublisher.pm 2001/08/11 18:51:40 1.35 +++ loncom/publisher/lonpublisher.pm 2001/10/08 19:00:50 1.47 @@ -11,7 +11,8 @@ # 04/16/2001 Scott Harrison # 05/03,05/05,05/07 Gerd Kortemeyer # 05/28/2001 Scott Harrison -# 06/23,08/07,08/11 Gerd Kortemeyer +# 06/23,08/07,08/11,8/13,8/17,8/18,8/24,9/26 Gerd Kortemeyer +# 10/3,10/8 Scott Harrison package Apache::lonpublisher; @@ -71,7 +72,8 @@ sub metaeval { } @{$token->[3]}; if ($metadatafields{$unikey}) { my $newentry=$parser->get_text('/'.$entry); - unless ($metadatafields{$unikey}=~/$newentry/) { + unless (($metadatafields{$unikey}=~/$newentry/) || + ($newentry eq '')) { $metadatafields{$unikey}.=', '.$newentry; } } else { @@ -133,11 +135,9 @@ sub selectbox { # -------------------------------------------------------- Publication Step One -sub makeallowed { -} - sub urlfixup { my ($url,$target)=@_; + unless ($url) { return ''; } my ($host)=($url=~/(?:http\:\/\/)*([^\/]+)/); map { if ($_ eq $host) { @@ -145,6 +145,7 @@ sub urlfixup { $url=~s/^$host//; } } values %Apache::lonnet::hostname; + if ($url=~/^http\:\/\//) { return $url; } $url=~s/\~$cuname/res\/$cudom\/$cuname/; if ($target) { $target=~s/\/[^\/]+$//; @@ -154,12 +155,13 @@ sub urlfixup { } 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 @@ -255,9 +257,40 @@ sub publish { print $logfile 'URL: '.$tag.':'.$oldurl.' - '. $newurl."\n"; } - &makeallowed($newurl); + $allow{$newurl}=1; + } + } ('src','href','background'); + + if ($tag 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'); } - } ('src','href','codebase'); + } my $newparmstring=''; my $endtag=''; @@ -271,15 +304,36 @@ 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]; + $outstring.=''.$token->[1].'>'; } } else { $outstring.=$token->[1]; } } +# ------------------------------------------------------------ Construct Allows + unless ($style eq 'rat') { + $scrout.='
Obsolete parameters or stored values: '.
$chparms;
}
- }
+
# ------------------------------------------------------- Now have all metadata
$scrout.=
@@ -420,12 +480,29 @@ sub publish {
$textonly=~s/[^a-z\s]//g;
my %keywords=();
- map {
- unless ($nokey{$_}) {
- $keywords{$_}=1;
- }
- } ($textonly=~m/(\w+)/g);
+ my $j=0;
+ my $word;
+ for (my $i=0; $i\n";
$colcount=0;
}
- $colcount++;
+ else {
+ $colcount++;
+ }
} sort keys %keywords;
$keywordout.=' ';
}
-
$scrout.=$keywordout;
$scrout.=&textfield('Additional Keywords','addkey','');
@@ -473,6 +551,13 @@ sub publish {
$scrout.=&textfield('Publisher/Owner','owner',
$metadatafields{'owner'});
+# --------------------------------------------------- Correct copyright for rat
+ if ($style eq 'rat') {
+ if ($metadatafields{'copyright'} eq 'public') {
+ delete $metadatafields{'copyright'};
+ }
+ delete $cprtag{'public'};
+ }
$scrout.=&selectbox('Copyright/Distribution','copyright',
$metadatafields{'copyright'},%cprtag);
@@ -788,6 +873,20 @@ sub handler {
return OK;
}
+# Get query string for limited number of parameters
+
+ map {
+ my ($name, $value) = split(/=/,$_);
+ $value =~ tr/+/ /;
+ $value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
+ if ($name eq 'filename') {
+ unless ($ENV{'form.'.$name}) {
+ $ENV{'form.'.$name}=$value;
+ }
+ }
+ } (split(/&/,$ENV{'QUERY_STRING'}));
+
+
# -------------------------------------------------------------- Check filename
my $fn=$ENV{'form.filename'};
@@ -819,7 +918,8 @@ sub handler {
return HTTP_NOT_ACCEPTABLE;
}
- $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
+ $fn=~s/^http\:\/\/[^\/]+//;
+ $fn=~s/^\/\~(\w+)/\/home\/$1\/public_html/;
my $targetdir='';
$docroot=$r->dir_config('lonDocRoot');