--- loncom/publisher/Attic/lonconstruct.pm 2003/10/19 16:46:16 1.18 +++ loncom/publisher/Attic/lonconstruct.pm 2005/02/17 09:01:04 1.28 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Construction Space Page Wrapper for Construction # -# $Id: lonconstruct.pm,v 1.18 2003/10/19 16:46:16 taceyjo1 Exp $ +# $Id: lonconstruct.pm,v 1.28 2005/02/17 09:01:04 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -85,8 +85,6 @@ sub Debug { } - - # ================================================================ Main Handler sub handler { @@ -94,16 +92,15 @@ sub handler { # -------------------------------------------------------------- Build frameset - $r->content_type('text/html'); + &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; return OK if $r->header_only; my $lowerframe=$r->path_info; - &Debug($r, "Initial URL for lower frame: ".$lowerframe); $lowerframe=~s/^\//\/\~/; &Debug($r, "Lower frame URL afer ~ subst: ".$lowerframe); - $lowerframe= &HTML::Entities::encode($lowerframe); + $lowerframe= &HTML::Entities::encode($lowerframe,'<>&"'); &Debug($r, "Lower frame URL after quote subst: ".$lowerframe); # @@ -120,10 +117,15 @@ sub handler { if ($ENV{'form.forceColoredit'}) { $lowerframe.='?editmode=Edit&problemmode=Edit'; } - &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['decompress']); - if ($ENV{'form.decompress'}) { - $lowerframe="http://$ENV{'SERVER_NAME'}/cgi-bin/decompress.pl?decompress"; + +# +# Checking to see if we should display the topframe +# + my $toprows = 0; + my $topsrc = ''; + if ($ENV{'environment.remote'} ne 'off') { + $toprows = '110'; + $topsrc = '/adm/localize/adm/publisher.html'; } $r->print(< @@ -132,8 +134,8 @@ sub handler { var lastknownpriv="$lowerframe"; - - + +