--- rat/lonpage.pm 2001/12/17 00:57:59 1.30 +++ rat/lonpage.pm 2002/05/27 12:04:36 1.39 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Page Handler # -# $Id: lonpage.pm,v 1.30 2001/12/17 00:57:59 harris41 Exp $ +# $Id: lonpage.pm,v 1.39 2002/05/27 12:04:36 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -34,6 +34,8 @@ # YEAR=2001 # 08/13/01,08/30,10/1 Gerd Kortemeyer # 12/16 Scott Harrison +# YEAR=2002 +# 03/19 Gerd Kortemeyer # ### @@ -46,6 +48,7 @@ use Apache::loncommon(); use Apache::lonxml(); use HTML::TokeParser; use GDBM_File; +use Apache::lonsequence; # -------------------------------------------------------------- Module Globals my %hash; @@ -149,10 +152,14 @@ sub handler { $r->send_http_header; return OK; } + + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['forceselect','launch']); - my $requrl=$r->uri; + my $requrl=$r->uri; + my $target = $ENV{'form.grade_target'}; # ----------------------------------------------------------------- Tie db file - if ($ENV{'request.course.fn'}) { + if (($ENV{'request.course.fn'}) && (!$ENV{'form.forceselect'})) { my $fn=$ENV{'request.course.fn'}; if (-e "$fn.db") { if (tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER,0640)) { @@ -304,7 +311,10 @@ sub handler { $thisdir=~s/\/[^\/]*$//; foreach (@rlinks) { unless (($_=~/^http:\/\//i) || - ($_=~/^\//)) { + ($_=~/^\//) || + ($_=~/^javascript:/i) || + ($_=~/^mailto:/i) || + ($_=~/^\#/)) { my $newlocation= &Apache::lonnet::hreflocation($thisdir,$_); $output=~s/(\"|\'|\=\s*)$_(\"|\'|\s|\>)/$1$newlocation$2/; @@ -326,43 +336,45 @@ sub handler { # ------------------------------------------------------------------ Build page # ---------------------------------------------------------------- Send headers - if ($isxml) { - $r->content_type('text/xml'); - $r->send_http_header; - $r->print($xmlheader); - } else { - $r->content_type('text/html'); - $r->send_http_header; - $r->print(''); - } + unless ($target eq 'tex') { + if ($isxml) { + $r->content_type('text/xml'); + $r->send_http_header; + $r->print($xmlheader); + } else { + $r->content_type('text/html'); + $r->send_http_header; + $r->print(''); + } # ------------------------------------------------------------------------ Head - $r->print("\n\n".$allmeta); - $allscript=~ - s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs; - if ($allscript) { - $r->print("\n\n"); - } - $r->print(&Apache::lonxml::registerurl(1)); - $r->print("\n\n"); + $r->print("\n\n".$allmeta); + $allscript=~ + s/\/\/ BEGIN LON\-CAPA Internal.+\/\/ END LON\-CAPA Internal\s//gs; + if ($allscript) { + $r->print("\n\n"); + } + $r->print(&Apache::lonxml::registerurl(1,undef)); + $r->print("\n\n"); # ------------------------------------------------------------------ Start body - if ($isxml) { - $r->print($xmlbody); - } else { - $r->print( - ''); - } + if ($isxml) { + $r->print($xmlbody); + } else { + $r->print(''); + } # ------------------------------------------------------------------ Start form - if ($nforms) { - $r->print('
'); - } + if ($nforms) { + $r->print(''); + } # ----------------------------------------------------------------- Start table - $r->print(''); + $r->print('
'); + } for ($i=0;$i<=$#rows;$i++) { if ($rows[$i]) { - $r->print("\n"); + unless ($target eq 'tex') { + $r->print("\n"); + } my @colcont=split(/\&/,$rows[$i]); my $avespan=$lcm/($#colcont+1); for ($j=0;$j<=$#colcont;$j++) { @@ -370,7 +382,11 @@ sub handler { my $metainfo=''. ''. - ''; + ''. + ''. + ''; if ( ($hash{'src_'.$rid}=~/\.(problem|exam|quiz|assess|survey|form)$/) && (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}))) { @@ -380,53 +396,68 @@ sub handler { '___'.$resid.'___'. &Apache::lonnet::declutter($hash{'src_'.$rid}); $metainfo.= - ''. ''. ''. - ''. + ''. ''. ''. - ''. + ''. ''. ''; } $metainfo.='

'; - $r->print(''); + unless ($target eq 'tex') { + $r->print(''); + } } - $r->print(''); + unless ($target eq 'tex') { + $r->print(''); + } } } - $r->print("\n
print('print(' bgcolor="'. - $ssibgcolor{$rid}.'"'); - } - $r->print('>'.$metainfo.'print(' text="'.$ssitext{$rid}.'"'); - } - if ($ssilink{$rid}) { - $r->print(' link="'.$ssilink{$rid}.'"'); - } - if ($ssitext{$rid}) { - $r->print(' vlink="'.$ssivlink{$rid}.'"'); - } - if ($ssialink{$rid}) { - $r->print(' alink="'.$ssialink{$rid}.'"'); - } - - $r->print('>'.$ssibody{$rid}.''); - } elsif ($cellemb{$rid} eq 'img') { + unless ($target eq 'tex') { + if ($ssibgcolor{$rid}) { + $r->print(' bgcolor="'. + $ssibgcolor{$rid}.'"'); + } + $r->print('>'.$metainfo.'print(' text="'.$ssitext{$rid}.'"'); + } + if ($ssilink{$rid}) { + $r->print(' link="'.$ssilink{$rid}.'"'); + } + if ($ssitext{$rid}) { + $r->print(' vlink="'.$ssivlink{$rid}.'"'); + } + if ($ssialink{$rid}) { + $r->print(' alink="'.$ssialink{$rid}.'"'); + } + $r->print('>'); + } + $r->print($ssibody{$rid}); + unless ($target eq 'tex') { + $r->print(''); + } + } elsif ($cellemb{$rid} eq 'img') { $r->print('>'.$metainfo.''); } elsif ($cellemb{$rid} eq 'emb') { $r->print('>'.$metainfo.''); } - $r->print('
"); + unless ($target eq 'tex') { + $r->print("\n"); + } # ---------------------------------------------------------------- Submit, etc. if ($nforms) { $r->print( @@ -440,7 +471,7 @@ sub handler { } else { $r->content_type('text/html'); $r->send_http_header; - $r->print('Page undefined.'); + &Apache::lonsequence::viewmap($r,$requrl); } # ------------------------------------------------------------------ Untie hash unless (untie(%hash)) { @@ -453,8 +484,10 @@ sub handler { } } } - $ENV{'user.error.msg'}="$requrl:bre:0:0:Course not initialized"; - return HTTP_NOT_ACCEPTABLE; + $r->content_type('text/html'); + $r->send_http_header; + &Apache::lonsequence::viewmap($r,$requrl); + return OK; } 1;