Return to lonwrapper.pm CVS log

Up to [LON-CAPA] / rat

Diff for /rat/lonwrapper.pm between versions 1.28.2.1 and 1.41

-version 1.28.2.1, 2008/12/21 04:49:58
+version 1.41, 2011/11/07 20:06:29
  Line 26
  # http://www.lon-capa.org/
  #
  package Apache::lonwrapper;
  use strict;
  use Apache::Constants qw(:common);
- use Apache::lonnet;
- use Apache::lonxml();
  use Apache::lonenc();
- use Apache::lonmenu();
+ use Apache::lonnet;
  # ================================================================ Main Handler
- sub simple_menu {
- #
- # Producing the menu buttons
- #
-     return &Apache::loncommon::start_page('Menu',undef,
- 					  {'only_body' => 1,
- 					   'bgcolor'   => '#FFFFFF',}).
- 	&Apache::lonmenu::menubuttons(1,'web',1).
- 	&Apache::loncommon::end_page();
- }
  sub wrapper {
-     my ($topurl,$bottomurl) = @_;
+     my $url = shift;
-     if ($env{'browser.interface'} eq 'textual') {
+     my $startpage =  Apache::loncommon::start_page('Menu',undef,
- #
+ 					  { 'force_register' =>1, 'bgcolor'   => '#FFFFFF',}) ;
- # ssi-based rendering for text-based interface
+     my $endpage =  Apache::loncommon::end_page();
- #
- 	return
+     my $script = Apache::lonhtmlcommon::scripttag(<<SCRIPT );
- 	    &Apache::loncommon::start_page('Menu',undef,
+     \$(document).ready( function() {
- 					  {'bgcolor'        => '#FFFFFF',
+         \$(window).unbind('resize').resize(function(){
- 					   'force_register' => 1,
+             var header = \$('.LC_head_subbox')[0] ?  \$('.LC_head_subbox')
- 				       }).
+                                                   :  \$('#LC_breadcrumbs');
- 	    &Apache::lonnet::ssi_body($bottomurl).
+             var pos = header.height() + header.position().top + 5;
- 	    &Apache::loncommon::end_page();
+             \$('.LC_iframecontainer').css('top', pos);
-     }
+         });
+     });
+     window.onload = function(){  \$(window).trigger('resize') };
-     my %layout = ('border' => 0);
+ SCRIPT
-     if ($env{'environment.remote'} eq 'off') {
-         if ($env{'environment.icons'} eq 'iconsonly') {
+     # javascript will position the iframe if window was resized (or zoomed)
-            $layout{'rows'} = "100,*";
+     return <<ENDFRAME;
-         } else {
+     $startpage
- 	   $layout{'rows'} = "200,*";
+     $script
-         }
+     <div class="LC_iframecontainer">
-     } else {
+         <iframe src="$url">No iframe support!</iframe>
- 	$layout{'rows'} = "1,*";
+     </div>
- 	$topurl = "/adm/rat/empty.html";
+     $endpage
-     }
+ ENDFRAME
-     my $start_page =
- 	&Apache::loncommon::start_page(undef,undef,
- 				       {'force_register' => 1,
- 					'frameset'       => 1,
- 					'add_entries'    => \%layout, });
-     my $end_page =
- 	&Apache::loncommon::end_page({'frameset' => 1});
-     foreach my $url ($topurl,$bottomurl) {
- 	if ($url !~ /^https?\:/) {
- 	    $url = &Apache::lonenc::check_encrypt($url);
- 	}
-     }
- #
- # frame-based rendering for graphical interface
- #
-     my $result =<<ENDDOCUMENT;
- $start_page
- test
- <frame src="$topurl" />
- <frame src="$bottomurl" />
- $end_page
- ENDDOCUMENT
-     return $result;
  }
  sub handler {
- Line 113  sub handler {
+ Line 72  sub handler {
      return OK if $r->header_only;
-     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+     my $url = $r->uri;
- 					    ['wrapperdisplay']);
+     my $is_ext;
-     if ($env{'form.wrapperdisplay'} eq 'menu') {
- 	$r->print(&simple_menu());
+     for ($url){
- 	return OK;
+         s|^/adm/wrapper||;
+         $is_ext = $_ =~ s|^/ext/|http://|;
+         s|http://https://|https://|;
+         s|&colon;|:|g;
      }
-     my $orgurl=$r->uri;
-     my $url=$orgurl;
-     $orgurl.=(($orgurl=~/\?/)?'&':'?').$ENV{'QUERY_STRING'};
-     $orgurl.=(($orgurl=~/\?/)?'&':'?').'wrapperdisplay=menu';
-     $url=~s/^\/adm\/wrapper//;
-     my $is_ext = $url =~ m|^/ext/|;
-     $url=~s{^/ext/}{http://};
-     $url=~s|http://https://|https://|;
-     $url=~s|&colon;|:|g;
  #
  # Actual URL
  #
-     if ($url=~/\.(problem|exam|quiz|assess|survey|form|library)$/) {
+     if ($url=~/$LONCAPA::assess_re/) {
  #
  # This is uploaded homework
  #
- 	$env{'request.state'}='uploaded';
+         $env{'request.state'}='uploaded';
- 	&Apache::lonhomework::renderpage($r,$url);
+         &Apache::lonhomework::renderpage($r,$url);
      } else {
  #
  # This is not homework
  #
- 	if ($is_ext) {
+         if ($is_ext) {
- 	    $ENV{'QUERY_STRING'}=~s/(^|\&)symb=[^\&]*/$1/;
+             $ENV{'QUERY_STRING'} =~ s/(^|\&)symb=[^\&]*/$1/;
- 	}
+             $ENV{'QUERY_STRING'} =~ s/\&$//;
- 	$url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'};
+         }
- 	# reappend the query arguments
- 	$r->print(&wrapper($orgurl,$url));
+         unless ($ENV{'QUERY_STRING'} eq '') {
+             $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'};
+         }
+         # encrypt url if not external
+         &Apache::lonenc::check_encrypt(\$url) if $url !~ /^https?\:/ ;
+         $r->print( wrapper($url) );
      } # not just the menu
      return OK;
  } # handler
 ;
  __END__
+ =pod
+ =head1 NAME
+ Apache::lonwrapper - External and binary file management.
+ =head1 SYNOPSIS
+ Wrapper for external and binary files as standalone resources. Edit handler for rat maps; TeX content handler.
+ This is part of the LearningOnline Network with CAPA project
+ described at http://www.lon-capa.org.
+ =head1 Subroutines
+ =over
+ =item wrapper($url)
+ Wraps $url in an iframe and generates a page for it.
+ Returns markup for the entire page.
+ =item handler()
+ =back
+ =cut

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

500 Internal Server Error

Internal Server Error

The server encountered an internal error or misconfiguration and was unable to complete your request.

Please contact the server administrator at root@localhost to inform them of the time this error occurred, and the actions you performed just before this error.

More information about this error may be available in the server error log.

Removed from v.1.28.2.1
changed lines
	Added in v.1.41