--- loncom/publisher/lonpublisher.pm	2002/01/09 20:45:16	1.69
+++ 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.69 2002/01/09 20:45:16 albertel 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
 #
 ###
 
@@ -146,8 +149,9 @@ sub metaread {
 
 # ---------------------------- convert 'time' format into a datetime sql format
 sub sqltime {
+    my $timef=shift @_;
     my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
-	localtime(@_[0]);
+	localtime($timef);
     $mon++; $year+=1900;
     return "$year-$mon-$mday $hour:$min:$sec";
 }
@@ -199,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);
@@ -314,7 +325,7 @@ sub publish {
                               print $logfile 'URL: '.$tag.':'.$oldurl.' - '.
 				  $newurl."\n";
 			  }
-                          $allow{$newurl}=1;
+                          $allow{&absoluteurl($newurl,$target)}=1;
                       }
                   }
 
@@ -333,7 +344,7 @@ sub publish {
                                   $oldcodebase.' - '.
 				  $codebase."\n";
 			 }
-                         $allow{$codebase.'/*'}=1;
+                         $allow{&absoluteurl($codebase,$target).'/*'}=1;
 		      } else {
                         foreach ('archive','code','object') {
                           if (defined($parms{$_})) {
@@ -343,7 +354,7 @@ sub publish {
                                   print $logfile 'Allow: applet '.$_.':'.
                                   $oldurl.' allows '.
 				  $newurl."\n";
-                              $allow{$newurl}=1;
+                              $allow{&absoluteurl($newurl,$target)}=1;
                           }
                         }
                       }
@@ -406,6 +417,7 @@ sub publish {
 	       }
            }
         }
+        $allowstr=~s/\n+/\n/g;
         $outstring=~s/(\<\/[^\>]+\>\s*)$/$allowstr$1/s;
 
 # ------------------------------------------------------------- Write modified
@@ -515,7 +527,7 @@ sub publish {
                      $chparms;
         }
 
-        my $chparms='';
+        $chparms='';
         foreach (sort keys %oldparmstores) {
 	    if (($_=~/^parameter/) || ($_=~/^stores/)) {
                 unless (($metadatafields{$_.'.name'}) ||
@@ -605,7 +617,7 @@ sub publish {
 
         $scrout.=&selectbox('Language','language',
                             $metadatafields{'language'},
-			    \&{Apache::loncommon::languagedescription},
+			    \&Apache::loncommon::languagedescription,
 			    (&Apache::loncommon::languageids),
 			     );
 
@@ -626,13 +638,13 @@ sub publish {
 	}
         $scrout.=&selectbox('Copyright/Distribution','copyright',
                             $metadatafields{'copyright'},
-			    \&{Apache::loncommon::copyrightdescription},
+			    \&Apache::loncommon::copyrightdescription,
 		     (grep !/^public$/,(&Apache::loncommon::copyrightids)));
     }
     else {
         $scrout.=&selectbox('Copyright/Distribution','copyright',
                             $metadatafields{'copyright'},
-			    \&{Apache::loncommon::copyrightdescription},
+			    \&Apache::loncommon::copyrightdescription,
 			     (&Apache::loncommon::copyrightids));
     }
     return $scrout.