Diff for /rat/lonwrapper.pm between versions 1.44 and 1.45

version 1.44, 2013/09/07 19:58:08 version 1.45, 2013/10/15 10:17:19
Line 40  use Apache::lonextresedit(); Line 40  use Apache::lonextresedit();
   
 # ================================================================ Main Handler  # ================================================================ Main Handler
 sub wrapper {  sub wrapper {
     my ($url,$brcrum,$absolute) = @_;      my ($url,$brcrum,$absolute,$is_ext) = @_;
   
     my $forcereg;      my $forcereg;
     unless ($env{'form.folderpath'}) {      unless ($env{'form.folderpath'}) {
Line 52  sub wrapper { Line 52  sub wrapper {
         $args->{'force_register'} = $forcereg;          $args->{'force_register'} = $forcereg;
     }      }
     if (ref($brcrum) eq 'ARRAY') {      if (ref($brcrum) eq 'ARRAY') {
          $args->{'bread_crumbs'} = $brcrum;          $args->{'bread_crumbs'} = $brcrum;
     }      }
     if ($absolute) {      if ($absolute) {
         $args->{'use_absolute'} = $absolute;           $args->{'use_absolute'} = $absolute; 
Line 172  sub handler { Line 172  sub handler {
         # encrypt url if not external          # encrypt url if not external
         &Apache::lonenc::check_encrypt(\$url) if $url !~ /^https?\:/ ;          &Apache::lonenc::check_encrypt(\$url) if $url !~ /^https?\:/ ;
   
         $r->print( wrapper($url,$brcrum,$absolute) );          $r->print( wrapper($url,$brcrum,$absolute,$is_ext) );
   
     } # not just the menu      } # not just the menu
           
Line 199  described at http://www.lon-capa.org. Line 199  described at http://www.lon-capa.org.
   
 =over  =over
   
 =item wrapper($url,$brcrum)  =item wrapper($url,$brcrum,$absolute,$is_ext)
   
 Wraps $url in an iframe and generates a page for it.  =over
 $brcrum contains breadcrumbs for unregistered urls  
   =item $url 
    
   url to display by including in an iframe within a
   LON-CAPA page which has a standard LON-CAPA inline menu.
   
   =item $brcrum
   
   breadcrumbs for unregistered urls
 (i.e., external resources in Supplemental Content).  (i.e., external resources in Supplemental Content).
   
   =item $absolute 
   
   contains protocol (http or https) followed by
   the hostname, if menu items in the standard LON-CAPA
   interface created by the call to loncommon::start_page()
   within &wrapper() need to use absolute URLs rather than
   relative URLs.
   
   That will be the case where an external resource has been 
   served from port 80, when the server customarily serves
   requests using Apache/SSL (i.e., port 443). mod_rewrite 
   is used to switch requests for external resources  
   from https:// to http:// where the the URL of the remote site 
   specified in the resource itself is http://.
   
   This is done to avoid default mixed content blocking
   in Firefox 23 and later, when serving from Apache/SSL.
   
   =item $is_ext
   
   true if URL is for an external resource.
   
   =back
   
 Returns markup for the entire page.  Returns markup for the entire page.
   
 =item handler()  =item handler()

Removed from v.1.44  
changed lines
  Added in v.1.45


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