Diff for /rat/lonwrapper.pm between versions 1.16 and 1.20

version 1.16, 2004/09/18 16:32:17 version 1.20, 2006/03/19 23:06:00
Line 25 Line 25
 #  #
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # (Edit Handler for RAT Maps  
 # (TeX Content Handler  
 #  
 # 05/29/00,05/30 Gerd Kortemeyer)  
 # 7/1,6/30 Gerd Kortemeyer)  
 #  
 # 7/5 Gerd Kortemeyer  
   
 package Apache::lonwrapper;  package Apache::lonwrapper;
   
 use strict;  use strict;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use Apache::lonnet();  use Apache::lonnet;
 use Apache::lonxml();  use Apache::lonxml();
 use Apache::lonmenu;  use Apache::lonmenu;
   
Line 57  sub handler { Line 50  sub handler {
   $orgurl.=(($orgurl=~/\?/)?'&':'?').$ENV{'QUERY_STRING'};    $orgurl.=(($orgurl=~/\?/)?'&':'?').$ENV{'QUERY_STRING'};
   $orgurl.=(($orgurl=~/\?/)?'&':'?').'wrapperdisplay=menu';    $orgurl.=(($orgurl=~/\?/)?'&':'?').'wrapperdisplay=menu';
   $url=~s/^\/adm\/wrapper//;    $url=~s/^\/adm\/wrapper//;
     my $is_ext = $url =~ m|^/ext/|;
   $url=~s/^\/ext\//http\:\/\//;    $url=~s/^\/ext\//http\:\/\//;
   $url=~s|:|:|g;    $url=~s|:|:|g;
   if ($ENV{'form.wrapperdisplay'} eq 'menu') {    if ($env{'form.wrapperdisplay'} eq 'menu') {
 #  #
 # Producing the menu buttons  # Producing the menu buttons
 #  #
Line 73  sub handler { Line 67  sub handler {
 #  #
 # This is uploaded homework  # This is uploaded homework
 #  #
           $ENV{'request.state'}='uploaded';            $env{'request.state'}='uploaded';
           &Apache::lonhomework::renderpage($r,$url);            &Apache::lonhomework::renderpage($r,$url);
       } else {        } else {
 #  #
 # This is not homework  # This is not homework
 #  #
     if ($is_ext) {
         $ENV{'QUERY_STRING'}=~s/(^|\&)symb=[^\&]*/$1/;
     }
   $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'};     $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; 
                                                  # reappend the query arguments                                                   # reappend the query arguments
   my $events='onLoad="'.&Apache::lonmenu::loadevents.    my $events='onLoad="'.&Apache::lonmenu::loadevents.
       '" onUnload="'.&Apache::lonmenu::unloadevents.'"';        '" onUnload="'.&Apache::lonmenu::unloadevents.'"';
   my $script=&Apache::lonmenu::registerurl(1,undef);    my $script=&Apache::lonmenu::registerurl(1,undef);
   
   if ($ENV{'browser.interface'} eq 'textual') {    if ($env{'browser.interface'} eq 'textual') {
 #  #
 # ssi-based rendering for text-based interface  # ssi-based rendering for text-based interface
 #  #
Line 94  sub handler { Line 91  sub handler {
  '</head><body bgcolor="#FFFFFF">'.   '</head><body bgcolor="#FFFFFF">'.
  &Apache::lonmenu::menubuttons(1).   &Apache::lonmenu::menubuttons(1).
  &Apache::lonnet::ssi_body($url).'</body></html>');   &Apache::lonnet::ssi_body($url).'</body></html>');
   } elsif ($ENV{'environment.remote'} eq 'off') {    } elsif ($env{'environment.remote'} eq 'off') {
 #  #
 # This is inline remote  # This is inline remote
 #   # 
Line 103  sub handler { Line 100  sub handler {
 <head>  <head>
 $script  $script
 </head>  </head>
 <frameset rows="180,*" border=0 $events>  <frameset rows="180,*" border="0" $events>
 <frame src="$orgurl">  <frame src="$orgurl">
 <frame src="$url">  <frame src="$url">
 </frameset>  </frameset>
Line 118  ENDDOCUMENTINL Line 115  ENDDOCUMENTINL
 <head>  <head>
 $script  $script
 </head>  </head>
 <frameset rows="1,*" border=0 $events>  <frameset rows="1,*" border="0" $events>
 <frame src="/adm/rat/empty.html">  <frame src="/adm/rat/empty.html">
 <frame src="$url">  <frame src="$url">
 </frameset>  </frameset>

Removed from v.1.16  
changed lines
  Added in v.1.20


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>