--- loncom/publisher/lonpublisher.pm	2002/01/16 19:09:31	1.70
+++ loncom/publisher/lonpublisher.pm	2002/04/10 15:28:45	1.76
@@ -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.76 2002/04/10 15:28:45 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
 #
 ###
 
@@ -65,7 +68,7 @@ use strict;
 use Apache::File;
 use File::Copy;
 use Apache::Constants qw(:common :http :methods);
-use HTML::TokeParser;
+use HTML::LCParser;
 use Apache::lonxml;
 use Apache::lonhomework;
 use Apache::loncacc;
@@ -88,7 +91,7 @@ my $cudom;
 sub metaeval {
     my $metastring=shift;
    
-        my $parser=HTML::TokeParser->new(\$metastring);
+        my $parser=HTML::LCParser->new(\$metastring);
         my $token;
         while ($token=$parser->get_token) {
            if ($token->[0] eq 'S') {
@@ -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);
@@ -247,7 +257,7 @@ sub publish {
           $content=join('',<$org>);
         }
         {
-          my $parser=HTML::TokeParser->new(\$content);
+          my $parser=HTML::LCParser->new(\$content);
           my $token;
           while ($token=$parser->get_token) {
               if ($token->[0] eq 'S') {
@@ -278,7 +288,7 @@ sub publish {
                 "Max Index: $maxindex (min 10)\n";
       }
           my $outstring='';
-          my $parser=HTML::TokeParser->new(\$content);
+          my $parser=HTML::LCParser->new(\$content);
           $parser->xml_mode(1);
           my $token;
           while ($token=$parser->get_token) {
@@ -304,19 +314,27 @@ 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";
+			      }
+			      if (($newurl !~ /^javascript:/i) &&
+				  ($newurl !~ /^mailto:/i) &&
+				  ($newurl !~ /^http:/i) &&
+				  ($newurl !~ /^\#/)) {
+				  $allow{&absoluteurl($newurl,$target)}=1;
+			      }
 			  }
-                          $allow{$newurl}=1;
-                      }
+			  last;
+		      }
                   }
 
                   if ($lctag eq 'applet') {
@@ -334,7 +352,7 @@ sub publish {
                                   $oldcodebase.' - '.
 				  $codebase."\n";
 			 }
-                         $allow{$codebase.'/*'}=1;
+                         $allow{&absoluteurl($codebase,$target).'/*'}=1;
 		      } else {
                         foreach ('archive','code','object') {
                           if (defined($parms{$_})) {
@@ -344,7 +362,7 @@ sub publish {
                                   print $logfile 'Allow: applet '.$_.':'.
                                   $oldurl.' allows '.
 				  $newurl."\n";
-                              $allow{$newurl}=1;
+                              $allow{&absoluteurl($newurl,$target)}=1;
                           }
                         }
                       }
@@ -379,8 +397,9 @@ sub publish {
     
 	$scrout.='<h3>Dependencies</h3>';
         my $allowstr='';
-        foreach (keys %allow) {
+        foreach (sort(keys(%allow))) {
 	   my $thisdep=$_;
+	   if ($thisdep !~ /[^\s]/) { next; }
            unless ($style eq 'rat') { 
               $allowstr.="\n".'<allow src="'.$thisdep.'" />';
 	   }
@@ -407,8 +426,11 @@ sub publish {
 	       }
            }
         }
+        $allowstr=~s/\n+/\n/g;
         $outstring=~s/(\<\/[^\>]+\>\s*)$/$allowstr$1/s;
 
+	#Encode any High ASCII characters
+	$outstring=&HTML::Entities::encode($outstring,"\200-\377");
 # ------------------------------------------------------------- Write modified
 
         {
@@ -578,7 +600,7 @@ sub publish {
                       $keywordout.=' checked'; 
                    }
 	        } elsif (&Apache::loncommon::keyword($_)) {
-		    $keywordout.=' checked';
+	            $keywordout.=' checked';
                 } 
                 $keywordout.='>'.$_.'</td>';
                 if ($colcount>10) {
@@ -702,7 +724,9 @@ sub phasetwo {
                $value=~s/\"/\'\'/g;
                print $mfh ' '.$_.'="'.$value.'"';
            }
-	   print $mfh '>'.$metadatafields{$unikey}.'</'.$tag.'>';
+	   print $mfh '>'.
+	     &HTML::Entities::encode($metadatafields{$unikey})
+	       .'</'.$tag.'>';
          }
        }
        $scrout.='<p>Wrote Metadata';
@@ -927,7 +951,7 @@ if (-e $target) {
 
 
     return $warning.$scrout.
-      '<hr><a href="'.$thisdistarget.'"><font size=+2>View Target</font></a>'.
+      '<hr><a href="'.$thisdistarget.'"><font size=+2>View Published Version</font></a>'.
       '<p><a href="'.$thissrc.'"><font size=+2>Back to Source</font></a>'.
       '<p><a href="'.$thissrcdir.
       '"><font size=+2>Back to Source Directory</font></a>';