[LON-CAPA-cvs] cvs: rat / lonpage.pm

[raeburn]

raeburn		Sat Oct 29 05:49:29 2016 EDT

  Modified files:              
    /rat	lonpage.pm 
  Log:
  - Countdown timer can be included in a composite page which contains
    resources with encrypted URLs.
  
  
Index: rat/lonpage.pm
diff -u rat/lonpage.pm:1.119 rat/lonpage.pm:1.120
--- rat/lonpage.pm:1.119	Sat Oct 29 05:29:39 2016
+++ rat/lonpage.pm	Sat Oct 29 05:49:28 2016
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Page Handler
 #
-# $Id: lonpage.pm,v 1.119 2016/10/29 05:29:39 raeburn Exp $
+# $Id: lonpage.pm,v 1.120 2016/10/29 05:49:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -301,6 +301,7 @@
                       $lcm*=($#colcont+1)/euclid($lcm,($#colcont+1));
                       foreach (@colcont) {
                           my $src=$hash{'src_'.$_};
+                          my $plainsrc = $src;
                           my ($extension)=($src=~/\.(\w+)$/);
 			  $cellexternal{$_}=($hash{'ext_'.$_} eq 'true:');
 			  if ($hash{'encrypted_'.$_}) {
@@ -474,11 +475,11 @@
                                   $output=~
                                       s/\<(input[^\>]+\Qonfocus=\"javascript:disableAutoComplete\E)\(\'([^\']+)\'\)(;\")/\<$1('$idprefix$2')$3/gsi;
                                   unless ($hastimer) {
-                                      if ($src =~ /$LONCAPA::assess_re/) {
+                                      if ($plainsrc =~ /$LONCAPA::assess_re/) {
                                           %Apache::lonhomework::history =
                                               &Apache::lonnet::restore($symb,$courseid,$domain,$name);
                                           my $type = 'problem';
-                                          if ($src =~ /\.task$/) {
+                                          if ($extension eq 'task') {
                                               $type = 'Task';
                                           }
                                           my ($status,$accessmsg,$slot_name,$slot) =