--- loncom/publisher/lonpublisher.pm 2001/08/18 16:38:37 1.42
+++ loncom/publisher/lonpublisher.pm 2001/10/16 19:28:38 1.50
@@ -11,7 +11,7 @@
# 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 Gerd Kortemeyer
+# 06/23,08/07,08/11,8/13,8/17,8/18,8/24,9/26 Gerd Kortemeyer
package Apache::lonpublisher;
@@ -259,7 +259,7 @@ sub publish {
}
$allow{$newurl}=1;
}
- } ('src','href');
+ } ('src','href','background');
if ($tag eq 'applet') {
my $codebase='';
@@ -317,9 +317,18 @@ sub publish {
}
# ------------------------------------------------------------ Construct Allows
unless ($style eq 'rat') {
+ $scrout.='
Dependencies
';
my $allowstr="\n";
map {
$allowstr.=''."\n";
+ $scrout.='
';
+ unless ($_=~/\*/) {
+ $scrout.='';
+ }
+ $scrout.=''.$_.'';
+ unless ($_=~/\*/) {
+ $scrout.='';
+ }
} keys %allow;
$outstring=~s/(\<\/[^\>]+\>\s*)$/$allowstr$1/s;
}
@@ -352,6 +361,8 @@ sub publish {
%metadatakeys=();
my %oldparmstores=();
+
+ $scrout.='Metadata Information
';
# ------------------------------------------------ First, check out environment
unless (-e $source.'.meta') {
@@ -522,6 +533,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);
@@ -837,6 +855,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'};
@@ -868,7 +900,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');