--- loncom/publisher/lonpublisher.pm 2002/01/16 19:09:31 1.70
+++ loncom/publisher/lonpublisher.pm 2002/01/17 15:13:56 1.71
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Publication Handler
#
-# $Id: lonpublisher.pm,v 1.70 2002/01/16 19:09:31 harris41 Exp $
+# $Id: lonpublisher.pm,v 1.71 2002/01/17 15:13:56 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -43,6 +43,9 @@
# 12/06,12/07 Gerd Kortemeyer
# 12/15,12/16 Scott Harrison
# 12/25 Gerd Kortemeyer
+# YEAR=2002
+# 1/16,1/17 Scott Harrison
+# 1/17 Gerd Kortemeyer
#
###
@@ -200,6 +203,13 @@ sub urlfixup {
}
if ($url=~/^http\:\/\//) { return $url; }
$url=~s/\~$cuname/res\/$cudom\/$cuname/;
+ return $url;
+}
+
+
+sub absoluteurl {
+ my ($url,$target)=@_;
+ unless ($url) { return ''; }
if ($target) {
$target=~s/\/[^\/]+$//;
$url=&Apache::lonnet::hreflocation($target,$url);
@@ -315,7 +325,7 @@ sub publish {
print $logfile 'URL: '.$tag.':'.$oldurl.' - '.
$newurl."\n";
}
- $allow{$newurl}=1;
+ $allow{&absoluteurl($newurl,$target)}=1;
}
}
@@ -334,7 +344,7 @@ sub publish {
$oldcodebase.' - '.
$codebase."\n";
}
- $allow{$codebase.'/*'}=1;
+ $allow{&absoluteurl($codebase,$target).'/*'}=1;
} else {
foreach ('archive','code','object') {
if (defined($parms{$_})) {
@@ -344,7 +354,7 @@ sub publish {
print $logfile 'Allow: applet '.$_.':'.
$oldurl.' allows '.
$newurl."\n";
- $allow{$newurl}=1;
+ $allow{&absoluteurl($newurl,$target)}=1;
}
}
}
@@ -407,6 +417,7 @@ sub publish {
}
}
}
+ $allowstr=~s/\n+/\n/g;
$outstring=~s/(\<\/[^\>]+\>\s*)$/$allowstr$1/s;
# ------------------------------------------------------------- Write modified
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.