--- loncom/publisher/lonpublisher.pm	2002/01/16 19:09:31	1.70
+++ loncom/publisher/lonpublisher.pm	2002/01/18 16:48:14	1.72
@@ -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.72 2002/01/18 16:48:14 albertel 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);
@@ -304,19 +314,22 @@ sub publish {
                               print $logfile 'Index: '.$tag.':'.$maxindex."\n";
 			  }
 		      }
-		  } 
-                  
-                  foreach ('src','href','background') {
-                      if (defined($parms{$_})) {
-			  my $oldurl=$parms{$_};
-                          my $newurl=&urlfixup($oldurl,$target);
-                          if ($newurl ne $oldurl) {
-			      $parms{$_}=$newurl;
-                              print $logfile 'URL: '.$tag.':'.$oldurl.' - '.
-				  $newurl."\n";
+		  }
+
+                  foreach my $type ('src','href','background','bgimg') {
+		      foreach my $key (keys(%parms)) {
+			  if ($key =~ /^$type$/i) {
+			      my $oldurl=$parms{$key};
+			      my $newurl=&urlfixup($oldurl,$target);
+			      if ($newurl ne $oldurl) {
+				  $parms{$key}=$newurl;
+				  print $logfile 'URL: '.$tag.':'.$oldurl.' - '.
+				      $newurl."\n";
+			      }
+			      $allow{&absoluteurl($newurl,$target)}=1;
 			  }
-                          $allow{$newurl}=1;
-                      }
+			  last;
+		      }
                   }
 
                   if ($lctag eq 'applet') {
@@ -334,7 +347,7 @@ sub publish {
                                   $oldcodebase.' - '.
 				  $codebase."\n";
 			 }
-                         $allow{$codebase.'/*'}=1;
+                         $allow{&absoluteurl($codebase,$target).'/*'}=1;
 		      } else {
                         foreach ('archive','code','object') {
                           if (defined($parms{$_})) {
@@ -344,7 +357,7 @@ sub publish {
                                   print $logfile 'Allow: applet '.$_.':'.
                                   $oldurl.' allows '.
 				  $newurl."\n";
-                              $allow{$newurl}=1;
+                              $allow{&absoluteurl($newurl,$target)}=1;
                           }
                         }
                       }
@@ -407,6 +420,7 @@ sub publish {
 	       }
            }
         }
+        $allowstr=~s/\n+/\n/g;
         $outstring=~s/(\<\/[^\>]+\>\s*)$/$allowstr$1/s;
 
 # ------------------------------------------------------------- Write modified