Diff for /rat/lonwrapper.pm between versions 1.23 and 1.26

version 1.23, 2006/04/11 19:42:32 version 1.26, 2006/12/20 22:42:48
Line 32  use strict; Line 32  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::lonenc();
   use Apache::lonmenu();
   
 # ================================================================ Main Handler  # ================================================================ Main Handler
   
Line 81  sub wrapper { Line 82  sub wrapper {
   
     my $end_page =       my $end_page = 
  &Apache::loncommon::end_page({'frameset' => 1});   &Apache::loncommon::end_page({'frameset' => 1});
       
         foreach my $url ($topurl,$bottomurl) {
    if ($url !~ /^http:/) {
       $url = &Apache::lonenc::check_encrypt($url);
    }
       }
 #  #
 # frame-based rendering for graphical interface  # frame-based rendering for graphical interface
 #  #
Line 117  sub handler { Line 122  sub handler {
     $orgurl.=(($orgurl=~/\?/)?'&':'?').'wrapperdisplay=menu';      $orgurl.=(($orgurl=~/\?/)?'&':'?').'wrapperdisplay=menu';
     $url=~s/^\/adm\/wrapper//;      $url=~s/^\/adm\/wrapper//;
     my $is_ext = $url =~ m|^/ext/|;      my $is_ext = $url =~ m|^/ext/|;
     $url=~s/^\/ext\//http\:\/\//;      $url=~s{^/ext/}{http://};
       $url=~s|http://https://|https://|;
     $url=~s|:|:|g;      $url=~s|:|:|g;
 #  #
 # Actual URL  # Actual URL

Removed from v.1.23  
changed lines
  Added in v.1.26


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