--- loncom/xml/scripttag.pm	2013/09/26 22:03:36	1.167
+++ loncom/xml/scripttag.pm	2013/09/30 13:44:16	1.168
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # <script> definiton
 #
-# $Id: scripttag.pm,v 1.167 2013/09/26 22:03:36 raeburn Exp $
+# $Id: scripttag.pm,v 1.168 2013/09/30 13:44:16 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -129,29 +129,31 @@ sub start_script {
       if ($target ne "meta" && $target ne 'tex' && $target ne 'answer') {
 	  $result = $token->[4];
 	  $result.=$bodytext;
-          if ($type eq "text/javascript") {
-              my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
-              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);
-                      }
+          my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
+          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 ne '') {
+              if ($src !~ m{^(/|https?://)}) {
+                  my $cleanhref = &Apache::londefdef::clean_docs_httpref($src,$url,$cdom,$cnum);
+                  if ($cleanhref) {
+                      &Apache::lonxml::extlink($cleanhref);
                   }
-              } 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);
-                                      }
+              }
+          } elsif (($type eq 'text/javascript') && ($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 (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 ($fname) = ($item =~ m{^\Q$srctype($quote\E([^$quote]+)\Q$quote)\E}); 
+                                  my $cleanhref = &Apache::londefdef::clean_docs_httpref($fname,$url,$cdom,$cnum);
+                                  if ($cleanhref) {
+                                      &Apache::lonxml::extlink($cleanhref);
                                   }
                               }
                           }