--- rat/lonpage.pm 2007/09/25 23:47:54 1.85 +++ rat/lonpage.pm 2008/12/19 03:50:48 1.90 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.85 2007/09/25 23:47:54 albertel Exp $ +# $Id: lonpage.pm,v 1.90 2008/12/19 03:50:48 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,6 +27,9 @@ # ### + + + package Apache::lonpage; use strict; @@ -78,7 +81,7 @@ sub tracetable { my $frid=$hash{'map_finish_'.$hash{'src_'.$rid}}; $sofar= &tracetable($sofar,$hash{'map_start_'.$hash{'src_'.$rid}}, - '&'.$frid.'&'); + '&'.$frid.$beenhere); $sofar++; if ($hash{'src_'.$frid}) { my $brepriv=&Apache::lonnet::allowed('bre',$hash{'src_'.$frid}); @@ -339,7 +342,7 @@ sub handler { } $thisdir=~s/\/[^\/]*$//; foreach (@rlinks) { - unless (($_=~/^http:\/\//i) || + unless (($_=~/^https?:\/\//i) || ($_=~/^\//) || ($_=~/^javascript:/i) || ($_=~/^mailto:/i) || @@ -389,7 +392,7 @@ sub handler { 'bgcolor' => '#ffffff',})); # ------------------------------------------------------------------ Start form if ($nforms) { - $r->print('