--- loncom/publisher/lonpublisher.pm	2013/07/18 16:28:50	1.284
+++ loncom/publisher/lonpublisher.pm	2013/12/01 21:50:30	1.288
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.284 2013/07/18 16:28:50 bisitz Exp $
+# $Id: lonpublisher.pm,v 1.288 2013/12/01 21:50:30 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -102,8 +102,6 @@ to publication space.
 Many of the undocumented subroutines implement various magical
 parsing shortcuts.
 
-=over 4
-
 =cut
 
 ######################################################################
@@ -149,6 +147,8 @@ my $lock;
 
 =pod
 
+=over 4
+
 =item B<metaeval>
 
 Evaluates a string that contains metadata.  This subroutine
@@ -790,10 +790,55 @@ sub fix_ids_and_indices {
 		}
 		if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
 		$outstring.='<'.$tag.$newparmstring.$endtag.'>';
-		if ($lctag eq 'm' || $lctag eq 'script' || $lctag eq 'answer' 
-                    || $lctag eq 'display' || $lctag eq 'tex') {
+		if ($lctag eq 'm' || $lctag eq 'answer' || $lctag eq 'display' ||
+                    $lctag eq 'tex') {
 		    $outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser);
-		}
+                } elsif ($lctag eq 'script') {
+                    if ($parms{'type'} eq 'loncapa/perl') {
+                        $outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser);
+                    } else {
+                        my $script = &get_all_text_unbalanced('/'.$lctag,\@parser);
+                        if ($script =~ m{\.set\w+(Src|Swf)\(["']}i) {
+                            my @srcs = split(/\.set/i,$script);
+                            if (scalar(@srcs) > 1) {
+                                foreach my $item (@srcs) {
+                                    if ($item =~ m{^(FlashPlayerSwf|MediaSrc|XMPSrc|ConfigurationSrc|PosterImageSrc)\((['"])(?:(?!\2).)+\2\)}is) {
+                                        my $srctype = $1;
+                                        my $quote = $2;
+                                        my ($url) = ($item =~ m{^\Q$srctype($quote\E([^$quote]+)\Q$quote)\E});
+                                        $url = &urlfixup($url);
+                                        unless ($url=~m{^(?:http|https|ftp)://}) {
+                                            $allow{&absoluteurl($url,$target)}=1;
+                                            if ($srctype eq 'ConfigurationSrc') {
+                                                if ($url =~ m{^(.+/)configuration_express\.xml$}) {
+#
+# Camtasia 8.1: express_show/spritesheet.png needed, and included in zip archive.
+# Not referenced directly in <main>.html or <main>_player.html files,
+# so add this file to %allow (where <main> is name user gave to file/archive).
+#
+                                                    my $spritesheet = $1.'express_show/spritesheet.png';
+                                                    $allow{&absoluteurl($spritesheet,$target)}=1;
+                                                }
+                                            } elsif ($srctype eq 'PosterImageSrc') {
+                                                if ($url =~ m{^(.+)_First_Frame\.png$}) {
+                                                    my $prefix = $1;
+#
+# Camtasia 8.1: <main>_Thumbnails.png needed, and included in zip archive.
+# Not referenced directly in <main>.html or <main>_player.html files,
+# so add this file to %allow (where <main> is name user gave to file/archive).
+#
+                                                    my $thumbnail = $prefix.'_Thumbnails.png';
+                                                    $allow{&absoluteurl($thumbnail,$target)}=1;
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        $outstring .= $script
+                    }
+                }
 	    } elsif ($token->[0] eq 'E') {
 		if ($token->[2]) {
 		    unless ($token->[1] eq 'allow') {
@@ -1484,6 +1529,8 @@ Returns:
 0: fail
 1: success
 
+=back
+
 =cut
 
 #'stupid emacs
@@ -1925,7 +1972,7 @@ sub publishdirectory {
 	    if ($filename=~/\.(\w+)$/) { $extension=$1; }
 	    if ($cmode&$dirptr) {
 		if (($filename!~/^\./) && ($env{'form.pubrec'})) {
-		    &publishdirectory($r,$docroot.$fn.'/'.$filename,$thisdisfn.'/'.$filename);
+		    &publishdirectory($r,$fn.'/'.$filename,$thisdisfn.'/'.$filename);
 		}
 	    } elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') &&
 		     ($filename!~/^[\#\.]/) && ($filename!~/\~$/)) {
@@ -2260,7 +2307,5 @@ __END__
 
 =back
 
-=back
-
 =cut