--- rat/lonwrapper.pm 2008/12/19 13:47:40 1.31
+++ rat/lonwrapper.pm 2009/10/21 23:47:11 1.36
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Wrapper for external and binary files as standalone resources
#
-# $Id: lonwrapper.pm,v 1.31 2008/12/19 13:47:40 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.36 2009/10/21 23:47:11 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -53,26 +53,12 @@ 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') {
- $layout{'rows'} = "100,*";
+ $layout{'rows'} = "140,*";
} else {
- $layout{'rows'} = "200,*";
+ $layout{'rows'} = "220,*";
}
} else {
$layout{'rows'} = "1,*";
@@ -89,7 +75,7 @@ sub wrapper {
&Apache::loncommon::end_page({'frameset' => 1});
foreach my $url ($topurl,$bottomurl) {
- if ($url !~ /^https?:/) {
+ if ($url !~ /^https?\:/) {
$url = &Apache::lonenc::check_encrypt($url);
}
}
@@ -145,8 +131,11 @@ sub handler {
#
if ($is_ext) {
$ENV{'QUERY_STRING'}=~s/(^|\&)symb=[^\&]*/$1/;
+ $ENV{'QUERY_STRING'} =~ s/\&$//;
}
- $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'};
+ unless ($ENV{'QUERY_STRING'} eq '') {
+ $url.=(($url=~/\?/)?'&':'?').$ENV{'QUERY_STRING'};
+ }
# reappend the query arguments
$r->print(&wrapper($orgurl,$url));
} # not just the menu
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.