--- loncom/publisher/lonpublisher.pm	2001/05/28 19:43:09	1.29
+++ loncom/publisher/lonpublisher.pm	2001/08/11 19:06:54	1.36
@@ -10,6 +10,8 @@
 # 03/24,03/29,04/03 Gerd Kortemeyer
 # 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
 
 package Apache::lonpublisher;
 
@@ -47,9 +49,15 @@ sub metaeval {
            if ($token->[0] eq 'S') {
 	      my $entry=$token->[1];
               my $unikey=$entry;
+              if (defined($token->[2]->{'package'})) { 
+                  $unikey.='_package_'.$token->[2]->{'package'};
+              } 
               if (defined($token->[2]->{'part'})) { 
                  $unikey.='_'.$token->[2]->{'part'}; 
 	      }
+              if (defined($token->[2]->{'id'})) { 
+                  $unikey.='_'.$token->[2]->{'id'};
+              } 
               if (defined($token->[2]->{'name'})) { 
                  $unikey.='_'.$token->[2]->{'name'}; 
 	      }
@@ -125,6 +133,23 @@ sub selectbox {
 
 # -------------------------------------------------------- Publication Step One
 
+sub urlfixup {
+    my ($url,$target)=@_;
+    my ($host)=($url=~/(?:http\:\/\/)*([^\/]+)/);
+    map {
+	if ($_ eq $host) {
+	    $url=~s/^http\:\/\///;
+            $url=~s/^$host//;
+        }
+    } values %Apache::lonnet::hostname;
+    $url=~s/\~$cuname/res\/$cudom\/$cuname/;
+    if ($target) {
+	$target=~s/\/[^\/]+$//;
+       $url=&Apache::lonnet::hreflocation($target,$url);
+    }
+    return $url;
+}
+
 sub publish {
 
     my ($source,$target,$style)=@_;
@@ -132,6 +157,8 @@ sub publish {
     my $scrout='';
     my $allmeta='';
     my $content='';
+    my %allow=();
+    undef %allow;
 
     unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
 	return 
@@ -192,46 +219,75 @@ sub publish {
           print $logfile "Needs ID and/or index fixup\n".
 	        "Max ID   : $maxid (min 10)\n".
                 "Max Index: $maxindex (min 10)\n";
-
+      }
           my $outstring='';
           my $parser=HTML::TokeParser->new(\$content);
           my $token;
           while ($token=$parser->get_token) {
               if ($token->[0] eq 'S') {
-                  my $counter;
-		  if ($counter=$addid{$token->[1]}) {
+                my $counter;
+                my $tag=$token->[1];
+                unless ($tag eq 'allow') {  
+                  my %parms=%{$token->[2]};
+		  if ($counter=$addid{$tag}) {
 		      if ($counter eq 'id') {
-			  if (defined($token->[2]->{'id'})) {
-			      $outstring.=$token->[4];
-			  } else {
+			  unless (defined($parms{'id'})) {
                               $maxid++;
-                              my $thisid=' id="'.$maxid.'"';
-			      my $fixup=$token->[4];
-                              $fixup=~s/(\<\w+)/$1$thisid/;
-                              $outstring.=$fixup;
-                              print $logfile 'ID: '.$fixup."\n";
+                              $parms{'id'}=$maxid;
+                              print $logfile 'ID: '.$tag.':'.$maxid."\n";
                           }
-                      } else {
- 			  if (defined($token->[2]->{'index'})) {
-			      $outstring.=$token->[4];
-			  } else {
+                      } elsif ($counter eq 'index') {
+ 			  unless (defined($parms{'index'})) {
                               $maxindex++;
-                              my $thisindex=' index="'.$maxindex.'"';
-			      my $fixup=$token->[4];
-                              $fixup=~s/(\<\w+)/$1$thisindex/;
-                              $outstring.=$fixup;
-                              print $logfile 'Index: '.$fixup."\n";
+                              $parms{'index'}=$maxindex;
+                              print $logfile 'Index: '.$tag.':'.$maxindex."\n";
 			  }
 		      }
-		  } else {
-                      $outstring.=$token->[4];
-                  }
+		  } 
+                  
+                  map {
+                      if (defined($parms{$_})) {
+			  my $oldurl=$parms{$_};
+                          my $newurl=&urlfixup($oldurl,$target);
+                          if ($newurl ne $oldurl) {
+			      $parms{$_}=$newurl;
+                              print $logfile 'URL: '.$tag.':'.$oldurl.' - '.
+				  $newurl."\n";
+			  }
+                          $allow{$newurl}=1;
+                      }
+                  } ('src','href','codebase');
+
+                  my $newparmstring='';
+                  my $endtag='';
+                  map {
+                    if ($_ eq '/') {
+                      $endtag=' /';
+                    } else { 
+                      my $quote=($parms{$_}=~/\"/?"'":'"');
+                      $newparmstring.=' '.$_.'='.$quote.$parms{$_}.$quote;
+		    }
+                  } keys %parms;
+  
+		  $outstring.='<'.$tag.$newparmstring.$endtag.'>';
+	         } else {
+		   $allow{$token->[2]->{'src'}}=1;
+		 }
               } elsif ($token->[0] eq 'E') {
-                  $outstring.=$token->[2];
+                  unless ($token->[1] eq 'allow') {
+                     $outstring.=$token->[2];
+		  }
               } else {
                   $outstring.=$token->[1];
               }
           }
+# ------------------------------------------------------------ Construct Allows
+	my $allowstr="\n";
+        map {
+           $allowstr.='<allow src="'.$_.'" />'."\n";
+        } keys %allow;
+        $outstring=~s/(\<\/[^\>]+\>\s*)$/$allowstr$1/s;
+        
         {
           my $org;
           unless ($org=Apache::File->new('>'.$source)) {
@@ -242,6 +298,8 @@ sub publish {
           print $org $outstring;
         }
 	  $content=$outstring;
+
+      if ($needsfixup) {
           print $logfile "End of ID and/or index fixup\n".
 	        "Max ID   : $maxid (min 10)\n".
                 "Max Index: $maxindex (min 10)\n";
@@ -308,6 +366,7 @@ sub publish {
 # -------------------------------------------------- Parse content for metadata
 
         $allmeta=Apache::lonxml::xmlparse('meta',$content);
+
         &metaeval($allmeta);
 
 # ---------------- Find and document discrepancies in the parameters and stores
@@ -331,7 +390,8 @@ sub publish {
         my $chparms='';
         map {
 	    if (($_=~/^parameter/) || ($_=~/^stores/)) {
-                unless (($metadatafields{$_.'.name'}) || ($_=~/\.\w+$/)) {
+                unless (($metadatafields{$_.'.name'}) ||
+                        ($metadatafields{$_.'.package'}) || ($_=~/\.\w+$/)) {
 		    print $logfile 'Obsolete: '.$_."\n";
                     $chparms.=$_.' ';
                 }
@@ -747,8 +807,9 @@ sub handler {
      return HTTP_NOT_FOUND;
   } 
 
-  unless (($cuname,$cudom)=
-    &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'))) {
+  ($cuname,$cudom)=
+    &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
+  unless (($cuname) && ($cudom)) {
      $r->log_reason($cuname.' at '.$cudom.
          ' trying to publish file '.$ENV{'form.filename'}.
          ' ('.$fn.') - not authorized',