--- loncom/publisher/lonpublisher.pm	2012/03/14 20:54:02	1.279
+++ loncom/publisher/lonpublisher.pm	2014/01/15 18:49:56	1.289
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.279 2012/03/14 20:54:02 www Exp $
+# $Id: lonpublisher.pm,v 1.289 2014/01/15 18:49:56 bisitz 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
 
 ######################################################################
@@ -121,7 +119,6 @@ use HTML::LCParser;
 use HTML::Entities;
 use Encode::Encoder;
 use Apache::lonxml;
-use Apache::loncacc;
 use DBI;
 use Apache::lonnet;
 use Apache::loncommon();
@@ -150,6 +147,8 @@ my $lock;
 
 =pod
 
+=over 4
+
 =item B<metaeval>
 
 Evaluates a string that contains metadata.  This subroutine
@@ -791,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') {
@@ -1485,6 +1529,8 @@ Returns:
 0: fail
 1: success
 
+=back
+
 =cut
 
 #'stupid emacs
@@ -1775,21 +1821,17 @@ sub phasetwo {
         my $thissrcdir=$thissrc;
         $thissrcdir=~s/\/[^\/]+$/\//;
         
-        $r->print(&Apache::loncommon::head_subbox(
-            &Apache::lonhtmlcommon::start_funclist().
-            &Apache::lonhtmlcommon::add_item_funclist(
+        $r->print(
+            &Apache::lonhtmlcommon::actionbox([
                 '<a href="'.$thisdistarget.'">'.
                 &mt('View Published Version').
-                '</a>').
-            &Apache::lonhtmlcommon::add_item_funclist(
+                '</a>',
                 '<a href="'.$thissrc.'">'.
                 &mt('Back to Source').
-                '</a>').
-            &Apache::lonhtmlcommon::add_item_funclist(
+                '</a>',
                 '<a href="'.$thissrcdir.'">'.
                 &mt('Back to Source Directory').
-                '</a>').
-            &Apache::lonhtmlcommon::end_funclist())
+                '</a>'])
         );
     }
     return 1;
@@ -1886,7 +1928,8 @@ sub publishdirectory {
     my $thisdisresdir=$thisdisfn;
     $thisdisresdir=~s/^\/priv\//\/res\//;
     my $resdir = $r->dir_config('lonDocRoot').$thisdisresdir;
-    $r->print(&Apache::lonhtmlcommon::start_pick_box()
+    $r->print('<form name="pubdirpref" method="post" action="">'
+             .&Apache::lonhtmlcommon::start_pick_box()
              .&Apache::lonhtmlcommon::row_title(&mt('Directory'))
             .'<span class="LC_filename">'.$thisdisfn.'</span>'
             .&Apache::lonhtmlcommon::row_closure()
@@ -1900,16 +1943,16 @@ sub publishdirectory {
         $r->print(&Apache::lonhtmlcommon::row_closure()
                  .&Apache::lonhtmlcommon::row_title(&mt('Options'))
         );
-        $r->print('<form name="pubdirpref" method="post">'.
-		  &hiddenfield('phase','two').
+        $r->print(&hiddenfield('phase','two').
 		  &hiddenfield('filename',$env{'form.filename'}).
 		  &checkbox('pubrec','include subdirectories').
 		  &checkbox('forcerepub','force republication of previously published files').
                   &checkbox('obsolete','make file(s) obsolete').
-		  &checkbox('forceoverride','force directory level metadata over existing').
-		  '<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>');
+		  &checkbox('forceoverride','force directory level metadata over existing')
+        );
         $r->print(&Apache::lonhtmlcommon::row_closure(1)
                  .&Apache::lonhtmlcommon::end_pick_box()
+                 .'<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>'
         );
         $lock=0;
     } else {
@@ -1930,7 +1973,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!~/\~$/)) {
@@ -2019,7 +2062,7 @@ sub defaultmetapublish {
 	$r->print($reply.'</p><br />');$r->rflush;
     }
 # ------------------------------------------------------------------- Link back
-    $r->print("<a href='".&Apache::lonnet::display($fn)."'>".&mt('Back to Metadata').'</a>');
+    $r->print("<a href='".&Apache::loncfile::display($fn)."'>".&mt('Back to Metadata').'</a>');
     $r->print(&Apache::loncommon::end_page());
     return OK;
 }
@@ -2083,7 +2126,7 @@ sub handler {
 # -------------------------------------------------------------- Check filename
 
     my $fn=&unescape($env{'form.filename'});
-    ($cuname,$cudom)=&Apache::loncacc::constructaccess($fn);
+    ($cuname,$cudom)=&Apache::lonnet::constructaccess($fn);
 # ----------------------------------------------------- Do we have permissions?
      unless (($cuname) && ($cudom)) {
        $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
@@ -2148,7 +2191,7 @@ sub handler {
     # Breadcrumbs
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({
-        'text'  => 'Construction Space',
+        'text'  => 'Authoring Space',
         'href'  => &Apache::loncommon::authorspace($fn),
     });
     &Apache::lonhtmlcommon::add_breadcrumb({
@@ -2173,7 +2216,10 @@ sub handler {
     if ($fn=~/\/$/) {
 # -------------------------------------------------------- This is a directory
 	&publishdirectory($r,$docroot.$fn,$thisdisfn);
-	$r->print('<hr /><a href="'.$thisdisfn.'">'.&mt('Return to Directory').'</a>');
+        $r->print(
+            '<br /><br />'.
+            &Apache::lonhtmlcommon::actionbox([
+                '<a href="'.$thisdisfn.'">'.&mt('Return to Directory').'</a>']));
     } else {
 # ---------------------- Evaluate individual file, and then output information.
 	$fn=~/\.(\w+)$/;
@@ -2223,7 +2269,7 @@ ENDCAPTION
             $r->print(&Apache::lonhtmlcommon::row_closure()
                      .&Apache::lonhtmlcommon::row_title(&mt('Diffs')));
 	    $r->print(<<ENDDIFF);
-<a href='javascript:void(window.open("/adm/diff?filename=$thisdisfn&versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>
+<a href='javascript:void(window.open("/adm/diff?filename=$thisdisfn&amp;versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>
 ENDDIFF
             $r->print(&mt('Diffs with Current Version').'</a>');
 	}
@@ -2265,7 +2311,5 @@ __END__
 
 =back
 
-=back
-
 =cut