--- rat/lonpage.pm 2007/09/26 00:34:31 1.84.2.1
+++ rat/lonpage.pm 2008/12/19 14:30:51 1.91
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Page Handler
#
-# $Id: lonpage.pm,v 1.84.2.1 2007/09/26 00:34:31 albertel Exp $
+# $Id: lonpage.pm,v 1.91 2008/12/19 14:30:51 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) ||
@@ -378,12 +381,13 @@ sub handler {
$r->send_http_header;
# ------------------------------------------------------------------------ Head
if ($allscript) {
- $allscript .=
- "\n\n";
+ $allscript =
+ "\n".'\n";
}
# ------------------------------------------------------------------ Start body
- $r->print(&Apache::loncommon::start_page(undef,undef,
+ $r->print(&Apache::loncommon::start_page(undef,$allscript,
{'force_register' => 1,
'bgcolor' => '#ffffff',}));
# ------------------------------------------------------------------ Start form
@@ -589,6 +593,7 @@ sub get_buttons {
1;
__END__
+
=head1 NAME
Apache::lonpage - Page Handler
@@ -690,5 +695,3 @@ tracetable() : Build page table.
=cut
-
-