--- loncom/xml/scripttag.pm	2012/02/05 23:00:06	1.165
+++ loncom/xml/scripttag.pm	2013/09/26 22:03:36	1.167
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.165 2012/02/05 23:00:06 raeburn Exp $
+# $Id: scripttag.pm,v 1.167 2013/09/26 22:03:36 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,8 @@ package Apache::scripttag;
 use strict;
 use Apache::lonnet;
 use Apache::lonlocal;
+use Apache::lonxml();
+use Apache::londefdef();
 use Apache::style();
 
 #Globals
@@ -109,7 +111,8 @@ sub start_script {
 		     $env{'form.counter'},$Apache::lonxml::curdepth);
             &Apache::lonxml::add_script_result(
 	             &Apache::loncommon::modal_adhoc_window($function_name,500,500,
-                            '<pre>'.&Apache::run::dump($target,$safeeval).'</pre>',
+                            '<pre style="background-color:#ffffff;">'.
+                            &Apache::run::dump($target,$safeeval).'</pre>',
                             &mt('Script Vars'))."<br />");
 	}
     } elsif ($target eq "edit" ) {
@@ -128,32 +131,30 @@ sub start_script {
 	  $result.=$bodytext;
           if ($type eq "text/javascript") {
               my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
-              if (($src =~ /\.js$/) && ($src !~ m{^(/|https?://)})) {
-                  my ($path,$scriptname) = ($src =~ m{^(.+)/([^/]*)$});
-                  my $docuri =
-                      $Apache::lonnet::env{'request.noversionuri'};
-                  my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
-                  my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-                  if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum\E)/(docs/.*/)[^/]+$}) {
-                      my $prefix = $1;
-                      my $relpath = $2;
-                      my $cleanrelpath;
-                      foreach my $dir (split(/\//,$relpath.$path)) {
-                          next if ($dir eq '.');
-                          if ($dir eq '..') {
-                              $cleanrelpath =~ s{([^/]+/)$}{};
-                          } else {
-                              $cleanrelpath .= $dir.'/';
-                          }
-                      }
-                      $cleanrelpath =~ s{/$}{};
-                      if ($cleanrelpath ne '') {
-                          $src = $prefix.'/'.$cleanrelpath.'/'.$scriptname;
-                      } else {
-                          $src = $prefix.'/'.$scriptname;
+              my $url=&Apache::lonnet::hreflocation('',$env{'request.filename'});
+              my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+              my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+              if ($src =~ /\.js$/) {
+                  if ($src !~ m{^(/|https?://)}) {
+                      my $cleanhref = &Apache::londefdef::clean_docs_httpref($src,$url,$cdom,$cnum);
+                      if ($cleanhref) {
+                          &Apache::lonxml::extlink($cleanhref);
                       }
-                      if ($src ne '') {
-                          &Apache::lonxml::extlink($src);
+                  }
+              } elsif (($src eq '') && ($bodytext ne '')) {
+                  if ($url =~ m{^\Q/uploaded/$cdom/$cnum/docs/\E}) {
+                      if ($bodytext =~ m{\.set\w+(Src|Swf)\(["']}i) {
+                          my @srcs = split(/\.set/,$bodytext);
+                          if (@srcs > 1) {
+                              foreach my $item (@srcs) {
+                                  if ($item =~ m{^(?:FlashPlayerSwf|MediaSrc|XMPSrc|ConfigurationSrc|PosterImageSrc)\(['"])([^$1]+)$1\)}is) {
+                                      my $cleanhref = &Apache::londefdef::clean_docs_httpref($2,$url,$cdom,$cnum);
+                                      if ($cleanhref) {
+                                          &Apache::lonxml::extlink($cleanhref);
+                                      }
+                                  }
+                              }
+                          }
                       }
                   }
               }