--- rat/lonwrapper.pm 2010/02/11 15:12:11 1.32.2.2 +++ rat/lonwrapper.pm 2009/05/27 16:55:03 1.33 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Wrapper for external and binary files as standalone resources # -# $Id: lonwrapper.pm,v 1.32.2.2 2010/02/11 15:12:11 raeburn Exp $ +# $Id: lonwrapper.pm,v 1.33 2009/05/27 16:55:03 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -53,20 +53,6 @@ sub simple_menu { sub wrapper { my ($topurl,$bottomurl) = @_; - if ($env{'browser.interface'} eq 'textual') { -# -# ssi-based rendering for text-based interface -# - return - &Apache::loncommon::start_page('Menu',undef, - {'bgcolor' => '#FFFFFF', - 'force_register' => 1, - }). - &Apache::lonnet::ssi_body($bottomurl). - &Apache::loncommon::end_page(); - } - - my %layout = ('border' => 0); if ($env{'environment.remote'} eq 'off') { if ($env{'environment.icons'} eq 'iconsonly') { @@ -145,11 +131,8 @@ sub handler { # if ($is_ext) { $ENV{'QUERY_STRING'}=~s/(^|\&)symb=[^\&]*/$1/; - $ENV{'QUERY_STRING'} =~ s/\&$//; } - unless ($ENV{'QUERY_STRING'} eq '') { - $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; - } + $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'}; # reappend the query arguments $r->print(&wrapper($orgurl,$url)); } # not just the menu